@@ -53,13 +53,16 @@ CometQLProxy_connection::~CometQLProxy_connection()
5353
5454int CometQLProxy_connection::proxy_query (int node, thread_data* local_buf, unsigned int PacketNomber)
5555{
56+ std::string query (" cometqlcluster_v1; "
57+ query.append (local_buf->qInfo .StartQury );
58+
5659 if (local_buf->qInfo .command == TOK_SELECT || local_buf->qInfo .command == TOK_SHOW)
5760 {
58- return proxy_union_select (node, local_buf-> qInfo . StartQury , local_buf, PacketNomber);
61+ return proxy_union_select (node, query. data () , local_buf, PacketNomber);
5962 }
6063 else if (local_buf->qInfo .command == TOK_INSERT || local_buf->qInfo .command == TOK_DELETE)
6164 {
62- return proxy_insert (node, local_buf-> qInfo . StartQury , local_buf, PacketNomber);
65+ return proxy_insert (node, query. data () , local_buf, PacketNomber);
6366 }
6467}
6568
@@ -96,8 +99,8 @@ int CometQLProxy_connection::proxy_union_select(int node, const char* query, thr
9699 {
97100 // @todo Проверять код ошибки и не паниковать если по коду ясно что проблема в самом запросе а не соединении.
98101 // @todo Проверять что если ошибка сетевая или что то ещё то повторять попытку.
99- TagLoger::error (Log_CometQLCluster, 0 , " CometQLProxy warn [6] on node=%s in query=%s\n " link ->name (), query );
100-
102+ TagLoger::error (Log_CometQLCluster, 0 , " CometQLProxy error [6] on node=%d in query=%s (errno=%d, error=%s) \n " node, query, mysql_errno ( link ->getLink ()), mysql_error ( link -> getLink ()) );
103+
101104 bool isSuccess = false ;
102105 // Если ошибка то ещё раз отправим запрос но на другую ноду
103106 auto it = local_buf->proxyCluster .begin ();
@@ -134,14 +137,14 @@ int CometQLProxy_connection::proxy_union_select(int node, const char* query, thr
134137 }
135138 else
136139 {
137- TagLoger::log (Log_CometQLCluster, 0 , " CometQLProxy query:`%s` send to node=%d from %d\n " proxyCluster .size ());
140+ TagLoger::log (Log_CometQLCluster, 0 , " CometQLProxy query:`%s` send to node=%d from %d (errno=%d, error=%s) \n " proxyCluster .size (), mysql_errno ( link -> getLink ()), mysql_error ( link -> getLink () ));
138141 // Если задана node то выполнить запрос на конкретной ноде а не на всех нодах.
139142 link = local_buf->proxyCluster [node];
140143 if (!link ->query (query))
141144 {
142145 // @todo Проверять код ошибки и не паниковать если по коду ясно что проблема в самом запросе а не соединении.
143146 // @todo Проверять что если ошибка сетевая или что то ещё то повторять попытку.
144- TagLoger::error (Log_CometQLCluster, 0 , " CometQLProxy error[6] on node=%d in query=%s\n "
147+ TagLoger::error (Log_CometQLCluster, 0 , " CometQLProxy error[6] on node=%d in query=%s (errno=%d, error=%s) \n " , mysql_errno ( link -> getLink ()), mysql_error ( link -> getLink ()) );
145148 local_buf->qInfo .setError (mysql_error (link ->getLink ()), mysql_errno (link ->getLink ()));
146149 local_buf->answer_buf .unlock ();
147150 Send_Err_Package (local_buf->qInfo .errorCode , local_buf->qInfo .errorText , ++PacketNomber, local_buf, this );
@@ -150,11 +153,19 @@ int CometQLProxy_connection::proxy_union_select(int node, const char* query, thr
150153 }
151154
152155 auto result = mysql_store_result (link ->getLink ());
156+ if (result == NULL )
157+ {
158+ TagLoger::error (Log_CometQLCluster, 0 , " CometQLProxy error[12] on node=%d in query=%s (errno=%d, error=%s)\n " mysql_errno (link ->getLink ()), mysql_error (link ->getLink ()));
159+ local_buf->qInfo .setError (mysql_error (link ->getLink ()), mysql_errno (link ->getLink ()));
160+ local_buf->answer_buf .unlock ();
161+ Send_Err_Package (local_buf->qInfo .errorCode , local_buf->qInfo .errorText , ++PacketNomber, local_buf, this );
162+ return 0 ;
163+ }
153164
154165 MYSQL_FIELD *field;
155166 while ((field = mysql_fetch_field (result)))
156167 {
157- printf (" field name %s\n " name );
168+ // printf("field name %s\n", field->name);
158169 local_buf->sql .columns [num_fields] = field->name ;
159170 num_fields++;
160171 if (num_fields >= MAX_COLUMNS_COUNT)
@@ -199,13 +210,21 @@ int CometQLProxy_connection::proxy_union_select(int node, const char* query, thr
199210
200211 isSuccess = true ;
201212 auto result = mysql_store_result (link ->getLink ());
213+ if (result == NULL )
214+ {
215+ TagLoger::error (Log_CometQLCluster, 0 , " CometQLProxy error[13] on node=%d in query=%s (errno=%d, error=%s)\n " link ->name (), query, mysql_errno (link ->getLink ()), mysql_error (link ->getLink ()));
216+ local_buf->qInfo .setError (mysql_error (link ->getLink ()), mysql_errno (link ->getLink ()));
217+ local_buf->answer_buf .unlock ();
218+ Send_Err_Package (local_buf->qInfo .errorCode , local_buf->qInfo .errorText , ++PacketNomber, local_buf, this );
219+ return 0 ;
220+ }
202221
203222 if (!isSendHeader)
204223 {
205224 MYSQL_FIELD *field;
206225 while ((field = mysql_fetch_field (result)))
207226 {
208- printf (" field name %s\n " name );
227+ // printf("field name %s\n", field->name);
209228 local_buf->sql .columns [num_fields] = field->name ;
210229 num_fields++;
211230 if (num_fields >= MAX_COLUMNS_COUNT)
@@ -222,10 +241,10 @@ int CometQLProxy_connection::proxy_union_select(int node, const char* query, thr
222241 {
223242 for (int i = 0 ; i < num_fields; i++)
224243 {
225- printf (" [%s]" " NULL"
244+ // printf("[%s]", row[i] ? row[i] : "NULL");
226245 value[i] = row[i];
227246 }
228- printf (" \n "
247+ // printf("\n");
229248 answer += RowPackage (num_fields, value, ++PacketNomber, answer);
230249 }
231250 mysql_free_result (result);
@@ -433,6 +452,14 @@ int CometQLProxy_connection::query_router(thread_data* local_buf, int PacketNomb
433452 {
434453 return proxy_query (PROXY_TO_RANDOM, local_buf,PacketNomber); // return sql_select_from_pipes_settings(local_buf,PacketNomber);
435454 }
455+ else if (local_buf->qInfo .tokCompare (" conference" qInfo .tableName ))
456+ {
457+ return proxy_query (PROXY_TO_RANDOM, local_buf,PacketNomber); // return sql_insert_into_conference(local_buf,PacketNomber);
458+ }
459+ else if (local_buf->qInfo .tokCompare (" conference_members" qInfo .tableName ))
460+ {
461+ return proxy_query (PROXY_TO_RANDOM, local_buf,PacketNomber); // return sql_insert_into_conference(local_buf,PacketNomber);
462+ }
436463 else
437464 {
438465 return Send_Err_Package (SQL_ERR_NOT_EXIST, " Table doesn't exist" 1 , local_buf, this );
@@ -481,8 +508,12 @@ int CometQLProxy_connection::query_router(thread_data* local_buf, int PacketNomb
481508 }
482509 else if (local_buf->qInfo .tokCompare (" conference" qInfo .tableName ))
483510 {
484- return proxy_query (PROXY_TO_ALL , local_buf,PacketNomber); // return sql_insert_into_conference(local_buf,PacketNomber);
511+ return proxy_query (PROXY_TO_RANDOM , local_buf,PacketNomber); // return sql_insert_into_conference(local_buf,PacketNomber);
485512 }
513+ else if (local_buf->qInfo .tokCompare (" conference_members" qInfo .tableName ))
514+ {
515+ return proxy_query (PROXY_TO_RANDOM, local_buf,PacketNomber); // return sql_insert_into_conference(local_buf,PacketNomber);
516+ }
486517 else if (local_buf->qInfo .tokCompare (" dialogs" qInfo .tableName ))
487518 {
488519 return proxy_query (PROXY_TO_ALL, local_buf,PacketNomber); // return sql_insert_into_dialogs(local_buf,PacketNomber);
@@ -528,6 +559,14 @@ int CometQLProxy_connection::query_router(thread_data* local_buf, int PacketNomb
528559 {
529560 return proxy_query (PROXY_TO_RANDOM, local_buf,PacketNomber); // return sql_delete_from_pipes_settings(local_buf,PacketNomber);
530561 }
562+ else if (local_buf->qInfo .tokCompare (" conference" qInfo .tableName ))
563+ {
564+ return proxy_query (PROXY_TO_RANDOM, local_buf,PacketNomber); // return sql_insert_into_conference(local_buf,PacketNomber);
565+ }
566+ else if (local_buf->qInfo .tokCompare (" conference_members" qInfo .tableName ))
567+ {
568+ return proxy_query (PROXY_TO_RANDOM, local_buf,PacketNomber); // return sql_insert_into_conference(local_buf,PacketNomber);
569+ }
531570 else
532571 {
533572 return Send_Err_Package (SQL_ERR_NOT_EXIST, " Table doesn't exist" 1 , local_buf, this );
@@ -595,6 +634,12 @@ int CometQLProxy_connection::sql_select_from_pipes(thread_data* local_buf, unsig
595634 }
596635
597636 auto result = mysql_store_result (link ->getLink ());
637+ if (result == NULL )
638+ {
639+ TagLoger::error (Log_CometQLCluster, 0 , " CometQLProxy error[14] on node=%d (errno=%d, error=%s)\n " link ->name (), mysql_errno (link ->getLink ()), mysql_error (link ->getLink ()));
640+ continue ;
641+ }
642+
598643 while ((row = mysql_fetch_row (result)))
599644 {
600645 long int_size = 0 ;
@@ -678,6 +723,12 @@ int CometQLProxy_connection::sql_union_select_from_users_time(thread_data* local
678723 }
679724
680725 auto result = mysql_store_result (link ->getLink ());
726+ if (result == NULL )
727+ {
728+ TagLoger::error (Log_CometQLCluster, 0 , " CometQLProxy error[15] on node=%d (errno=%d, error=%s)\n " link ->name (), mysql_errno (link ->getLink ()), mysql_error (link ->getLink ()));
729+ continue ;
730+ }
731+
681732 while ((row = mysql_fetch_row (result)))
682733 {
683734 long time = 0 ;
0 commit comments