Merge lp:~mark-pent/percona-playback/add-select-only-option into lp:percona-playback

[Mark Pentland]

I have added a --query-log-select-only option to only execute SELECT statements.
Not 100% accurate (SELECT INTO) but I also use a read-only user for playback so it will catch any that slip through.
Referenced in Bug #1231391
Includes a basic test

Thanks for the good work on Percona.

Mark

[Stewart Smith (stewart)]

This looks great! Thanks for the patch!

I'm just in the process of getting the last things done for the 0.7 release and then I'll merge this in.

One question: what is it with the "USE " query detection in this patch? Should it be a separate option?

Unmerged revisions

197. By Mark Pentland on 2013-09-26

Added --query-log-select-only option to only execute SELECT (and use) statements

=== modified file 'Makefile.am'
--- Makefile.am	2013-07-26 09:35:29 +0000
+++ Makefile.am	2013-09-26 12:08:23 +0000
@@ -102,6 +102,7 @@
 
 check_PROGRAMS += \
   percona_playback/test/basic \
+  percona_playback/test/basic-select-only \
   percona_playback/test/basic-stdin \
   percona_playback/test/basic-multiline \
   percona_playback/test/basic-queue-depth \
@@ -118,6 +119,7 @@
   percona_playback/test/help
 
 percona_playback_test_basic_CXXFLAGS= $(AM_CXXFLAGS) -DSRCDIR=\"${srcdir}\"
+percona_playback_test_basic_select_only_CXXFLAGS= $(AM_CXXFLAGS) -DSRCDIR=\"${srcdir}\"
 percona_playback_test_basic_stdin_CXXFLAGS= $(AM_CXXFLAGS) -DSRCDIR=\"${srcdir}\"
 percona_playback_test_basic_multiline_CXXFLAGS= $(AM_CXXFLAGS) -DSRCDIR=\"${srcdir}\"
 percona_playback_test_basic_queue_depth_CXXFLAGS= $(AM_CXXFLAGS) -DSRCDIR=\"${srcdir}\"
@@ -138,6 +140,9 @@
 percona_playback_test_basic_SOURCES= percona_playback/test/basic.cc
 percona_playback_test_basic_LDADD= $(LDADD) $(MYSQL_LIBS)
 
+percona_playback_test_basic_select_only_SOURCES= percona_playback/test/basic-select-only.cc
+percona_playback_test_basic_select_only_LDADD= $(LDADD) $(MYSQL_LIBS)
+
 percona_playback_test_basic_stdin_SOURCES= percona_playback/test/basic-stdin.cc
 percona_playback_test_basic_stdin_LDADD= $(LDADD) $(MYSQL_LIBS)
 
 
=== modified file 'percona_playback/query_log/query_log.cc'
--- percona_playback/query_log/query_log.cc	2013-06-07 07:04:15 +0000
+++ percona_playback/query_log/query_log.cc	2013-09-26 12:08:23 +0000
@@ -49,6 +49,7 @@
 
 static bool g_run_set_timestamp;
 static bool g_preserve_query_time;
+static bool g_select_only;
 
 extern percona_playback::DispatcherPlugin *g_dispatcher_plugin;
 
@@ -131,11 +132,12 @@
 
     if (strncmp(p, "# User@Host", strlen("# User@Host")) == 0)
     {
-      if (!tmp_entry->getQuery().empty())
+      if ((!tmp_entry->getQuery().empty())&&(tmp_entry->should_run())) {
         entries->push_back(tmp_entry);
+        (*this->nr_entries)++;
+      }
       count++;
       tmp_entry.reset(new QueryLogEntry());
-      (*this->nr_entries)++;
     }
 
     if (p[0] == '#')
@@ -174,7 +176,7 @@
     p= line;
   }
 
-  if (!tmp_entry->getQuery().empty())
+  if ((!tmp_entry->getQuery().empty())&&(tmp_entry->should_run()))
     entries->push_back(tmp_entry);
 
   free(line);
@@ -308,6 +310,12 @@
   return r;
 }
 
