Changeset 1334

Timestamp:

03/13/08 00:48:02 (7 months ago)

Author:

benoitg

Message:

• Major performance improvement in content manager for content groups picking items with limits on how many times they can be displayed.
  
  • Improve performance of Content::getLastDisplayedTimestamp(), will mostly show when using the RSS aggregator, especially when postgres has little memory
    

Files:

• trunk/wifidog-auth/CHANGELOG (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Content.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/classes/Content/ContentGroup/ContentGroup.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/include/schema_validate.php (modified) (2 diffs)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
-# $Id$
+2008-03-12 Benoit Grégoire  <bock@step.polymtl.ca>
+    * Major performance improvement in content manager for content groups picking items with limits on how many times they can be displayed.
+        * Improve performance of Content::getLastDisplayedTimestamp(), will mostly show when using the RSS aggregator, especially when postgres has little memory
+        
-2008-03-06 Benoit Grégoire  <bock@step.polymtl.ca>
-    * Fix #438.  Not Node::getNumOnlineUsers() will count every users connected (once for every account), except the splash-only user + every mac adresses connecting as the splash-only user.

trunk/wifidog-auth/wifidog/classes/Content.php

@@ -1434 +1434 @@
-        $db = AbstractDb :: getObject();
-
-last_display_timestamp) as last_display_timestamp FROM content_display_log WHERE content_id='$this->id' $user_sql $node_sql ORDER BY last_display_timestamp DESC limit 1
+MAX(last_display_timestamp)) as last_display_timestamp FROM content_display_log WHERE content_id='$this->id' $user_sql $node_sql
-        $db->execSqlUniqueRes($sql, $log_row, false);
-        if ($log_row != null) {
@@ -1523 +1523 @@
-                array (
-                'isSimpleContent'
-        
+
-                );
-                $metadada_allowed_content_types = ContentTypeFilter :: getObject($criteria_array);
@@ -1970 +1970 @@
-            'title' => _("Reusable content library"),
-            'url' => BASE_URL_PATH.htmlspecialchars("admin/generic_object_admin.php?object_class=Content&action=list")
-               
+            
-        }
-

trunk/wifidog-auth/wifidog/classes/Content/ContentGroup/ContentGroup.php

@@ -495 +495 @@
-                /* There aren't enough elements to redisplay, We need new content */
-
-                $sql_base = "SELECT content_group_element_id FROM content_group_element WHERE content_group_id='$this->id' \n";
-                $sql_base .= $sql_time_restrictions;
-                $sql = $sql_base;
-
-                /*'YES' => "Content can be shown more than once", 'NO' => "Content can only be shown once", 'ONCE_PER_NODE' => "Content can be shown more than once, but not at the same node"*/
-                $allow_repeat = $this->getAllowRepeat();
-                if ($allow_repeat == 'NO') {
-
+
+
-                }
-                elseif ($allow_repeat == 'ONCE_PER_NODE') {
-
+
+
-                } else {
+                    $sql_repeat_join = null;
-                    $sql_repeat = null;
-                }
+                $sql = "SELECT content_group_element_id FROM content_group_element $sql_repeat_join WHERE content_group_id='$this->id' \n";
+                $sql .= $sql_time_restrictions;
-                $sql .= $sql_repeat;
-                if ($sql_redisplay) {
@@ -541 +542 @@
-                if ($content_ordering_mode == 'PSEUDO_RANDOM') {
-                    //Special case, first get only the rows that haven't been displayed before'
-
-
+
+
+
+
+
-                }
-                //Normal case, or there wasn't any undisplayed content in PSEUDO_RANDOM

trunk/wifidog-auth/wifidog/include/schema_validate.php

@@ -48 +48 @@
- * Define current database schema version
- */
-8
+9
-/** Used to test a new shecma version before modyfying the database */
-define('SCHEMA_UPDATE_TEST_MODE', false);
@@ -1313 +1313 @@
-    }
-
+    $new_schema_version = 59;
+    if ($schema_version < $new_schema_version && $new_schema_version <= $targetSchema) {
+        printUpdateVersion($new_schema_version);
+        $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+        $sql .= "CREATE INDEX idx_content_display_log ON content_display_log (last_display_timestamp);\n";
+    }
+    
-    /*
-     $new_schema_version = ;