[feature](inverted index) add ordered functionality to match_phrase query #36356
Conversation
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
|
Thank you for your contribution to Apache Doris. Since 2024-03-18, the Document has been moved to doris-website. |
|
run buildall |
|
clang-tidy review says "All clean, LGTM! 👍" |
|
TeamCity be ut coverage result: |
TPC-H: Total hot run time: 40490 ms |
TPC-DS: Total hot run time: 172901 ms |
ClickBench: Total hot run time: 30.48 s |
zzzxl1993
force-pushed
the
match_phrase_order
branch
from
ba4c966
to
83cff3b
Compare
|
run buildall |
xiaokang
reviewed
Jul 8, 2024
| @@ -323,7 +323,7 @@ Status FullTextIndexReader::query(OlapReaderStatistics* stats, RuntimeState* run | |||
| query_info.terms.emplace_back(search_str); | |||
| } else { | |||
| if (query_type == InvertedIndexQueryType::MATCH_PHRASE_QUERY) { | |||
| RETURN_IF_ERROR(PhraseQuery::parser_slop(search_str, query_info)); | |||
| PhraseQuery::parser_slop(search_str, query_info); | |||
There was a problem hiding this comment.
Why not return status now?
There was a problem hiding this comment.
Parse errors indicate no slop is needed
| CL_NS_USE(index) | ||
| CL_NS_USE(search) | ||
|
|
||
| namespace doris::segment_v2 { | ||
|
|
||
| class PostingsAndPosition { |
There was a problem hiding this comment.
delete old private class PostingsAndPosition
| }; | ||
|
|
||
| using PhraseQueryPtr = std::unique_ptr<CL_NS(search)::PhraseQuery>; | ||
| using Matcher = std::variant<ExactPhraseMatcher, OrderedSloppyPhraseMatcher, PhraseQueryPtr>; |
There was a problem hiding this comment.
add comment to explain usage of different matchers
| @@ -44,16 +140,19 @@ void PhraseQuery::add(const InvertedIndexQueryInfo& query_info) { | |||
| } | |||
|
|
|||
| _slop = query_info.slop; | |||
| if (_slop <= 0) { | |||
|
|
|||
| if (_slop == 0 || query_info.ordered) { | |||
There was a problem hiding this comment.
add comment to explain different branch
| @@ -73,14 +172,33 @@ void PhraseQuery::add(const std::wstring& field_name, const std::vector<std::str | |||
| } | |||
There was a problem hiding this comment.
no _matcher for terms.size() == 1 ?
There was a problem hiding this comment.
Matcher handles position information, terms.size() == 1 is handled in other processes
| @@ -54,12 +105,10 @@ class PhraseQuery : public Query { | |||
| void search_by_skiplist(roaring::Roaring& roaring); | |||
|
|
|||
| int32_t do_next(int32_t doc); | |||
There was a problem hiding this comment.
add comment for sematics of the interfaces.
| auto result = | ||
| std::from_chars(slop_str.begin(), slop_str.end(), query_info.slop); | ||
| if (result.ec != std::errc()) { | ||
| break; |
There was a problem hiding this comment.
Why not return Status::Error now?
| template <typename Derived> | ||
| class PhraseMatcherBase { | ||
| public: | ||
| bool matches(int32_t doc); |
There was a problem hiding this comment.
add comment for all interface
|
clang-tidy review says "All clean, LGTM! 👍" |
TPC-H: Total hot run time: 40132 ms |
TPC-DS: Total hot run time: 173071 ms |
ClickBench: Total hot run time: 30.57 s |
zzzxl1993
force-pushed
the
match_phrase_order
branch
from
83cff3b
to
22580d7
Compare
|
run buildall |
|
clang-tidy review says "All clean, LGTM! 👍" |
airborne12
reviewed
Jul 9, 2024
| return false; | ||
| } | ||
|
|
||
| bool OrderedSloppyPhraseMatcher::stretchToOrder(PostingsAndPosition* prev_posting) { |
There was a problem hiding this comment.
use consistent function name style here.
may be stretch_to_order is better
zzzxl1993
force-pushed
the
match_phrase_order
branch
from
22580d7
to
b883e3d
Compare
|
run buildall |
TPC-H: Total hot run time: 40252 ms |
TPC-DS: Total hot run time: 174752 ms |
ClickBench: Total hot run time: 30.14 s |
github-actions
bot
added
the
approved
|
PR approved by at least one committer and no changes requested. |
|
PR approved by anyone and no changes requested. |
qidaye
approved these changes
Jul 12, 2024
zzzxl1993
added a commit
to zzzxl1993/doris
that referenced
this pull request
Jul 14, 2024
…ery (apache#36356) 1. select count() from tbl where b match_phrase 'the brown ~2+';
This was referenced Jul 15, 2024
seawinde
pushed a commit
to seawinde/doris
that referenced
this pull request
Jul 17, 2024
…ery (apache#36356) 1. select count() from tbl where b match_phrase 'the brown ~2+';
dataroaring
pushed a commit
that referenced
this pull request
Jul 17, 2024
…ery (#36356) 1. select count() from tbl where b match_phrase 'the brown ~2+';
zzzxl1993
changed the title
xiaokang
added
dev/2.0.14-merged
dev/2.1.6-merged
and removed
dev/2.0.x
dev/2.1.x
doing
labels
mongo360
pushed a commit
to mongo360/doris
that referenced
this pull request
Aug 16, 2024
…uery (apache#37752) ## Proposed changes 1. select count() from tbl where b match_phrase 'the brown ~2+'; pick from apache#36356
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes