diff --git a/pkg/planner/core/casetest/BUILD.bazel b/pkg/planner/core/casetest/BUILD.bazel index 1f88dc86084d3..a9cac84c4ba66 100644 --- a/pkg/planner/core/casetest/BUILD.bazel +++ b/pkg/planner/core/casetest/BUILD.bazel @@ -12,7 +12,7 @@ go_test( ], data = glob(["testdata/**"]), flaky = True, - shard_count = 19, + shard_count = 20, deps = [ "//pkg/domain", "//pkg/parser", diff --git a/pkg/planner/core/casetest/integration_test.go b/pkg/planner/core/casetest/integration_test.go index 85f3b942d3f54..09e5c3802cbd5 100644 --- a/pkg/planner/core/casetest/integration_test.go +++ b/pkg/planner/core/casetest/integration_test.go @@ -348,6 +348,38 @@ func TestTiFlashFineGrainedShuffle(t *testing.T) { } } +func TestIssue51873(t *testing.T) { + store := testkit.CreateMockStore(t) + tk := testkit.NewTestKit(t, store) + tk.MustExec(`use test`) + tk.MustExec(`CREATE TABLE h1 ( + id bigint(20) NOT NULL AUTO_INCREMENT, + position_date date NOT NULL, + asset_id varchar(32) DEFAULT NULL, + portfolio_code varchar(50) DEFAULT NULL, + PRIMARY KEY (id,position_date) /*T![clustered_index] NONCLUSTERED */, + UNIQUE KEY uidx_posi_asset_balance_key (position_date,portfolio_code,asset_id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin AUTO_INCREMENT=30002 +PARTITION BY RANGE COLUMNS(position_date) +(PARTITION p202401 VALUES LESS THAN ('2024-02-01'))`) + tk.MustExec(`create table h2 like h1`) + tk.MustExec(`insert into h1 values(1,'2024-01-01',1,1)`) + tk.MustExec(`insert into h2 values(1,'2024-01-01',1,1)`) + tk.MustExec(`analyze table h1`) + tk.MustExec(`set @@tidb_skip_missing_partition_stats=0`) + tk.MustQuery(`with assetBalance AS + (SELECT asset_id, portfolio_code FROM h1 pab WHERE pab.position_date = '2024-01-01' ), +cashBalance AS (SELECT portfolio_code, asset_id + FROM h2 pcb WHERE pcb.position_date = '2024-01-01' ), +assetIdList AS (SELECT DISTINCT asset_id AS assetId + FROM assetBalance ) +SELECT main.portfolioCode +FROM (SELECT DISTINCT balance.portfolio_code AS portfolioCode + FROM assetBalance balance + LEFT JOIN assetIdList + ON balance.asset_id = assetIdList.assetId ) main`).Check(testkit.Rows("1")) +} + func TestIssue50926(t *testing.T) { store := testkit.CreateMockStore(t) tk := testkit.NewTestKit(t, store) diff --git a/pkg/planner/core/optimizer.go b/pkg/planner/core/optimizer.go index fada1322343f6..ace88fa1526b9 100644 --- a/pkg/planner/core/optimizer.go +++ b/pkg/planner/core/optimizer.go @@ -362,7 +362,9 @@ func adjustOptimizationFlags(flag uint64, logic LogicalPlan) uint64 { } flag |= flagCollectPredicateColumnsPoint flag |= flagSyncWaitStatsLoadPoint - + if !logic.SCtx().GetSessionVars().StmtCtx.UseDynamicPruneMode { + flag |= flagPartitionProcessor // apply partition pruning under static mode + } return flag }