Merge lp:~vjsamuel/drizzle/rplugin-transaction-log into lp:~drizzle-trunk/drizzle/development

[Vijay Samuel]

[Vijay Samuel (vjsamuel)]

I ve made some mistake which is reflecting in CentOS FreeBSD and Solaris. I ll fix it and re submit the merge proposal.

review: Needs Fixing

=== modified file 'plugin/replication_dictionary/tests/t/replication_streams-master.opt'
--- plugin/replication_dictionary/tests/t/replication_streams-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/replication_dictionary/tests/t/replication_streams-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --transaction-log-use-replicator=filtered
+--transaction-log.enable --transaction-log.use-replicator=filtered

=== modified file 'plugin/transaction_log/module.cc'
--- plugin/transaction_log/module.cc	2010-06-23 20:51:16 +0000
+++ plugin/transaction_log/module.cc	2010-08-06 07:56:00 +0000
@@ -44,7 +44,10 @@
 #include <drizzled/session.h>
 #include <drizzled/set_var.h>
 #include <drizzled/gettext.h>
+#include <boost/program_options.hpp>
+#include <drizzled/module/option_map.h>
 
+namespace po= boost::program_options;
 using namespace std;
 using namespace drizzled;
 
@@ -110,6 +113,46 @@
 
 static int init(drizzled::module::Context &context)
 {
+  const module::option_map &vm= context.getOptions();
+
+  if (vm.count("sync-method"))
+  {
+    if (sysvar_transaction_log_sync_method > 2)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for sync-method\n"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("num-write-buffers"))
+  {
+    if (sysvar_transaction_log_num_write_buffers < 4 || sysvar_transaction_log_num_write_buffers > 8192)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for num-write-buffers\n"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("file"))
+  {
+    sysvar_transaction_log_file= strdup(vm["file"].as<string>().c_str());
+  }
+
+  else
+  {
+    sysvar_transaction_log_file= strdup(DEFAULT_LOG_FILE_PATH);
+  }
+
+  if (vm.count("use-replicator"))
+  {
+    sysvar_transaction_log_use_replicator= strdup(vm["use-replicator"].as<string>().c_str());
+  }
+
+  else
+  {
+    sysvar_transaction_log_use_replicator= strdup(DEFAULT_USE_REPLICATOR);
+  }
+
   /* Create and initialize the transaction log itself */
   if (sysvar_transaction_log_enabled)
   {
@@ -281,6 +324,31 @@
                            8192,
                            0);
 
+static void init_options(drizzled::module::option_context &context)
+{
+  context("truncate-debug",
+          po::value<bool>(&sysvar_transaction_log_truncate_debug)->default_value(false)->zero_tokens(),
+          N_("DEBUGGING - Truncate transaction log"));
+  context("enable-checksum",
+          po::value<bool>(&sysvar_transaction_log_checksum_enabled)->default_value(false)->zero_tokens(),
+          N_("Enable CRC32 Checksumming of each written transaction log entry"));  
+  context("enable",
+          po::value<bool>(&sysvar_transaction_log_enabled)->default_value(false)->zero_tokens(),
+          N_("Enable transaction log"));
+  context("file",
+          po::value<string>(),
+          N_("Path to the file to use for transaction log"));
+  context("use-replicator",
+          po::value<string>(),
+          N_("Name of the replicator plugin to use (default='default_replicator')")); 
+  context("sync-method",
+          po::value<uint32_t>(&sysvar_transaction_log_sync_method)->default_value(0),
+          N_("0 == rely on operating system to sync log file (default), 1 == sync file at each transaction write, 2 == sync log file once per second"));
+  context("num-write-buffers",
+          po::value<uint32_t>(&sysvar_transaction_log_num_write_buffers)->default_value(8),
+          N_("Number of slots for in-memory write buffers (default=8)."));
+}
+
 static drizzle_sys_var* sys_variables[]= {
   DRIZZLE_SYSVAR(enable),
   DRIZZLE_SYSVAR(truncate_debug),
@@ -292,4 +360,4 @@
   NULL
 };
 
-DRIZZLE_PLUGIN(init, sys_variables, NULL);
+DRIZZLE_PLUGIN(init, sys_variables, init_options);

=== modified file 'plugin/transaction_log/tests/t/alter-master.opt'
--- plugin/transaction_log/tests/t/alter-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/alter-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/auto_commit-master.opt'
--- plugin/transaction_log/tests/t/auto_commit-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/auto_commit-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/bad_replicator-master.opt'
--- plugin/transaction_log/tests/t/bad_replicator-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/bad_replicator-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --transaction-log-use-replicator=bad --scheduler=multi_thread
+--transaction-log.enable --transaction-log.use-replicator=bad --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/blob-master.opt'
--- plugin/transaction_log/tests/t/blob-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/blob-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/create_select-master.opt'
--- plugin/transaction_log/tests/t/create_select-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/create_select-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/create_table-master.opt'
--- plugin/transaction_log/tests/t/create_table-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/create_table-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/database-master.opt'
--- plugin/transaction_log/tests/t/database-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/database-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/ddl_transaction_id-master.opt'
--- plugin/transaction_log/tests/t/ddl_transaction_id-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/ddl_transaction_id-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/delete-master.opt'
--- plugin/transaction_log/tests/t/delete-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/delete-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/filtered_replicator-master.opt'
--- plugin/transaction_log/tests/t/filtered_replicator-master.opt	2010-07-16 10:52:11 +0000
+++ plugin/transaction_log/tests/t/filtered_replicator-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --transaction-log-use-replicator=filtered --scheduler=multi_thread --filtered-replicator.filteredschemas=notest
+--transaction-log.enable --transaction-log.use-replicator=filtered --scheduler=multi_thread --filtered-replicator.filteredschemas=notest

=== modified file 'plugin/transaction_log/tests/t/information_schema-master.opt'
--- plugin/transaction_log/tests/t/information_schema-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/information_schema-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/insert-master.opt'
--- plugin/transaction_log/tests/t/insert-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/insert-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/insert_multi-master.opt'
--- plugin/transaction_log/tests/t/insert_multi-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/insert_multi-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/insert_on_duplicate_update-master.opt'
--- plugin/transaction_log/tests/t/insert_on_duplicate_update-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/insert_on_duplicate_update-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/insert_select-master.opt'
--- plugin/transaction_log/tests/t/insert_select-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/insert_select-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/multi_column_primary_key-master.opt'
--- plugin/transaction_log/tests/t/multi_column_primary_key-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/multi_column_primary_key-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/multi_table-master.opt'
--- plugin/transaction_log/tests/t/multi_table-master.opt	2010-07-21 03:20:34 +0000
+++ plugin/transaction_log/tests/t/multi_table-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/no_modification-master.opt'
--- plugin/transaction_log/tests/t/no_modification-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/no_modification-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/no_primary_key-master.opt'
--- plugin/transaction_log/tests/t/no_primary_key-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/no_primary_key-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/null_values-master.opt'
--- plugin/transaction_log/tests/t/null_values-master.opt	2010-07-25 00:52:26 +0000
+++ plugin/transaction_log/tests/t/null_values-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/rand-master.opt'
--- plugin/transaction_log/tests/t/rand-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/rand-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/rename-master.opt'
--- plugin/transaction_log/tests/t/rename-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/rename-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/replace-master.opt'
--- plugin/transaction_log/tests/t/replace-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/replace-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/rollback-master.opt'
--- plugin/transaction_log/tests/t/rollback-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/rollback-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/schema-master.opt'
--- plugin/transaction_log/tests/t/schema-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/schema-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/select_for_update-master.opt'
--- plugin/transaction_log/tests/t/select_for_update-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/select_for_update-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/slap-master.opt'
--- plugin/transaction_log/tests/t/slap-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/slap-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/temp_tables-master.opt'
--- plugin/transaction_log/tests/t/temp_tables-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/temp_tables-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/truncate-master.opt'
--- plugin/transaction_log/tests/t/truncate-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/truncate-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/truncate_log-master.opt'
--- plugin/transaction_log/tests/t/truncate_log-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/truncate_log-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/udf_print_transaction_message-master.opt'
--- plugin/transaction_log/tests/t/udf_print_transaction_message-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/udf_print_transaction_message-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/update-master.opt'
--- plugin/transaction_log/tests/t/update-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/update-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --scheduler=multi_thread
+--transaction-log.enable --scheduler=multi_thread

=== modified file 'plugin/transaction_log/tests/t/variables-master.opt'
--- plugin/transaction_log/tests/t/variables-master.opt	2010-04-05 16:06:01 +0000
+++ plugin/transaction_log/tests/t/variables-master.opt	2010-08-06 07:56:00 +0000
@@ -1,1 +1,1 @@
---transaction-log-enable --transaction-log-sync-method=1 --scheduler=multi_thread
+--transaction-log.enable --transaction-log.sync-method=1 --scheduler=multi_thread