mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
into weblab.(none):/home/marcsql/TREE/mysql-5.1-merge mysql-test/r/sp.result: Auto merged server-tools/instance-manager/commands.cc: Auto merged server-tools/instance-manager/commands.h: Auto merged server-tools/instance-manager/guardian.cc: Auto merged server-tools/instance-manager/guardian.h: Auto merged server-tools/instance-manager/instance.cc: Auto merged server-tools/instance-manager/instance.h: Auto merged server-tools/instance-manager/instance_map.cc: Auto merged server-tools/instance-manager/instance_map.h: Auto merged server-tools/instance-manager/instance_options.h: Auto merged server-tools/instance-manager/listener.cc: Auto merged server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/manager.h: Auto merged server-tools/instance-manager/user_map.cc: Auto merged sql/event_data_objects.cc: Auto merged sql/event_queue.cc: Auto merged sql/handler.cc: Auto merged sql/lock.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/csv/ha_tina.cc: Auto merged tests/mysql_client_test.c: Auto merged
This commit is contained in:
unknown
@@ -29,7 +29,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Print all instances of this instance manager.
|
||||
Grammar: SHOW INSTANCES
|
||||
*/
|
||||
@@ -49,7 +49,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Reread configuration file and refresh internal cache.
|
||||
Grammar: FLUSH INSTANCES
|
||||
*/
|
||||
@@ -65,29 +65,20 @@ public:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
Abstract class for Instance-specific commands.
|
||||
/**
|
||||
Base class for Instance-specific commands
|
||||
(commands that operate on one instance).
|
||||
|
||||
Instance_cmd extends Command class by:
|
||||
- an attribute for storing instance name;
|
||||
- code to initialize instance name in constructor;
|
||||
- an accessor to get instance name.
|
||||
*/
|
||||
|
||||
class Abstract_instance_cmd: public Command
|
||||
class Instance_cmd : public Command
|
||||
{
|
||||
public:
|
||||
Abstract_instance_cmd(const LEX_STRING *instance_name_arg);
|
||||
|
||||
public:
|
||||
virtual int execute(st_net *net, ulong connection_id);
|
||||
|
||||
protected:
|
||||
/* MT-NOTE: this operation is called under acquired Instance_map's lock. */
|
||||
virtual int execute_impl(st_net *net, Instance *instance) = 0;
|
||||
|
||||
/*
|
||||
This operation is invoked on successful return of execute_impl() and is
|
||||
intended to send closing data.
|
||||
|
||||
MT-NOTE: this operation is called under released Instance_map's lock.
|
||||
*/
|
||||
virtual int send_ok_response(st_net *net, ulong connection_id) = 0;
|
||||
Instance_cmd(const LEX_STRING *instance_name_arg);
|
||||
|
||||
protected:
|
||||
inline const LEX_STRING *get_instance_name() const
|
||||
@@ -100,7 +91,50 @@ private:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Abstract class for Instance-specific commands.
|
||||
|
||||
Abstract_instance_cmd extends Instance_cmd by providing a common
|
||||
framework for writing command-implementations. Basically, the class
|
||||
implements Command::execute() pure virtual function in the following
|
||||
way:
|
||||
- Lock Instance_map;
|
||||
- Get an instance by name. Return an error, if there is no such
|
||||
instance;
|
||||
- Lock the instance;
|
||||
- Unlock Instance_map;
|
||||
- Call execute_impl(), which should be implemented in derived class;
|
||||
- Unlock the instance;
|
||||
- Send response to the client and return error status.
|
||||
*/
|
||||
|
||||
class Abstract_instance_cmd: public Instance_cmd
|
||||
{
|
||||
public:
|
||||
Abstract_instance_cmd(const LEX_STRING *instance_name_arg);
|
||||
|
||||
public:
|
||||
virtual int execute(st_net *net, ulong connection_id);
|
||||
|
||||
protected:
|
||||
/**
|
||||
This operation is intended to contain command-specific implementation.
|
||||
|
||||
MT-NOTE: this operation is called under acquired Instance's lock.
|
||||
*/
|
||||
virtual int execute_impl(st_net *net, Instance *instance) = 0;
|
||||
|
||||
/**
|
||||
This operation is invoked on successful return of execute_impl() and is
|
||||
intended to send closing data.
|
||||
|
||||
MT-NOTE: this operation is called under released Instance's lock.
|
||||
*/
|
||||
virtual int send_ok_response(st_net *net, ulong connection_id) = 0;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
Print status of an instance.
|
||||
Grammar: SHOW INSTANCE STATUS <instance_name>
|
||||
*/
|
||||
@@ -120,7 +154,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Print options of chosen instance.
|
||||
Grammar: SHOW INSTANCE OPTIONS <instance_name>
|
||||
*/
|
||||
@@ -140,7 +174,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Start an instance.
|
||||
Grammar: START INSTANCE <instance_name>
|
||||
*/
|
||||
@@ -156,7 +190,7 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Stop an instance.
|
||||
Grammar: STOP INSTANCE <instance_name>
|
||||
*/
|
||||
@@ -172,12 +206,12 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Create an instance.
|
||||
Grammar: CREATE INSTANCE <instance_name> [<options>]
|
||||
*/
|
||||
|
||||
class Create_instance: public Command
|
||||
class Create_instance: public Instance_cmd
|
||||
{
|
||||
public:
|
||||
Create_instance(const LEX_STRING *instance_name_arg);
|
||||
@@ -188,22 +222,15 @@ public:
|
||||
protected:
|
||||
virtual int execute(st_net *net, ulong connection_id);
|
||||
|
||||
inline const LEX_STRING *get_instance_name() const
|
||||
{
|
||||
return instance_name.get_str();
|
||||
}
|
||||
|
||||
private:
|
||||
bool parse_args(const char **text);
|
||||
|
||||
private:
|
||||
Instance_name instance_name;
|
||||
|
||||
Named_value_arr options;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Drop an instance.
|
||||
Grammar: DROP INSTANCE <instance_name>
|
||||
|
||||
@@ -212,18 +239,17 @@ private:
|
||||
is removed from the instance map.
|
||||
*/
|
||||
|
||||
class Drop_instance: public Abstract_instance_cmd
|
||||
class Drop_instance: public Instance_cmd
|
||||
{
|
||||
public:
|
||||
Drop_instance(const LEX_STRING *instance_name_arg);
|
||||
|
||||
protected:
|
||||
virtual int execute_impl(st_net *net, Instance *instance);
|
||||
virtual int send_ok_response(st_net *net, ulong connection_id);
|
||||
virtual int execute(st_net *net, ulong connection_id);
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Print requested part of the log.
|
||||
Grammar:
|
||||
SHOW <instance_name> LOG {ERROR | SLOW | GENERAL} size[, offset_from_end]
|
||||
@@ -251,7 +277,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Shows the list of the log files, used by an instance.
|
||||
Grammar: SHOW <instance_name> LOG FILES
|
||||
*/
|
||||
@@ -271,7 +297,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Abstract class for option-management commands.
|
||||
*/
|
||||
|
||||
@@ -311,7 +337,7 @@ private:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Set an option for the instance.
|
||||
Grammar: SET instance_name.option[=option_value][, ...]
|
||||
*/
|
||||
@@ -328,7 +354,7 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Remove option of the instance.
|
||||
Grammar: UNSET instance_name.option[, ...]
|
||||
*/
|
||||
@@ -345,7 +371,7 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
/**
|
||||
Syntax error command.
|
||||
|
||||
This command is issued if parser reported a syntax error. We need it to
|
||||
|
||||
Reference in New Issue
Block a user