Changeset 696

Timestamp:

Sep 23, 2014, 9:56:07 PM (10 years ago)

Author:

chronos

Message:

• Upraveno: Dobu trvání v tabulce NetworkInterfaceUpDown ukládat jako pevné číslo ihned při vkládání. Tím dojde ke zpomalení vkládání, ale zrychlení prohlížení tabulky stavu dostupnosti.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 693; // Subversion revision
-$DatabaseRevision = 692; // SQL structure revision
-$ReleaseTime = strtotime('2014-09-14');
+$Revision = 696; // Subversion revision
+$DatabaseRevision = 696; // SQL structure revision
+$ReleaseTime = strtotime('2014-09-23');

trunk/Common/Setup/Updates.php

@@ -911 +911 @@
   $Manager->Execute('ALTER TABLE `User` DROP `PhoneNumber`;');
 }
+
+function UpdateTo696($Manager)
+{
+        $Manager->Execute('ALTER TABLE `NetworkInterfaceUpDown` ADD `Duration` INT NOT NULL ;');
+        $Manager->Execute('UPDATE `NetworkInterfaceUpDown` AS `TM` SET `Duration` = IFNULL(TIMESTAMPDIFF(SECOND,
+    (SELECT `Time` FROM (SELECT * FROM `NetworkInterfaceUpDown`) AS `TA` WHERE (`TA`.`Time` < `TM`.`Time`)
+    AND (`TA`.`Interface`=`TM`.`Interface`) ORDER BY `TA`.`Time` DESC LIMIT 1), `TM`.`Time`), 0)');
+}
+
 
 class Updates
@@ -962 +971 @@
       679 => array('Revision' => 688, 'Function' => 'UpdateTo688'),
       688 => array('Revision' => 692, 'Function' => 'UpdateTo692'),
+      692 => array('Revision' => 696, 'Function' => 'UpdateTo696'),
     ));
   }

trunk/Modules/NetworkConfigRouterOS/Generators/NetwatchImport.php

@@ -57 +57 @@
     {
         // Online state changed
-      $System->Database->insert('NetworkInterfaceUpDown', array(
-        'Interface' => $Interface['Id'], 'State' => $Interface['NewOnline'],
-           'Time' => TimeToMysqlDateTime($StartTime)));
+      $System->Database->query('INSERT INTO `NetworkInterfaceUpDown` (`Interface`,
+        `State`, `Time`, `Duration`) VALUES ('.$Interface['Id'].', '.$Interface['NewOnline'].', "'.
+         TimeToMysqlDateTime($StartTime).'", IFNULL(TIMESTAMPDIFF(SECOND, '.
+         '(SELECT `Time` FROM `NetworkInterfaceUpDown` AS `TA` WHERE (`TA`.`Time` < "'.TimeToMysqlDateTime($StartTime).'") '.
+         'AND (`TA`.`Interface`='.$Interface['Id'].') ORDER BY `TA`.`Time` DESC LIMIT 1), "'.TimeToMysqlDateTime($StartTime).'"), 0))');
+      echo($System->Database->LastQuery."\n");
       $System->Database->update('NetworkInterface', '`Id` = "'.$Interface['Id'].'"',
         array('Online' => $Interface['NewOnline']));

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -37 +37 @@
         'Interface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => '', 'ReadOnly' => true),
         'State' => array('Type' => 'TOnlineState', 'Caption' => 'Stav', 'Default' => '', 'ReadOnly' => true),
-        'Duration' => array('Type' => 'TimeDiff', 'Caption' => 'Trvání', 'Default' => '', 'ReadOnly' => true,
-          'SQL' => 'TIMESTAMPDIFF(SECOND, `Time`, '.
-            '(SELECT `Time` FROM `NetworkInterfaceUpDown` AS `TA` WHERE (`TA`.`Time` > `TX`.`Time`) '.
-                        'AND (`TA`.`Interface`=`TX`.`Interface`) ORDER BY `TA`.`Time` LIMIT 1))'),
+        'Duration' => array('Type' => 'TimeDiff', 'Caption' => 'Trvání', 'Default' => '', 'ReadOnly' => true),
       ),
     ));