From 535711a922c2c7d4f3b6d2fd568508bc3b28f733 Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Mon, 30 Jan 2023 11:29:49 +0100 Subject: [PATCH] backport of #40674 --- executor/builder.go | 12 +++++----- executor/partition_table_test.go | 38 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/executor/builder.go b/executor/builder.go index 5b011227f73e2..0c33214f847e4 100644 --- a/executor/builder.go +++ b/executor/builder.go @@ -4009,13 +4009,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 { @@ -4051,11 +4051,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/partition_table_test.go b/executor/partition_table_test.go index 0115a11a93272..24472ca2b4319 100644 --- a/executor/partition_table_test.go +++ b/executor/partition_table_test.go @@ -3686,6 +3686,44 @@ from ` └─TableRangeScan_17 1.00 cop[tikv] table:c range: decided by [test39999.t.txn_account_id test39999.t.serial_id], keep order:false`)) } +func TestIssue40596(t *testing.T) { + store, clean := testkit.CreateMockStore(t) + defer clean() + 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(" ")) + // 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()) +} + func TestIssue40803(t *testing.T) { store, clean := testkit.CreateMockStore(t) defer clean()