Skip to content

Commit 892552d

Browse files
ahmadovahmadov
committed
fix style and fast test builds
1 parent 0a2aa38 commit 892552d

8 files changed

+29
-28
lines changed

‎src/Storages/IndicesDescription.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast
168168

169169
if (index_type && index_type->arguments)
170170
{
171-
if (index_type->name == "gin" && parseGinIndexArgumentsFromAST(index_type->arguments, result.arguments))
171+
bool is_gin_function = index_type->name == "gin" || index_type->name == "inverted" || index_type->name == "full_text";
172+
if (is_gin_function && parseGinIndexArgumentsFromAST(index_type->arguments, result.arguments))
172173
{
173174
return result;
174175
}

‎src/Storages/MergeTree/MergeTreeIndexGin.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -841,9 +841,9 @@ void ginIndexValidator(const IndexDescription & index, bool /*attach*/)
841841
if (!tokenizer.has_value())
842842
throw Exception(ErrorCodes::INCORRECT_QUERY, "GIN index must include the '{}' argument", GIN_INDEX_ARGUMENT_TOKENIZER);
843843

844-
if (!std::unordered_set<String>{
845-
SplitTokenExtractor::getExternalName(), NoOpTokenExtractor::getExternalName(), NgramTokenExtractor::getExternalName()}
846-
.contains(tokenizer.value()))
844+
const bool is_supported_tokenizer = tokenizer.value() == SplitTokenExtractor::getExternalName()
845+
|| tokenizer.value() == NoOpTokenExtractor::getExternalName() || tokenizer.value() == NgramTokenExtractor::getExternalName();
846+
if (!is_supported_tokenizer)
847847
throw Exception(
848848
ErrorCodes::INCORRECT_QUERY,
849849
"GIN index '{}' argument supports only 'default', 'ngram', and 'noop', but got {}",

‎tests/queries/0_stateless/02346_gin_index_bug47393.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ CREATE TABLE tab
77
(
88
id UInt64,
99
str String,
10-
INDEX idx str TYPE gin(3) GRANULARITY 1
10+
INDEX idx str TYPE gin(tokenizer = 'ngram', ngram_size = 3) GRANULARITY 1
1111
)
1212
ENGINE = MergeTree
1313
ORDER BY tuple()

‎tests/queries/0_stateless/02346_gin_index_bug54541.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CREATE TABLE tab
88
(
99
id UInt32,
1010
str String,
11-
INDEX idx str TYPE gin
11+
INDEX idx str TYPE gin(tokenizer = 'default')
1212
)
1313
ENGINE = MergeTree
1414
ORDER BY id

‎tests/queries/0_stateless/02346_gin_index_bug59039.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CREATE TABLE tab
99
(
1010
id UInt64,
1111
doc String,
12-
INDEX text_idx doc TYPE gin
12+
INDEX text_idx doc TYPE gin(tokenizer = 'default')
1313
)
1414
ENGINE = MergeTree
1515
ORDER BY id

‎tests/queries/0_stateless/02346_gin_index_experimental_flag.sql‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ DROP TABLE IF EXISTS tab;
66

77
SET allow_experimental_full_text_index = 0;
88
CREATE TABLE tab1 (id UInt32, str String, INDEX idx str TYPE gin(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError SUPPORT_IS_DISABLED }
9-
CREATE TABLE tab2 (id UInt32, str String, INDEX idx str TYPE full_text(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
10-
CREATE TABLE tab3 (id UInt32, str String, INDEX idx str TYPE inverted(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
9+
CREATE TABLE tab2 (id UInt32, str String, INDEX idx str TYPE full_text(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
10+
CREATE TABLE tab3 (id UInt32, str String, INDEX idx str TYPE inverted(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
1111

1212
SET allow_experimental_full_text_index = 1;
1313
CREATE TABLE tab1 (id UInt32, str String, INDEX idx str TYPE gin(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple();
14-
CREATE TABLE tab2 (id UInt32, str String, INDEX idx str TYPE full_text(0)) ENGINE = MergeTree ORDER BY tuple();
15-
CREATE TABLE tab3 (id UInt32, str String, INDEX idx str TYPE inverted(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
14+
CREATE TABLE tab2 (id UInt32, str String, INDEX idx str TYPE full_text(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple();
15+
CREATE TABLE tab3 (id UInt32, str String, INDEX idx str TYPE inverted(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
1616
DROP TABLE tab1, tab2;
1717

1818
SET allow_experimental_full_text_index = 0; -- reset to default
@@ -21,13 +21,13 @@ SET allow_experimental_full_text_index = 0; -- reset to default
2121

2222
SET allow_experimental_inverted_index = 0;
2323
CREATE TABLE tab1 (id UInt32, str String, INDEX idx str TYPE gin(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError SUPPORT_IS_DISABLED }
24-
CREATE TABLE tab2 (id UInt32, str String, INDEX idx str TYPE full_text(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
25-
CREATE TABLE tab3 (id UInt32, str String, INDEX idx str TYPE inverted(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
24+
CREATE TABLE tab2 (id UInt32, str String, INDEX idx str TYPE full_text(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
25+
CREATE TABLE tab3 (id UInt32, str String, INDEX idx str TYPE inverted(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
2626

2727
SET allow_experimental_inverted_index = 1;
2828
CREATE TABLE tab1 (id UInt32, str String, INDEX idx str TYPE gin(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError SUPPORT_IS_DISABLED }
29-
CREATE TABLE tab2 (id UInt32, str String, INDEX idx str TYPE full_text(0)) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
30-
CREATE TABLE tab3 (id UInt32, str String, INDEX idx str TYPE inverted(0)) ENGINE = MergeTree ORDER BY tuple();
29+
CREATE TABLE tab2 (id UInt32, str String, INDEX idx str TYPE full_text(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple(); -- { serverError ILLEGAL_INDEX }
30+
CREATE TABLE tab3 (id UInt32, str String, INDEX idx str TYPE inverted(tokenizer = 'default')) ENGINE = MergeTree ORDER BY tuple();
3131
DROP TABLE tab3;
3232

3333

@@ -38,15 +38,15 @@ SET allow_experimental_inverted_index = 0; -- reset to default
3838
SET allow_experimental_full_text_index = 0;
3939
CREATE TABLE tab (id UInt32, str String) ENGINE = MergeTree ORDER BY tuple();
4040
ALTER TABLE tab ADD INDEX idx1 str TYPE gin(tokenizer = 'default'); -- { serverError SUPPORT_IS_DISABLED }
41-
ALTER TABLE tab ADD INDEX idx2 str TYPE full_text(0); -- { serverError ILLEGAL_INDEX }
42-
ALTER TABLE tab ADD INDEX idx3 str TYPE inverted(0); -- { serverError ILLEGAL_INDEX }
41+
ALTER TABLE tab ADD INDEX idx2 str TYPE full_text(tokenizer = 'default'); -- { serverError ILLEGAL_INDEX }
42+
ALTER TABLE tab ADD INDEX idx3 str TYPE inverted(tokenizer = 'default'); -- { serverError ILLEGAL_INDEX }
4343
DROP TABLE tab;
4444

4545
SET allow_experimental_full_text_index = 1;
4646
CREATE TABLE tab (id UInt32, str String) ENGINE = MergeTree ORDER BY tuple();
4747
ALTER TABLE tab ADD INDEX idx1 str TYPE gin(tokenizer = 'default');
48-
ALTER TABLE tab ADD INDEX idx2 str TYPE full_text(0);
49-
ALTER TABLE tab ADD INDEX idx3 str TYPE inverted(0); -- { serverError ILLEGAL_INDEX }
48+
ALTER TABLE tab ADD INDEX idx2 str TYPE full_text(tokenizer = 'default');
49+
ALTER TABLE tab ADD INDEX idx3 str TYPE inverted(tokenizer = 'default'); -- { serverError ILLEGAL_INDEX }
5050
DROP TABLE tab;
5151
SET allow_experimental_full_text_index = 0; -- reset to default
5252

@@ -56,14 +56,14 @@ SET allow_experimental_full_text_index = 0; -- reset to default
5656
SET allow_experimental_inverted_index = 0;
5757
CREATE TABLE tab (id UInt32, str String) ENGINE = MergeTree ORDER BY tuple();
5858
ALTER TABLE tab ADD INDEX idx1 str TYPE gin(tokenizer = 'default'); -- { serverError SUPPORT_IS_DISABLED }
59-
ALTER TABLE tab ADD INDEX idx2 str TYPE full_text(0); -- { serverError ILLEGAL_INDEX }
60-
ALTER TABLE tab ADD INDEX idx3 str TYPE inverted(0); -- { serverError ILLEGAL_INDEX }
59+
ALTER TABLE tab ADD INDEX idx2 str TYPE full_text(tokenizer = 'default'); -- { serverError ILLEGAL_INDEX }
60+
ALTER TABLE tab ADD INDEX idx3 str TYPE inverted(tokenizer = 'default'); -- { serverError ILLEGAL_INDEX }
6161
DROP TABLE tab;
6262

6363
SET allow_experimental_inverted_index = 1;
6464
CREATE TABLE tab (id UInt32, str String) ENGINE = MergeTree ORDER BY tuple();
6565
ALTER TABLE tab ADD INDEX idx1 str TYPE gin(tokenizer = 'default'); -- { serverError SUPPORT_IS_DISABLED }
66-
ALTER TABLE tab ADD INDEX idx2 str TYPE full_text(0); -- { serverError ILLEGAL_INDEX }
67-
ALTER TABLE tab ADD INDEX idx3 str TYPE inverted(0);
66+
ALTER TABLE tab ADD INDEX idx2 str TYPE full_text(tokenizer = 'default'); -- { serverError ILLEGAL_INDEX }
67+
ALTER TABLE tab ADD INDEX idx3 str TYPE inverted(tokenizer = 'default');
6868
DROP TABLE tab;
6969
SET allow_experimental_inverted_index = 0; -- reset to default

‎tests/queries/0_stateless/02346_gin_index_legacy_name.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ DROP TABLE IF EXISTS tab;
88

99
-- Creation only works with the (old) setting enabled.
1010
SET allow_experimental_inverted_index = 0;
11-
CREATE TABLE tab(k UInt64, s String, INDEX idx(s) TYPE inverted(2)) ENGINE = MergeTree() ORDER BY k SETTINGS min_bytes_for_full_part_storage = 0; -- { serverError ILLEGAL_INDEX }
11+
CREATE TABLE tab(k UInt64, s String, INDEX idx(s) TYPE inverted(tokenizer = 'ngram', ngram_size = 2)) ENGINE = MergeTree() ORDER BY k SETTINGS min_bytes_for_full_part_storage = 0; -- { serverError ILLEGAL_INDEX }
1212

1313
SET allow_experimental_inverted_index = 1;
14-
CREATE TABLE tab(k UInt64, s String, INDEX idx(s) TYPE inverted(2)) ENGINE = MergeTree() ORDER BY k SETTINGS min_bytes_for_full_part_storage = 0;
14+
CREATE TABLE tab(k UInt64, s String, INDEX idx(s) TYPE inverted(tokenizer = 'ngram', ngram_size = 2)) ENGINE = MergeTree() ORDER BY k SETTINGS min_bytes_for_full_part_storage = 0;
1515
INSERT INTO tab VALUES (1, 'ab') (2, 'bc');
1616

1717
-- Detach and attach should work.
@@ -40,10 +40,10 @@ DROP TABLE tab;
4040

4141
-- Creation only works with the (old) setting enabled.
4242
SET allow_experimental_full_text_index = 0;
43-
CREATE TABLE tab(k UInt64, s String, INDEX idx(s) TYPE full_text(2)) ENGINE = MergeTree() ORDER BY k SETTINGS min_bytes_for_full_part_storage = 0; -- { serverError ILLEGAL_INDEX }
43+
CREATE TABLE tab(k UInt64, s String, INDEX idx(s) TYPE full_text(tokenizer = 'ngram', ngram_size = 2)) ENGINE = MergeTree() ORDER BY k SETTINGS min_bytes_for_full_part_storage = 0; -- { serverError ILLEGAL_INDEX }
4444

4545
SET allow_experimental_full_text_index = 1;
46-
CREATE TABLE tab(k UInt64, s String, INDEX idx(s) TYPE full_text(2)) ENGINE = MergeTree() ORDER BY k SETTINGS min_bytes_for_full_part_storage = 0;
46+
CREATE TABLE tab(k UInt64, s String, INDEX idx(s) TYPE full_text(tokenizer = 'ngram', ngram_size = 2)) ENGINE = MergeTree() ORDER BY k SETTINGS min_bytes_for_full_part_storage = 0;
4747
INSERT INTO tab VALUES (1, 'ab') (2, 'bc');
4848

4949
-- Detach and attach should work.

‎tests/queries/0_stateless/03165_string_functions_with_token_text_indexes.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ CREATE TABLE 03165_token_ft
124124
(
125125
id Int64,
126126
message String,
127-
INDEX idx_message message TYPE gin() GRANULARITY 1
127+
INDEX idx_message message TYPE gin(tokenizer = 'default') GRANULARITY 1
128128
)
129129
ENGINE = MergeTree
130130
ORDER BY id

0 commit comments

Comments
 (0)