[feature](search) add variant subcolumn suppport for search function #56718
Conversation
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
|
run buildall |
Cloud UT Coverage ReportIncrement line coverage Increment coverage report
|
TPC-DS: Total hot run time: 189957 ms |
ClickBench: Total hot run time: 0.03 s |
BE UT Coverage ReportIncrement line coverage Increment coverage report
|
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
FE Regression Coverage ReportIncrement line coverage |
There was a problem hiding this comment.
Pull Request Overview
This PR adds support for variant subcolumn access in search functions, enabling search queries to target specific JSON paths within variant columns using dot notation (e.g., field.subcolumn). The feature extends the search DSL to handle variant data types with subcolumn paths, allowing more granular search capabilities on semi-structured data.
Key changes:
- Extended search grammar to support dot notation for variant subcolumn paths
- Modified field binding structures to handle variant subcolumn metadata
- Updated query processing to create ElementAt expressions for variant subcolumns
- Enhanced backend search evaluation to gracefully handle missing variant subcolumns
Reviewed Changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| regression-test/suites/variant_p0/test_variant_search_subcolumn.groovy | Test suite validating variant subcolumn search functionality |
| regression-test/data/variant_p0/test_variant_search_subcolumn.out | Expected test output for variant subcolumn search tests |
| gensrc/thrift/Exprs.thrift | Extended TSearchFieldBinding with variant subcolumn metadata fields |
| fe/fe-core/src/main/antlr4/org/apache/doris/nereids/search/SearchParser.g4 | Updated grammar to support field.subcolumn path syntax |
| fe/fe-core/src/main/antlr4/org/apache/doris/nereids/search/SearchLexer.g4 | Added DOT token for subcolumn path parsing |
| fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/SearchDslParser.java | Modified to parse field paths with dot notation |
| fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/SearchExpression.java | Updated to accept ElementAt expressions for variant subcolumns |
| fe/fe-core/src/main/java/org/apache/doris/nereids/rules/rewrite/RewriteSearchToSlots.java | Enhanced to create ElementAt expressions for variant subcolumn access |
| fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java | Repositioned search rewriting before variant subpath pruning |
| fe/fe-core/src/main/java/org/apache/doris/analysis/SearchPredicate.java | Added variant subcolumn metadata to thrift parameter building |
| be/src/vec/functions/function_search.h | Extended FieldReaderResolver with variant subcolumn detection |
| be/src/vec/functions/function_search.cpp | Enhanced query building to handle missing variant subcolumns gracefully |
| be/src/vec/exprs/vsearch.h | Added getter for search parameters |
| be/src/vec/exprs/vsearch.cpp | Updated search input collection to handle variant subcolumns |
| be/src/olap/rowset/segment_v2/segment_iterator.cpp | Modified to enable search expression evaluation without column-level indexes |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| if (ctx.fieldName() == null) { | ||
| throw new RuntimeException("Invalid field query: missing field name"); | ||
| if (ctx.fieldPath() == null) { | ||
| throw new RuntimeException("Invalid field query: missing field path"); |
There was a problem hiding this comment.
The error message should be more descriptive and specify what constitutes a valid field path.
Suggested change
| throw new RuntimeException("Invalid field query: missing field path"); | |
| throw new RuntimeException("Invalid field query: missing field path. A valid field path consists of one or more segments (e.g., field, field.subfield), where each segment is an identifier or a quoted string if it contains special characters."); |
Comment on lines
195
to
+199
| if (iterators.empty() || data_type_with_names.empty()) { | ||
| LOG(INFO) << "No indexed columns or iterators available, returning empty result"; | ||
| LOG(INFO) << "No indexed columns or iterators available, returning empty result, dsl:" | ||
| << search_param.original_dsl; | ||
| bitmap_result = InvertedIndexResultBitmap(std::make_shared<roaring::Roaring>(), | ||
| std::make_shared<roaring::Roaring>()); |
There was a problem hiding this comment.
The creation of an empty InvertedIndexResultBitmap is duplicated in multiple places. Consider extracting this into a helper function to reduce code duplication.
Comment on lines
+97
to
+100
| // Check if this is ElementAt expression (for variant subcolumn access) | ||
| if (child->expr_name() == "element_at" && child_index < field_bindings.size() && | ||
| field_bindings[child_index].__isset.is_variant_subcolumn && | ||
| field_bindings[child_index].is_variant_subcolumn) { |
There was a problem hiding this comment.
The hardcoded string 'element_at' should be defined as a constant to avoid magic strings and improve maintainability.
| } | ||
|
|
||
| private Slot findSlotByName(String fieldName, LogicalOlapScan scan) { | ||
| // Direct match only - variant subcolumns are handled by caller |
There was a problem hiding this comment.
The comment should explain why variant subcolumns are handled by the caller and provide a brief explanation of the handling mechanism.
Suggested change
| // Direct match only - variant subcolumns are handled by caller | |
| /* | |
| * This method performs a direct match for slot names only and does not attempt to resolve variant subcolumns. | |
| * Variant subcolumns (e.g., fields within complex or nested types) require special parsing and resolution logic, | |
| * which is handled by the caller prior to invoking this method. The caller is responsible for extracting the | |
| * appropriate subcolumn name from the field path and ensuring that the correct slot or sub-slot is passed here | |
| * for direct matching. This separation keeps this method simple and focused on direct slot lookup. | |
| */ |
|
PR approved by anyone and no changes requested. |
eldenmoon
reviewed
Oct 10, 2025
github-actions
bot
added
the
approved
|
PR approved by at least one committer and no changes requested. |
github-actions bot
pushed a commit
that referenced
this pull request
Oct 16, 2025
…56718) ### What problem does this PR solve? Issue Number: close #xxx Related PR: #56139 Problem Summary: This PR adds support for variant subcolumn access in search functions, enabling search queries to target specific JSON paths within variant columns using dot notation (e.g., field.subcolumn). The feature extends the search DSL to handle variant data types with subcolumn paths, allowing more granular search capabilities on semi-structured data. ``` SELECT * FROM test_variant_search_subcolumn WHERE search('variantColumn.subcolumn:textMatched'); ```
yiguolei
pushed a commit
that referenced
this pull request
Oct 17, 2025
…ch function #56718 (#57049) Cherry-picked from #56718 Co-authored-by: Jack <[email protected]>
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 #xxx
Related PR: #56139
Problem Summary:
This PR adds support for variant subcolumn access in search functions, enabling search queries to target specific JSON paths within variant columns using dot notation (e.g., field.subcolumn). The feature extends the search DSL to handle variant data types with subcolumn paths, allowing more granular search capabilities on semi-structured data.
Release note
None
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)