From efeb97a8149c65976ad3e2ff12c096b180bf1f4a Mon Sep 17 00:00:00 2001
From: Nicolas Payart <npayart@ccmbenchmark.com>
Date: Fri, 15 Mar 2019 11:10:51 +0100
Subject: [PATCH] Use char(32) for checksums instead of bigint unsigned (as
 required from pt-query-digest 3.0.11+)

---
 conf/sample.config.inc.php    |  1 -
 docs/classes/Anemometer.html  | 35 -------------------------------
 docs/files/Anemometer.php.txt | 39 +++++------------------------------
 install.sql                   |  4 ++--
 lib/Anemometer.php            | 38 +++++-----------------------------
 lib/AnemometerModel.php       |  8 +++----
 6 files changed, 16 insertions(+), 109 deletions(-)

diff --git a/conf/sample.config.inc.php b/conf/sample.config.inc.php
index fe51fbb4..4a89106d 100644
--- a/conf/sample.config.inc.php
+++ b/conf/sample.config.inc.php
@@ -345,7 +345,6 @@
 	'callbacks'     => array(
 		'table' => array(
 			'date'  => function ($x) { $type=''; if ( date('N',strtotime($x)) >= 6) { $type = 'weekend'; } return array($x,$type); },
-			'checksum' => function ($x) { return array(dec2hex($x), ''); }
 		)
 	)
 
diff --git a/docs/classes/Anemometer.html b/docs/classes/Anemometer.html
index 1c378e40..6b0cc070 100644
--- a/docs/classes/Anemometer.html
+++ b/docs/classes/Anemometer.html
@@ -223,7 +223,6 @@ <h2>Summary</h2>
                         <section class="row-fluid private">
                             <section class="span4">
                                                                     <a href="../classes/Anemometer.html#method_setup_data_for_graph_search" class="">setup_data_for_graph_search()</a><br />
-                                                                    <a href="../classes/Anemometer.html#method_translate_checksum" class="">translate_checksum()</a><br />
                                                                     <a href="../classes/Anemometer.html#method_alert" class="">alert()</a><br />
                                                                     <a href="../classes/Anemometer.html#method_display_report_form" class="">display_report_form()</a><br />
                                                                     <a href="../classes/Anemometer.html#method_footer" class="">footer()</a><br />
@@ -754,40 +753,6 @@ <h4>Parameters</h4>
                 
                 
                 				
-                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                                                            <dl>
-                                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="method_translate_checksum" name="method_translate_checksum" class="anchor"></a>
-            <article class="method">
-                <h3 class="private ">translate_checksum()</h3>
-                <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">translate_checksum(  <span class="argument">$checksum</span>) </pre>
-                <p><em></em></p>
-                
-
-                                    <h4>Parameters</h4>
-                    <table class="table table-condensed table-hover">
-                                                    <tr>
-                                <td></td>
-                                <td>$checksum </td>
-                                <td></td>
-                            </tr>
-                                            </table>
-                
-                
-                				
                             </article>
         </div>
         <aside class="span4 detailsbar">
diff --git a/docs/files/Anemometer.php.txt b/docs/files/Anemometer.php.txt
index eab2f890..59ff7876 100644
--- a/docs/files/Anemometer.php.txt
+++ b/docs/files/Anemometer.php.txt
@@ -89,15 +89,12 @@ class Anemometer {
         } else if (get_var('dimension-pivot-'.$checksum_field_name) != null
                    and get_var("dimension-pivot-{$checksum_field_name}-use-values") != null) {
             $values = explode('|',get_var("dimension-pivot-{$checksum_field_name}-use-values"));
-            for ($i=0; $i<count($values); $i++) {
-                $values[$i] = $this->translate_checksum($values[$i]);
-            }
             $this->report_obj->set_pivot_values("dimension-pivot-{$checksum_field_name}", $values);
             //$_GET["dimension-pivot-{$checksum_field_name}"] = get_var('plot_field');
         }
 
         // translate the checksum field from possible hex value
