Changeset 852 for trunk/Packages/Common

Timestamp:

Oct 25, 2017, 10:55:05 PM (7 years ago)

Author:

chronos

Message:

• Modified: Use better transaction mechanism for netwatch import and latency measurement.
• Fixed: Query duration mesurement using outdated microtime result.

File:

• trunk/Packages/Common/Database.php (modified) (6 diffs)

trunk/Packages/Common/Database.php

@@ -3 +3 @@
 // Extended database class
 // Date: 2016-01-11
+
+function microtime_float()
+{
+  list($usec, $sec) = explode(" ", microtime());
+  return ((float)$usec + (float)$sec);
+}
 
 class DatabaseResult
@@ -51 +57 @@
     $this->LogFile = dirname(__FILE__).'/../../Query.log';
   }
+ 
 
   function Connect($Host, $User, $Password, $Database)
@@ -85 +92 @@
   {
     if(!$this->Connected()) throw new Exception(T('Not connected to database'));
-    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime();
+    if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
     $this->LastQuery = $Query;
+    //echo('a'.$this->ShowSQLQuery.'<'.$QueryStartTime.', '.microtime_float());
     if(($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
-      $Duration = ' ; '.round(microtime() - $QueryStartTime, 4). ' s';
+      $Duration = ' ; '.round(microtime_float() - $QueryStartTime, 4). ' s';
     if($this->LogSQLQuery == true)
       file_put_contents($this->LogFile, $Query.$Duration."\n", FILE_APPEND);
@@ -123 +131 @@
   function insert($Table, $Data)
   {
+    $this->query($this->GetInsert($Table, $Data));
+    $this->insert_id = $this->PDO->lastInsertId();
+  }
+  
+  function GetInsert($Table, $Data)
+  {
     $Name = '';
     $Values = '';
@@ -137 +151 @@
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
-    $this->insert_id = $this->PDO->lastInsertId();
+    return('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
   }
 
   function update($Table, $Condition, $Data)
+  {
+    $this->query($this->GetUpdate($Table, $Condition, $Data));
+  }
+  
+  function GetUpdate($Table, $Condition, $Data)
   {
     $Values = '';
@@ -154 +172 @@
     }
     $Values = substr($Values, 2);
-    //echo('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
-    $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
+    return('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
   }