Revert "Reset current_hostgroup to default when no query rule matches"

rahim-kanji · rahim-kanji · commit 194e20b3e89a · 2026-02-20T01:29:53.000+05:00
This reverts commit 1b3d203.
diff --git a/lib/PgSQL_Session.cpp b/lib/PgSQL_Session.cpp
@@ -4470,13 +4470,8 @@ bool PgSQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___PGSQL_Q
 		next_query_flagIN = qpo->next_query_flagIN;
 	}
 
-	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;
-		}
+	if (qpo->destination_hostgroup >= 0 && transaction_persistent_hostgroup == -1) {
+		current_hostgroup = qpo->destination_hostgroup;
 	}
 
 	// Hostgroup locking check

Original file line number	Diff line number	Diff line change
`@@ -4470,13 +4470,8 @@ bool PgSQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___PGSQL_Q`
`4470`	`4470`	`next_query_flagIN = qpo->next_query_flagIN;`
`4471`	`4471`	`}`
`4472`	`4472`
`4473`		`- if (transaction_persistent_hostgroup == -1) {`
`4474`		`- if (qpo->destination_hostgroup >= 0) {`
`4475`		`- current_hostgroup = qpo->destination_hostgroup;`
`4476`		`- } else {`
`4477`		`- // No query rule matched - use default hostgroup`
`4478`		`- current_hostgroup = default_hostgroup;`
`4479`		`- }`
	`4473`	`+ if (qpo->destination_hostgroup >= 0 && transaction_persistent_hostgroup == -1) {`
	`4474`	`+ current_hostgroup = qpo->destination_hostgroup;`
`4480`	`4475`	`}`
`4481`	`4476`
`4482`	`4477`	`// Hostgroup locking check`