Merge pull request #5388 from sysown/v3.0_fix-pgsql-extended-query-routing_5387

Fix: Extended query Routing and Statistics Tracking

Author: renecannao

lib/PgSQL_Connection.cpp

@@ -726,13 +726,24 @@ PG_ASYNC_ST PgSQL_Connection::handler(short event) {
 		break;
 
 	case ASYNC_STMT_DESCRIBE_START:
+	{
 		stmt_describe_start();
+		__sync_fetch_and_add(&parent->queries_sent, 1);
+		size_t bytes_sent = 7 + 5; // 7 for DESCRIBE header, 5 for SYNC/FLUSH
+		if (query.extended_query_info->stmt_type == 'P') {
+			bytes_sent += query.extended_query_info->stmt_client_portal_name ? (strlen(query.extended_query_info->stmt_client_portal_name) + 1) : 0;
+		} else {
+			bytes_sent += query.backend_stmt_name ? (strlen(query.backend_stmt_name) + 1) : 0;
+		}
+		update_bytes_sent(bytes_sent);
+		statuses.questions++;
 		if (async_exit_status) {
 			next_event(ASYNC_STMT_DESCRIBE_CONT);
 		} else {
 			NEXT_IMMEDIATE(ASYNC_STMT_DESCRIBE_END);
 		}
-		break;
+	}
+	break;
 	case ASYNC_STMT_DESCRIBE_CONT:
 		if (event) {
 			stmt_describe_cont(event);
@@ -750,6 +761,9 @@ PG_ASYNC_ST PgSQL_Connection::handler(short event) {
 
 	case ASYNC_STMT_EXECUTE_START:
 		stmt_execute_start();
+		__sync_fetch_and_add(&parent->queries_sent, 1);
+		update_bytes_sent(query.extended_query_info->bind_msg->get_raw_pkt().size + 5);
+		statuses.questions++;
 		if (async_exit_status) {
 			next_event(ASYNC_STMT_EXECUTE_CONT);
 		} else {
@@ -808,10 +822,11 @@ PG_ASYNC_ST PgSQL_Connection::handler(short event) {
 
 	case ASYNC_RESYNC_START:
 		if (PQpipelineStatus(pgsql_conn) == PQ_PIPELINE_OFF) {
-			proxy_warning("Resync not required — connection already synchronized.\n");
+			proxy_warning("Resync not required - connection already synchronized.\n");
 			NEXT_IMMEDIATE(ASYNC_RESYNC_END);
 		}
 		resync_start();
+		update_bytes_sent(5); // SYNC message
 		if (async_exit_status) {
 			next_event(ASYNC_RESYNC_CONT);
 		} else {

lib/PgSQL_Session.cpp

@@ -4470,8 +4470,13 @@ bool PgSQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___PGSQL_Q
 		next_query_flagIN = qpo->next_query_flagIN;
 	}
 
-	if (qpo->destination_hostgroup >= 0 && transaction_persistent_hostgroup == -1) {
-		current_hostgroup = qpo->destination_hostgroup;
+	if (transaction_persistent_hostgroup == -1) {
+		if (qpo->destination_hostgroup >= 0) {
+			current_hostgroup = qpo->destination_hostgroup;
+		} else {
+			// No query rule matched - use default hostgroup
+			current_hostgroup = default_hostgroup;
+		}
 	}
 
 	// Hostgroup locking check

test/tap/groups/groups.json

@@ -225,6 +225,7 @@
   "mysql-watchdog_test-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],
   "pgsql-extended_query_protocol_query_rules_test-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],
   "pgsql-extended_query_protocol_test-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],
+  "pgsql-query_rules_routing-t": [ "pgsql17-repl-g4" ],
   "pgsql-multiplex_status_test-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],
   "pgsql-proxysql_cmd_test-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],
   "pgsql-query_cancel_session_termination_test-t": [ "default-g4", "mysql-auto_increment_delay_multiplex=0-g4", "mysql-multiplexing=false-g4", "mysql-query_digests=0-g4", "mysql-query_digests_keep_comment=1-g4" ],

test/tap/groups/pgsql17-repl/env.sh

@@ -0,0 +1,5 @@
+# PostgreSQL 17 Replication Test Group
+#
+# Tests for replication, query routing, read-only detection
+
+export TEST_PY_TAP_INCL="pgsql-query_rules_routing-t"

test/tap/groups/pgsql17-repl/pre-proxysql.bash

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+#
+# change infra config for PostgreSQL 17 replication
+# inherits env from tester script
+#
+
+INFRA=infra-$(basename $(dirname "$0") | sed 's/-g[0-9]//' | sed 's/_.*//')
+
+# destroy running infras
+$JENKINS_SCRIPTS_PATH/infra-default/docker-compose-destroy.bash
+
+# cleanup ProxySQL before starting new infra
+psql -h127.0.0.1 -p6132 -Uadmin -dadmin -c " \
+DELETE FROM pgsql_users; \
+LOAD PGSQL USERS TO RUNTIME; \
+SAVE PGSQL USERS TO DISK; \
+DELETE FROM pgsql_servers; \
+DELETE FROM pgsql_hostgroup_parameters; \
+DELETE FROM pgsql_replication_hostgroups; \
+LOAD PGSQL SERVERS TO RUNTIME; \
+SAVE PGSQL SERVERS TO DISK; \
+DELETE FROM pgsql_query_rules; \
+LOAD PGSQL QUERY RULES TO RUNTIME; \
+SAVE PGSQL QUERY RULES TO DISK; \
+DELETE FROM mysql_users; \
+LOAD MYSQL USERS TO RUNTIME; \
+SAVE MYSQL USERS TO DISK; \
+DELETE FROM mysql_servers; \
+DELETE FROM mysql_replication_hostgroups; \
+DELETE FROM mysql_group_replication_hostgroups; \
+DELETE FROM mysql_galera_hostgroups; \
+LOAD MYSQL SERVERS TO RUNTIME; \
+SAVE MYSQL SERVERS TO DISK; \
+DELETE FROM mysql_query_rules; \
+LOAD MYSQL QUERY RULES TO RUNTIME; \
+SAVE MYSQL QUERY RULES TO DISK; \
+" 2>&1
+
+# load environment for infra
+source $JENKINS_SCRIPTS_PATH/${INFRA}/.env
+
+# Start infra (this will configure ProxySQL via docker-proxy-post.bash)
+$JENKINS_SCRIPTS_PATH/infra-docker-hoster/docker-compose-init.bash
+$JENKINS_SCRIPTS_PATH/${INFRA}/docker-compose-init.bash
+
+# wait for infra to stabilize
+sleep 10