~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_stats/stats_schema.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-23 11:44:30 UTC
  • mto: This revision was merged to the branch mainline in revision 2348.
  • Revision ID: olafvdspek@gmail.com-20110623114430-no355yypk4y3icqb
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/*
2
 
 * Copyright (c) 2010, Joseph Daly <skinny.moey@gmail.com>
 
2
 * Copyright (C) 2010 Joseph Daly <skinny.moey@gmail.com>
3
3
 * All rights reserved.
4
4
 *
5
5
 * Redistribution and use in source and binary forms, with or without
52
52
 * +----------------+---------+-------+---------+-----------------+-----------+
53
53
 * | Field          | Type    | Null  | Default | Default_is_NULL | On_Update |
54
54
 * +----------------+---------+-------+---------+-----------------+-----------+
55
 
 * | USER           | VARCHAR | FALSE |         | FALSE           |           |
 
55
 * | USERNAME       | VARCHAR | FALSE |         | FALSE           |           |
56
56
 * | IP             | VARCHAR | FALSE |         | FALSE           |           |
57
57
 * | COUNT_SELECT   | BIGINT  | FALSE |         | FALSE           |           |
58
58
 * | COUNT_DELETE   | BIGINT  | FALSE |         | FALSE           |           |
70
70
 * +----------------+---------+-------+---------+-----------------+-----------+
71
71
 * | Field          | Type    | Null  | Default | Default_is_NULL | On_Update |
72
72
 * +----------------+---------+-------+---------+-----------------+-----------+
73
 
 * | USER           | VARCHAR | FALSE |         | FALSE           |           |
 
73
 * | USERNAME       | VARCHAR | FALSE |         | FALSE           |           |
74
74
 * | COUNT_SELECT   | BIGINT  | FALSE |         | FALSE           |           |
75
75
 * | COUNT_DELETE   | BIGINT  | FALSE |         | FALSE           |           |
76
76
 * | COUNT_UPDATE   | BIGINT  | FALSE |         | FALSE           |           |
87
87
 * +---------------------+---------+-------+---------+-----------------+-----------+
88
88
 * | Field               | Type    | Null  | Default | Default_is_NULL | On_Update |
89
89
 * +---------------------+---------+-------+---------+-----------------+-----------+
90
 
 * | USER                | VARCHAR | FALSE |         | FALSE           |           | 
 
90
 * | USERNAME            | VARCHAR | FALSE |         | FALSE           |           | 
91
91
 * | BYTES_RECEIVED      | VARCHAR | FALSE |         | FALSE           |           | 
92
92
 * | BYTES_SENT          | VARCHAR | FALSE |         | FALSE           |           | 
93
93
 * | DENIED_CONNECTIONS  | VARCHAR | FALSE |         | FALSE           |           | 
103
103
 *
104
104
 */
105
105
 
106
 
#include "config.h"
107
 
 
 
106
#include <config.h>
 
107
#include <drizzled/statistics_variables.h>
108
108
#include "stats_schema.h"
109
 
 
110
109
#include <sstream>
111
110
 
112
111
using namespace drizzled;
134
133
  std::vector<ScoreboardSlot* > *scoreboard_vector=
135
134
     current_scoreboard->getVectorOfScoreboardVectors()->at(bucket_number);
136
135
 
137
 
  std::vector<ScoreboardSlot *>::iterator scoreboard_vector_it= scoreboard_vector->begin();
138
 
  std::vector<ScoreboardSlot *>::iterator scoreboard_vector_end= scoreboard_vector->end();
139
 
 
140
136
  ScoreboardSlot *scoreboard_slot= NULL;
141
137
  for (std::vector<ScoreboardSlot *>::iterator it= scoreboard_vector->begin();
142
138
       it != scoreboard_vector->end(); ++it)
226
222
{
227
223
  outer_logging_stats= logging_stats;
228
224
 
229
 
  add_field("USER");
 
225
  add_field("USERNAME");
230
226
  add_field("IP");
231
227
 
232
228
  uint32_t number_commands= UserCommands::getUserCounts();
318
314
{
319
315
  outer_logging_stats= logging_stats;
320
316
 
321
 
  add_field("USER");
 
317
  add_field("USERNAME");
322
318
 
323
319
  uint32_t number_commands= UserCommands::getUserCounts();
324
320
 
384
380
{
385
381
  outer_logging_stats= logging_stats;
386
382
 
387
 
  add_field("USER");
 
383
  add_field("USERNAME");
388
384
  add_field("BYTES_RECEIVED");
389
385
  add_field("BYTES_SENT");
390
386
  add_field("DENIED_CONNECTIONS");