Return next_query_flagIN in qpo

This is a minor improvement on pull request #825
sysown · Dec 29, 2016 · 790cc78 · 790cc78
1 parent f35e853
commit 790cc78
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/include/query_processor.h b/include/query_processor.h
@@ -52,6 +52,7 @@ class Query_Processor_Output {
 	int destination_hostgroup;
 	int mirror_hostgroup;
 	int mirror_flagOUT;
+	int next_query_flagIN;
 	int cache_ttl;
 	int reconnect;
 	int timeout;
@@ -81,6 +82,7 @@ class Query_Processor_Output {
 		destination_hostgroup=-1;
 		mirror_hostgroup=-1;
 		mirror_flagOUT=-1;
+		next_query_flagIN=-1;
 		cache_ttl=-1;
 		reconnect=-1;
 		timeout=-1;

diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
@@ -3164,6 +3164,9 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
 
 __exit_set_destination_hostgroup:
 
+	if ( qpo->next_query_flagIN >= 0 ) {
+		next_query_flagIN=qpo->next_query_flagIN;
+	}
 	if ( qpo->destination_hostgroup >= 0 ) {
 		if (transaction_persistent_hostgroup == -1) {
 			current_hostgroup=qpo->destination_hostgroup;

diff --git a/lib/Query_Processor.cpp b/lib/Query_Processor.cpp
@@ -710,6 +710,7 @@ Query_Processor_Output * Query_Processor::process_mysql_query(MySQL_Session *ses
 	QP_rule_t *qr;
 	re2_t *re2p;
 	int flagIN=0;
+	ret->next_query_flagIN=-1; // reset
 	if (sess->next_query_flagIN >= 0) {
 		flagIN=sess->next_query_flagIN;
 	}
@@ -860,8 +861,8 @@ Query_Processor_Output * Query_Processor::process_mysql_query(MySQL_Session *ses
     }
     if (qr->next_query_flagIN >= 0) {
 			// Note: Negative next_query_flagIN means this rule doesn't change the next query flagIN
-        proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "query rule %d has set next query flagIN: %d\n", qr->rule_id, flagIn);
-        sess->next_query_flagIN=qr->next_query_flagIN;
+        proxy_debug(PROXY_DEBUG_MYSQL_QUERY_PROCESSOR, 5, "query rule %d has set next query flagIN: %d\n", qr->rule_id, qr->next_query_flagIN);
+        ret->next_query_flagIN=qr->next_query_flagIN;
     }
     if (qr->mirror_flagOUT >= 0) {
 			// Note: negative mirror_flagOUT means this rule doesn't change the mirror flagOUT