← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/mysql_protocol.cc

  • Committer: Brian Aker
  • Date: 2011-01-11 20:32:48 UTC
  • mto: This revision was merged to the branch mainline in revision 2075.
  • Revision ID: brian@tangent.org-20110111203248-0kyusqlkqd2xqvs7
Cleanup issue of OR in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/mysql_protocol.cc
21
21
#include <drizzled/gettext.h>
22
22
#include <drizzled/error.h>
23
23
#include <drizzled/query_id.h>
24
 
#include <drizzled/error/sql_state.h>
 
24
#include <drizzled/sql_state.h>
25
25
#include <drizzled/session.h>
26
26
#include "drizzled/internal/m_string.h"
27
27
#include <algorithm>
32
32
#include "mysql_protocol.h"
33
33
#include "mysql_password.h"
34
34
#include "options.h"
 
35
#include "table_function.h"
35
36
 
36
37
#include "drizzled/identifier.h"
37
38
 
65
66
ListenMySQLProtocol::~ListenMySQLProtocol()
66
67
{ }
67
68
 
68
 
void ListenMySQLProtocol::addCountersToTable()
69
 
{
70
 
  counters.push_back(new drizzled::plugin::ListenCounter(new std::string("connection_count"), &getCounters()->connectionCount));
71
 
  counters.push_back(new drizzled::plugin::ListenCounter(new std::string("connected"), &getCounters()->connected));
72
 
  counters.push_back(new drizzled::plugin::ListenCounter(new std::string("failed_connections"), &getCounters()->failedConnections));
73
 
}
74
 
 
75
69
const std::string ListenMySQLProtocol::getHost(void) const
76
70
{
77
71
  return _hostname;
402
396
}
403
397
 
404
398
 
405
 
void ClientMySQLProtocol::sendError(drizzled::error_t sql_errno, const char *err)
 
399
void ClientMySQLProtocol::sendError(uint32_t sql_errno, const char *err)
406
400
{
407
401
  uint32_t length;
408
402
  /*
410
404
  */
411
405
  unsigned char buff[2+1+SQLSTATE_LENGTH+DRIZZLE_ERRMSG_SIZE], *pos;
412
406
 
413
 
  assert(sql_errno != EE_OK);
 
407
  assert(sql_errno);
414
408
  assert(err && err[0]);
415
409
 
416
410
  /*
435
429
    return;
436
430
  }
437
431
 
438
 
  int2store(buff, static_cast<uint16_t>(sql_errno));
 
432
  int2store(buff,sql_errno);
439
433
  pos= buff+2;
440
434
 
441
435
  /* The first # is to make the client backward compatible */
442
436
  buff[2]= '#';
443
 
  pos= (unsigned char*) strcpy((char*) buff+3, error::convert_to_sqlstate(sql_errno));
444
 
  pos+= strlen(error::convert_to_sqlstate(sql_errno));
 
437
  pos= (unsigned char*) strcpy((char*) buff+3, drizzle_errno_to_sqlstate(sql_errno));
 
438
  pos+= strlen(drizzle_errno_to_sqlstate(sql_errno));
445
439
 
446
440
  char *tmp= strncpy((char*)pos, err, DRIZZLE_ERRMSG_SIZE-1);
447
441
  tmp+= strlen((char*)pos);
985
979
 
986
980
static int init(drizzled::module::Context &context)
987
981
{  
 
982
  context.add(new MysqlProtocolStatus);
 
983
 
988
984
  /* Initialize random seeds for the MySQL algorithm with minimal changes. */
989
985
  time_t seed_time= time(NULL);
990
986
  random_seed1= seed_time % random_max;
996
992
  context.add(mysql_password);
997
993
 
998
994
  listen_obj= new ListenMySQLProtocol("mysql_protocol", vm["bind-address"].as<std::string>(), true);
999
 
  listen_obj->addCountersToTable();
1000
995
  context.add(listen_obj); 
1001
996
  context.registerVariable(new sys_var_constrained_value_readonly<in_port_t>("port", port));
1002
997
  context.registerVariable(new sys_var_constrained_value<uint32_t>("connect_timeout", connect_timeout));
1016
1011
{
1017
1012
  context("port",
1018
1013
          po::value<port_constraint>(&port)->default_value(3306),
1019
 
          _("Port number to use for connection or 0 for default to with MySQL "
 
1014
          N_("Port number to use for connection or 0 for default to with MySQL "
1020
1015
                              "protocol."));
1021
1016
  context("connect-timeout",
1022
1017
          po::value<timeout_constraint>(&connect_timeout)->default_value(10),
1023
 
          _("Connect Timeout."));
 
1018
          N_("Connect Timeout."));
1024
1019
  context("read-timeout",
1025
1020
          po::value<timeout_constraint>(&read_timeout)->default_value(30),
1026
 
          _("Read Timeout."));
 
1021
          N_("Read Timeout."));
1027
1022
  context("write-timeout",
1028
1023
          po::value<timeout_constraint>(&write_timeout)->default_value(60),
1029
 
          _("Write Timeout."));
 
1024
          N_("Write Timeout."));
1030
1025
  context("retry-count",
1031
1026
          po::value<retry_constraint>(&retry_count)->default_value(10),
1032
 
          _("Retry Count."));
 
1027
          N_("Retry Count."));
1033
1028
  context("buffer-length",
1034
1029
          po::value<buffer_constraint>(&buffer_length)->default_value(16384),
1035
 
          _("Buffer length."));
 
