This is an automated cherry-pick of pingcap#40674

Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Apr 11, 2023 · 5f0f3b6 · 5f0f3b6
1 parent 5ccbe49
commit 5f0f3b6
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 8 deletions.
diff --git a/executor/builder.go b/executor/builder.go
@@ -3576,8 +3576,8 @@ func (builder *dataReaderBuilder) prunePartitionForInnerExecutor(tbl table.Table
 	partitions := make(map[int64]table.PhysicalTable)
 	contentPos = make([]int64, len(lookUpContent))
 	for idx, content := range lookUpContent {
-		for i, date := range content.keys {
-			locateKey[keyColOffsets[i]] = date
+		for i, data := range content.keys {
+			locateKey[keyColOffsets[i]] = data
 		}
 		p, err := partitionTbl.GetPartitionByRow(builder.ctx, locateKey)
 		if err != nil {
@@ -4160,13 +4160,13 @@ func (builder *dataReaderBuilder) buildTableReaderForIndexJoin(ctx context.Conte
 	}
 	if v.IsCommonHandle {
 		if len(keyColOffsets) > 0 {
-			locateKey := make([]types.Datum, e.Schema().Len())
+			locateKey := make([]types.Datum, len(pt.Cols()))
 			kvRanges = make([]kv.KeyRange, 0, len(lookUpContents))
 			// lookUpContentsByPID groups lookUpContents by pid(partition) so that kv ranges for same partition can be merged.
 			lookUpContentsByPID := make(map[int64][]*indexJoinLookUpContent)
 			for _, content := range lookUpContents {
-				for i, date := range content.keys {
-					locateKey[content.keyCols[i]] = date
+				for i, data := range content.keys {
+					locateKey[keyColOffsets[i]] = data
 				}
 				p, err := pt.GetPartitionByRow(e.ctx, locateKey)
 				if err != nil {
@@ -4206,11 +4206,11 @@ func (builder *dataReaderBuilder) buildTableReaderForIndexJoin(ctx context.Conte
 	handles, lookUpContents := dedupHandles(lookUpContents)
 
 	if len(keyColOffsets) > 0 {
-		locateKey := make([]types.Datum, e.Schema().Len())
+		locateKey := make([]types.Datum, len(pt.Cols()))
 		kvRanges = make([]kv.KeyRange, 0, len(lookUpContents))
 		for _, content := range lookUpContents {
-			for i, date := range content.keys {
-				locateKey[content.keyCols[i]] = date
+			for i, data := range content.keys {
+				locateKey[keyColOffsets[i]] = data
 			}
 			p, err := pt.GetPartitionByRow(e.ctx, locateKey)
 			if err != nil {

diff --git a/executor/issuetest/executor_issue_test.go b/executor/issuetest/executor_issue_test.go
@@ -1352,6 +1352,7 @@ func TestIssue40158(t *testing.T) {
 	tk.MustQuery("select * from t1 where c1 is null and _id < 1;").Check(testkit.Rows())
 }
 
+<<<<<<< HEAD
 func TestIssue42662(t *testing.T) {
 	store, dom := testkit.CreateMockStoreAndDomain(t)
 	tk := testkit.NewTestKit(t, store)
@@ -1393,4 +1394,41 @@ func TestIssue42662(t *testing.T) {
 
 	require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/executor/issue42662_1"))
 	require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/util/servermemorylimit/issue42662_2"))
+=======
+func TestIssue40596(t *testing.T) {
+	store := testkit.CreateMockStore(t)
+	tk := testkit.NewTestKit(t, store)
+
+	tk.MustExec("use test")
+	tk.MustExec(`CREATE TABLE t1 (
+  c1 double DEFAULT '1.335088259490289',
+  c2 set('mj','4s7ht','z','3i','b26','9','cg11','uvzcp','c','ns','fl9') NOT NULL DEFAULT 'mj,z,3i,9,cg11,c',
+  PRIMARY KEY (c2) /*T![clustered_index] CLUSTERED */,
+  KEY i1 (c1),
+  KEY i2 (c1),
+  KEY i3 (c1)
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COLLATE=gbk_chinese_ci;`)
+	tk.MustExec("INSERT INTO t1 VALUES (634.2783557491367,''),(2000.5041449792013,'4s7ht'),(634.2783557491367,'3i'),(634.2783557491367,'9'),(7803.173688589342,'uvzcp'),(634.2783557491367,'ns'),(634.2783557491367,'fl9');")
+	tk.MustExec(`CREATE TABLE t2 (
+  c3 decimal(56,16) DEFAULT '931359772706767457132645278260455518957.9866038319986886',
+  c4 set('3bqx','g','6op3','2g','jf','arkd3','y0b','jdy','1g','ff5z','224b') DEFAULT '3bqx,2g,ff5z,224b',
+  c5 smallint(6) NOT NULL DEFAULT '-25973',
+  c6 year(4) DEFAULT '2122',
+  c7 text DEFAULT NULL,
+  PRIMARY KEY (c5) /*T![clustered_index] CLUSTERED */,
+  KEY i4 (c6),
+  KEY i5 (c5)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT=''
+PARTITION BY HASH (c5) PARTITIONS 4;`)
+	tk.MustExec("INSERT INTO t2 VALUES (465.0000000000000000,'jdy',-8542,2008,'FgZXe');")
+	tk.MustExec("set @@sql_mode='';")
+	tk.MustExec("set tidb_partition_prune_mode=dynamic;")
+	tk.MustExec("analyze table t1;")
+	tk.MustExec("analyze table t2;")
+
+	// No nil pointer panic
+	tk.MustQuery("select    /*+ inl_join( t1 , t2 ) */ avg(   t2.c5 ) as r0 , repeat( t2.c7 , t2.c5 ) as r1 , locate( t2.c7 , t2.c7 ) as r2 , unhex( t1.c1 ) as r3 from t1 right join t2 on t1.c2 = t2.c5 where not( t2.c5 in ( -7860 ,-13384 ,-12940 ) ) and not( t1.c2 between '4s7ht' and 'mj' );").Check(testkit.Rows("<nil> <nil> <nil> <nil>"))
+	// Again, a simpler reproduce.
+	tk.MustQuery("select /*+ inl_join (t1, t2) */ t2.c5 from t1 right join t2 on t1.c2 = t2.c5 where not( t1.c2 between '4s7ht' and 'mj' );").Check(testkit.Rows())
+>>>>>>> 5cb64fd09a9 (executor: fix buildTableReaderForIndexJoin on partition table (#40674))
 }