Skip to content
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

Jump to bottom

distsql: fix a bug of ranger.Range to kv.KeyRange conversion (#40204) #40552

Merged
merged 3 commits into from
Jan 13, 2023
Merged

distsql: fix a bug of ranger.Range to kv.KeyRange conversion (#40204) #40552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58ef95c
This is an automated cherry-pick of #40204
tiancaiamao Jan 13, 2023
da4a0dd
resolve conflict
tiancaiamao Jan 13, 2023
7658416
fix build
tiancaiamao Jan 13, 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
15 changes: 0 additions & 15 deletions distsql/request_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,20 +735,5 @@ func EncodeIndexKey(sc *stmtctx.StatementContext, ran *ranger.Range) ([]byte, []
if !ran.HighExclude {
high = kv.Key(high).PrefixNext()
}

var hasNull bool
for _, highVal := range ran.HighVal {
if highVal.IsNull() {
hasNull = true
break
}
}

// NOTE: this is a hard-code operation to avoid wrong results when accessing unique index with NULL;
// Please see https://github.com/pingcap/tidb/issues/29650 for more details
if hasNull {
// Append 0 to make unique-key range [null, null] to be a scan rather than point-get.
high = kv.Key(high).Next()
}
return low, high, nil
}
12 changes: 12 additions & 0 deletions executor/executor_issue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,3 +1302,15 @@ func TestIssue33214(t *testing.T) {
}
}
}

func TestIssue40158(t *testing.T) {
store, clean := testkit.CreateMockStore(t)
defer clean()
tk := testkit.NewTestKit(t, store)

tk.MustExec("use test")
tk.MustExec("drop table if exists t1")
tk.MustExec("create table t1 (_id int PRIMARY KEY, c1 char, index (c1));")
tk.MustExec("insert into t1 values (1, null);")
tk.MustQuery("select * from t1 where c1 is null and _id < 1;").Check(testkit.Rows())
}