1030
          N_("Buffer length."));
1036
1031
  context("bind-address",
1037
1032
          po::value<string>()->default_value(""),
1038
 
          _("Address to bind to."));
 
1033
          N_("Address to bind to."));
1039
1034
  context("max-connections",
1040
1035
          po::value<uint32_t>(&ListenMySQLProtocol::mysql_counters->max_connections)->default_value(1000),
1041
 
          _("Maximum simultaneous connections."));
 
1036
          N_("Maximum simultaneous connections."));
1042
1037
  context("admin-ip-addresses",
1043
1038
          po::value<vector<string> >()->composing()->notifier(&ClientMySQLProtocol::mysql_compose_ip_addresses),
1044
 
          _("A restrictive IP address list for incoming admin connections."));
 
1039
          N_("A restrictive IP address list for incoming admin connections."));
 
1040
}
 
1041
 
 
1042
static int mysql_protocol_connection_count_func(drizzle_show_var *var, char *buff)
 
1043
{
 
1044
  var->type= SHOW_LONGLONG;
 
1045
  var->value= buff;
 
1046
  *((uint64_t *)buff)= ListenMySQLProtocol::mysql_counters->connectionCount;
 
1047
  return 0;
 
1048
}
 
1049
 
 
1050
static int mysql_protocol_connected_count_func(drizzle_show_var *var, char *buff)
 
1051
{
 
1052
  var->type= SHOW_LONGLONG;
 
1053
  var->value= buff;
 
1054
  *((uint64_t *)buff)= ListenMySQLProtocol::mysql_counters->connected;
 
1055
  return 0;
 
1056
}
 
1057
 
 
1058
static int mysql_protocol_failed_count_func(drizzle_show_var *var, char *buff)
 
1059
{
 
1060
  var->type= SHOW_LONGLONG;
 
1061
  var->value= buff;
 
1062
  *((uint64_t *)buff)= ListenMySQLProtocol::mysql_counters->failedConnections;
 
1063
  return 0;
 
1064
}
 
1065
 
 
1066
static st_show_var_func_container mysql_protocol_connection_count=
 
1067
  { &mysql_protocol_connection_count_func };
 
1068
 
 
1069
static st_show_var_func_container mysql_protocol_connected_count=
 
1070
  { &mysql_protocol_connected_count_func };
 
1071
 
 
1072
static st_show_var_func_container mysql_protocol_failed_count=
 
1073
  { &mysql_protocol_failed_count_func };
 
1074
 
 
1075
static drizzle_show_var mysql_protocol_status_variables[]= {
 
1076
  {"Connections",
 
1077
  (char*) &mysql_protocol_connection_count, SHOW_FUNC},
 
1078
  {"Connected",
 
1079
  (char*) &mysql_protocol_connected_count, SHOW_FUNC},
 
1080
  {"Failed_connections",
 
1081
  (char*) &mysql_protocol_failed_count, SHOW_FUNC},
 
1082
  {NULL, NULL, SHOW_LONGLONG}
 
1083
};
 
1084
 
 
1085
MysqlProtocolStatus::Generator::Generator(drizzled::Field **fields) :
 
1086
  plugin::TableFunction::Generator(fields)
 
1087
{
 
1088
  status_var_ptr= mysql_protocol_status_variables;
 
1089
}
 
1090
 
 
1091
bool MysqlProtocolStatus::Generator::populate()
 
1092
{
 
1093
  MY_ALIGNED_BYTE_ARRAY(buff_data, SHOW_VAR_FUNC_BUFF_SIZE, int64_t);
 
1094
  char * const buff= (char *) &buff_data;
 
1095
  drizzle_show_var tmp;
 
1096
 
 
1097
  if (status_var_ptr->name)
 
1098
  {
 
1099
    std::ostringstream oss;
 
1100
    string return_value;
 
1101
    const char *value;
 
1102
    int type;
 
1103
 
 
1104
    push(status_var_ptr->name);
 
1105
 
 
1106
    if (status_var_ptr->type == SHOW_FUNC)
 
1107
    {
 
1108
      ((drizzle_show_var_func)((st_show_var_func_container *)status_var_ptr->value)->func)(&tmp, buff);
 
1109
      value= buff;
 
1110
      type= tmp.type;
 
1111
    }
 
1112
    else
 
1113
    {
 
1114
      value= status_var_ptr->value;
 
1115
      type= status_var_ptr->type;
 
1116
    }
 
1117
 
 
1118
    switch(type)
 
1119
    {
 
1120
    case SHOW_LONGLONG:
 
1121
      oss << *(uint64_t*) value;
 
1122
      return_value= oss.str();
 
1123
      break;
 
1124
    default:
 
1125
      assert(0);
 
1126
    }
 
1127
    if (return_value.length())
 
1128
      push(return_value);
 
1129
    else
 
1130
      push(" ");
 
1131
 
 
1132
    status_var_ptr++;
 
1133
 
 
1134
    return true;
 
1135
  }
 
1136
  return false;
1045
1137
}
1046
1138
 
1047
1139
} /* namespace drizzle_plugin */
1055
1147
  "MySQL Protocol Module",
1056
1148
  PLUGIN_LICENSE_GPL,
1057
1149
  drizzle_plugin::init,             /* Plugin Init */
1058
 
  NULL, /* depends */
 
1150
  NULL, /* system variables */
1059
1151
  drizzle_plugin::init_options    /* config options */
1060
1152
}
1061
1153
DRIZZLE_DECLARE_PLUGIN_END;