From d4385831567432d1252e4919428036a9cc2605e7 Mon Sep 17 00:00:00 2001 From: Harsha Vamsi Kalluri Date: Mon, 19 Aug 2024 17:15:30 -0700 Subject: [PATCH] Added new ApproximateableQuery Signed-off-by: Harsha Vamsi Kalluri --- CHANGELOG.md | 1 + .../org/opensearch/search/internal/ContextIndexSearcher.java | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1030f79279330..492f6e2bd981c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Add took time to request nodes stats ([#15054](https://github.com/opensearch-project/OpenSearch/pull/15054)) - [Workload Management] QueryGroup resource tracking framework changes ([#13897](https://github.com/opensearch-project/OpenSearch/pull/13897)) - Add slice execution listeners to SearchOperationListener interface ([#15153](https://github.com/opensearch-project/OpenSearch/pull/15153)) +- [Range Queries] Add new approximateable query framework to short-circuit range queries ([#13788](https://github.com/opensearch-project/OpenSearch/pull/13788)) ### Dependencies - Bump `netty` from 4.1.111.Final to 4.1.112.Final ([#15081](https://github.com/opensearch-project/OpenSearch/pull/15081)) diff --git a/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java index ce749e0c9d356..023cdd8320a1f 100644 --- a/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java +++ b/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java @@ -292,12 +292,7 @@ protected void search(List leaves, Weight weight, Collector c searchContext.indexShard().getSearchOperationListener().onFailedSliceExecution(searchContext); throw t; } -<<<<<<< HEAD - - searchContext.bucketCollectorProcessor().processPostCollection(collector); -======= searchContext.indexShard().getSearchOperationListener().onSliceExecution(searchContext); ->>>>>>> 978d14e867c (Add slice level operation listener methods (#15153)) } /**