+//should this query be run? (--query-log-select-only)
+bool QueryLogEntry::should_run() 
+{
+  return ( (!g_select_only) || (is_select_statement()) || (is_use_statement()) );
+}
+
 extern percona_playback::DBClientPlugin *g_dbclient_plugin;
 
 void* dispatch (void *input_)
@@ -395,6 +403,12 @@
           zero_tokens(),
        _("Ensure that each query takes at least Query_time (from slow query "
 	 "log) to execute."))
+	    ("query-log-select-only",
+       po::value<bool>(&g_select_only)->
+        default_value(false)->
+          zero_tokens(),
+       _("Only execute queries starting with 'select ' allowing for replay "
+         "on slave servers."))
       ;
 
     return &options;
 
=== modified file 'percona_playback/query_log/query_log.h'
--- percona_playback/query_log/query_log.h	2013-06-07 07:04:15 +0000
+++ percona_playback/query_log/query_log.h	2013-09-26 12:08:23 +0000
@@ -22,6 +22,7 @@
 #include <fstream>
 #include <string>
 #include <vector>
+#include <boost/algorithm/string/predicate.hpp> 
 
 #include <tbb/atomic.h>
 
@@ -66,6 +67,20 @@
   {
     return (query.compare(0, 30, "# administrator command: Quit;") == 0);
   }
+  
+  bool is_select_statement()
+  {
+    const std::string select_prefix("SELECT ");
+    return (boost::istarts_with(query, select_prefix));
+  }
+  
+  bool is_use_statement()
+  {
+    const std::string use_prefix("USE ");
+    return (boost::istarts_with(query, use_prefix));
+  }
+  
+  bool should_run();
 
   void execute(DBThread *t);
 };
 
=== added file 'percona_playback/test/basic-select-only.cc'
--- percona_playback/test/basic-select-only.cc	1970-01-01 00:00:00 +0000
+++ percona_playback/test/basic-select-only.cc	2013-09-26 12:08:23 +0000
@@ -0,0 +1,77 @@
+/* BEGIN LICENSE
+ * Copyright (C) 2011-2013 Percona Ireland Ltd.
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * END LICENSE */
+
+#include "config.h"
+
+#include <iostream>
+#include <cstdio>
+#include <string>
+#include <cstring>
+#include <assert.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <percona_playback/percona_playback.h>
+
+/**
+ * @TODO Actually write a real test suite here
+ */
+int main(int argc, char **argv)
+{
+  (void)argc; (void)argv;
+
+  fprintf(stderr, "Working dir: %s\n\n", get_current_dir_name());
+
+  percona_playback_st *the_percona_playback= percona_playback_create("test_Percona Playback");
+  assert(the_percona_playback);
+
+  char dbplugin_opt[] = "--db-plugin=null";
+  char stdin_opt[] = "--query-log-stdin";
+  char select_only_opt[] = "--query-log-select-only";
+
+  char *dbplugin_argv[4];
+  dbplugin_argv[0]= argv[0];
+  dbplugin_argv[1]= dbplugin_opt;
+  dbplugin_argv[2]= stdin_opt;
+  dbplugin_argv[3]= select_only_opt;
+
+  const char *query_log = SRCDIR"/percona_playback/test/basic-slow.log";
+  int fd = open(query_log, O_RDONLY);
+  if (fd < 0)
+  {
+    fprintf(stderr, "Error: open file '%s' error: %s\n", query_log, strerror(errno));
+    return -1;
+  }
+
+  if (dup2(fd, STDIN_FILENO) < 0)
+  {
+    fprintf(stderr, "Error: can't dup2 to stdin: %s\n", strerror(errno));
+    return -1;
+  }
+
+  assert(0 == percona_playback_argv(the_percona_playback, 4, dbplugin_argv));
+
+  struct percona_playback_run_result *r= percona_playback_run(the_percona_playback);
+
+  assert(r->err == 0);
+  assert(r->n_queries == 17);
+  assert(r->n_log_entries == 2);
+  percona_playback_destroy(&the_percona_playback);
+  return r->err;
+}