Skip to content

[Hybrid Query] Gate collapse distinct-groups collection behind an opt-in index setting #1956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ystk-hsn wants to merge 5 commits into
base: main
Choose a base branch
from
+2,307 −37
Open

[Hybrid Query] Gate collapse distinct-groups collection behind an opt-in index setting #1956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a840bb8
Fix hybrid collapse dropping valid groups when one group owns multipl…
Ystk-hsn Aug 20, 2026
728ef05
Deep-copy BytesRef collapse values on output
Ystk-hsn Aug 20, 2026
d43f6c4
Gate hybrid collapse distinct-groups collection behind an opt-in inde…
Ystk-hsn Sep 4, 2026
5ff02f0
Elect collapse group representatives independently of sub-queries
Ystk-hsn Sep 5, 2026
bc1a0ac
Update stale test comments referencing the replaced per-leg election
Ystk-hsn Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

### Bug Fixes
* [Neural Query] Expose embedded filters to `QueryBuilderVisitor` traversal ([#1992](https://github.com/opensearch-project/neural-search/pull/1992))
* [Hybrid Query] Add opt-in index setting `index.neural_search.hybrid_collapse_distinct_groups_enabled` to make collapse return top-`size` distinct groups instead of deduplicated top-`size` documents ([#1947](https://github.com/opensearch-project/neural-search/issues/1947))
* [Hybrid Query] Fix NoSuchElementException in hybrid query with sort/search_after when a shard returns no results ([#1939](https://github.com/opensearch-project/neural-search/pull/1939))
* [SemanticHighlighter] Fix SemanticHighlighterExtBuilder.toXContent ([#1906](https://github.com/opensearch-project/neural-search/issues/1906)) (query-insights [#651](https://github.com/opensearch-project/query-insights/issues/651))
* [Sparse ANN] Fold sparse vector tokens into the signed-short range (modulus 32768) so folded tokens are never sign-extended to a negative value when stored in short[] ([#1926](https://github.com/opensearch-project/neural-search/pull/1926))
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/opensearch/neuralsearch/plugin/NeuralSearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package org.opensearch.neuralsearch.plugin;

import static org.opensearch.neuralsearch.highlight.SemanticHighlightingConstants.HIGHLIGHTER_TYPE;
import static org.opensearch.neuralsearch.settings.NeuralSearchSettings.HYBRID_COLLAPSE_DISTINCT_GROUPS_ENABLED;
import static org.opensearch.neuralsearch.settings.NeuralSearchSettings.HYBRID_COLLAPSE_DOCS_PER_GROUP_PER_SUBQUERY;
import static org.opensearch.neuralsearch.settings.NeuralSearchSettings.RERANKER_MAX_DOC_FIELDS;
import static org.opensearch.neuralsearch.settings.NeuralSearchSettings.NEURAL_STATS_ENABLED;
Expand Down Expand Up @@ -376,6 +377,7 @@ public List<Setting<?>> getSettings() {
NEURAL_STATS_ENABLED,
SEMANTIC_INGEST_BATCH_SIZE,
HYBRID_COLLAPSE_DOCS_PER_GROUP_PER_SUBQUERY,
HYBRID_COLLAPSE_DISTINCT_GROUPS_ENABLED,
SparseSettings.IS_SPARSE_INDEX_SETTING,
NeuralSearchSettings.SPARSE_ALGO_PARAM_INDEX_THREAD_QTY_SETTING,
NEURAL_CIRCUIT_BREAKER_LIMIT,
Expand Down
Loading
Loading