Changeset 3e48d2ee in github

Timestamp:

Nov 21, 2008 1:19:30 PM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

dcf780a

Parents:

be7d3b6

Message:

• Increase speed of session destroy and garbage clean up
• Fix session timeout when DB server got clock skew (#1485490)

Files:

• CHANGELOG (modified) (1 diff)
• SQL/mssql.initial.sql (modified) (1 diff)
• SQL/mysql.initial.sql (modified) (1 diff)
• SQL/mysql.update.sql (modified) (1 diff)
• SQL/mysql5.initial.sql (modified) (1 diff)
• SQL/postgres.initial.sql (modified) (1 diff)
• SQL/postgres.update.sql (modified) (1 diff)
• SQL/sqlite.initial.sql (modified) (1 diff)
• SQL/sqlite.update.sql (modified) (1 diff)
• program/include/rcube_imap.php (modified) (3 diffs)
• program/include/session.inc (modified) (3 diffs)

CHANGELOG

@@ -5 +5 @@
 ----------
 - Fix 'cache' table cleanup on session destroy (#1485516)
+- Increase speed of session destroy and garbage clean up
+- Fix session timeout when DB server got clock skew (#1485490)
 
 2008/11/19 (alec)

SQL/mssql.initial.sql

@@ -197 +197 @@
 GO
 
+ CREATE  INDEX [IX_session_changed] ON [dbo].[session]([changed]) ON [PRIMARY]
+GO
+
 ALTER TABLE [dbo].[users] ADD 
         CONSTRAINT [DF_users_username] DEFAULT ('') FOR [username],

SQL/mysql.initial.sql

@@ -74 +74 @@
   `ip` VARCHAR(40) NOT NULL default '',
   `vars` text NOT NULL,
-  PRIMARY KEY  (`sess_id`)
+  PRIMARY KEY  (`sess_id`),
+  INDEX `changed_index` (`changed`) 
 );
 

SQL/mysql.update.sql

@@ -39 +39 @@
     ON DELETE CASCADE
     ON UPDATE CASCADE;
+
+ALTER TABLE `session`
+    ADD INDEX `changed_index` (`changed`);

SQL/mysql5.initial.sql

@@ -15 +15 @@
  `ip` varchar(40) NOT NULL,
  `vars` text NOT NULL,
- PRIMARY KEY(`sess_id`)
+ PRIMARY KEY(`sess_id`),
+ INDEX `changed_index` (`changed`)
 ) TYPE=INNODB CHARACTER SET utf8 COLLATE utf8_general_ci;
 

SQL/postgres.initial.sql

@@ -43 +43 @@
 );
 
+CREATE INDEX session_changed_idx ON session (changed);
 
 

SQL/postgres.update.sql

@@ -26 +26 @@
 
 ALTER TABLE cache DROP CONSTRAINT cache_session_id_fkey;
-ALTER TABLE cache ADD FOREIGN KEY (session_id) REFERENCES session(sess_id) ON DELETE CASCADE ON UPDATE CASCADE;
-CREATE INDEX cache_session_id_idx ON "cache" (session_id);
+ALTER TABLE cache ADD FOREIGN KEY (session_id) REFERENCES session (sess_id) ON DELETE CASCADE ON UPDATE CASCADE;
+
+CREATE INDEX cache_session_id_idx ON cache (session_id);
+CREATE INDEX session_changed_idx ON session (changed);

SQL/sqlite.initial.sql

@@ -98 +98 @@
 );
 
+CREATE INDEX ix_session_changed ON session (changed);
 
 -- --------------------------------------------------------

SQL/sqlite.update.sql

@@ -30 +30 @@
 
 CREATE INDEX ix_messages_created ON messages (created);
+
+-- Updates from version 0.2-beta
+
+CREATE INDEX ix_session_changed ON session (changed);

program/include/rcube_imap.php

@@ -2147 +2147 @@
       $this->db->query(
         "UPDATE ".get_table_name('cache')."
-         SET    created=".$this->db->now().", data=?, session_id=?
+         SET    created=". $this->db->fromunixtime(time()).", data=?, session_id=?
          WHERE  user_id=?
          AND    cache_key=?",
@@ -2161 +2161 @@
         "INSERT INTO ".get_table_name('cache')."
          (created, user_id, cache_key, data, session_id)
-         VALUES (".$this->db->now().", ?, ?, ?, ?)",
+         VALUES (".$this->db->fromunixtime(time()).", ?, ?, ?, ?)",
         $_SESSION['user_id'],
         $key,
@@ -2375 +2375 @@
         "INSERT INTO ".get_table_name('messages')."
          (user_id, del, cache_key, created, idx, uid, subject, ".$this->db->quoteIdentifier('from').", ".$this->db->quoteIdentifier('to').", cc, date, size, headers, structure)
-         VALUES (?, 0, ?, ".$this->db->now().", ?, ?, ?, ?, ?, ?, ".$this->db->fromunixtime($headers->timestamp).", ?, ?, ?)",
+         VALUES (?, 0, ?, ".$this->db->fromunixtime(time()).", ?, ?, ?, ?, ?, ?, ".$this->db->fromunixtime($headers->timestamp).", ?, ?, ?)",
         $_SESSION['user_id'],
         $key,

program/include/session.inc

@@ -76 +76 @@
     $key);
 
