[fix](search) fix MATCH_ALL_DOCS losing occur attribute in multi-field expansion#60873
Merged
airborne12 merged 1 commit intoapache:masterfrom Feb 27, 2026
Merged
[fix](search) fix MATCH_ALL_DOCS losing occur attribute in multi-field expansion#60873airborne12 merged 1 commit intoapache:masterfrom
airborne12 merged 1 commit intoapache:masterfrom
Conversation
…field expansion In lucene mode with multi-field queries like '"phrase" OR *', the standalone wildcard '*' is parsed as MATCH_ALL_DOCS with occur=SHOULD. However, during the cross-field expansion (expandNodeCrossFields, deepCopyWithField, setFieldOnLeaves), new MATCH_ALL_DOCS nodes were created without preserving the occur attribute. This caused the BE to default to MUST, changing the query semantics from "phrase OR match_all = all docs" to "phrase AND match_all = only phrase matches", producing results inconsistent with ES. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Member
Author
|
run buildall |
TPC-H: Total hot run time: 28527 ms |
TPC-DS: Total hot run time: 183734 ms |
zclllyybb
approved these changes
Feb 27, 2026
Contributor
|
PR approved by at least one committer and no changes requested. |
github-actions
bot
added
the
approved
Contributor
|
PR approved by anyone and no changes requested. |
airborne12
added a commit
to airborne12/apache-doris
that referenced
this pull request
Mar 3, 2026
…d expansion (apache#60873) ### What problem does this PR solve? Issue Number: close #DORIS-24561 Problem Summary: In lucene mode with multi-field queries (e.g., `best_fields` with `fields: ["title", "content"]`), the query `"Lauren Boebert" OR *` returns results inconsistent with Elasticsearch. **Root cause:** During multi-field expansion (`expandNodeCrossFields`, `deepCopyWithField`, `setFieldOnLeaves`), `MATCH_ALL_DOCS` nodes are recreated without preserving the `occur` attribute (e.g., `SHOULD`). The BE defaults `occur=null` to `MUST`, changing the query semantics: - **Expected (ES behavior):** `SHOULD(phrase) OR SHOULD(match_all)` = all documents - **Actual (bug):** `SHOULD(phrase) AND MUST(match_all)` = only phrase-matching documents **ES explain** for `"Lauren Boebert" OR *`: ``` (title:"lauren boebert" | content:"lauren boebert") (ConstantScore(FieldExistsQuery [field=content]) | ConstantScore(FieldExistsQuery [field=title])) ``` Returns 1,000,000 docs (all). Doris was returning only phrase-matching docs. **Fix:** Preserve the `occur` attribute when creating new `MATCH_ALL_DOCS` nodes in all three multi-field expansion methods.
airborne12
added a commit
to airborne12/apache-doris
that referenced
this pull request
Mar 4, 2026
…o branch-4.0 Squashed backport of the following master PRs: - apache#59747 [fix](search) Make AND/OR/NOT operators case-sensitive in search DSL - apache#60654 [refactor](search) Refactor SearchDslParser to single-phase ANTLR parsing and fix ES compatibility issues - apache#60782 [fix](search) Upgrade query type for variant subcolumns with analyzer-based indexes - apache#60784 [fix](search) Fix MATCH_ALL_DOCS query failing in multi-field search mode - apache#60786 [feat](search) Support field-grouped query syntax field:(term1 OR term2) - apache#60790 [fix](search) Add searcher cache reuse and DSL result cache for search() function - apache#60793 [fix](search) Fix wildcard query on variant subcolumns returning empty results - apache#60798 [fix](search) Use FE-provided analyzer key for multi-index columns in search() - apache#60814 [fix](search) Fix implicit conjunction incorrectly modifying preceding term in lucene mode - apache#60834 [test](search) Add regression test for wildcard query on variant subcolumns with multi-index - apache#60873 [fix](search) fix MATCH_ALL_DOCS losing occur attribute in multi-field expansion - apache#60891 [fix](search) inject MATCH_ALL_DOCS for multi-MUST_NOT queries in lucene mode
16 tasks
airborne12
added a commit
to airborne12/apache-doris
that referenced
this pull request
Mar 4, 2026
…o branch-4.0 Squashed backport of the following master PRs: - apache#59747 [fix](search) Make AND/OR/NOT operators case-sensitive in search DSL - apache#60654 [refactor](search) Refactor SearchDslParser to single-phase ANTLR parsing and fix ES compatibility issues - apache#60782 [fix](search) Upgrade query type for variant subcolumns with analyzer-based indexes - apache#60784 [fix](search) Fix MATCH_ALL_DOCS query failing in multi-field search mode - apache#60786 [feat](search) Support field-grouped query syntax field:(term1 OR term2) - apache#60790 [fix](search) Add searcher cache reuse and DSL result cache for search() function - apache#60793 [fix](search) Fix wildcard query on variant subcolumns returning empty results - apache#60798 [fix](search) Use FE-provided analyzer key for multi-index columns in search() - apache#60814 [fix](search) Fix implicit conjunction incorrectly modifying preceding term in lucene mode - apache#60834 [test](search) Add regression test for wildcard query on variant subcolumns with multi-index - apache#60873 [fix](search) fix MATCH_ALL_DOCS losing occur attribute in multi-field expansion - apache#60891 [fix](search) inject MATCH_ALL_DOCS for multi-MUST_NOT queries in lucene mode
yiguolei
pushed a commit
that referenced
this pull request
Mar 4, 2026
… bug fixes (#61028) ### What problem does this PR solve? Squashed backport of all search() function improvements and bug fixes from master to branch-4.0. This PR combines the following master PRs into a single backport: | Master PR | Type | Description | |-----------|------|-------------| | #59747 | fix | Make AND/OR/NOT operators case-sensitive in search DSL | | #60654 | refactor | Refactor SearchDslParser to single-phase ANTLR parsing and fix ES compatibility issues | | #60782 | fix | Upgrade query type for variant subcolumns with analyzer-based indexes | | #60784 | fix | Fix MATCH_ALL_DOCS query failing in multi-field search mode | | #60786 | feat | Support field-grouped query syntax field:(term1 OR term2) | | #60790 | fix | Add searcher cache reuse and DSL result cache for search() function | | #60793 | fix | Fix wildcard query on variant subcolumns returning empty results | | #60798 | fix | Use FE-provided analyzer key for multi-index columns in search() | | #60814 | fix | Fix implicit conjunction incorrectly modifying preceding term in lucene mode | | #60834 | test | Add regression test for wildcard query on variant subcolumns with multi-index | | #60873 | fix | fix MATCH_ALL_DOCS losing occur attribute in multi-field expansion | | #60891 | fix | inject MATCH_ALL_DOCS for multi-MUST_NOT queries in lucene mode | ### Release note Backport search() function improvements including DSL parser refactoring, multi-field search fixes, variant subcolumn support, query caching, and field-grouped query syntax. ### Check List (For Author) - Test - [x] Regression test - [x] Unit Test - [ ] Manual test (add detailed scripts or steps below) - [ ] No need to test or manual test. Explain why: - [ ] This is a refactor/code format and no logic has been changed. - [x] Previous test can cover this change. - [ ] No code files have been changed. - [ ] Other reason - Behavior changed: - [ ] No. - [x] Yes. New search() function features and bug fixes backported from master. - Does this need documentation? - [x] No. - [ ] Yes. ### Check List (For Reviewer who merge this PR) - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
What problem does this PR solve?
Issue Number: close #DORIS-24561
Problem Summary:
In lucene mode with multi-field queries (e.g.,
best_fieldswithfields: ["title", "content"]), the query"Lauren Boebert" OR *returns results inconsistent with Elasticsearch.Root cause: During multi-field expansion (
expandNodeCrossFields,deepCopyWithField,setFieldOnLeaves),MATCH_ALL_DOCSnodes are recreated without preserving theoccurattribute (e.g.,SHOULD). The BE defaultsoccur=nulltoMUST, changing the query semantics:SHOULD(phrase) OR SHOULD(match_all)= all documentsSHOULD(phrase) AND MUST(match_all)= only phrase-matching documentsES explain for
"Lauren Boebert" OR *:Returns 1,000,000 docs (all). Doris was returning only phrase-matching docs.
Fix: Preserve the
occurattribute when creating newMATCH_ALL_DOCSnodes in all three multi-field expansion methods.Release note
Fix search() function returning incorrect results for lucene mode queries containing standalone wildcard
*with multi-field expansion (e.g.,"phrase" OR *withbest_fields).Check List (For Author)
Test
Behavior changed:
*(MATCH_ALL_DOCS) now correctly preserve theoccurattribute during cross-field expansion, matching ES behavior.Does this need documentation?
Check List (For Reviewer who merge this PR)