Merge lp:~diego-fmpwizard/drizzle/logging_x_plugin_additions into lp:~drizzle-trunk/drizzle/development

[fmpwizard]

[fmpwizard (diego-fmpwizard)]

Added 3 new fields to the gearman and query logging plugins.
Fixed an unreported bug similar to https://bugs.launchpad.net/drizzle/+bug/402831 that affected the gearman logging plugin.

[Jay Pipes (jaypipes)]

Great work, Diego!

review: Approve

[Jay Pipes (jaypipes)]

Pulling into my captain branch now...

=== modified file 'plugin/logging_gearman/logging_gearman.cc'
--- plugin/logging_gearman/logging_gearman.cc	2009-08-05 09:29:04 +0000
+++ plugin/logging_gearman/logging_gearman.cc	2009-08-21 18:11:49 +0000
@@ -240,21 +240,21 @@
     if (dbs != NULL)
       dbl= session->db_length;
   
-    // todo, add hostname, listener port, and server id to this
+
   
     msgbuf_len=
       snprintf(msgbuf, MAX_MSG_LEN,
                "%"PRIu64",%"PRIu64",%"PRIu64",\"%.*s\",\"%s\",\"%.*s\","
-               "%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64
-               "%"PRIu32",%"PRIu32"",
+               "%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64","
+               "%"PRIu32",%"PRIu32",%"PRIu32",\"%s\",%"PRIu32"",
                t_mark,
                session->thread_id,
-               session->query_id,
+               session->getQueryId(),
                // dont need to quote the db name, always CSV safe
                dbl, dbs,
                // do need to quote the query
-               quotify((unsigned char *)session->query,
-                       session->query_length, qs, sizeof(qs)),
+               quotify((unsigned char *)session->getQueryString(),
+                       session->getQueryLength(), qs, sizeof(qs)),
                // command_name is defined in drizzled/sql_parse.cc
                // dont need to quote the command name, always CSV safe
                (int)command_name[session->command].length,
@@ -266,7 +266,11 @@
                session->sent_row_count,
                session->examined_row_count,
                session->tmp_table,
-               session->total_warn_count);
+               session->total_warn_count,
+               session->getServerId(),
+               glob_hostname,
+               drizzled_tcp_port
+               );
   
     char job_handle[GEARMAN_JOB_HANDLE_SIZE];
   
 
=== modified file 'plugin/logging_query/logging_query.cc'
--- plugin/logging_query/logging_query.cc	2009-08-05 09:29:04 +0000
+++ plugin/logging_query/logging_query.cc	2009-08-21 18:11:49 +0000
@@ -285,15 +285,15 @@
       snprintf(msgbuf, MAX_MSG_LEN,
                "%"PRIu64",%"PRIu64",%"PRIu64",\"%.*s\",\"%s\",\"%.*s\","
                "%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64",%"PRIu64","
-               "%"PRIu32",%"PRIu32"\n",
+               "%"PRIu32",%"PRIu32",%"PRIu32",\"%s\",%"PRIu32"\n",
                t_mark,
                session->thread_id,
-               session->query_id,
+               session->getQueryId(),
                // dont need to quote the db name, always CSV safe
                dbl, dbs,
                // do need to quote the query
-               quotify((unsigned char *)session->query,
-                       session->query_length, qs, sizeof(qs)),
+               quotify((unsigned char *)session->getQueryString(),
+                       session->getQueryLength(), qs, sizeof(qs)),
                // command_name is defined in drizzled/sql_parse.cc
                // dont need to quote the command name, always CSV safe
                (int)command_name[session->command].length,
@@ -305,7 +305,11 @@
                session->sent_row_count,
                session->examined_row_count,
                session->tmp_table,
-               session->total_warn_count);
+               session->total_warn_count,
+               session->getServerId(),
+               glob_hostname,
+               drizzled_tcp_port
+               );
   
     // a single write has a kernel thread lock, thus no need mutex guard this
     wrv= write(fd, msgbuf, msgbuf_len);
 
=== modified file 'plugin/logging_syslog/logging_syslog.cc'
--- plugin/logging_syslog/logging_syslog.cc	2009-08-05 09:29:04 +0000
+++ plugin/logging_syslog/logging_syslog.cc	2009-08-21 18:11:49 +0000
@@ -139,10 +139,10 @@
     if (dbs)
       dbl= session->db_length;
   
-    const char *qys= (session->query) ? session->query : "";
+    const char *qys= (session->getQueryString()) ? session->getQueryString() : "";
     int qyl= 0;
     if (qys)
-      qyl= session->query_length;
+      qyl= session->getQueryLength();
     
     syslog(syslog_priority,
            "thread_id=%ld query_id=%ld"
@@ -153,7 +153,7 @@
            " rows_sent=%ld rows_examined=%ld"
            " tmp_table=%ld total_warn_count=%ld\n",
            (unsigned long) session->thread_id,
-           (unsigned long) session->query_id,
+           (unsigned long) session->getQueryId(),
            dbl, dbs,
            qyl, qys,
            (int) command_name[session->command].length,