cherry pick pingcap#16070 to release-3.1

Signed-off-by: sre-bot <sre-bot@pingcap.com>

cmd/explaintest/r/partition_pruning.result

@@ -4209,5 +4209,17 @@ PARTITION p2 VALUES LESS THAN (100)
 desc select * from t where a = 11 and b = 1 or a = 12 and b = 1;
 id	count	task	operator info
 TableReader_8	8000.00	root	data:Selection_7
+<<<<<<< HEAD
 └─Selection_7	8000.00	cop[tikv]	or(and(eq(test.t.a, 11), eq(test.t.b, 1)), and(eq(test.t.a, 12), eq(test.t.b, 1)))
   └─TableScan_6	10000.00	cop[tikv]	table:t, partition:p2, range:[-inf,+inf], keep order:false, stats:pseudo
+=======
+└─Selection_7	8000.00	cop	or(and(eq(test.t.a, 11), eq(test.t.b, 1)), and(eq(test.t.a, 12), eq(test.t.b, 1)))
+  └─TableScan_6	10000.00	cop	table:t, partition:p2, range:[-inf,+inf], keep order:false, stats:pseudo
+drop table if exists t;
+create table t (id int, name varchar(20)) partition by hash(id) partitions 128;
+explain SELECT * FROM t partition (p1) where name = '1';
+id	count	task	operator info
+TableReader_8	10.00	root	data:Selection_7
+└─Selection_7	10.00	cop	eq(test.t.name, "1")
+  └─TableScan_6	10000.00	cop	table:t, partition:p1, range:[-inf,+inf], keep order:false, stats:pseudo
+>>>>>>> 07fe918... planner/core: fix partition selection on hash partitioned table (#16070)

cmd/explaintest/t/partition_pruning.test

@@ -976,3 +976,7 @@ PARTITION BY RANGE COLUMNS(a) (
 );
 
 desc select * from t where a = 11 and b = 1 or a = 12 and b = 1;
+
+drop table if exists t;
+create table t (id int, name varchar(20)) partition by hash(id) partitions 128;
+explain SELECT * FROM t partition (p1) where name = '1';

planner/core/rule_partition_processor.go

@@ -147,48 +147,8 @@ func (s *partitionProcessor) pruneHashPartition(ds *DataSource, pi *model.Partit
 		pl := &newDataSource
 		return pl, nil
 	}
-	// If can not hit partition by FastLocateHashPartition, try to prune all partition.
-	sctx := ds.context()
-	filterConds = expression.PropagateConstant(sctx, filterConds)
-	filterConds = solver.Solve(sctx, filterConds)
-	alwaysFalse := false
-	if len(filterConds) == 1 {
-		// Constant false.
-		if con, ok := filterConds[0].(*expression.Constant); ok && con.DeferredExpr == nil {
-			ret, _, err := expression.EvalBool(sctx, expression.CNFExprs{con}, chunk.Row{})
-			if err == nil && ret == false {
-				alwaysFalse = true
-			}
-		}
-	}
-	if alwaysFalse {
-		tableDual := LogicalTableDual{RowCount: 0}.Init(ds.context())
-		tableDual.schema = ds.Schema()
-		return tableDual, nil
-	}
-	children := make([]LogicalPlan, 0, len(pi.Definitions))
-	for i := 0; i < len(pi.Definitions); i++ {
-		// Not a deep copy.
-		newDataSource := *ds
-		newDataSource.baseLogicalPlan = newBaseLogicalPlan(ds.context(), plancodec.TypeTableScan, &newDataSource)
-		newDataSource.isPartition = true
-		newDataSource.physicalTableID = pi.Definitions[i].ID
-		newDataSource.possibleAccessPaths = make([]*accessPath, len(ds.possibleAccessPaths))
-		for i := range ds.possibleAccessPaths {
-			newPath := *ds.possibleAccessPaths[i]
-			newDataSource.possibleAccessPaths[i] = &newPath
-		}
-		// There are many expression nodes in the plan tree use the original datasource
-		// id as FromID. So we set the id of the newDataSource with the original one to
-		// avoid traversing the whole plan tree to update the references.
-		newDataSource.id = ds.id
-		newDataSource.statisticTable = getStatsTable(ds.context(), ds.table.Meta(), pi.Definitions[i].ID)
-		children = append(children, &newDataSource)
-	}
-	unionAll := LogicalUnionAll{}.Init(ds.context())
-	unionAll.SetChildren(children...)
-	unionAll.SetSchema(ds.schema)
-	return unionAll, nil
+
+	return s.makeUnionAllChildren(ds, pi, fullRange(len(pi.Definitions)))
 }
 
 func (s *partitionProcessor) prune(ds *DataSource) (LogicalPlan, error) {