external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge dbf15ceed3 into 31911d8297

pull/8371/merge
Imran Zaheer 2025-12-06 15:00:11 +00:00 committed by GitHub
parent 31911d8297 dbf15ceed3
commit bbec3ddc51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/distributed/planner/local_plan_cache.c
View File

@ -239,6 +239,13 @@ GetCachedLocalPlan(Task *task, DistributedPlan *distributedPlan)
{
return NULL;
}
if (list_length(distributedPlan->workerJob->taskList) != 1)
{
/* we only support plan caching for single shard queries */
return NULL;
}
List *cachedPlanList = distributedPlan->workerJob->localPlannedStatements;
LocalPlannedStatement *localPlannedStatement = NULL;

44
src/test/regress/expected/citus_stat_tenants.out
View File

@ -1111,6 +1111,50 @@ ORDER BY tenant_attribute;
5 | 0 | 0 | 1 | 0 | t | f
(5 rows)
-- test cache with multi-shard queries #8330
\c - - - :master_port
SET search_path TO citus_stat_tenants;
SET citus.shard_replication_factor TO 1;
SELECT citus_stat_tenants_reset();
citus_stat_tenants_reset
---------------------------------------------------------------------
(1 row)
CREATE TABLE referenced (shard_key int NOT NULL, other_key bigint NOT NULL, PRIMARY KEY (shard_key, other_key));
CREATE TABLE referencing (shard_key int NOT NULL, other_key bigint NOT NULL);
SELECT create_distributed_table('referenced', 'shard_key', shard_count := 4);
create_distributed_table
---------------------------------------------------------------------
(1 row)
SELECT create_distributed_table('referencing', 'shard_key', shard_count := 4, colocate_with := 'none');
create_distributed_table
---------------------------------------------------------------------
(1 row)
SELECT update_distributed_table_colocation('referencing', colocate_with => 'referenced');
update_distributed_table_colocation
---------------------------------------------------------------------
(1 row)
ALTER TABLE referencing ADD CONSTRAINT fkey FOREIGN KEY (shard_key, other_key) REFERENCES referenced(shard_key, other_key);
INSERT INTO referenced VALUES (0, 1), (0, 2), (1, 2);
\c - - - :worker_2_port
SET search_path TO citus_stat_tenants;
PREPARE prep_stmt (bigint, int, bigint, int) AS INSERT INTO referencing (shard_key, other_key) VALUES ($1, $2), ($3, $4);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 1, 2); -- multi-shard query shouldn't use local cache and fail
\c - - - :master_port
SET client_min_messages TO ERROR;
DROP SCHEMA citus_stat_tenants CASCADE;
DROP SCHEMA citus_stat_tenants_t1 CASCADE;

32
src/test/regress/sql/citus_stat_tenants.sql
View File

@ -418,6 +418,36 @@ SELECT tenant_attribute, read_count_in_this_period, read_count_in_last_period, q
FROM citus_stat_tenants(true)
ORDER BY tenant_attribute;
-- test cache with multi-shard queries #8330
\c - - - :master_port
SET search_path TO citus_stat_tenants;
SET citus.shard_replication_factor TO 1;
SELECT citus_stat_tenants_reset();
CREATE TABLE referenced (shard_key int NOT NULL, other_key bigint NOT NULL, PRIMARY KEY (shard_key, other_key));
CREATE TABLE referencing (shard_key int NOT NULL, other_key bigint NOT NULL);
SELECT create_distributed_table('referenced', 'shard_key', shard_count := 4);
SELECT create_distributed_table('referencing', 'shard_key', shard_count := 4, colocate_with := 'none');
SELECT update_distributed_table_colocation('referencing', colocate_with => 'referenced');
ALTER TABLE referencing ADD CONSTRAINT fkey FOREIGN KEY (shard_key, other_key) REFERENCES referenced(shard_key, other_key);
INSERT INTO referenced VALUES (0, 1), (0, 2), (1, 2);
\c - - - :worker_2_port
SET search_path TO citus_stat_tenants;
PREPARE prep_stmt (bigint, int, bigint, int) AS INSERT INTO referencing (shard_key, other_key) VALUES ($1, $2), ($3, $4);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 0, 2);
EXECUTE prep_stmt(0, 1, 1, 2); -- multi-shard query shouldn't use local cache and fail
\c - - - :master_port
SET client_min_messages TO ERROR;
DROP SCHEMA citus_stat_tenants CASCADE;
DROP SCHEMA citus_stat_tenants_t1 CASCADE;
DROP SCHEMA citus_stat_tenants_t1 CASCADE;