fix: refactor of DELETE removed schema sharding (#661)

Issue introduced in #657.

Author: levkk

integration/python/test_asyncpg.py

@@ -483,3 +483,26 @@ async def test_schema_sharding_default():
             raise Exception("table shouldn't exist on shard 1")
         except Exception as e:
             assert "relation \"test_schema_sharding_default\" does not exist" == str(e)
+
+
+@pytest.mark.asyncio
+async def test_schema_sharding_search_path():
+    import asyncio
+
+    async def run_test():
+        conn = await schema_sharded_async()
+
+        for _ in range(10):
+            for schema in ["shard_0", "shard_1"]:
+                await conn.execute(f"SET search_path TO {schema}")
+
+                async with conn.transaction():
+                    await conn.execute(f"DROP SCHEMA IF EXISTS {schema} CASCADE")
+                    await conn.execute(f"CREATE SCHEMA IF NOT EXISTS {schema}")
+                    await conn.execute("SET LOCAL statement_timeout TO '10s'")
+                    await conn.execute(f"CREATE TABLE {schema}.test(id BIGINT, created_at TIMESTAMPTZ DEFAULT NOW())")
+                    await conn.fetch(f"SELECT * FROM {schema}.test WHERE id = $1", 1)
+
+        await conn.close()
+
+    await asyncio.gather(*[run_test() for _ in range(10)])

pgdog/src/frontend/router/parser/query/select.rs

@@ -1,6 +1,5 @@
-use crate::frontend::router::{
-    parser::{cache::CachedAst, from_clause::FromClause, where_clause::TablesSource},
-    sharding::SchemaSharder,
+use crate::frontend::router::parser::{
+    cache::CachedAst, from_clause::FromClause, where_clause::TablesSource,
 };
 
 use super::*;
@@ -63,22 +62,6 @@ impl QueryParser {
 
         let from_clause = TablesSource::from(FromClause::new(&stmt.from_clause));
 
-        // Schema-based sharding.
-        let mut schema_sharder = SchemaSharder::default();
-        for table in cached_ast.tables() {
-            let schema = table.schema();
-            schema_sharder.resolve(schema, &context.sharding_schema.schemas);
-        }
-        if let Some((shard, schema)) = schema_sharder.get() {
-            if let Some(recorder) = self.recorder_mut() {
-                recorder.record_entry(
-                    Some(shard.clone()),
-                    format!("SELECT matched schema {}", schema),
-                );
-            }
-            shards.insert(shard);
-        }
-
         // Shard by vector in ORDER BY clause.
         for order in &order_by {
             if let Some((vector, column_name)) = order.vector() {