← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_stats/stats_schema.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_stats/stats_schema.cc
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"
 
106
#include <config.h>
107
107
 
108
108
#include "stats_schema.h"
109
109
 
131
131
 
132
132
  uint32_t bucket_number= current_scoreboard->getBucketNumber(&getSession());
133
133
 
134
 
  vector<ScoreboardSlot* > *scoreboard_vector=
 
134
  std::vector<ScoreboardSlot* > *scoreboard_vector=
135
135
     current_scoreboard->getVectorOfScoreboardVectors()->at(bucket_number);
136
136
 
137
 
  vector<ScoreboardSlot *>::iterator scoreboard_vector_it= scoreboard_vector->begin();
138
 
  vector<ScoreboardSlot *>::iterator scoreboard_vector_end= scoreboard_vector->end();
 
137
  std::vector<ScoreboardSlot *>::iterator scoreboard_vector_it= scoreboard_vector->begin();
 
138
  std::vector<ScoreboardSlot *>::iterator scoreboard_vector_end= scoreboard_vector->end();
139
139
 
140
140
  ScoreboardSlot *scoreboard_slot= NULL;
141
 
  for (vector<ScoreboardSlot *>::iterator it= scoreboard_vector->begin();
 
141
  for (std::vector<ScoreboardSlot *>::iterator it= scoreboard_vector->begin();
142
142
       it != scoreboard_vector->end(); ++it)
143
143
  {
144
144
    scoreboard_slot= *it;
226
226
{
227
227
  outer_logging_stats= logging_stats;
228
228
 
229
 
  add_field("USER");
 
229
  add_field("USERNAME");
230
230
  add_field("IP");
231
231
 
232
232
  uint32_t number_commands= UserCommands::getUserCounts();
260
260
 
261
261
void CurrentCommandsTool::Generator::setVectorIteratorsAndLock(uint32_t bucket_number)
262
262
{
263
 
  vector<ScoreboardSlot* > *scoreboard_vector= 
 
263
  std::vector<ScoreboardSlot* > *scoreboard_vector= 
264
264
    current_scoreboard->getVectorOfScoreboardVectors()->at(bucket_number); 
265
265
 
266
266
  current_lock= current_scoreboard->getVectorOfScoreboardLocks()->at(bucket_number);
318
318
{
319
319
  outer_logging_stats= logging_stats;
320
320
 
321
 
  add_field("USER");
 
321
  add_field("USERNAME");
322
322
 
323
323
  uint32_t number_commands= UserCommands::getUserCounts();
324
324
 
384
384
{
385
385
  outer_logging_stats= logging_stats;
386
386
 
387
 
  add_field("USER");
 
387
  add_field("USERNAME");
388
388
  add_field("BYTES_RECEIVED");
389
389
  add_field("BYTES_SENT");
390
390
  add_field("DENIED_CONNECTIONS");