You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@solr.apache.org by "ercsonusharma (via GitHub)" <gi...@apache.org> on 2026/05/29 17:25:34 UTC
[PR] SOLR-18271: QueryElevation support for Combined Query feature [solr]
ercsonusharma opened a new pull request, #4476:
URL: https://github.com/apache/solr/pull/4476
https://issues.apache.org/jira/browse/SOLR-18271
<!--
_(If you are a project committer then you may remove some/all of the following template.)_
Before creating a pull request, please file an issue in the ASF Jira system for Solr:
* https://issues.apache.org/jira/projects/SOLR
For something minor (i.e. that wouldn't be worth putting in release notes), you can skip JIRA.
To create a Jira issue, you will need to create an account there first.
The title of the PR should reference the Jira issue number in the form:
* SOLR-####: <short description of problem or changes>
SOLR must be fully capitalized. A short description helps people scanning pull requests for items they can work on.
Properly referencing the issue in the title ensures that Jira is correctly updated with code review comments and commits. -->
# Description
Adds QueryElevationComponent support to the Combined Query feature, so that elevated docIds (via elevateIds / configured elevations) are honored when results from multiple subqueries are combined and merged across shards.
# Solution
QueryElevationComponent.prepare now detects when it is operating on a CombinedQueryResponseBuilder and dispatches to a new prepareCombined path. That path runs the existing elevation preparation on each subquery's ResponseBuilder, then mirrors the resulting SortSpec and filters from a representative subquery onto the parent crb. This lets `CombinedQueryComponent#mergeIds` read the `_elevate_` marker from each shard's `sort_values_i` during distributed merge, preserving elevation order across the combined result set.
Supporting changes:
- `CombinedQueryComponent#prepare` now propagates the debug flag `(rbNew.setDebug(rb.isDebug()))` to subquery response builders so debug info flows through.
- When debug is on, per-subquery queryBoosting debug entries are aggregated and re-attached to the parent crb under the same key.
- `solrconfig-combined-query.xml` (test config) adds a `/search-elevate` handler wired with the elevator (QueryElevationComponent) as a last-component, using elevate.xml.
# Tests
Added two new tests as described below:
- `CombinedQuerySolrCloudTest#testElevatedQueriesWithFacetAndHighlights` - new SolrCloud integration test that issues a combined JSON query with two lexical subqueries plus elevateIds, faceting, and highlighting. Verifies elevated ids appear first in the expected order, and that facet counts and highlight snippets are still correct alongside elevation.
- `DistributedCombinedQueryComponentTest#testElevatedQueriesWithFacetAndHighlights` - new distributed test that passes lucene subqueries with elevateIds and debug=true. Verifies elevated order, facets, highlights, and that the merged debug response contains a queryBoosting entry with one element per subquery.
# Checklist
Please review the following and check all that apply:
- [x] I have reviewed the guidelines for [How to Contribute](https://github.com/apache/solr/blob/main/CONTRIBUTING.md) and my code conforms to the standards described there to the best of my ability.
- [x] I have created a Jira issue and added the issue ID to my pull request title.
- [x] I have given Solr maintainers [access](https://help.github.com/en/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork) to contribute to my PR branch. (optional but recommended, not available for branches on forks living under an organisation)
- [x] I have developed this patch against the `main` branch.
- [x] I have run `./gradlew check`.
- [x] I have added tests for my changes.
- [ ] I have added documentation for the [Reference Guide](https://github.com/apache/solr/tree/main/solr/solr-ref-guide)
- [x] I have added a [changelog entry](https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc) for my change
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-18271: QueryElevation support for Combined Query feature [solr]
Posted by "ercsonusharma (via GitHub)" <gi...@apache.org>.
ercsonusharma commented on PR #4476:
URL: https://github.com/apache/solr/pull/4476#issuecomment-4627259111
Thank you for the review, @dsmiley
When you have a chance, Could you also please help with the merge and backport ([This PR](https://github.com/apache/solr/pull/4497) should have been backported first (?)) ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-18271: QueryElevation support for Combined Query feature [solr]
Posted by "ercsonusharma (via GitHub)" <gi...@apache.org>.
ercsonusharma commented on PR #4476:
URL: https://github.com/apache/solr/pull/4476#issuecomment-4677050827
@dsmiley Could you please help backport this to branch_9x as well? Thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-18271: QueryElevation support for Combined Query feature [solr]
Posted by "ercsonusharma (via GitHub)" <gi...@apache.org>.
ercsonusharma commented on PR #4476:
URL: https://github.com/apache/solr/pull/4476#issuecomment-4585913061
Hi David, when you get a chance, could you please take a look at this PR? Your continued feedback in this context would be much appreciated. Thanks! @dsmiley
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-18271: QueryElevation support for Combined Query feature [solr]
Posted by "ercsonusharma (via GitHub)" <gi...@apache.org>.
ercsonusharma commented on PR #4476:
URL: https://github.com/apache/solr/pull/4476#issuecomment-4644900982
@dsmiley Thank you for merging this. Would you mind also helping with the backports to the 10_x and 9_x branches when convenient?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-18271: QueryElevation support for Combined Query feature [solr]
Posted by "ercsonusharma (via GitHub)" <gi...@apache.org>.
ercsonusharma commented on code in PR #4476:
URL: https://github.com/apache/solr/pull/4476#discussion_r3353548513
##########
solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java:
##########
@@ -488,6 +489,45 @@ public void prepare(ResponseBuilder rb) throws IOException {
return;
}
+ if (rb instanceof CombinedQueryResponseBuilder crb) {
+ prepareCombined(crb);
+ } else {
+ prepareElevationComponent(rb);
+ }
+ }
+
+ /**
+ * Elevates each subquery and mirrors the resulting SortSpec/filters onto the parent crb so {@link
+ * CombinedQueryComponent#mergeIds} can read {@code _elevate_} from each shard's {@code
+ * sort_values_i} during distributed merge.
+ */
+ private void prepareCombined(CombinedQueryResponseBuilder crb) throws IOException {
+ if (crb.responseBuilders.isEmpty()) {
+ return;
+ }
+ for (ResponseBuilder thisRb : crb.responseBuilders) {
+ prepareElevationComponent(thisRb);
+ }
+ // Subqueries get identical elevation treatment, so any one is representative.
+ ResponseBuilder representative = crb.responseBuilders.getFirst();
+ crb.setSortSpec(representative.getSortSpec());
+ crb.setFilters(representative.getFilters());
+
+ if (crb.isDebug() && crb.isDebugQuery()) {
Review Comment:
Debug handling was already part of this component [here](https://github.com/apache/solr/blob/main/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java#L498). All this block does is pick up the entry this very component wrote on each sub-rb and roll it onto the parent rb so the combined response shows it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-18271: QueryElevation support for Combined Query feature [solr]
Posted by "dsmiley (via GitHub)" <gi...@apache.org>.
dsmiley commented on code in PR #4476:
URL: https://github.com/apache/solr/pull/4476#discussion_r3353316277
##########
solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java:
##########
@@ -488,6 +489,45 @@ public void prepare(ResponseBuilder rb) throws IOException {
return;
}
+ if (rb instanceof CombinedQueryResponseBuilder crb) {
+ prepareCombined(crb);
+ } else {
+ prepareElevationComponent(rb);
+ }
+ }
+
+ /**
+ * Elevates each subquery and mirrors the resulting SortSpec/filters onto the parent crb so {@link
+ * CombinedQueryComponent#mergeIds} can read {@code _elevate_} from each shard's {@code
+ * sort_values_i} during distributed merge.
+ */
+ private void prepareCombined(CombinedQueryResponseBuilder crb) throws IOException {
+ if (crb.responseBuilders.isEmpty()) {
+ return;
+ }
+ for (ResponseBuilder thisRb : crb.responseBuilders) {
+ prepareElevationComponent(thisRb);
+ }
+ // Subqueries get identical elevation treatment, so any one is representative.
+ ResponseBuilder representative = crb.responseBuilders.getFirst();
+ crb.setSortSpec(representative.getSortSpec());
+ crb.setFilters(representative.getFilters());
+
+ if (crb.isDebug() && crb.isDebugQuery()) {
Review Comment:
okay but does that belong _here_? This isn't the DebugComponent
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org
Re: [PR] SOLR-18271: QueryElevation support for Combined Query feature [solr]
Posted by "dsmiley (via GitHub)" <gi...@apache.org>.
dsmiley merged PR #4476:
URL: https://github.com/apache/solr/pull/4476
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org