Skip to content

fix mutil_uniq #2650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 23, 2023
Merged

fix mutil_uniq #2650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f49f20
fix mutil_uniq
shiyuhang0 Mar 15, 2023
966882b
optimize code
shiyuhang0 Mar 17, 2023
0ea6d40
Merge branch 'master' into mutil_uniq
shiyuhang0 Mar 20, 2023
59ebad9
Merge branch 'master' into mutil_uniq
shiyuhang0 Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions core/src/test/scala/org/apache/spark/sql/IssueTestSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@ import org.apache.spark.sql.functions.{col, sum}

class IssueTestSuite extends BaseTiSparkTest {

test("test issue 2649") {
val dbTable = "tispark_test.mutil_uniq"
tidbStmt.execute(s"drop table if exists $dbTable")
tidbStmt.execute(
s"CREATE TABLE $dbTable (`a` int(5) NOT NULL,`b` int(5) NOT NULL,UNIQUE KEY `idx_ab` (`a`,`b`))")
tidbStmt.execute(s"insert into $dbTable values(0, 0),(1,1)")
val df = spark.sql(s"select * from $dbTable where a=1")
val row1 = Row(1, 1)
checkAnswer(df, Seq(row1))
}

//https://github.com/pingcap/tispark/issues/2268
test("show rowid in commonhandle") {
spark.sqlContext.setConf(TiConfigConst.SHOW_ROWID, "true")
Expand Down
6 changes: 3 additions & 3 deletions tikv-client/src/main/java/com/pingcap/tikv/meta/TiDAGRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@ private void addIndexReaderIndexRangeScanExecutorCols(

private void addIndexColsToScanBuilder(
IndexScan.Builder indexScanBuilder, Map<String, Integer> colOffsetInFieldMap) {
if (indexInfo.isUnique()) {
indexScanBuilder.setUnique(true);
}
for (TiIndexColumn indexColumn : indexInfo.getIndexColumns()) {
// We can optimize performance by pass unique into index scan.
// Refer to
// https://github.com/pingcap/tidb/blob/4ae5be190b0017675deedd9af8b80d8868e03f0e/planner/core/plan_to_pb.go#L271 to see if we can pass unique into index scan.
TiColumnInfo tableInfoColumn = tableInfo.getColumn(indexColumn.getName());
// already add this col before.
ColumnInfo.Builder colBuild = ColumnInfo.newBuilder(tableInfoColumn.toProto(tableInfo));
Expand Down