Drizzle

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

  1. rplugin-logging-stats
  2. Merge into development
Proposed by Vijay Samuel
Status: Merged
Merged at revision: 1686
Proposed branch: lp:~vjsamuel/drizzle/rplugin-logging-stats
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 225 lines (+55/-107)
7 files modified
plugin/logging_stats/logging_stats.cc (+50/-3)
plugin/logging_stats/tests/t/command-master.opt (+1/-1)
plugin/logging_stats/tests/t/cumulative-master.opt (+1/-1)
plugin/logging_stats/tests/t/max_session-master.opt (+1/-1)
plugin/logging_stats/tests/t/max_user-master.opt (+1/-1)
plugin/logging_stats/tests/t/slap-master.opt (+1/-1)
po/POTFILES.in (+0/-99)
To merge this branch: bzr merge lp:~vjsamuel/drizzle/rplugin-logging-stats
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Joe Daly Pending
Review via email: mp+31718@code.launchpad.net

This proposal supersedes a proposal from 2010-08-03.

To post a comment you must log in.
Revision history for this message
Joe Daly (skinny.moey) wrote : Posted in a previous version of this proposal

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
Revision history for this message
Vijay Samuel (vjsamuel) wrote : Posted in a previous version of this proposal

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
91#include "logging_stats.h"91#include "logging_stats.h"
92#include "status_tool.h"92#include "status_tool.h"
93#include "stats_schema.h"93#include "stats_schema.h"
9494#include <boost/program_options.hpp>
95#include <drizzled/module/option_map.h>
95#include <drizzled/session.h>96#include <drizzled/session.h>
9697
98namespace po= boost::program_options;
97using namespace drizzled;99using namespace drizzled;
98using namespace plugin;100using namespace plugin;
99using namespace std;101using namespace std;
@@ -291,8 +293,37 @@
291 return false;293 return false;
292}294}
293295
294static int init(module::Context &context)296static int init(drizzled::module::Context &context)
295{297{
298 const module::option_map &vm= context.getOptions();
299 if (vm.count("max-user-count"))
300 {
301 if (sysvar_logging_stats_max_user_count < 100 || sysvar_logging_stats_max_user_count > 50000)
302 {
303 errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for max-user-count\n"));
304 exit(-1);
305 }
306 }
307 if (vm.count("bucket-count"))
308 {
309 if (sysvar_logging_stats_bucket_count < 5 || sysvar_logging_stats_bucket_count > 500)
310 {
311 errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for bucket-count\n"));
312 exit(-1);
313 }
314 }
315
316 if (vm.count("scoreboard-size"))
317 {
318 if (sysvar_logging_stats_scoreboard_size < 10 || sysvar_logging_stats_scoreboard_size > 50000)
319 {
320 errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for scoreboard-size\n"));
321 exit(-1);
322 }
323 else
324 sysvar_logging_stats_scoreboard_size= vm["scoreboard-size"].as<uint32_t>();
325 }
326
296 logging_stats= new LoggingStats("logging_stats");327 logging_stats= new LoggingStats("logging_stats");
297328
298 if (initTable())329 if (initTable())
@@ -358,6 +389,22 @@
358 enable, /* update func */389 enable, /* update func */
359 true /* default */);390 true /* default */);
360391
392static void init_options(drizzled::module::option_context &context)
393{
394 context("max-user-count",
395 po::value<uint32_t>(&sysvar_logging_stats_max_user_count)->default_value(500),
396 N_("Max number of users that will be logged"));
397 context("bucket-count",
398 po::value<uint32_t>(&sysvar_logging_stats_bucket_count)->default_value(10),
399 N_("Max number of vector buckets to construct for logging"));
400 context("scoreboard-size",
401 po::value<uint32_t>(&sysvar_logging_stats_scoreboard_size)->default_value(2000),
402 N_("Max number of concurrent sessions that will be logged"));
403 context("enable",
404 po::value<bool>(&sysvar_logging_stats_enabled)->default_value(true)->zero_tokens(),
405 N_("Enable Logging Statistics Collection"));
406}
407
361static drizzle_sys_var* system_var[]= {408static drizzle_sys_var* system_var[]= {
362 DRIZZLE_SYSVAR(max_user_count),409 DRIZZLE_SYSVAR(max_user_count),
363 DRIZZLE_SYSVAR(bucket_count),410 DRIZZLE_SYSVAR(bucket_count),
@@ -376,6 +423,6 @@
376 PLUGIN_LICENSE_BSD,423 PLUGIN_LICENSE_BSD,
377 init, /* Plugin Init */424 init, /* Plugin Init */
378 system_var, /* system variables */425 system_var, /* system variables */
379 NULL /* config options */426 init_options /* config options */
380}427}
381DRIZZLE_DECLARE_PLUGIN_END;428DRIZZLE_DECLARE_PLUGIN_END;
382429
=== 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 @@
1--plugin-add=logging_stats --logging-stats-enable --logging-stats-max-user-count=5031--plugin-add=logging_stats --logging-stats.enable --logging-stats.max-user-count=503
22
=== 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 @@
1--plugin-add=logging_stats --logging_stats_enable --logging_stats_max_user_count=5041--plugin-add=logging_stats --logging-stats.enable --logging-stats.max-user-count=504
22
=== 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 @@
1--plugin-add=logging_stats --logging-stats-enable --logging-stats-scoreboard-size=10 --logging-stats-bucket-count=5 --logging-stats-max-user-count=5021--plugin-add=logging_stats --logging-stats.enable --logging-stats.scoreboard-size=10 --logging-stats.bucket-count=5 --logging-stats.max-user-count=502
22
=== 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 @@
1--plugin-add=logging_stats --logging-stats-enable --logging-stats-max-user-count=5051--plugin-add=logging_stats --logging-stats.enable --logging-stats.max-user-count=505
22
=== 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 @@
1--plugin-add=logging_stats --logging-stats-enable --logging-stats-max-user-count=5011--plugin-add=logging_stats --logging-stats.enable --logging-stats.max-user-count=501
22
=== 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 @@
1client/drizzle.cc
2client/drizzledump.cc
3client/drizzleimport.cc
4client/drizzleslap.cc
5client/drizzletest.cc
6drizzled/cursor.cc
7drizzled/db.cc
8drizzled/drizzled.cc
9drizzled/error.cc
10drizzled/gettext.h
11drizzled/ha_commands.cc
12drizzled/identifier/schema.cc
13drizzled/identifier/table.cc
14drizzled/internal/default.cc
15drizzled/main.cc
16drizzled/message/transaction_reader.cc
17drizzled/message/transaction_writer.cc
18drizzled/module/library.cc
19drizzled/module/loader.cc
20drizzled/module/registry.h
21drizzled/option.cc
22drizzled/plugin/authentication.cc
23drizzled/plugin/authorization.cc
24drizzled/plugin/error_message.cc
25drizzled/plugin/event_observer.cc
26drizzled/plugin/function.cc
27drizzled/plugin/listen.cc
28drizzled/plugin/listen_tcp.cc
29drizzled/plugin/logging.cc
30drizzled/plugin/query_cache.cc
31drizzled/plugin/query_rewrite.cc
32drizzled/plugin/scheduler.cc
33drizzled/plugin/schema_engine.cc
34drizzled/plugin/storage_engine.cc
35drizzled/plugin/table_function.cc
36drizzled/plugin/xa_resource_manager.cc
37drizzled/plugin/xa_storage_engine.cc
38drizzled/replication_services.cc
39drizzled/session.cc
40drizzled/set_var.cc
41drizzled/show.cc
42drizzled/signal_handler.cc
43drizzled/sql_base.cc
44drizzled/sql_select.cc
45drizzled/sql_table.cc
46drizzled/sql_yacc.cc
47drizzled/stacktrace.cc
48drizzled/statement/alter_table.cc
49drizzled/table.cc
50drizzled/table_share.cc
51drizzled/transaction_services.cc
52drizzled/tztime.cc
53gnulib/getopt.c
54gnulib/gettext.h
55plugin/auth_file/auth_file.cc
56plugin/auth_http/auth_http.cc
57plugin/auth_ldap/auth_ldap.cc
58plugin/blitzdb/ha_blitz.h
59plugin/console/console.cc
60plugin/default_replicator/default_replicator.cc
61plugin/drizzle_protocol/drizzle_protocol.cc
62plugin/drizzle_protocol/errmsg.cc
63plugin/embedded_innodb/embedded_innodb_engine.cc
64plugin/errmsg_notify/errmsg_notify.cc
65plugin/errmsg_stderr/errmsg_stderr.cc
66plugin/filtered_replicator/filtered_replicator.cc
67plugin/hello_events/hello_events.cc
68plugin/innobase/handler/data_dictionary.cc
69plugin/innobase/ut/ut0auxconf_pause.c
70plugin/logging_gearman/logging_gearman.cc
71plugin/logging_query/logging_query.cc
72plugin/logging_stats/logging_stats.cc
73plugin/md5/md5.cc
74plugin/memcached_stats/analysis_table.cc
75plugin/memcached_stats/memcached_stats.cc
76plugin/memcached_stats/stats_table.cc
77plugin/multi_thread/multi_thread.cc
78plugin/multi_thread/multi_thread.h
79plugin/myisam/ha_myisam.cc
80plugin/myisam/my_handler_errors.cc
81plugin/mysql_protocol/mysql_protocol.cc
82plugin/pbms/src/parameters_ms.cc
83plugin/pool_of_threads/pool_of_threads.cc
84plugin/pool_of_threads/pool_of_threads.h
85plugin/pool_of_threads/session_scheduler.cc
86plugin/rabbitmq/rabbitmq_log.cc
87plugin/signal_handler/signal_handler.cc
88plugin/single_thread/single_thread.h
89plugin/syslog/errmsg.cc
90plugin/syslog/function.cc
91plugin/syslog/logging.cc
92plugin/syslog/module.cc
93plugin/transaction_log/background_worker.cc
94plugin/transaction_log/hexdump_transaction_message.cc
95plugin/transaction_log/module.cc
96plugin/transaction_log/print_transaction_message.cc
97plugin/transaction_log/transaction_log.cc
98plugin/transaction_log/transaction_log_reader.cc
99plugin/transaction_log/write_buffer.cc