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

types: fix compare object json type (#21703) #21718

Merged
merged 3 commits into from
Jan 25, 2021
Merged

types: fix compare object json type (#21703) #21718

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
85e9174
cherry pick #21703 to release-4.0
lzmhhh123 Dec 14, 2020
f40fcc1
fix conflicts
lzmhhh123 Dec 14, 2020
accf5fd
Merge branch 'release-4.0' into release-4.0-dfbb69d33d02
ti-srebot Jan 25, 2021
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
13 changes: 13 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7342,6 +7342,19 @@ func (s *testIntegrationSuite) TestIssue20860(c *C) {
c.Assert(tk.ExecToErr("update t set d = adddate(d, interval 1 day) where id < 10"), NotNil)
}

func (s *testIntegrationSerialSuite) TestJsonObjectCompare(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")

tk.MustQuery("select json_object('k', -1) > json_object('k', 2)").Check(testkit.Rows("0"))
tk.MustQuery("select json_object('k', -1) < json_object('k', 2)").Check(testkit.Rows("1"))

tk.MustExec("drop table if exists tx")
tk.MustExec("create table tx(a double, b int)")
tk.MustExec("insert into tx values (3.0, 3)")
tk.MustQuery("select json_object('k', a) = json_object('k', b) from tx").Check(testkit.Rows("1"))
}

func (s *testIntegrationSerialSuite) TestIssue21290(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
Expand Down
21 changes: 18 additions & 3 deletions types/json/binary_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,9 +729,24 @@ func CompareBinary(left, right BinaryJSON) int {
}
cmp = leftCount - rightCount
case TypeCodeObject:
// only equal is defined on two json objects.
// larger and smaller are not defined.
cmp = bytes.Compare(left.Value, right.Value)
// reference:
// https://github.com/mysql/mysql-server/blob/ee4455a33b10f1b1886044322e4893f587b319ed/sql/json_dom.cc#L2561
leftCount, rightCount := left.GetElemCount(), right.GetElemCount()
cmp := compareInt64(int64(leftCount), int64(rightCount))
if cmp != 0 {
return cmp
}
for i := 0; i < leftCount; i++ {
leftKey, rightKey := left.objectGetKey(i), right.objectGetKey(i)
cmp = bytes.Compare(leftKey, rightKey)
if cmp != 0 {
return cmp
}
cmp = CompareBinary(left.objectGetVal(i), right.objectGetVal(i))
if cmp != 0 {
return cmp
}
}
}
} else {
cmp = precedence1 - precedence2
Expand Down