sessionctx: Change default tidb_partition_prune_mode from static to dynamic

ddl/db_partition_test.go

@@ -1348,7 +1348,7 @@ func TestAlterTableDropPartitionByList(t *testing.T) {
 	);`)
 	tk.MustExec(`insert into t values (1),(3),(5),(null)`)
 	tk.MustExec(`alter table t drop partition p1`)
-	tk.MustQuery("select * from t").Check(testkit.Rows("1", "5", "<nil>"))
+	tk.MustQuery("select * from t").Sort().Check(testkit.Rows("1", "5", "<nil>"))
 	ctx := tk.Session()
 	is := domain.GetDomain(ctx).InfoSchema()
 	tbl, err := is.TableByName(model.NewCIStr("test"), model.NewCIStr("t"))

infoschema/tables_test.go

@@ -1543,7 +1543,6 @@ func TestVariablesInfo(t *testing.T) {
 		"tidb_enable_collect_execution_info ON OFF", // for test stability
 		"tidb_enable_mutation_checker OFF ON",       // for new installs
 		"tidb_mem_oom_action CANCEL LOG",            // always changed for tests
-		"tidb_partition_prune_mode static dynamic",  // for new installs
 		"tidb_row_format_version 1 2",               // for new installs
 		"tidb_txn_assertion_level OFF FAST",         // for new installs
 		"timestamp 0 123456789",                     // always dynamic

planner/core/rule_result_reorder_test.go

@@ -179,7 +179,9 @@ func TestOrderedResultModeOnPartitionTable(t *testing.T) {
 					partition p1 values less than (200),
 					partition p2 values less than (300),
 					partition p3 values less than (400))`)
-	tk.MustQuery("select @@tidb_partition_prune_mode").Check(testkit.Rows("static"))
+	tk.MustExec(`analyze table thash`)
+	tk.MustExec(`analyze table trange`)
+	tk.MustQuery("select @@tidb_partition_prune_mode").Check(testkit.Rows("dynamic"))
 	runTestData(t, tk, "TestOrderedResultModeOnPartitionTable")
 }
 

planner/core/testdata/ordered_result_mode_suite_out.json

@@ -439,44 +439,30 @@
     "Cases": [
       {
         "Plan": [
-          "Sort_10 4.00 root  test.thash.a",
-          "└─PartitionUnion_12 4.00 root  ",
-          "  ├─Batch_Point_Get_13 2.00 root table:thash handle:[1 200], keep order:false, desc:false",
-          "  └─Batch_Point_Get_14 2.00 root table:thash handle:[1 200], keep order:false, desc:false"
+          "Sort_6 2.00 root  test.thash.a",
+          "└─TableReader_9 2.00 root partition:p0,p1 data:TableRangeScan_8",
+          "  └─TableRangeScan_8 2.00 cop[tikv] table:thash range:[1,1], [200,200], keep order:false, stats:pseudo"
         ]
       },
       {
         "Plan": [
-          "Sort_12 400.00 root  test.thash.a",
-          "└─PartitionUnion_14 400.00 root  ",
-          "  ├─TableReader_16 100.00 root  data:TableRangeScan_15",
-          "  │ └─TableRangeScan_15 100.00 cop[tikv] table:thash, partition:p0 range:[50,150], keep order:false, stats:pseudo",
-          "  ├─TableReader_18 100.00 root  data:TableRangeScan_17",
-          "  │ └─TableRangeScan_17 100.00 cop[tikv] table:thash, partition:p1 range:[50,150], keep order:false, stats:pseudo",
-          "  ├─TableReader_20 100.00 root  data:TableRangeScan_19",
-          "  │ └─TableRangeScan_19 100.00 cop[tikv] table:thash, partition:p2 range:[50,150], keep order:false, stats:pseudo",
-          "  └─TableReader_22 100.00 root  data:TableRangeScan_21",
-          "    └─TableRangeScan_21 100.00 cop[tikv] table:thash, partition:p3 range:[50,150], keep order:false, stats:pseudo"
+          "Sort_6 100.00 root  test.thash.a",
+          "└─TableReader_9 100.00 root partition:all data:TableRangeScan_8",
+          "  └─TableRangeScan_8 100.00 cop[tikv] table:thash range:[50,150], keep order:false, stats:pseudo"
         ]
       },
       {
         "Plan": [
-          "Sort_10 4.00 root  test.trange.a",
-          "└─PartitionUnion_12 4.00 root  ",
-          "  ├─TableReader_14 2.00 root  data:TableRangeScan_13",
-          "  │ └─TableRangeScan_13 2.00 cop[tikv] table:trange, partition:p0 range:[1,1], [200,200], keep order:false, stats:pseudo",
-          "  └─TableReader_16 2.00 root  data:TableRangeScan_15",
-          "    └─TableRangeScan_15 2.00 cop[tikv] table:trange, partition:p2 range:[1,1], [200,200], keep order:false, stats:pseudo"
+          "Sort_6 2.00 root  test.trange.a",
+          "└─TableReader_9 2.00 root partition:p0,p2 data:TableRangeScan_8",
+          "  └─TableRangeScan_8 2.00 cop[tikv] table:trange range:[1,1], [200,200], keep order:false, stats:pseudo"
         ]
       },
       {
         "Plan": [
-          "Sort_10 200.00 root  test.trange.a",
-          "└─PartitionUnion_12 200.00 root  ",
-          "  ├─TableReader_14 100.00 root  data:TableRangeScan_13",
-          "  │ └─TableRangeScan_13 100.00 cop[tikv] table:trange, partition:p0 range:[50,150], keep order:false, stats:pseudo",
-          "  └─TableReader_16 100.00 root  data:TableRangeScan_15",
-          "    └─TableRangeScan_15 100.00 cop[tikv] table:trange, partition:p1 range:[50,150], keep order:false, stats:pseudo"
+          "Sort_6 100.00 root  test.trange.a",
+          "└─TableReader_9 100.00 root partition:p0,p1 data:TableRangeScan_8",
+          "  └─TableRangeScan_8 100.00 cop[tikv] table:trange range:[50,150], keep order:false, stats:pseudo"
         ]
       }
     ]

sessionctx/variable/tidb_vars.go

@@ -960,7 +960,7 @@ const (
 	DefTiDBEnableTelemetry                         = true
 	DefTiDBEnableParallelApply                     = false
 	DefTiDBEnableAmendPessimisticTxn               = false
-	DefTiDBPartitionPruneMode                      = "static"
+	DefTiDBPartitionPruneMode                      = "dynamic"
 	DefTiDBEnableRateLimitAction                   = true
 	DefTiDBEnableAsyncCommit                       = false
 	DefTiDBEnable1PC                               = false