这是indexloc提供的服务，不要输入任何密码
Skip to content

feat(spanner/spansql): Add support for TOKENIZE_JSON. #12338

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 3 commits into from
Jun 16, 2025
+27 −8
Merged

feat(spanner/spansql): Add support for TOKENIZE_JSON. #12338

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
a68884a
feat(spanner/spansql): Add support for TOKENIZE_JSON.
webbju May 27, 2025
fe22743
Merge branch 'main' into webbju/tokenize-json
rahul2393 Jun 16, 2025
8aa935d
Merge branch 'main' into webbju/tokenize-json
rahul2393 Jun 16, 2025
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
1 change: 1 addition & 0 deletions spanner/spansql/keywords.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ var funcNames = []string{
"TOKEN",
"TOKENIZE_BOOL",
"TOKENIZE_FULLTEXT",
"TOKENIZE_JSON",
"TOKENIZE_NGRAMS",
"TOKENIZE_NUMBER",
"TOKENIZE_SUBSTRING",
Expand Down
19 changes: 14 additions & 5 deletions spanner/spansql/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2225,6 +2225,8 @@ func TestParseDDL(t *testing.T) {
ValueThree_Tokens TOKENLIST AS (TOKENIZE_NGRAMS(ValueThree)) HIDDEN,
ValueFour STRING(MAX) NOT NULL,
ValueFour_Tokens TOKENLIST AS (TOKENIZE_FULLTEXT(ValueFour || "concat")) HIDDEN,
ValueFive JSON NOT NULL,
ValueFive_Tokens TOKENLIST AS (TOKENIZE_JSON(ValueFive)) HIDDEN,
Combined_Tokens TOKENLIST AS (TOKENLIST_CONCAT([Name_Tokens, ValueFour_Tokens])) HIDDEN,
Argument_Tokens TOKENLIST AS (TOKENIZE_FULLTEXT(Name, token_category => "small")) HIDDEN,
ManyArgument_Tokens TOKENLIST AS (TOKENIZE_NUMBER(Value, comparison_type => "all", min => 1, max => 5)) HIDDEN,
Expand Down Expand Up @@ -2285,11 +2287,18 @@ func TestParseDDL(t *testing.T) {
Hidden: true,
Position: line(13),
},
{Name: "ValueFive", Type: Type{Base: JSON}, NotNull: true, Position: line(14)},
{
Name: "ValueFive_Tokens", Type: Type{Base: Tokenlist},
Generated: Func{Name: "TOKENIZE_JSON", Args: []Expr{ID("ValueFive")}},
Hidden: true,
Position: line(15),
},
{
Name: "Combined_Tokens", Type: Type{Base: Tokenlist},
Generated: Func{Name: "TOKENLIST_CONCAT", Args: []Expr{Array{ID("Name_Tokens"), ID("ValueFour_Tokens")}}},
Hidden: true,
Position: line(14),
Position: line(16),
},
{
Name: "Argument_Tokens", Type: Type{Base: Tokenlist},
Expand All @@ -2298,7 +2307,7 @@ func TestParseDDL(t *testing.T) {
Value: StringLiteral("small"),
}}},
Hidden: true,
Position: line(15),
Position: line(17),
},
{
Name: "ManyArgument_Tokens", Type: Type{Base: Tokenlist},
Expand All @@ -2318,7 +2327,7 @@ func TestParseDDL(t *testing.T) {
},
}},
Hidden: true,
Position: line(16),
Position: line(18),
},
},
PrimaryKey: []KeyPart{{Column: "Name"}},
Expand All @@ -2334,7 +2343,7 @@ func TestParseDDL(t *testing.T) {
Storing: []ID{"ValueTwo"},
PartitionBy: []ID{"Value", "ValueTwo"},
OrderBy: []Order{{Expr: ID("Value"), Desc: true}, {Expr: ID("ValueTwo"), Desc: false}},
Position: line(19),
Position: line(21),
Interleave: ID("SomeTable"),
Options: SearchIndexOptions{SortOrderSharding: func(b bool) *bool { return &b }(true)},
},
Expand All @@ -2351,7 +2360,7 @@ func TestParseDDL(t *testing.T) {

CREATE SEARCH INDEX TableTokensSearch
ON TableTokens(Name_Tokens, Value_Tokens);

ALTER SEARCH INDEX TableTokensSearch ADD STORED COLUMN Value_Tokens;
ALTER SEARCH INDEX TableTokensSearch DROP STORED COLUMN Value_Tokens;
DROP SEARCH INDEX IF EXISTS TableTokensSearch;`,
Expand Down
15 changes: 12 additions & 3 deletions spanner/spansql/sql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,11 +833,18 @@ func TestSQL(t *testing.T) {
Hidden: true,
Position: line(13),
},
{Name: "ValueFive", Type: Type{Base: JSON}, NotNull: true, Position: line(14)},
{
Name: "ValueFive_Tokens", Type: Type{Base: Tokenlist},
Generated: Func{Name: "TOKENIZE_JSON", Args: []Expr{ID("ValueFive")}},
Hidden: true,
Position: line(15),
},
{
Name: "Combined_Tokens", Type: Type{Base: Tokenlist},
Generated: Func{Name: "TOKENLIST_CONCAT", Args: []Expr{Array{ID("Name_Tokens"), ID("ValueFour_Tokens")}}},
Hidden: true,
Position: line(14),
Position: line(16),
},
{
Name: "Argument_Tokens", Type: Type{Base: Tokenlist},
Expand All @@ -846,7 +853,7 @@ func TestSQL(t *testing.T) {
Value: StringLiteral("small"),
}}},
Hidden: true,
Position: line(15),
Position: line(17),
},
{
Name: "ManyArgument_Tokens", Type: Type{Base: Tokenlist},
Expand All @@ -866,7 +873,7 @@ func TestSQL(t *testing.T) {
},
}},
Hidden: true,
Position: line(16),
Position: line(18),
},
},
PrimaryKey: []KeyPart{{Column: "Name"}},
Expand All @@ -885,6 +892,8 @@ func TestSQL(t *testing.T) {
ValueThree_Tokens TOKENLIST AS (TOKENIZE_NGRAMS(ValueThree)) HIDDEN,
ValueFour STRING(MAX) NOT NULL,
ValueFour_Tokens TOKENLIST AS (TOKENIZE_FULLTEXT(ValueFour)) HIDDEN,
ValueFive JSON NOT NULL,
ValueFive_Tokens TOKENLIST AS (TOKENIZE_JSON(ValueFive)) HIDDEN,
Combined_Tokens TOKENLIST AS (TOKENLIST_CONCAT([Name_Tokens, ValueFour_Tokens])) HIDDEN,
Argument_Tokens TOKENLIST AS (TOKENIZE_FULLTEXT(Name, token_category => "small")) HIDDEN,
ManyArgument_Tokens TOKENLIST AS (TOKENIZE_NUMBER(Value, comparison_type => "all", min => 1, max => 5)) HIDDEN,
Expand Down
Loading