bug fix: unique key/secondary key get incorrect value (#18711) (#18717)

pkg/sql/plan/build_dml_util.go

@@ -2758,15 +2758,14 @@ func recomputeMoCPKeyViaProjection(builder *QueryBuilder, bindCtx *BindContext,
 		}
 
 		if tableDef.Pkey.PkeyColName == catalog.CPrimaryKeyColName {
-			pkNamesMap := make(map[string]int)
-			for _, name := range tableDef.Pkey.Names {
-				pkNamesMap[name] = 1
-			}
-
+			// pkNamesMap := make(map[string]int)
 			prikeyPos := make([]int, 0)
-			for i, coldef := range tableDef.Cols {
-				if _, ok := pkNamesMap[coldef.Name]; ok {
-					prikeyPos = append(prikeyPos, i)
+			for _, name := range tableDef.Pkey.Names {
+				for i, coldef := range tableDef.Cols {
+					if coldef.Name == name {
+						prikeyPos = append(prikeyPos, i)
+						break
+					}
 				}
 			}
 

test/distributed/cases/dml/select/select.result

@@ -487,4 +487,11 @@ select * from t1 where a in (3,3,3,2,1);
 a    b
 1    1
 2    2
-3    3
+3    3
+drop table if exists t1;
+create table t1 (a int, b varchar, c int, primary key (c,a), key idx_b(b));
+insert into t1 select result, result || "_a",result+100000000 from generate_series(1,10000) g;
+select * from t1 where b in ("11_a","21_a");
+a    b    c
+11    11_a    100000011
+21    21_a    100000021

test/distributed/cases/dml/select/select.test

@@ -263,3 +263,8 @@ insert into t1 values (1,1),(2,2),(3,3);
 -- @separator:table
 select mo_ctl('dn', 'flush', 'select.t1');
 select * from t1 where a in (3,3,3,2,1);
+
+drop table if exists t1;
+create table t1 (a int, b varchar, c int, primary key (c,a), key idx_b(b));
+insert into t1 select result, result || "_a",result+100000000 from generate_series(1,10000) g;
+select * from t1 where b in ("11_a","21_a");