Merge lp:~vjsamuel/drizzle/rplugin-logging-stats into lp:~drizzle-trunk/drizzle/development

[Vijay Samuel]

[Joe Daly (skinny.moey)]

Theres some debug code left in this I think. Search for cout and youll see it, if its not debug code it needs to be more descriptive then "Value is " unless something else echos out above this.

review: Needs Fixing

[Vijay Samuel (vjsamuel)]

Hi Joe,
  I just noticed the debug code while working on another branch. I ve already fixed it and will push the updated branch ASAP.
Cheers,
 -Vijay

=== modified file 'plugin/logging_stats/logging_stats.cc'
--- plugin/logging_stats/logging_stats.cc	2010-07-08 00:59:29 +0000
+++ plugin/logging_stats/logging_stats.cc	2010-08-04 03:35:58 +0000
@@ -91,9 +91,11 @@
 #include "logging_stats.h"
 #include "status_tool.h"
 #include "stats_schema.h"
-
+#include <boost/program_options.hpp>
+#include <drizzled/module/option_map.h>
 #include <drizzled/session.h>
 
+namespace po= boost::program_options;
 using namespace drizzled;
 using namespace plugin;
 using namespace std;
@@ -291,8 +293,37 @@
   return false;
 }
 
-static int init(module::Context &context)
+static int init(drizzled::module::Context &context)
 {
+  const module::option_map &vm= context.getOptions();
+  if (vm.count("max-user-count"))
+  {
+    if (sysvar_logging_stats_max_user_count < 100 || sysvar_logging_stats_max_user_count > 50000)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for max-user-count\n"));
+      exit(-1);
+    }
+  }
+  if (vm.count("bucket-count"))
+  {
+    if (sysvar_logging_stats_bucket_count < 5 || sysvar_logging_stats_bucket_count > 500)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for bucket-count\n"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("scoreboard-size"))
+  {
+    if (sysvar_logging_stats_scoreboard_size < 10 || sysvar_logging_stats_scoreboard_size > 50000)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for scoreboard-size\n"));
+      exit(-1);
+    }
+    else
+      sysvar_logging_stats_scoreboard_size= vm["scoreboard-size"].as<uint32_t>(); 
+  }
+
   logging_stats= new LoggingStats("logging_stats");
 
   if (initTable())
@@ -358,6 +389,22 @@
                            enable, /* update func */
                            true /* default */);
 
+static void init_options(drizzled::module::option_context &context)
+{
+  context("max-user-count",
+          po::value<uint32_t>(&sysvar_logging_stats_max_user_count)->default_value(500),
+          N_("Max number of users that will be logged"));
+  context("bucket-count",
+          po::value<uint32_t>(&sysvar_logging_stats_bucket_count)->default_value(10),
+          N_("Max number of vector buckets to construct for logging"));
+  context("scoreboard-size",
+          po::value<uint32_t>(&sysvar_logging_stats_scoreboard_size)->default_value(2000),
+          N_("Max number of concurrent sessions that will be logged"));
+  context("enable",
+          po::value<bool>(&sysvar_logging_stats_enabled)->default_value(true)->zero_tokens(),
+          N_("Enable Logging Statistics Collection"));
+}
+
 static drizzle_sys_var* system_var[]= {
   DRIZZLE_SYSVAR(max_user_count),
   DRIZZLE_SYSVAR(bucket_count),
@@ -376,6 +423,6 @@
   PLUGIN_LICENSE_BSD,
   init,   /* Plugin Init      */
   system_var, /* system variables */
-  NULL    /* config options   */
+  init_options    /* config options   */
 }
 DRIZZLE_DECLARE_PLUGIN_END;

=== modified file 'plugin/logging_stats/tests/t/command-master.opt'
--- plugin/logging_stats/tests/t/command-master.opt	2010-06-23 20:51:16 +0000
+++ plugin/logging_stats/tests/t/command-master.opt	2010-08-04 03:35:58 +0000
@@ -1,1 +1,1 @@
---plugin-add=logging_stats --logging-stats-enable --logging-stats-max-user-count=503
+--plugin-add=logging_stats --logging-stats.enable --logging-stats.max-user-count=503

=== modified file 'plugin/logging_stats/tests/t/cumulative-master.opt'
--- plugin/logging_stats/tests/t/cumulative-master.opt	2010-04-09 01:58:28 +0000
+++ plugin/logging_stats/tests/t/cumulative-master.opt	2010-08-04 03:35:58 +0000
@@ -1,1 +1,1 @@
---plugin-add=logging_stats --logging_stats_enable --logging_stats_max_user_count=504
+--plugin-add=logging_stats --logging-stats.enable --logging-stats.max-user-count=504

=== modified file 'plugin/logging_stats/tests/t/max_session-master.opt'
--- plugin/logging_stats/tests/t/max_session-master.opt	2010-06-23 20:51:16 +0000
+++ plugin/logging_stats/tests/t/max_session-master.opt	2010-08-04 03:35:58 +0000
@@ -1,1 +1,1 @@
---plugin-add=logging_stats --logging-stats-enable --logging-stats-scoreboard-size=10 --logging-stats-bucket-count=5 --logging-stats-max-user-count=502
+--plugin-add=logging_stats --logging-stats.enable --logging-stats.scoreboard-size=10 --logging-stats.bucket-count=5 --logging-stats.max-user-count=502