-        $checksum = $this->translate_checksum(get_var("fact-{$checksum_field_name}"));
+        $checksum = get_var("fact-{$checksum_field_name}");
         if (isset($checksum))
         {
 //            print "setting checksum [$checksum]";
@@ -268,7 +265,7 @@ class Anemometer {
      */
     public function quicksearch() {
         $datasource = get_var('datasource');
-        $checksum = $this->translate_checksum(get_var('checksum'));
+        $checksum = get_var('checksum');
         $exists = $this->data_model->checksum_exists($checksum);
         if (!$exists) {
             $this->alert("Unknown checksum: {$checksum}");
@@ -334,7 +331,7 @@ class Anemometer {
         $this->header();
 
         $datasource = get_var('datasource');
-        $checksum = $this->translate_checksum(get_var('checksum'));
+        $checksum = get_var('checksum');
         $start = get_var('start') | 0;
         $rpp = get_var('rpp');
 
@@ -355,31 +352,6 @@ class Anemometer {
         $this->footer();
     }
 
-    private function translate_checksum($checksum)
-    {
-	if (!in_array($this->data_model->get_source_type(), array('slow_query_log','default')))
-	{
-		return $checksum;
-	}
-
-        if (preg_match('/^[0-9]+$/', $checksum))
-        {
-            return $checksum;
-        }
-        else if (preg_match('/^[0-9A-Fa-f]+$/', $checksum))
-        {
-            return $this->bchexdec($checksum);
-        }
-        else if (strlen($checksum) == 0)
-        {
-            return null;
-        }
-        else
-        {
-            throw new Exception("Invalid query checksum");
-        }
-    }
-
     /**
      * Display a specific query from its checksum value
      *
@@ -387,7 +359,7 @@ class Anemometer {
     public function show_query() {
         $this->header();
         $output = 'table';
-        $checksum = $this->translate_checksum(get_var('checksum'));
+        $checksum = get_var('checksum');
         $exists = $this->data_model->checksum_exists($checksum);
         if (!$exists) {
             $this->alert("Unknown checksum: {$checksum}");
@@ -524,7 +496,7 @@ class Anemometer {
      *
      */
     public function upd_query() {
-        $checksum = $this->translate_checksum(get_var('checksum'));
+        $checksum = get_var('checksum');
         $valid_actions = array('Review', 'Review and Update Comments', 'Update Comments', 'Clear Review');
         $submit = get_var('submit');
 
@@ -746,4 +718,3 @@ class Anemometer {
 }
 
 ?>
-
diff --git a/install.sql b/install.sql
index 8803f38e..b1954219 100644
--- a/install.sql
+++ b/install.sql
@@ -5,7 +5,7 @@ USE slow_query_log;
 
 -- Create the global query review table
 CREATE TABLE `global_query_review` (
-  `checksum` bigint(20) unsigned NOT NULL,
+  `checksum` char(32) NOT NULL,
   `fingerprint` text NOT NULL,
   `sample` longtext NOT NULL,
   `first_seen` datetime DEFAULT NULL,
@@ -21,7 +21,7 @@ CREATE TABLE `global_query_review` (
 CREATE TABLE `global_query_review_history` (
   `hostname_max` varchar(64) NOT NULL,
   `db_max` varchar(64) DEFAULT NULL,
-  `checksum` bigint(20) unsigned NOT NULL,
+  `checksum` char(32) NOT NULL,
   `sample` longtext NOT NULL,
   `ts_min` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `ts_max` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
diff --git a/lib/Anemometer.php b/lib/Anemometer.php
index 6b14f51d..59ff7876 100644
--- a/lib/Anemometer.php
+++ b/lib/Anemometer.php
@@ -89,15 +89,12 @@ public function api()
         } else if (get_var('dimension-pivot-'.$checksum_field_name) != null
                    and get_var("dimension-pivot-{$checksum_field_name}-use-values") != null) {
             $values = explode('|',get_var("dimension-pivot-{$checksum_field_name}-use-values"));
-            for ($i=0; $i<count($values); $i++) {
-                $values[$i] = $this->translate_checksum($values[$i]);
-            }
             $this->report_obj->set_pivot_values("dimension-pivot-{$checksum_field_name}", $values);
             //$_GET["dimension-pivot-{$checksum_field_name}"] = get_var('plot_field');
         }
 
         // translate the checksum field from possible hex value
-        $checksum = $this->translate_checksum(get_var("fact-{$checksum_field_name}"));
+        $checksum = get_var("fact-{$checksum_field_name}");
         if (isset($checksum))
         {
 //            print "setting checksum [$checksum]";
@@ -268,7 +265,7 @@ public function noconfig()
      */
     public function quicksearch() {
         $datasource = get_var('datasource');
-        $checksum = $this->translate_checksum(get_var('checksum'));
+        $checksum = get_var('checksum');
         $exists = $this->data_model->checksum_exists($checksum);
         if (!$exists) {
             $this->alert("Unknown checksum: {$checksum}");
@@ -334,7 +331,7 @@ public function samples() {
         $this->header();
 
         $datasource = get_var('datasource');
-        $checksum = $this->translate_checksum(get_var('checksum'));
+        $checksum = get_var('checksum');
         $start = get_var('start') | 0;
         $rpp = get_var('rpp');
 
@@ -355,31 +352,6 @@ public function samples() {
         $this->footer();
     }
 
-    private function translate_checksum($checksum)
-    {
-	if (!in_array($this->data_model->get_source_type(), array('slow_query_log','default')))
-	{
-		return $checksum;
-	}
-
-        if (preg_match('/^[0-9]+$/', $checksum))
-        {
-            return $checksum;
-        }
-        else if (preg_match('/^[0-9A-Fa-f]+$/', $checksum))
-        {
-            return $this->bchexdec($checksum);
-        }
-        else if (strlen($checksum) == 0)
-        {
-            return null;
-        }
-        else
-        {
-            throw new Exception("Invalid query checksum");
-        }
-    }
-
     /**
      * Display a specific query from its checksum value
      *
@@ -387,7 +359,7 @@ private function translate_checksum($checksum)
     public function show_query() {
         $this->header();
         $output = 'table';
-        $checksum = $this->translate_checksum(get_var('checksum'));
+        $checksum = get_var('checksum');
         $exists = $this->data_model->checksum_exists($checksum);
         if (!$exists) {
             $this->alert("Unknown checksum: {$checksum}");
@@ -524,7 +496,7 @@ public function show_query() {
      *
      */
     public function upd_query() {
-        $checksum = $this->translate_checksum(get_var('checksum'));
+        $checksum = get_var('checksum');
         $valid_actions = array('Review', 'Review and Update Comments', 'Update Comments', 'Clear Review');
         $submit = get_var('submit');
 
diff --git a/lib/AnemometerModel.php b/lib/AnemometerModel.php
index 1742792f..75b3e3da 100644
--- a/lib/AnemometerModel.php
+++ b/lib/AnemometerModel.php
@@ -198,7 +198,7 @@ public function get_reviewers() {
      */
     public function checksum_exists($checksum) {
         $checksum_field_name = $this->get_field_name('checksum');
-        $query = "SELECT `{$checksum_field_name}` FROM `{$this->fact_table}` WHERE `{$checksum_field_name}`=" . $this->mysqli->real_escape_string($checksum);
+        $query = "SELECT `{$checksum_field_name}` FROM `{$this->fact_table}` WHERE `{$checksum_field_name}`='" . $this->mysqli->real_escape_string($checksum) . "'";
         $result = $this->mysqli->query($query);
         check_mysql_error($result, $this->mysqli);
         if ($result->num_rows) {
@@ -227,7 +227,7 @@ function ($x, $y) use ($mysqli) {
                         }, array_keys($fields), array_values($fields)
                 )
         );
-        $sql .= " WHERE `{$checksum_field_name}`=" . $this->mysqli->real_escape_string($checksum);
+        $sql .= " WHERE `{$checksum_field_name}`='" . $this->mysqli->real_escape_string($checksum) . "'";
         $res = $this->mysqli->query($sql);
         // @todo ... fix this by making it a local method
         check_mysql_error($res, $this->mysqli);
@@ -241,7 +241,7 @@ function ($x, $y) use ($mysqli) {
      */
     public function get_query_by_checksum($checksum) {
         $checksum_field_name = $this->get_field_name('checksum');
-        $result = $this->mysqli->query("SELECT * FROM `{$this->fact_table}` WHERE `{$checksum_field_name}`={$checksum}");
+        $result = $this->mysqli->query("SELECT * FROM `{$this->fact_table}` WHERE `{$checksum_field_name}`='" . $this->mysqli->real_escape_string($checksum) . "'");
         check_mysql_error($result, $this->mysqli);
         if ($row = $result->fetch_assoc()) {
             return $row;
@@ -265,7 +265,7 @@ public function get_query_samples($checksum, $limit = 1, $offset = 0) {
         {
             $table = $this->fact_table;
         }
-        $sql = "SELECT * FROM `{$table}` WHERE `{$checksum_field_name}`={$checksum} ORDER BY `{$time_field_name}` DESC LIMIT {$limit} OFFSET {$offset}";
+        $sql = "SELECT * FROM `{$table}` WHERE `{$checksum_field_name}`='" . $this->mysqli->real_escape_string($checksum) . "' ORDER BY `{$time_field_name}` DESC LIMIT {$limit} OFFSET {$offset}";
         return $this->mysqli->query($sql);
     }