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

types: fix incompatible implementation of jsonpath extraction #35320

Merged
merged 13 commits into from
Jun 28, 2022
Merged

types: fix incompatible implementation of jsonpath extraction #35320

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
71166e2
fix incompatible implementation of jsonpath extraction
mengxin9014 Jun 13, 2022
35bb63d
Merge branch 'master' into mx/fixIssue30352
hawkingrei Jun 13, 2022
12c7d4f
Merge branch 'master' into mx/fixIssue30352
mengxin9014 Jun 20, 2022
1ccdf0c
fix issue 30352
mengxin9014 Jun 21, 2022
4b8bf2b
Merge branch 'mx/fixIssue30352' of github.com:mengxin9014/tidb into m…
mengxin9014 Jun 21, 2022
9254cbc
Merge branch 'master' into mx/fixIssue30352
mengxin9014 Jun 21, 2022
21a0b6a
Update binary_test.go
mengxin9014 Jun 28, 2022
3bf25e7
Merge branch 'master' into mx/fixIssue30352
mengxin9014 Jun 28, 2022
ed321c9
Merge branch 'master' into mx/fixIssue30352
mengxin9014 Jun 28, 2022
ea1aa0c
Merge branch 'master' into mx/fixIssue30352
mengxin9014 Jun 28, 2022
8b9881f
Merge branch 'master' into mx/fixIssue30352
mengxin9014 Jun 28, 2022
776ef76
Merge branch 'master' into mx/fixIssue30352
mengxin9014 Jun 28, 2022
6c16ade
Merge branch 'master' into mx/fixIssue30352
ti-chi-bot Jun 28, 2022
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
4 changes: 4 additions & 0 deletions types/json/binary_functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,10 @@ func (bj BinaryJSON) Extract(pathExprList []PathExpression) (ret BinaryJSON, fou
// even if len(pathExprList) equals to 1.
found = true
ret = buf[0]
// Fix https://github.com/pingcap/tidb/issues/30352
if pathExprList[0].ContainsAnyAsterisk() {
ret = buildBinaryArray(buf)
}
} else {
found = true
ret = buildBinaryArray(buf)
Expand Down
4 changes: 2 additions & 2 deletions types/json/binary_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ func TestBinaryJSONExtract(t *testing.T) {
{bj1, []string{"$.*[0]"}, mustParseBinaryFromString(t, `["world", 1, true, "d"]`), true, nil},
{bj1, []string{`$.a[*]."aa"`}, mustParseBinaryFromString(t, `["bb", "cc"]`), true, nil},
{bj1, []string{`$."\"hello\""`}, mustParseBinaryFromString(t, `"world"`), true, nil},
{bj1, []string{`$**[1]`}, mustParseBinaryFromString(t, `"2"`), true, nil},
{bj1, []string{`$**[1]`}, mustParseBinaryFromString(t, `["2"]`), true, nil},
{bj3, []string{`$.properties.$type`}, mustParseBinaryFromString(t, `"TiDB"`), true, nil},
{bj4, []string{`$.properties.$type$type`}, mustParseBinaryFromString(t, `{"$a$a" : "TiDB"}`), true, nil},
{bj4, []string{`$.properties.$type$type.$a$a`}, mustParseBinaryFromString(t, `"TiDB"`), true, nil},
{bj5, []string{`$.properties.$type.$a.$b`}, mustParseBinaryFromString(t, `"TiDB"`), true, nil},
{bj5, []string{`$.properties.$type.$a.*[0]`}, mustParseBinaryFromString(t, `"TiDB"`), true, nil},
{bj5, []string{`$.properties.$type.$a.*[0]`}, mustParseBinaryFromString(t, `["TiDB"]`), true, nil},

// test extract with multi path expressions.
{bj1, []string{"$.a", "$[5]"}, mustParseBinaryFromString(t, `[[1, "2", {"aa": "bb"}, 4.0, {"aa": "cc"}]]`), true, nil},
Expand Down