=== modified file 'plugin/logging_stats/tests/t/max_user-master.opt'
--- plugin/logging_stats/tests/t/max_user-master.opt	2010-06-23 20:51:16 +0000
+++ plugin/logging_stats/tests/t/max_user-master.opt	2010-08-04 03:35:58 +0000
@@ -1,1 +1,1 @@
---plugin-add=logging_stats --logging-stats-enable --logging-stats-max-user-count=505
+--plugin-add=logging_stats --logging-stats.enable --logging-stats.max-user-count=505

=== modified file 'plugin/logging_stats/tests/t/slap-master.opt'
--- plugin/logging_stats/tests/t/slap-master.opt	2010-06-23 20:51:16 +0000
+++ plugin/logging_stats/tests/t/slap-master.opt	2010-08-04 03:35:58 +0000
@@ -1,1 +1,1 @@
---plugin-add=logging_stats --logging-stats-enable --logging-stats-max-user-count=501
+--plugin-add=logging_stats --logging-stats.enable --logging-stats.max-user-count=501

=== removed file 'po/POTFILES.in'
--- po/POTFILES.in	2010-07-27 00:41:57 +0000
+++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-client/drizzle.cc
-client/drizzledump.cc
-client/drizzleimport.cc
-client/drizzleslap.cc
-client/drizzletest.cc
-drizzled/cursor.cc
-drizzled/db.cc
-drizzled/drizzled.cc
-drizzled/error.cc
-drizzled/gettext.h
-drizzled/ha_commands.cc
-drizzled/identifier/schema.cc
-drizzled/identifier/table.cc
-drizzled/internal/default.cc
-drizzled/main.cc
-drizzled/message/transaction_reader.cc
-drizzled/message/transaction_writer.cc
-drizzled/module/library.cc
-drizzled/module/loader.cc
-drizzled/module/registry.h
-drizzled/option.cc
-drizzled/plugin/authentication.cc
-drizzled/plugin/authorization.cc
-drizzled/plugin/error_message.cc
-drizzled/plugin/event_observer.cc
-drizzled/plugin/function.cc
-drizzled/plugin/listen.cc
-drizzled/plugin/listen_tcp.cc
-drizzled/plugin/logging.cc
-drizzled/plugin/query_cache.cc
-drizzled/plugin/query_rewrite.cc
-drizzled/plugin/scheduler.cc
-drizzled/plugin/schema_engine.cc
-drizzled/plugin/storage_engine.cc
-drizzled/plugin/table_function.cc
-drizzled/plugin/xa_resource_manager.cc
-drizzled/plugin/xa_storage_engine.cc
-drizzled/replication_services.cc
-drizzled/session.cc
-drizzled/set_var.cc
-drizzled/show.cc
-drizzled/signal_handler.cc
-drizzled/sql_base.cc
-drizzled/sql_select.cc
-drizzled/sql_table.cc
-drizzled/sql_yacc.cc
-drizzled/stacktrace.cc
-drizzled/statement/alter_table.cc
-drizzled/table.cc
-drizzled/table_share.cc
-drizzled/transaction_services.cc
-drizzled/tztime.cc
-gnulib/getopt.c
-gnulib/gettext.h
-plugin/auth_file/auth_file.cc
-plugin/auth_http/auth_http.cc
-plugin/auth_ldap/auth_ldap.cc
-plugin/blitzdb/ha_blitz.h
-plugin/console/console.cc
-plugin/default_replicator/default_replicator.cc
-plugin/drizzle_protocol/drizzle_protocol.cc
-plugin/drizzle_protocol/errmsg.cc
-plugin/embedded_innodb/embedded_innodb_engine.cc
-plugin/errmsg_notify/errmsg_notify.cc
-plugin/errmsg_stderr/errmsg_stderr.cc
-plugin/filtered_replicator/filtered_replicator.cc
-plugin/hello_events/hello_events.cc
-plugin/innobase/handler/data_dictionary.cc
-plugin/innobase/ut/ut0auxconf_pause.c
-plugin/logging_gearman/logging_gearman.cc
-plugin/logging_query/logging_query.cc
-plugin/logging_stats/logging_stats.cc
-plugin/md5/md5.cc
-plugin/memcached_stats/analysis_table.cc
-plugin/memcached_stats/memcached_stats.cc
-plugin/memcached_stats/stats_table.cc
-plugin/multi_thread/multi_thread.cc
-plugin/multi_thread/multi_thread.h
-plugin/myisam/ha_myisam.cc
-plugin/myisam/my_handler_errors.cc
-plugin/mysql_protocol/mysql_protocol.cc
-plugin/pbms/src/parameters_ms.cc
-plugin/pool_of_threads/pool_of_threads.cc
-plugin/pool_of_threads/pool_of_threads.h
-plugin/pool_of_threads/session_scheduler.cc
-plugin/rabbitmq/rabbitmq_log.cc
-plugin/signal_handler/signal_handler.cc
-plugin/single_thread/single_thread.h
-plugin/syslog/errmsg.cc
-plugin/syslog/function.cc
-plugin/syslog/logging.cc
-plugin/syslog/module.cc
-plugin/transaction_log/background_worker.cc
-plugin/transaction_log/hexdump_transaction_message.cc
-plugin/transaction_log/module.cc
-plugin/transaction_log/print_transaction_message.cc
-plugin/transaction_log/transaction_log.cc
-plugin/transaction_log/transaction_log_reader.cc
-plugin/transaction_log/write_buffer.cc