-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fix](inverted index) fix multi match result error (#38931)
1. multi_match result merging logic is incorrect
- Loading branch information
Showing
10 changed files
with
187 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
regression-test/data/inverted_index_p0/test_index_multi_match.out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| -- This file is automatically generated. You should know what you did if you want to edit this | ||
| -- !sql -- | ||
| 178 | ||
|
|
||
| -- !sql -- | ||
| 180 | ||
|
|
||
| -- !sql -- | ||
| 859 | ||
|
|
||
| -- !sql -- | ||
| 44 | ||
|
|
||
| -- !sql -- | ||
| 178 | ||
|
|
||
| -- !sql -- | ||
| 180 | ||
|
|
||
| -- !sql -- | ||
| 859 | ||
|
|
||
| -- !sql -- | ||
| 44 | ||
|
|
124 changes: 124 additions & 0 deletions
124
regression-test/suites/inverted_index_p0/test_index_multi_match.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| // 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_index_multi_match", "p0"){ | ||
| def indexTbName1 = "test_index_multi_match_1" | ||
| def indexTbName2 = "test_index_multi_match_2" | ||
|
|
||
| sql "DROP TABLE IF EXISTS ${indexTbName1}" | ||
| sql "DROP TABLE IF EXISTS ${indexTbName2}" | ||
|
|
||
| sql """ | ||
| CREATE TABLE ${indexTbName1} ( | ||
| `@timestamp` int(11) NULL COMMENT "", | ||
| `clientip` text NULL COMMENT "", | ||
| `request` text NULL COMMENT "", | ||
| `status` text NULL COMMENT "", | ||
| `size` text NULL COMMENT "", | ||
| INDEX clientip_idx (`clientip`) USING INVERTED PROPERTIES("parser" = "english", "support_phrase" = "true") COMMENT '', | ||
| INDEX request_idx (`request`) USING INVERTED PROPERTIES("parser" = "english", "support_phrase" = "true") COMMENT '', | ||
| INDEX status_idx (`status`) USING INVERTED PROPERTIES("parser" = "english", "support_phrase" = "true") COMMENT '', | ||
| INDEX size_idx (`size`) USING INVERTED PROPERTIES("parser" = "english", "support_phrase" = "true") COMMENT '' | ||
| ) ENGINE=OLAP | ||
| DUPLICATE KEY(`@timestamp`) | ||
| COMMENT "OLAP" | ||
| DISTRIBUTED BY RANDOM BUCKETS 1 | ||
| PROPERTIES ( | ||
| "replication_allocation" = "tag.location.default: 1", | ||
| "disable_auto_compaction" = "true" | ||
| ); | ||
| """ | ||
|
|
||
| sql """ | ||
| CREATE TABLE ${indexTbName2} ( | ||
| `@timestamp` int(11) NULL COMMENT "", | ||
| `clientip` text NULL COMMENT "", | ||
| `request` text NULL COMMENT "", | ||
| `status` text NULL COMMENT "", | ||
| `size` text NULL COMMENT "", | ||
| INDEX clientip_idx (`clientip`) USING INVERTED PROPERTIES("parser" = "english", "support_phrase" = "true") COMMENT '', | ||
| INDEX request_idx (`request`) USING INVERTED PROPERTIES("parser" = "english", "support_phrase" = "true") COMMENT '', | ||
| INDEX status_idx (`status`) USING INVERTED PROPERTIES("parser" = "english", "support_phrase" = "true") COMMENT '', | ||
| INDEX size_idx (`size`) USING INVERTED PROPERTIES("parser" = "english", "support_phrase" = "true") COMMENT '' | ||
| ) ENGINE=OLAP | ||
| DUPLICATE KEY(`@timestamp`) | ||
| COMMENT "OLAP" | ||
| DISTRIBUTED BY RANDOM BUCKETS 1 | ||
| PROPERTIES ( | ||
| "replication_allocation" = "tag.location.default: 1", | ||
| "disable_auto_compaction" = "true" | ||
| ); | ||
| """ | ||
|
|
||
| def load_httplogs_data = {table_name, label, read_flag, format_flag, file_name, ignore_failure=false, | ||
| expected_succ_rows = -1, load_to_single_tablet = 'true' -> | ||
|
|
||
| // load the json data | ||
| streamLoad { | ||
| table "${table_name}" | ||
|
|
||
| // set http request header params | ||
| set 'label', label + "_" + UUID.randomUUID().toString() | ||
| set 'read_json_by_line', read_flag | ||
| set 'format', format_flag | ||
| file file_name // import json file | ||
| time 10000 // limit inflight 10s | ||
| if (expected_succ_rows >= 0) { | ||
| set 'max_filter_ratio', '1' | ||
| } | ||
|
|
||
| // if declared a check callback, the default check condition will ignore. | ||
| // So you must check all condition | ||
| check { result, exception, startTime, endTime -> | ||
| if (ignore_failure && expected_succ_rows < 0) { return } | ||
| if (exception != null) { | ||
| throw exception | ||
| } | ||
| log.info("Stream load result: ${result}".toString()) | ||
| def json = parseJson(result) | ||
| assertEquals("success", json.Status.toLowerCase()) | ||
| if (expected_succ_rows >= 0) { | ||
| assertEquals(json.NumberLoadedRows, expected_succ_rows) | ||
| } else { | ||
| assertEquals(json.NumberTotalRows, json.NumberLoadedRows + json.NumberUnselectedRows) | ||
| assertTrue(json.NumberLoadedRows > 0 && json.LoadBytes > 0) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| try { | ||
| load_httplogs_data.call(indexTbName1, 'test_index_multi_match_1', 'true', 'json', 'documents-1000.json') | ||
| load_httplogs_data.call(indexTbName2, 'test_index_multi_match_2', 'true', 'json', 'documents-1000.json') | ||
|
|
||
| sql "sync" | ||
|
|
||
| qt_sql """ select count() from ${indexTbName1} where (clientip match_phrase_prefix '2'); """ | ||
| qt_sql """ select count() from ${indexTbName1} where (clientip match_phrase_prefix '2' or request match_phrase_prefix '2'); """ | ||
| qt_sql """ select count() from ${indexTbName1} where (clientip match_phrase_prefix '2' or request match_phrase_prefix '2' or status match_phrase_prefix '2' or size match_phrase_prefix '2'); """ | ||
| qt_sql """ select count() from ${indexTbName1} where (clientip match_phrase_prefix 'a' or request match_phrase_prefix 'a' or status match_phrase_prefix 'a' or size match_phrase_prefix 'a'); """ | ||
|
|
||
| qt_sql """ select count() from ${indexTbName2} where multi_match(clientip, '', 'phrase_prefix', '2'); """ | ||
| qt_sql """ select count() from ${indexTbName2} where multi_match(clientip, 'request', 'phrase_prefix', '2'); """ | ||
| qt_sql """ select count() from ${indexTbName2} where multi_match(clientip, 'request, status, size', 'phrase_prefix', '2'); """ | ||
| qt_sql """ select count() from ${indexTbName2} where multi_match(clientip, 'request, status, size', 'phrase_prefix', 'a'); """ | ||
|
|
||
| } finally { | ||
| //try_sql("DROP TABLE IF EXISTS ${testTable}") | ||
| } | ||
| } |