This is an automated email from the ASF dual-hosted git repository.
jianliangqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 5f2dad29ca [enhancement](inverted index) Support inverted index
without specified parser to use match query (#17110)
5f2dad29ca is described below
commit 5f2dad29cac904d1cda962baa803bfe6b7d6ae66
Author: YueW <[email protected]>
AuthorDate: Fri Feb 24 20:34:55 2023 +0800
[enhancement](inverted index) Support inverted index without specified
parser to use match query (#17110)
---
.../rowset/segment_v2/inverted_index_reader.cpp | 8 +-
.../test_index_match_term_and_phrase_select.out | 140 +++++++++++++++++++++
.../test_index_match_term_and_phrase_select.groovy | 4 +
3 files changed, 146 insertions(+), 6 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/inverted_index_reader.cpp
b/be/src/olap/rowset/segment_v2/inverted_index_reader.cpp
index 52220e5ba7..b330754803 100644
--- a/be/src/olap/rowset/segment_v2/inverted_index_reader.cpp
+++ b/be/src/olap/rowset/segment_v2/inverted_index_reader.cpp
@@ -280,6 +280,8 @@ Status
StringTypeInvertedIndexReader::query(OlapReaderStatistics* stats,
}
switch (query_type) {
+ case InvertedIndexQueryType::MATCH_ANY_QUERY:
+ case InvertedIndexQueryType::MATCH_ALL_QUERY:
case InvertedIndexQueryType::EQUAL_QUERY: {
query.reset(new lucene::search::TermQuery(term.get()));
break;
@@ -301,12 +303,6 @@ Status
StringTypeInvertedIndexReader::query(OlapReaderStatistics* stats,
break;
}
default:
- LOG(ERROR) << "invalid query type when query untokenized inverted
index";
- if (_is_match_query(query_type)) {
- LOG(WARNING) << column_name << " is untokenized inverted index"
- << ", please use equal query instead of match query";
- return Status::Error<ErrorCode::INVERTED_INDEX_NOT_SUPPORTED>();
- }
LOG(WARNING) << "invalid query type when query untokenized inverted
index";
return Status::Error<ErrorCode::INVERTED_INDEX_NOT_SUPPORTED>();
}
diff --git
a/regression-test/data/inverted_index_p0/test_index_match_term_and_phrase_select.out
b/regression-test/data/inverted_index_p0/test_index_match_term_and_phrase_select.out
index f1a1262c63..940e8b5066 100644
---
a/regression-test/data/inverted_index_p0/test_index_match_term_and_phrase_select.out
+++
b/regression-test/data/inverted_index_p0/test_index_match_term_and_phrase_select.out
@@ -45,6 +45,46 @@ zhang san yi grade 5 zhang yi chen san buy
11 2017-10-01T00:00 tall:120cm, weigh
-- !sql --
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
-- !sql --
san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
@@ -57,6 +97,8 @@ zhang san yi grade 5 zhang yi chen san buy
11 2017-10-01T00:00 tall:120cm, weigh
-- !sql --
+-- !sql --
+
-- !sql --
san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
@@ -81,6 +123,34 @@ zhang san yi grade 5 zhang yi chen san
buy 11 2017-10-01T00:00 tall:120cm, weigh
-- !sql --
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
+-- !sql --
+
-- !sql --
zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
@@ -385,6 +455,46 @@ zhang san yi grade 5 zhang yi chen san
buy 11 2017-10-01T00:00 tall:120cm, weigh
-- !sql --
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
-- !sql --
san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
@@ -397,6 +507,8 @@ zhang san yi grade 5 zhang yi chen san
buy 11 2017-10-01T00:00 tall:120cm, weigh
-- !sql --
+-- !sql --
+
-- !sql --
san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
@@ -421,6 +533,34 @@ zhang san yi grade 5 zhang yi chen san
buy 11 2017-10-01T00:00 tall:120cm, weigh
-- !sql --
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+san zhang grade 5 10 2017-10-01T00:00
tall:100cm, weight: 30kg, hobbies:
+zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
+zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
+
+-- !sql --
+
+-- !sql --
+
-- !sql --
zhang san grade 5 zhang yi chen san buy dancing book
10 2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: sing,
dancing Like cultural and recreational activities Class activists
zhang san yi grade 5 zhang yi chen san buy 11
2017-10-01T00:00 tall:120cm, weight: 35kg, hobbies: reading book A quiet
little boy learn makes me happy
diff --git
a/regression-test/suites/inverted_index_p0/test_index_match_term_and_phrase_select.groovy
b/regression-test/suites/inverted_index_p0/test_index_match_term_and_phrase_select.groovy
index 566d182831..583c50fc15 100644
---
a/regression-test/suites/inverted_index_p0/test_index_match_term_and_phrase_select.groovy
+++
b/regression-test/suites/inverted_index_p0/test_index_match_term_and_phrase_select.groovy
@@ -178,6 +178,10 @@ suite("test_index_match_term_and_phrase_select",
"inverted_index_select"){
qt_sql """ select * from ${indexTbName1} where
${varchar_colume2}='grade 5' order by name """
qt_sql """ select * from ${indexTbName1} where
${varchar_colume2}="grade 5" order by name """
qt_sql """ select * from ${indexTbName1} where
${varchar_colume2}='grade none' order by name """
+ qt_sql """ select * from ${indexTbName1} where ${varchar_colume2}
match 'grade 5' order by name """
+ qt_sql """ select * from ${indexTbName1} where ${varchar_colume2}
match "grade 5" order by name """
+ qt_sql """ select * from ${indexTbName1} where ${varchar_colume2}
match 'grade none' order by name """
+ qt_sql """ select * from ${indexTbName1} where ${varchar_colume2}
match 'grade' order by name """
}
// cas2.2 test varchar standard match same term with different way and
repeate 5 times
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
