Merge lp:~vlad-lesin/percona-playback/query-log-from-stdin into lp:percona-playback

[Vlad Lesin]

The new option --query-log-stdin is added in query_log plugin to read
query log from stdin.

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-09-17 05:54:15 +0000
+++ Makefile.am	2012-11-14 22:05:23 +0000
@@ -83,6 +83,7 @@
 
 check_PROGRAMS += \
   percona_playback/test/basic \
+  percona_playback/test/basic-stdin \
   percona_playback/test/basic-multiline \
   percona_playback/test/basic-queue-depth \
   percona_playback/test/crashme-slow \
@@ -97,6 +98,7 @@
   percona_playback/test/help
 
 percona_playback_test_basic_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}\"
 percona_playback_test_crashme_slow_CXXFLAGS= $(AM_CXXFLAGS) -DSRCDIR=\"${srcdir}\"
@@ -115,6 +117,9 @@
 percona_playback_test_basic_SOURCES= percona_playback/test/basic.cc
 percona_playback_test_basic_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)
+
 percona_playback_test_basic_multiline_SOURCES= percona_playback/test/basic-multiline.cc
 percona_playback_test_basic_multiline_LDADD= $(LDADD) $(MYSQL_LIBS)
 
 
=== modified file 'percona_playback/query_log/query_log.cc'
--- percona_playback/query_log/query_log.cc	2012-09-17 05:54:15 +0000
+++ percona_playback/query_log/query_log.cc	2012-11-14 22:05:23 +0000
@@ -336,38 +336,29 @@
   r->n_queries= queries;
 }
 
-int run_query_log(const std::string &log_file, unsigned int run_count, struct percona_playback_run_result *r)
-{
-  FILE* input_file = fopen(log_file.c_str(),"r");
-  if (input_file == NULL)
-    return -1;
-
-  boost::thread log_reader_thread(LogReaderThread,input_file, run_count, r);
-
-  log_reader_thread.join();
-  fclose(input_file);
-
-  return 0;
-}
-
 class QueryLogPlugin : public percona_playback::InputPlugin
 {
 private:
   po::options_description     options;
   std::string                 file_name;
   unsigned int                read_count;
+  bool			      std_in;
 
 public:
   QueryLogPlugin(const std::string &_name) :
     InputPlugin(_name),
     options(_("Query Log Options")),
-    read_count(1)
+    read_count(1),
+    std_in(false)
   {};
 
   virtual boost::program_options::options_description* getProgramOptions() {
       options.add_options()
       ("query-log-file",
        po::value<std::string>(), _("Query log file"))
+      ("query-log-stdin",
+       po::value<bool>()->default_value(false)->zero_tokens(),
+       _("Read query log from stdin"))
 /* Disabled for 0.3 until we have something more universal.
       ("query-log-read-count",
        po::value<unsigned int>(&read_count)->default_value(1),
@@ -396,6 +387,7 @@
   {
     if (!active &&
         (vm.count("query-log-file") ||
+	 !vm["query-log-stdin"].defaulted() ||
 //         !vm["query-log-read-count"].defaulted() ||
          !vm["query-log-preserve-query-time"].defaulted() ||
          !vm["query-log-set-timestamp"].defaulted()))
@@ -409,8 +401,19 @@
     if (!active)
       return 0;
 
+    if (vm.count("query-log-file") && vm["query-log-stdin"].as<bool>())
+    {
+      fprintf(stderr,  _(("The options --query-log-file and --query-log-stdin "
+			  "can not be used together\n")));
+      return -1;
+    }
+
     if (vm.count("query-log-file"))
       file_name= vm["query-log-file"].as<std::string>();
+    else if (vm["query-log-stdin"].as<bool>())
+    {
+      std_in = true;
+    }
     else
     {
       fprintf(stderr, _("ERROR: --query-log-file is a required option.\n"));
@@ -422,7 +425,31 @@
 
   virtual void run(percona_playback_run_result  &result)
   {
-    run_query_log(file_name, read_count, &result);
+    FILE* input_file;
+
+    if (std_in)
+    {
+      input_file = stdin;
+    }
+    else
+    {
+      input_file = fopen(file_name.c_str(),"r");
+      if (input_file == NULL)
+      {
+        fprintf(stderr,
+		_("ERROR: Error opening file '%s': %s"),
+		file_name.c_str(), strerror(errno));
+	return;
+      }
+    }
+
+    boost::thread log_reader_thread(LogReaderThread,
+				    input_file,
+				    read_count,
+				    &result);
+
+    log_reader_thread.join();
+    fclose(input_file);
   }
 };
 
 
=== added file 'percona_playback/test/basic-stdin.cc'
--- percona_playback/test/basic-stdin.cc	1970-01-01 00:00:00 +0000
+++ percona_playback/test/basic-stdin.cc	2012-11-14 22:05:23 +0000
@@ -0,0 +1,77 @@
+/* BEGIN LICENSE
+ * Copyright (C) 2011-2012 Percona Inc.
+ * 
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3, 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 *dbplugin_argv[3];
+  dbplugin_argv[0]= argv[0];
+  dbplugin_argv[1]= dbplugin_opt;
+  dbplugin_argv[2]= stdin_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, 3, 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 = 17);
+
+  percona_playback_destroy(&the_percona_playback);
+  return r->err;
+}