Skip to content

Commit e5b3fa3

Browse files
authored
Revert "Disable concurrent search for filter duplicates" (#20915)
Concurrent search creates a new aggregator per slice, so there is no concurrency problem here. The dedup logic is currently per-shard with no reduce logic at the coordinator, so concurrent search does change that to be per-slice, but does not fundamentally change the behavior. I'm reverting this and will deal with test flakiness if it continues. This reverts commit f46ce23. Signed-off-by: Andrew Ross <andrross@amazon.com>
1 parent e67f291 commit e5b3fa3

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3131
- Use env variable (OPENSEARCH_FIPS_MODE) to enable opensearch to run in FIPS enforced mode instead of checking for existence of bcFIPS jars ([#20625](https://github.com/opensearch-project/OpenSearch/pull/20625))
3232
- Update streaming flag to use search request context ([#20530](https://github.com/opensearch-project/OpenSearch/pull/20530))
3333
- Move pull-based ingestion classes from experimental to publicAPI ([#20704](https://github.com/opensearch-project/OpenSearch/pull/20704))
34-
- Disable concurrent search for filter duplicates in significant_text ([#20857](https://github.com/opensearch-project/OpenSearch/pull/20857))
3534

3635
### Fixed
3736
- Relax index template pattern overlap check to use minimum-string heuristic, allowing distinguishable multi-wildcard patterns at the same priority ([#20702](https://github.com/opensearch-project/OpenSearch/pull/20702))

server/src/main/java/org/opensearch/search/aggregations/bucket/terms/SignificantTextAggregatorFactory.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -315,9 +315,6 @@ public void close() {
315315

316316
@Override
317317
protected boolean supportsConcurrentSegmentSearch() {
318-
// The underlying structured used to find duplicate byte sequences (DuplicateByteSequenceSpotter)
319-
// is stateful and not thread-safe, so disable concurrent search if this particular feature is
320-
// being used.
321-
return filterDuplicateText == false;
318+
return true;
322319
}
323320
}

0 commit comments

Comments
 (0)