diff --git a/build.gradle b/build.gradle index cf62eff8..cb0165cf 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { opensearch_group = "org.opensearch" isSnapshot = "true" == System.getProperty("build.snapshot", "true") opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT") - opensearch_plugin_version = System.getProperty("bwc.version", "2.8.0.0") + opensearch_plugin_version = System.getProperty("bwc.version", "2.9.0.0") buildVersionQualifier = System.getProperty("build.version_qualifier", "") // 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT version_tokens = opensearch_version.tokenize('-') @@ -256,7 +256,7 @@ ext.getPluginResource = { download_to_folder, download_from_src -> } String baseName = "asynSearchCluster" -String bwcVersionShort = "2.8.0" +String bwcVersionShort = "2.9.0" String bwcVersion = bwcVersionShort + ".0" String bwcFilePath = "src/test/resources/org/opensearch/search/asynchronous/bwc/" String bwcRemoteFile = "https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/"+ bwcVersionShort + "/latest/linux/x64/tar/builds/opensearch/plugins/opensearch-asynchronous-search-"+ bwcVersion +".zip" @@ -266,7 +266,7 @@ getPluginResource(bwcFilePath + bwcVersion, bwcRemoteFile) testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = ["2.8.0",opensearch_version] + versions = ["2.9.0",opensearch_version] numberOfNodes = 3 plugin(provider(new Callable() { @Override diff --git a/release-notes/opensearch-asynchronous-search.release-notes-2.9.0.0.md b/release-notes/opensearch-asynchronous-search.release-notes-2.9.0.0.md new file mode 100644 index 00000000..ef061a05 --- /dev/null +++ b/release-notes/opensearch-asynchronous-search.release-notes-2.9.0.0.md @@ -0,0 +1,6 @@ +## Version 2.9.0.0 2023-07-18 + +Compatible with OpenSearch 2.9.0 + +### Maintenance +* Increment version to 2.9.0 ([300](https://github.com/opensearch-project/asynchronous-search/pull/300)) diff --git a/src/main/java/org/opensearch/search/asynchronous/response/AsynchronousSearchResponse.java b/src/main/java/org/opensearch/search/asynchronous/response/AsynchronousSearchResponse.java index 20810a26..c38e7253 100644 --- a/src/main/java/org/opensearch/search/asynchronous/response/AsynchronousSearchResponse.java +++ b/src/main/java/org/opensearch/search/asynchronous/response/AsynchronousSearchResponse.java @@ -5,7 +5,6 @@ package org.opensearch.search.asynchronous.response; -import org.opensearch.BaseExceptionsHelper; import org.opensearch.core.ParseField; import org.opensearch.core.xcontent.ToXContent; import org.opensearch.core.xcontent.XContentBuilder; @@ -124,7 +123,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws } if (error != null) { builder.startObject(ERROR.getPreferredName()); - BaseExceptionsHelper.generateThrowableXContent(builder, ToXContent.EMPTY_PARAMS, error); + OpenSearchException.generateThrowableXContent(builder, ToXContent.EMPTY_PARAMS, error); builder.endObject(); } builder.endObject(); @@ -207,7 +206,7 @@ private Map getErrorAsMap(OpenSearchException exception) throws BytesReference error; try (XContentBuilder builder = XContentFactory.contentBuilder(Requests.INDEX_CONTENT_TYPE)) { builder.startObject(); - BaseExceptionsHelper.generateThrowableXContent(builder, ToXContent.EMPTY_PARAMS, exception); + OpenSearchException.generateThrowableXContent(builder, ToXContent.EMPTY_PARAMS, exception); builder.endObject(); error = BytesReference.bytes(builder); return convertToMap(error, false, Requests.INDEX_CONTENT_TYPE).v2(); diff --git a/src/main/java/org/opensearch/search/asynchronous/transport/TransportSubmitAsynchronousSearchAction.java b/src/main/java/org/opensearch/search/asynchronous/transport/TransportSubmitAsynchronousSearchAction.java index 06151805..1e35d960 100644 --- a/src/main/java/org/opensearch/search/asynchronous/transport/TransportSubmitAsynchronousSearchAction.java +++ b/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(); diff --git a/src/test/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchRejectionIT.java b/src/test/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchRejectionIT.java index e2981c01..2a9c6506 100644 --- a/src/test/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchRejectionIT.java +++ b/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 exceptionRef = new AtomicReference<>(); Function responseFunction = (r) -> null; diff --git a/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchCancellationIT.java b/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchCancellationIT.java index 422d0b78..93c3be97 100644 --- a/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchCancellationIT.java +++ b/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchCancellationIT.java @@ -120,7 +120,7 @@ private void testCase(Client client, SearchRequest request, List exceptionRef = new AtomicReference<>(); CountDownLatch latch = new CountDownLatch(1); Function responseFunction = diff --git a/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchPartialResponseIT.java b/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchPartialResponseIT.java index aa91b909..deace270 100644 --- a/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchPartialResponseIT.java +++ b/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 exceptionRef = new AtomicReference<>(); CountDownLatch latch = new CountDownLatch(1); Function responseFunction = diff --git a/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListenerIT.java b/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListenerIT.java index 80ab11a4..48fba6fd 100644 --- a/src/test/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListenerIT.java +++ b/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 responseRef = new AtomicReference<>(); AtomicReference exceptionRef = new AtomicReference<>(); CountDownLatch latch = new CountDownLatch(1);