+  $now = $DB->fromunixtime(time());
+
   if ($DB->num_rows($sql_result)) {
     $DB->query(
       "UPDATE " . get_table_name('session') . "
-       SET    vars=?, changed=" . $DB->now() . "
+       SET    vars=?, changed= " . $now . "
        WHERE  sess_id=?",
       $vars,
@@ -88 +90 @@
       "INSERT INTO " . get_table_name('session') . "
        (sess_id, vars, ip, created, changed)
-       VALUES (?, ?, ?, ".$DB->now().", ".$DB->now().")",
+       VALUES (?, ?, ?, " . $now . ", " . $now .")",
       $key,
       $vars,
@@ -108 +110 @@
   }
 
+  $DB->query("DELETE FROM " . get_table_name('session') . " WHERE sess_id=?", $key);
+
+  // delete session entries in cache table
+  // on databases wthout foreign keys
+  if ($rcmail->config->get('enable_caching') && $DB->db_provider != 'pgsql') {
+    $DB->query("DELETE FROM " . get_table_name('cache') . " WHERE session_id=?", $key);
+  }
+
+  return true;
+}
+
+
+// garbage collecting function
+function rcube_sess_gc($maxlifetime)
+{
+  $rcmail = rcmail::get_instance();
+  $DB = $rcmail->get_dbh();
+
+  if ($DB->is_error()) {
+    return false;
+  }
+
+  $now = $DB->fromunixtime(time() - $maxlifetime);
+
   // delete session entries in cache table
   if ($rcmail->config->get('enable_caching')) {
-    $DB->query("DELETE FROM " . get_table_name('cache') . " WHERE session_id=?", $key);
-  }
-              
-  $DB->query("DELETE FROM " . get_table_name('session') . " WHERE sess_id=?", $key);
-
-  return true;
-}
-
-
-// garbage collecting function
-function rcube_sess_gc($maxlifetime)
-{
-  $rcmail = rcmail::get_instance();
-  $DB = $rcmail->get_dbh();
-
-  if ($DB->is_error()) {
-    return false;
-  }
-
-  if ($rcmail->config->get('enable_caching')) {
-    // get all expired sessions
-    $sql_result = $DB->query(
-        "SELECT sess_id
-        FROM " . get_table_name('session') . "
-        WHERE " . $DB->unixtimestamp($DB->now())."-".$DB->unixtimestamp('changed') . " > ?",
-        $maxlifetime);
-                                   
-    $exp_sessions = array();
-    while ($sql_arr = $DB->fetch_assoc($sql_result)) {
-      $exp_sessions[] = $sql_arr['sess_id'];
+
+    // on databases wthout foreign keys...
+    if($DB->db_provider != 'pgsql') {
+
+      // get all expired sessions
+      $sql_result = $DB->query(
+        "SELECT sess_id FROM " . get_table_name('session') . "
+            WHERE changed < " . $now);
+
+      $exp_sessions = array();
+      while ($sql_arr = $DB->fetch_assoc($sql_result)) {
+        $exp_sessions[] = $sql_arr['sess_id'];
+      }
+
+      if (sizeof($exp_sessions)) {
+        $exp_sessions = "'" . join("','", $exp_sessions) . "'";
+        // delete session cache records
+        $DB->query("DELETE FROM " . get_table_name('cache') . "
+            WHERE session_id IN (" . $exp_sessions . ")");
+      }
     }
-
-    if (sizeof($exp_sessions)) {
-      $exp_sessions = "'" . join("','", $exp_sessions) . "'";
-      // delete session cache records
-      $DB->query("DELETE FROM " . get_table_name('cache') . "
-            WHERE session_id IN (" . $exp_sessions . ")");
-
-      // delete session records
-      $DB->query("DELETE FROM " . get_table_name('session') . "
-            WHERE sess_id IN (" . $exp_sessions . ")");
-    }
-
     // also run message cache GC
     rcmail_message_cache_gc();
-  
-  } else {
-    // just delete all expired sessions
-    $DB->query("DELETE FROM " . get_table_name('session') . "
-        WHERE " . $DB->unixtimestamp($DB->now())."-".$DB->unixtimestamp('changed') . " > ?",
-        $maxlifetime);
-  }
+  }
+
+  // just delete all expired sessions
+  $DB->query("DELETE FROM " . get_table_name('session') . "
+    WHERE changed < " . $now);
 
   rcmail_temp_gc();