fix

Author: jiyfhust

executor/batch_point_get_test.go

@@ -379,15 +379,23 @@ func TestBatchPointGetIssue46779(t *testing.T) {
 	tk.MustExec("drop table if exists t1")
 	tk.MustExec("CREATE TABLE t1 (id int, c varchar(128), primary key (id)) PARTITION BY HASH (id) PARTITIONS 3;")
 	tk.MustExec(`insert into t1 values (1, "a"), (11, "b"), (21, "c")`)
-	tk.MustQuery("select * from t1 where id in (1, 1, 11)").Sort().Check(testkit.Rows("1 a", "11 b"))
-	tk.MustQuery("select * from t1 where id in (1, 11, 11, 21)").Sort().Check(testkit.Rows("1 a", "11 b", "21 c"))
+	query := "select * from t1 where id in (1, 1, 11)"
+	require.True(t, tk.HasPlan(query, "Batch_Point_Get")) // check if BatchPointGet is used
+	tk.MustQuery(query).Sort().Check(testkit.Rows("1 a", "11 b"))
+	query = "select * from t1 where id in (1, 11, 11, 21)"
+	require.True(t, tk.HasPlan(query, "Batch_Point_Get")) // check if BatchPointGet is used
+	tk.MustQuery(query).Sort().Check(testkit.Rows("1 a", "11 b", "21 c"))
 
 	tk.MustExec("drop table if exists t2")
 	tk.MustExec(`CREATE TABLE t2 (id int, c varchar(128), primary key (id)) partition by range (id)(
 		partition p0 values less than (10), 
 		partition p1 values less than (20), 
 		partition p2 values less than (30));`)
 	tk.MustExec(`insert into t2 values (1, "a"), (11, "b"), (21, "c")`)
-	tk.MustQuery("select * from t2 where id in (1, 1, 11)").Sort().Check(testkit.Rows("1 a", "11 b"))
-	tk.MustQuery("select * from t2 where id in (1, 11, 11, 21)").Sort().Check(testkit.Rows("1 a", "11 b", "21 c"))
+	query = "select * from t2 where id in (1, 1, 11)"
+	require.True(t, tk.HasPlan(query, "Batch_Point_Get")) // check if BatchPointGet is used
+	tk.MustQuery(query).Sort().Check(testkit.Rows("1 a", "11 b"))
+	require.True(t, tk.HasPlan(query, "Batch_Point_Get")) // check if BatchPointGet is used
+	query = "select * from t2 where id in (1, 11, 11, 21)"
+	tk.MustQuery(query).Sort().Check(testkit.Rows("1 a", "11 b", "21 c"))
 }

executor/builder.go

@@ -5229,20 +5229,18 @@ func (b *executorBuilder) buildBatchPointGet(plan *plannercore.BatchPointGetPlan
 		// Used for clear paritionIDs of duplicated rows.
 		dupPartPos := 0
 		if plan.IndexInfo == nil {
-			dupPartID := len(plan.PartitionIDs) >= len(plan.Handles)
 			for idx, handle := range plan.Handles {
 				if _, found := dedup.Get(handle); found {
 					continue
 				}
 				dedup.Set(handle, true)
 				handles = append(handles, handle)
-				if dupPartID {
+				if len(plan.PartitionIDs) > 0 {
 					e.planPhysIDs[dupPartPos] = e.planPhysIDs[idx]
 					dupPartPos++
 				}
 			}
 		} else {
-			dupPartID := len(plan.PartitionIDs) >= len(plan.IndexValues)
 			for idx, value := range plan.IndexValues {
 				if datumsContainNull(value) {
 					continue
@@ -5265,7 +5263,7 @@ func (b *executorBuilder) buildBatchPointGet(plan *plannercore.BatchPointGetPlan
 				}
 				dedup.Set(handle, true)
 				handles = append(handles, handle)
-				if dupPartID {
+				if len(plan.PartitionIDs) > 0 {
 					e.planPhysIDs[dupPartPos] = e.planPhysIDs[idx]
 					dupPartPos++
 				}