xiaokang commented on code in PR #47688:
URL: https://github.com/apache/doris/pull/47688#discussion_r1960808100
##########
be/test/common/schema_util_test.cpp:
##########
@@ -48,6 +48,18 @@ void construct_subcolumn(TabletSchemaSPtr schema, const
FieldType& type, int32_t
vectorized::PathInData col_path(path);
subcol.set_path_info(col_path);
subcol.set_name(col_path.get_path());
+
+ if (type == FieldType::OLAP_FIELD_TYPE_ARRAY) {
+ TabletColumn array_item_col;
+ // double not support inverted index
+ array_item_col.set_type(FieldType::OLAP_FIELD_TYPE_DOUBLE);
Review Comment:
Is it a trick to add a default type DOUBLE that does not support inverted
index?
##########
be/src/vec/exprs/vexpr.cpp:
##########
@@ -653,7 +653,7 @@ Status VExpr::_evaluate_inverted_index(VExprContext*
context, const FunctionBase
context->get_inverted_index_context()
->get_storage_name_and_type_by_column_id(column_id);
auto storage_type = remove_nullable(storage_name_type->second);
- auto target_type = cast_expr->get_target_type();
+ auto target_type =
remove_nullable(cast_expr->get_target_type());
Review Comment:
Why add remove_nullable?
##########
be/test/common/schema_util_test.cpp:
##########
@@ -48,6 +48,18 @@ void construct_subcolumn(TabletSchemaSPtr schema, const
FieldType& type, int32_t
vectorized::PathInData col_path(path);
subcol.set_path_info(col_path);
subcol.set_name(col_path.get_path());
+
+ if (type == FieldType::OLAP_FIELD_TYPE_ARRAY) {
+ TabletColumn array_item_col;
+ // double not support inverted index
+ array_item_col.set_type(FieldType::OLAP_FIELD_TYPE_DOUBLE);
Review Comment:
Where do you set the real item type and why not set the real item type here?
##########
regression-test/suites/variant_p0/with_index/test_array_contains_with_inverted_index.groovy:
##########
@@ -0,0 +1,112 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_array_contains_with_inverted_index"){
+ // prepare test table
+ def indexTblName = "tai"
+ sql "set disable_inverted_index_v1_for_variant = false"
+
+ // If we use common expr pass to inverted index , we should set
enable_common_expr_pushdown = true
+ sql """ set enable_common_expr_pushdown = true; """
+ sql """ set enable_common_expr_pushdown_for_inverted_index = true; """
+ sql """ set enable_pipeline_x_engine = true;"""
Review Comment:
dito
##########
regression-test/suites/variant_github_events_new_p2/load.groovy:
##########
@@ -128,4 +128,26 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
sql """DELETE FROM github_events where k >= 9223372036854775107"""
qt_sql_select_count """ select count(*) from github_events_2; """
+
+ trigger_and_wait_compaction("github_events", "full")
+
+ // query and filterd by inverted index
+ profile("test_profile_1") {
+ sql """ set enable_common_expr_pushdown = true; """
+ sql """ set enable_common_expr_pushdown_for_inverted_index = true; """
+ sql """ set enable_pipeline_x_engine = true;"""
Review Comment:
Is enable_pipeline_x_engine necessary? Setting it explicitly will prevent
session var fuzzy.
##########
regression-test/suites/variant_p0/with_index/test_array_contains_with_inverted_index.groovy:
##########
@@ -0,0 +1,112 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("test_array_contains_with_inverted_index"){
+ // prepare test table
+ def indexTblName = "tai"
+ sql "set disable_inverted_index_v1_for_variant = false"
+
+ // If we use common expr pass to inverted index , we should set
enable_common_expr_pushdown = true
+ sql """ set enable_common_expr_pushdown = true; """
+ sql """ set enable_common_expr_pushdown_for_inverted_index = true; """
+ sql """ set enable_pipeline_x_engine = true;"""
+ sql """ set enable_profile = true;"""
+
+ sql "DROP TABLE IF EXISTS ${indexTblName}"
+ // create 1 replica table
+ def storageFormat = new Random().nextBoolean() ? "V1" : "V2"
+ sql """
+ CREATE TABLE IF NOT EXISTS `${indexTblName}` (
+ `apply_date` date NULL COMMENT '',
+ `id` varchar(60) NOT NULL COMMENT '',
+ `inventors` variant NULL COMMENT '',
+ INDEX index_inverted_inventors(inventors) USING INVERTED COMMENT ''
+ ) ENGINE=OLAP
+ DUPLICATE KEY(`apply_date`, `id`)
+ COMMENT 'OLAP'
+ DISTRIBUTED BY HASH(`id`) BUCKETS 1
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1",
+ "is_being_synced" = "false",
+ "storage_format" = "V2",
+ "light_schema_change" = "true",
+ "disable_auto_compaction" = "false",
+ "enable_single_replica_compaction" = "false",
+ "inverted_index_storage_format" = "$storageFormat"
+ );
+ """
+
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', '6afef581285b6608bf80d5a4e46cf839', '{"inventors":["a",
"b", "c"]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', 'd93d942d985a8fb7547c72dada8d332d', '{"inventors":["d",
"e", "f", "g", "h", "i", "j", "k", "l"]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', '48a33ec3453a28bce84b8f96fe161956',
'{"inventors":["m"]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', '021603e7dcfe65d44af0efd0e5aee154',
'{"inventors":["n"]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', '9fcb57ae675f0af4d613d9e6c0e8a2a2',
'{"inventors":["o"]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`) VALUES
('2017-01-01', '8fcb57ae675f0af4d613d9e6c0e8a2a3'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', '8fcb57ae675f0af4d613d9e6c0e8a2a4', NULL); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', '8fcb57ae675f0af4d613d9e6c0e8a2a5', '{"inventors":[]}');
"""
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', '8fcb57ae675f0af4d613d9e6c0e8a2a6',
'{"inventors":[null,null,null]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', '8fcb57ae675f0af4d613d9e6c0e8a2a7',
'{"inventors":[null,null,null]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2017-01-01', '8fcb57ae675f0af4d613d9e6c0e8a2a8', '{"inventors":[]}');
"""
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2019-01-01', 'a648a447b8f71522f11632eba4b4adde', '{"inventors":["p",
"q", "r", "s", "t"]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2019-01-01', 'a9fb5c985c90bf05f3bee5ca3ae95260', '{"inventors":["u",
"v"]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2019-01-01', '0974e7a82e30d1af83205e474fadd0a2',
'{"inventors":["w"]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2019-01-01', '26823b3995ee38bd145ddd910b2f6300',
'{"inventors":["x"]}'); """
+ sql """ INSERT INTO `${indexTblName}`(`apply_date`, `id`, `inventors`)
VALUES ('2019-01-01', 'ee27ee1da291e46403c408e220bed6e1',
'{"inventors":["y"]}'); """
+ sql """ set enable_common_expr_pushdown = true """
+
+ qt_sql """ select count() from ${indexTblName}"""
+ def param_contains = ["'s'", "''", null]
+ for (int i = 0 ; i < param_contains.size(); ++i) {
+ def p = param_contains[i]
+ log.info("param: ${p}")
+ order_qt_sql """ select * from tai where
array_contains(cast(inventors['inventors'] as array<text>), ${p}) order by id;
"""
+ order_qt_sql """ select * from tai where
array_contains(cast(inventors['inventors'] as array<text>), ${p}) and
apply_date = '2017-01-01' order by id; """
+ order_qt_sql """ select * from tai where
array_contains(cast(inventors['inventors'] as array<text>), ${p}) and
apply_date = '2019-01-01' order by id; """
+ order_qt_sql """ select * from tai where
array_contains(cast(inventors['inventors'] as array<text>), ${p}) or apply_date
= '2017-01-01' order by id; """
+ order_qt_sql """ select * from tai where
!array_contains(cast(inventors['inventors'] as array<text>), ${p}) order by id;
"""
+ order_qt_sql """ select * from tai where
!array_contains(cast(inventors['inventors'] as array<text>), ${p}) and
apply_date = '2017-01-01' order by id; """
+ order_qt_sql """ select * from tai where
!array_contains(cast(inventors['inventors'] as array<text>), ${p}) and
apply_date = '2019-01-01' order by id; """
+ order_qt_sql """ select * from tai where
!array_contains(cast(inventors['inventors'] as array<text>), ${p}) or
apply_date = '2017-01-01' order by id; """
+ order_qt_sql """ select * from tai where
(array_contains(cast(inventors['inventors'] as array<text>), ${p}) and
apply_date = '2017-01-01') or apply_date = '2019-01-01' order by id; """
+ }
+
+ // test arrays_overlap with inverted index
Review Comment:
How to check whether inverted index is used?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
