Skip to content

M
MariaDB
Commit ede6ba56 authored by hf@bison.(none)'s avatar hf@bison.(none)
Browse files
Options

Removing net emulation out of embedded library

parent 4375d827
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 616 additions and 297 deletions
BitKeeper/etc/logging_ok
View file @ ede6ba56
......@@ -54,3 +54,4 @@ venu@work.mysql.com
zak@balfor.local
zak@linux.local
ram@gw.udmsearch.izhnet.ru
hf@bison.(none)
include/mysql.h
View file @ ede6ba56
......@@ -123,6 +123,9 @@ typedef struct st_mysql_data {
unsigned int fields;
MYSQL_ROWS *data;
MEM_ROOT alloc;
#ifdef EMBEDDED_LIBRARY
MYSQL_ROWS **prev_ptr;
#endif
} MYSQL_DATA;
struct st_mysql_options {
......@@ -152,13 +155,20 @@ struct st_mysql_options {
a read that is replication-aware
*/
my_bool no_master_reads;
#ifdef EMBEDDED_LIBRARY
my_bool separate_thread;
#endif
};
enum mysql_option { MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS,
MYSQL_OPT_NAMED_PIPE, MYSQL_INIT_COMMAND,
MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,
MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME,
MYSQL_OPT_LOCAL_INFILE};
MYSQL_OPT_LOCAL_INFILE,
#ifdef EMBEDDED_LIBRARY
MYSQL_OPT_USE_RESULT
#endif
};
enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,
MYSQL_STATUS_USE_RESULT};
......@@ -171,12 +181,18 @@ enum mysql_status { MYSQL_STATUS_READY,MYSQL_STATUS_GET_RESULT,
enum mysql_rpl_type { MYSQL_RPL_MASTER, MYSQL_RPL_SLAVE,
MYSQL_RPL_ADMIN };
struct st_mysql_res;
typedef struct st_mysql {
NET net; /* Communication parameters */
gptr connector_fd; /* ConnectorFd for SSL */
char *host,*user,*passwd,*unix_socket,*server_version,*host_info,
*info,*db;
#ifndef _0EMBEDDED_LIBRARY
char *host,*user,*passwd,*unix_socket,*server_version,*host_info,*info;
#endif
#ifdef EMBEDDED_LIBRARY
struct st_mysql_res *result;
#endif
char *db;
struct charset_info_st *charset;
MYSQL_FIELD *fields;
MEM_ROOT field_alloc;
......@@ -212,6 +228,9 @@ typedef struct st_mysql {
typedef struct st_mysql_res {
#ifdef EMBEDDED_LIBRARY
const char *query_str;
#endif
my_ulonglong row_count;
MYSQL_FIELD *fields;
MYSQL_DATA *data;
......
include/violite.h
View file @ ede6ba56
......@@ -31,8 +31,13 @@
extern "C" {
#endif /* __cplusplus */
enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET,
VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL};
enum enum_vio_type {
VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET,
VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL
#ifdef EMBEDDED_LIBRARY
,VIO_SHARED_MEMORY, VIO_BUFFER
#endif
};
#ifndef __WIN__
#define HANDLE void *
......
libmysqld/embedded_priv.h
View file @ ede6ba56
......@@ -29,4 +29,7 @@ extern void end_embedded_connection(NET * net);
extern void lib_connection_phase(NET *net, int phase);
extern bool lib_dispatch_command(enum enum_server_command command, NET *net,
const char *arg, ulong length);
extern void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db);
extern void *create_embedded_thd(Vio *vio, unsigned char *buff, int client_flag, char *db);
extern NET *get_mysql_net(MYSQL *mysql);
C_MODE_END
libmysqld/lib_sql.cc
View file @ ede6ba56
This diff is collapsed.
libmysqld/lib_vio.c
View file @ ede6ba56
......@@ -42,14 +42,7 @@
struct st_vio
{
my_socket sd; /* my_socket - real or imaginary */
HANDLE hPipe;
my_bool localhost; /* Are we from localhost? */
int fcntl_mode; /* Buffered fcntl(sd,F_GETFL) */
struct sockaddr_in local; /* Local internet address */
struct sockaddr_in remote; /* Remote internet address */
enum enum_vio_type type; /* Type of connection */
char desc[30]; /* String description */
void *dest_thd;
char *packets, **last_packet;
char *where_in_packet, *end_of_packet;
......@@ -57,6 +50,7 @@ struct st_vio
MEM_ROOT root;
};
/* Initialize the communication buffer */
Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
......@@ -68,6 +62,7 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
init_alloc_root(&vio->root, 8192, 8192);
vio->root.min_malloc = sizeof(char *) + 4;
vio->last_packet = &vio->packets;
vio->type = type;
}
return (vio);
}
......@@ -212,4 +207,22 @@ my_bool vio_poll_read(Vio *vio,uint timeout)
return 0;
}
int create_vio(NET *net, int separate_thread)
{
Vio * v = net->vio;
if (!v)
{
v = vio_new(0, separate_thread ? VIO_SHARED_MEMORY : VIO_BUFFER, 0);
net->vio = v;
}
return !v;
}
void set_thd(Vio *v, void *thd)
{
if (v)
{
v -> dest_thd = thd;
}
}
#endif /* HAVE_VIO */
libmysqld/libmysqld.c
View file @ ede6ba56
This diff is collapsed.
sql/ha_myisam.cc
View file @ ede6ba56
......@@ -80,7 +80,7 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type,
net_store_data(packet, msg_type);
net_store_data(packet, msgbuf);
if (my_net_write(&thd->net, (char*)thd->packet.ptr(), thd->packet.length()))
if (SEND_ROW(thd, &thd->net, 4, (char*)thd->packet.ptr(), thd->packet.length()))
sql_print_error("Failed on my_net_write, writing to stderr instead: %s\n",
msgbuf);
return;
......
sql/net_pkg.cc
View file @ ede6ba56
......@@ -48,6 +48,11 @@ void send_error(NET *net, uint sql_errno, const char *err)
}
}
}
#ifdef EMBEDDED_LIBRARY
net->last_errno= sql_errno;
strmake(net->last_error, err, sizeof(net->last_error)-1);
#else
if (net->vio == 0)
{
if (thd && thd->bootstrap)
......@@ -70,6 +75,7 @@ void send_error(NET *net, uint sql_errno, const char *err)
set_if_smaller(length,MYSQL_ERRMSG_SIZE);
}
VOID(net_write_command(net,(uchar) 255,(char*) err,length));
#endif /* EMBEDDED_LIBRARY*/
if (thd)
thd->fatal_error=0; // Error message is given
DBUG_VOID_RETURN;
......@@ -123,6 +129,7 @@ net_printf(NET *net, uint errcode, ...)
length=sizeof(net->last_error)-1; /* purecov: inspected */
va_end(args);
#ifndef EMBEDDED_LIBRARY
if (net->vio == 0)
{
if (thd && thd->bootstrap)
......@@ -140,11 +147,16 @@ net_printf(NET *net, uint errcode, ...)
if (offset)
int2store(text_pos-2, errcode);
VOID(net_real_write(net,(char*) net->buff,length+head_length+1+offset));
#else
net->last_errno= errcode;
strmake(net->last_error, text_pos, length);
#endif
if (thd)
thd->fatal_error=0; // Error message is given
DBUG_VOID_RETURN;
}
#ifndef EMBEDDED_LIBRARY
void
send_ok(NET *net,ha_rows affected_rows,ulonglong id,const char *message)
......@@ -172,6 +184,8 @@ send_ok(NET *net,ha_rows affected_rows,ulonglong id,const char *message)
DBUG_VOID_RETURN;
}
#endif /* EMBEDDED_LIBRARY */
void
send_eof(NET *net,bool no_flush)
{
......
sql/sql_acl.cc
View file @ ede6ba56
......@@ -2512,8 +2512,12 @@ uint get_table_grant(THD *thd, TABLE_LIST *table)
GRANT_TABLE *grant_table;
pthread_mutex_lock(&LOCK_grant);
#ifdef EMBEDDED_LIBRARY
grant_table= NULL;
#else
grant_table = table_hash_search(thd->host,thd->ip,db,user,
table->real_name,0);
#endif
table->grant.grant_table=grant_table; // Remember for column test
table->grant.version=grant_version;
if (grant_table)
......
sql/sql_base.cc
View file @ ede6ba56
......@@ -180,6 +180,8 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
}
#ifndef EMBEDDED_LIBRARY
/******************************************************************************
** Send name and type of result to client.
** Sum fields has table name empty and field_name.
......@@ -264,6 +266,7 @@ send_fields(THD *thd,List<Item> &list,uint flag)
return 1; /* purecov: inspected */
}
#endif /* EMBEDDED_LIBRARY */
/*****************************************************************************
* Functions to free open table cache
......
sql/sql_class.cc
View file @ ede6ba56
......@@ -383,6 +383,8 @@ bool select_send::send_fields(List<Item> &list,uint flag)
}
#ifndef EMBEDDED_LIBRARY
/* Send data to client. Returns 0 if ok */
bool select_send::send_data(List<Item> &items)
......@@ -411,6 +413,7 @@ bool select_send::send_data(List<Item> &items)
bool error=my_net_write(&thd->net,(char*) packet->ptr(),packet->length());
DBUG_RETURN(error);
}
#endif /* EMBEDDED_LIBRARY */
bool select_send::send_eof()
{
......
sql/sql_class.h
View file @ ede6ba56
......@@ -273,6 +273,10 @@ class delayed_insert;
#define THD_SENTRY_MAGIC 0xfeedd1ff
#define THD_SENTRY_GONE 0xdeadbeef
#ifdef EMBEDDED_LIBRARY
typedef struct st_mysql;
#endif
#define THD_CHECK_SENTRY(thd) DBUG_ASSERT(thd->dbug_sentry == THD_SENTRY_MAGIC)
/* For each client connection we create a separate thread with THD serving as
......@@ -287,6 +291,9 @@ class THD :public ilink {
String packet; // dynamic string buffer used for network I/O
struct sockaddr_in remote; // client socket address
struct rand_struct rand; // used for authentication
#ifdef EMBEDDED_LIBRARY
struct st_mysql *mysql;
#endif
/* query points to the current query,
thread_stack is a pointer to the stack frame of handle_one_connection(),
......
sql/sql_parse.cc
View file @ ede6ba56
......@@ -791,8 +791,9 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd)
}
/* Execute one command from socket (query or simple command) */
#ifndef EMBEDDED_LIBRARY
/* Execute one command from socket (query or simple command) */
bool do_command(THD *thd)
{
char *packet;
......@@ -830,6 +831,7 @@ bool do_command(THD *thd)
DBUG_RETURN(dispatch_command(command,thd, packet+1, (uint) packet_length));
}
#endif /* EMBEDDED_LIBRARY */
bool dispatch_command(enum enum_server_command command, THD *thd,
char* packet, uint packet_length)
......
sql/sql_show.cc
View file @ ede6ba56
......@@ -52,8 +52,6 @@ extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd;
** Send list of databases
** A database is a directory in the mysql_data_home directory
****************************************************************************/
int
mysqld_show_dbs(THD *thd,const char *wild)
{
......@@ -85,8 +83,8 @@ mysqld_show_dbs(THD *thd,const char *wild)
{
thd->packet.length(0);
net_store_data(&thd->packet, thd->convert_set, file_name);
if (my_net_write(&thd->net, (char*) thd->packet.ptr(),
thd->packet.length()))
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
}
}
......@@ -123,8 +121,9 @@ int mysqld_show_open_tables(THD *thd,const char *wild)
net_store_data(&thd->packet,convert, open_list->table);
net_store_data(&thd->packet,open_list->in_use);
net_store_data(&thd->packet,open_list->locked);
if (my_net_write(&thd->net,(char*) thd->packet.ptr(),thd->packet.length()))
DBUG_RETURN(-1);
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
}
send_eof(&thd->net);
......@@ -162,8 +161,9 @@ int mysqld_show_tables(THD *thd,const char *db,const char *wild)
{
thd->packet.length(0);
net_store_data(&thd->packet, thd->convert_set, file_name);
if (my_net_write(&thd->net,(char*) thd->packet.ptr(),thd->packet.length()))
DBUG_RETURN(-1);
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
}
send_eof(&thd->net);
DBUG_RETURN(0);
......@@ -411,9 +411,9 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
}
close_thread_tables(thd,0);
}
if (my_net_write(&thd->net,(char*) packet->ptr(),
packet->length()))
DBUG_RETURN(-1);
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
}
send_eof(&thd->net);
DBUG_RETURN(0);
......@@ -424,7 +424,6 @@ int mysqld_extend_show_tables(THD *thd,const char *db,const char *wild)
/***************************************************************************
** List all columns in a table
***************************************************************************/
int
mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
bool verbose)
......@@ -523,8 +522,8 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
if (verbose)
{
/* Add grant options */
col_access= get_column_grant(thd,table_list,field) & COL_ACLS;
end=tmp;
col_access= get_column_grant(thd,table_list,field) & COL_ACLS;
for (uint bitnr=0; col_access ; col_access>>=1,bitnr++)
{
if (col_access & 1)
......@@ -535,8 +534,9 @@ mysqld_show_fields(THD *thd, TABLE_LIST *table_list,const char *wild,
}
net_store_data(packet,convert, tmp+1,end == tmp ? 0 : (uint) (end-tmp-1));
}
if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
DBUG_RETURN(1);
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
}
}
}
......@@ -591,8 +591,9 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
int3store(p, create_len);
// now we are in business :-)
if (my_net_write(&thd->net, (char*)packet->ptr(), packet->length()))
DBUG_RETURN(1);
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
}
send_eof(&thd->net);
DBUG_RETURN(0);
......@@ -714,8 +715,9 @@ mysqld_show_keys(THD *thd, TABLE_LIST *table_list)
net_store_data(packet,convert,table->file->index_type(i));
/* Comment */
net_store_data(packet,convert,"");
if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
DBUG_RETURN(1); /* purecov: inspected */
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
DBUG_RETURN(-1);
}
}
send_eof(&thd->net);
......@@ -1126,8 +1128,9 @@ void mysqld_list_processes(THD *thd,const char *user, bool verbose)
net_store_data(packet,convert,thd_info->query);
else
net_store_null(packet);
if (my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
break; /* purecov: inspected */
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
break;
}
send_eof(&thd->net);
DBUG_VOID_RETURN;
......@@ -1372,8 +1375,9 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables)
#endif /* HAVE_OPENSSL */
}
if (my_net_write(&thd->net, (char*) packet2.ptr(),packet2.length()))
goto err; /* purecov: inspected */
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)packet2.ptr(), packet2.length()))
goto err;
}
}
pthread_mutex_unlock(&LOCK_status);
......
sql/sql_table.cc
View file @ ede6ba56
......@@ -1060,6 +1060,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
thd->open_options|= extra_open_options;
table->table = open_ltable(thd, table, lock_type);
#ifdef EMBEDDED_LIBRARY
thd->net.last_errno= 0; // these errors shouldn't get client
#endif
thd->open_options&= ~extra_open_options;
packet->length(0);
if (prepare_func)
......@@ -1174,8 +1177,8 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
table->table->real_name);
close_thread_tables(thd);
table->table=0; // For query cache
if (my_net_write(&thd->net, (char*) packet->ptr(),
packet->length()))
if (SEND_ROW(thd, &thd->net, field_list.elements,
(char *)thd->packet.ptr(), thd->packet.length()))
goto err;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7