Skip to content

branch-4.0: [fix](search) Backport search() function improvements and bug fixes#61028

Merged
yiguolei merged 1 commit intoapache:branch-4.0from
airborne12:pick/branch-4.0/search-all
Mar 4, 2026
Merged

branch-4.0: [fix](search) Backport search() function improvements and bug fixes#61028
yiguolei merged 1 commit intoapache:branch-4.0from
airborne12:pick/branch-4.0/search-all

Conversation

@airborne12
Copy link
Member

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

    • Regression test
    • 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.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason
  • Behavior changed:

    • No.
    • Yes. New search() function features and bug fixes backported from master.
  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@airborne12 airborne12 requested a review from yiguolei as a code owner March 4, 2026 02:27
@hello-stephen
Copy link
Contributor

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@airborne12 airborne12 changed the title [fix](search) Backport search() function improvements and bug fixes branch-4.0: [fix](search) Backport search() function improvements and bug fixes Mar 4, 2026
@airborne12
Copy link
Member Author

run buildall

@hello-stephen
Copy link
Contributor

Cloud UT Coverage Report

Increment line coverage 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 79.14% (1787/2258)
Line Coverage 64.67% (31894/49318)
Region Coverage 65.49% (15956/24365)
Branch Coverage 56.05% (8490/15148)

…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
@airborne12 airborne12 force-pushed the pick/branch-4.0/search-all branch from 24ce49d to f18a2b3 Compare March 4, 2026 05:50
@airborne12
Copy link
Member Author

run buildall

@doris-robot
Copy link

Cloud UT Coverage Report

Increment line coverage 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 79.14% (1787/2258)
Line Coverage 64.67% (31896/49318)
Region Coverage 65.49% (15956/24365)
Branch Coverage 56.10% (8498/15148)

@hello-stephen
Copy link
Contributor

BE UT Coverage Report

Increment line coverage 26.91% (81/301) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 53.00% (19150/36132)
Line Coverage 36.18% (178299/492808)
Region Coverage 32.74% (138090/421753)
Branch Coverage 33.73% (60003/177869)

@yiguolei
Copy link
Contributor

yiguolei commented Mar 4, 2026

run p0

@yiguolei yiguolei merged commit 4db07d3 into apache:branch-4.0 Mar 4, 2026
24 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants