Merge b78e915 into b255fa2

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         distribution = 'oss-zip'
         opensearch_group = "org.opensearch"
         isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-        opensearch_version = System.getProperty("opensearch.version", "2.8.0-SNAPSHOT")
+        opensearch_version = System.getProperty("opensearch.version", "2.9.0-SNAPSHOT")
         opensearch_plugin_version = System.getProperty("bwc.version", "1.1.0.0")
         buildVersionQualifier = System.getProperty("build.version_qualifier", "")
         // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT

src/main/java/org/opensearch/search/asynchronous/transport/TransportSubmitAsynchronousSearchAction.java

@@ -72,7 +72,7 @@ protected void doExecute(Task task, SubmitAsynchronousSearchRequest request, Act
         try {
             final long relativeStartTimeInMillis = threadPool.relativeTimeInMillis();
             asynchronousSearchContext = asynchronousSearchService.createAndStoreContext(request, relativeStartTimeInMillis,
-                    () -> searchService.aggReduceContextBuilder(request.getSearchRequest()), user);
+                    () -> searchService.aggReduceContextBuilder(request.getSearchRequest().source()), user);
             assert asynchronousSearchContext.getAsynchronousSearchProgressListener() != null
                     : "missing progress listener for an active context";
             AsynchronousSearchProgressListener progressListener = asynchronousSearchContext.getAsynchronousSearchProgressListener();

src/test/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchRejectionIT.java

@@ -189,7 +189,7 @@ public void testSearchFailures() throws Exception {
                 AtomicInteger reduceContextInvocation = new AtomicInteger();
                 AsynchronousSearchProgressListener listener;
                 SearchService service = internalCluster().getInstance(SearchService.class);
-                InternalAggregation.ReduceContextBuilder reduceContextBuilder = service.aggReduceContextBuilder(request);
+                InternalAggregation.ReduceContextBuilder reduceContextBuilder = service.aggReduceContextBuilder(request.source());
                 AtomicReference<Exception> exceptionRef = new AtomicReference<>();
                 Function<SearchResponse, AsynchronousSearchResponse> responseFunction =
                         (r) -> null;

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchCancellationIT.java

@@ -120,7 +120,7 @@ private void testCase(Client client, SearchRequest request, List<ScriptedBlockPl
         try {
             threadPool = new TestThreadPool(AsynchronousSearchProgressListenerIT.class.getName());
             SearchService service = internalCluster().getInstance(SearchService.class);
-            InternalAggregation.ReduceContextBuilder reduceContextBuilder = service.aggReduceContextBuilder(request);
+            InternalAggregation.ReduceContextBuilder reduceContextBuilder = service.aggReduceContextBuilder(request.source());
             AtomicReference<Exception> exceptionRef = new AtomicReference<>();
             CountDownLatch latch = new CountDownLatch(1);
             Function<SearchResponse, AsynchronousSearchResponse> responseFunction =

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchPartialResponseIT.java

@@ -119,7 +119,7 @@ private void testCase(Client client, SearchRequest request) throws Exception {
         try {
             threadPool = new TestThreadPool(AsynchronousSearchProgressListenerIT.class.getName());
             SearchService service = internalCluster().getInstance(SearchService.class);
-            InternalAggregation.ReduceContextBuilder reduceContextBuilder = service.aggReduceContextBuilder(request);
+            InternalAggregation.ReduceContextBuilder reduceContextBuilder = service.aggReduceContextBuilder(request.source());
             AtomicReference<Exception> exceptionRef = new AtomicReference<>();
             CountDownLatch latch = new CountDownLatch(1);
             Function<SearchResponse, AsynchronousSearchResponse> responseFunction =

src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListenerIT.java

@@ -138,7 +138,7 @@ private void testCase(NodeClient client, SearchRequest request) throws Interrupt
         try {
             threadPool = new TestThreadPool(AsynchronousSearchProgressListenerIT.class.getName());
             SearchService service = getInstanceFromNode(SearchService.class);
-            InternalAggregation.ReduceContextBuilder reduceContextBuilder = service.aggReduceContextBuilder(request);
+            InternalAggregation.ReduceContextBuilder reduceContextBuilder = service.aggReduceContextBuilder(request.source());
             AtomicReference<SearchResponse> responseRef = new AtomicReference<>();
             AtomicReference<Exception> exceptionRef = new AtomicReference<>();
             CountDownLatch latch = new CountDownLatch(1);

src/test/java/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementServiceTests.java

@@ -8,7 +8,6 @@
 import org.opensearch.search.asynchronous.service.AsynchronousSearchPersistenceService;
 import org.opensearch.search.asynchronous.response.AcknowledgedResponse;
 import org.opensearch.search.asynchronous.service.AsynchronousSearchService;
-import com.carrotsearch.hppc.cursors.ObjectCursor;
 import org.opensearch.OpenSearchException;
 import org.opensearch.Version;
 import org.opensearch.cluster.ClusterChangedEvent;
@@ -197,8 +196,8 @@ private static IndexMetadata createIndexMetadata(final Index index, final long v
     // Create the routing table for a cluster state.
     private static RoutingTable createRoutingTable(final long version, final Metadata metadata) {
         final RoutingTable.Builder builder = RoutingTable.builder().version(version);
-        for (ObjectCursor<IndexMetadata> cursor : metadata.indices().values()) {
-            builder.addAsNew(cursor.value);
+        for (IndexMetadata cursor : metadata.indices().values()) {
+            builder.addAsNew(cursor);
         }
         return builder.build();
     }