diff --git a/.github/workflows/integ-tests-with-security.yml b/.github/workflows/integ-tests-with-security.yml index 8d55571b91..d02cbc1b25 100644 --- a/.github/workflows/integ-tests-with-security.yml +++ b/.github/workflows/integ-tests-with-security.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - java: [21] + java: [21, 23] runs-on: ubuntu-latest container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution @@ -62,7 +62,7 @@ jobs: fail-fast: false matrix: os: [ windows-latest, macos-13 ] - java: [21] + java: [21, 23] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/sql-pitest.yml b/.github/workflows/sql-pitest.yml index fed98e4926..15f7f198fd 100644 --- a/.github/workflows/sql-pitest.yml +++ b/.github/workflows/sql-pitest.yml @@ -22,6 +22,7 @@ jobs: matrix: java: - 21 + - 23 runs-on: ubuntu-latest container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index 010590a021..664f091106 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -29,7 +29,7 @@ jobs: # Run all jobs fail-fast: false matrix: - java: [21] + java: [21, 23] runs-on: ubuntu-latest container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution @@ -101,7 +101,9 @@ jobs: matrix: entry: - { os: windows-latest, java: 21, os_build_args: -x doctest -PbuildPlatform=windows } + - { os: windows-latest, java: 23, os_build_args: -x doctest -PbuildPlatform=windows } - { os: macos-13, java: 21 } + - { os: macos-13, java: 23 } runs-on: ${{ matrix.entry.os }} steps: @@ -161,7 +163,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [21] + java: [21, 23] container: image: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-version-linux }} options: ${{ needs.Get-CI-Image-Tag.outputs.ci-image-start-options }} diff --git a/.github/workflows/sql-test-workflow.yml b/.github/workflows/sql-test-workflow.yml index 9cbec80037..c34c87c2e5 100644 --- a/.github/workflows/sql-test-workflow.yml +++ b/.github/workflows/sql-test-workflow.yml @@ -22,6 +22,7 @@ jobs: matrix: java: - 21 + - 23 runs-on: ubuntu-latest container: # using the same image which is used by opensearch-build team to build the OpenSearch Distribution diff --git a/async-query-core/build.gradle b/async-query-core/build.gradle index 02a63afae4..1856f1a552 100644 --- a/async-query-core/build.gradle +++ b/async-query-core/build.gradle @@ -9,7 +9,7 @@ plugins { id 'jacoco' id 'antlr' id 'com.diffplug.spotless' version '6.22.0' - id 'com.github.johnrengelman.shadow' + id 'com.gradleup.shadow' } repositories { @@ -148,4 +148,4 @@ shadowJar { from sourceSets.main.output configurations = [project.configurations.runtimeClasspath] -} \ No newline at end of file +} diff --git a/async-query/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java b/async-query/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java index 52c829318a..4820d658d8 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/cluster/ClusterManagerEventListener.java @@ -12,7 +12,6 @@ import java.time.Duration; import java.util.Arrays; import java.util.List; -import org.opensearch.client.Client; import org.opensearch.cluster.LocalNodeClusterManagerListener; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.lifecycle.LifecycleListener; @@ -25,6 +24,7 @@ import org.opensearch.sql.spark.flint.operation.FlintIndexOpFactory; import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; public class ClusterManagerEventListener implements LocalNodeClusterManagerListener { diff --git a/async-query/src/main/java/org/opensearch/sql/spark/cluster/IndexCleanup.java b/async-query/src/main/java/org/opensearch/sql/spark/cluster/IndexCleanup.java index 562f12b69e..7a935dcf5a 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/cluster/IndexCleanup.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/cluster/IndexCleanup.java @@ -8,13 +8,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.support.IndicesOptions; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.core.action.ActionListener; import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.reindex.DeleteByQueryAction; import org.opensearch.index.reindex.DeleteByQueryRequest; +import org.opensearch.transport.client.Client; /** Clean up the old docs for indices. */ public class IndexCleanup { diff --git a/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/StateStore.java b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/StateStore.java index 552c646cbe..19aac03a1d 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/StateStore.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/execution/statestore/StateStore.java @@ -30,7 +30,6 @@ import org.opensearch.action.support.WriteRequest; import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.action.ActionFuture; import org.opensearch.common.util.concurrent.ThreadContext; @@ -60,6 +59,7 @@ import org.opensearch.sql.spark.execution.xcontent.XContentSerializerUtil; import org.opensearch.sql.spark.flint.FlintIndexState; import org.opensearch.sql.spark.flint.FlintIndexStateModel; +import org.opensearch.transport.client.Client; /** * State Store maintain the state of Session and Statement. State State create/update/get doc on @@ -260,7 +260,7 @@ public long count(String indexName, QueryBuilder query) { throw new RuntimeException( "Fetching job metadata information failed with status : " + searchResponse.status()); } else { - return searchResponse.getHits().getTotalHits().value; + return searchResponse.getHits().getTotalHits().value(); } } diff --git a/async-query/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImpl.java b/async-query/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImpl.java index 38789dd796..b4a1a41c54 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImpl.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImpl.java @@ -22,9 +22,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse; -import org.opensearch.client.Client; import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext; import org.opensearch.sql.spark.dispatcher.model.FlintIndexOptions; +import org.opensearch.transport.client.Client; /** Implementation of {@link FlintIndexMetadataService} */ @AllArgsConstructor diff --git a/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClient.java b/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClient.java index 7a655f0678..c8181e4ba8 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClient.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClient.java @@ -9,8 +9,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.admin.indices.delete.DeleteIndexRequest; -import org.opensearch.action.support.master.AcknowledgedResponse; -import org.opensearch.client.Client; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; +import org.opensearch.transport.client.Client; @RequiredArgsConstructor public class OpenSearchFlintIndexClient implements FlintIndexClient { diff --git a/async-query/src/main/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReader.java b/async-query/src/main/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReader.java index c969a3a6dc..8e83480877 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReader.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReader.java @@ -14,7 +14,6 @@ import org.json.JSONObject; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.action.ActionFuture; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.query.QueryBuilder; @@ -23,6 +22,7 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata; import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext; +import org.opensearch.transport.client.Client; /** JobExecutionResponseReader implementation for reading response from OpenSearch index. */ public class OpenSearchJobExecutionResponseReader implements JobExecutionResponseReader { diff --git a/async-query/src/main/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementAction.java b/async-query/src/main/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementAction.java index c188cf693f..714fc47a1c 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementAction.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementAction.java @@ -20,7 +20,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.OpenSearchException; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.rest.BaseRestHandler; @@ -48,6 +47,7 @@ import org.opensearch.sql.spark.transport.model.CreateAsyncQueryActionResponse; import org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionRequest; import org.opensearch.sql.spark.transport.model.GetAsyncQueryResultActionResponse; +import org.opensearch.transport.client.node.NodeClient; @RequiredArgsConstructor public class RestAsyncQueryManagementAction extends BaseRestHandler { diff --git a/async-query/src/main/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQueryScheduler.java b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQueryScheduler.java index 59bad14320..bb10721a6b 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQueryScheduler.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQueryScheduler.java @@ -28,7 +28,6 @@ import org.opensearch.action.support.WriteRequest; import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.action.ActionFuture; import org.opensearch.common.xcontent.XContentType; @@ -40,6 +39,7 @@ import org.opensearch.sql.spark.scheduler.job.ScheduledAsyncQueryJobRunner; import org.opensearch.sql.spark.scheduler.model.AsyncQuerySchedulerRequest; import org.opensearch.sql.spark.scheduler.model.ScheduledAsyncQueryJobRequest; +import org.opensearch.transport.client.Client; /** Scheduler class for managing asynchronous query jobs. */ @RequiredArgsConstructor diff --git a/async-query/src/main/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunner.java b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunner.java index a2abb8e944..feacb61539 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunner.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunner.java @@ -7,7 +7,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.jobscheduler.spi.JobExecutionContext; import org.opensearch.jobscheduler.spi.ScheduledJobParameter; @@ -20,6 +19,7 @@ import org.opensearch.sql.spark.rest.model.CreateAsyncQueryResponse; import org.opensearch.sql.spark.scheduler.model.ScheduledAsyncQueryJobRequest; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; /** * The job runner class for scheduling async query. @@ -27,7 +27,7 @@ *

The job runner should be a singleton class if it uses OpenSearch client or other objects * passed from OpenSearch. Because when registering the job runner to JobScheduler plugin, * OpenSearch has not invoked plugins' createComponents() method. That is saying the plugin is not - * completely initialized, and the OpenSearch {@link org.opensearch.client.Client}, {@link + * completely initialized, and the OpenSearch {@link org.opensearch.transport.client.Client}, {@link * ClusterService} and other objects are not available to plugin and this job runner. * *

So we have to move this job runner initialization to {@link Plugin} createComponents() method, diff --git a/async-query/src/main/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModule.java b/async-query/src/main/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModule.java index d21f8c7665..5b651dc50b 100644 --- a/async-query/src/main/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModule.java +++ b/async-query/src/main/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModule.java @@ -9,7 +9,6 @@ import com.google.common.collect.ImmutableMap; import lombok.RequiredArgsConstructor; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.AbstractModule; import org.opensearch.common.inject.Provides; @@ -71,6 +70,7 @@ import org.opensearch.sql.spark.validator.S3GlueSQLGrammarElementValidator; import org.opensearch.sql.spark.validator.SQLQueryValidator; import org.opensearch.sql.spark.validator.SecurityLakeSQLGrammarElementValidator; +import org.opensearch.transport.client.node.NodeClient; @RequiredArgsConstructor public class AsyncExecutorServiceModule extends AbstractModule { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceSpec.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceSpec.java index 9511359f86..48ecb5f60f 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceSpec.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceSpec.java @@ -38,7 +38,6 @@ import org.opensearch.action.admin.indices.delete.DeleteIndexRequest; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; @@ -109,6 +108,7 @@ import org.opensearch.sql.spark.validator.SQLQueryValidator; import org.opensearch.sql.storage.DataSourceFactory; import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.transport.client.node.NodeClient; public class AsyncQueryExecutorServiceSpec extends OpenSearchIntegTestCase { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintIndex.java b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintIndex.java index e25250fd09..08260fb7c9 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintIndex.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/asyncquery/model/MockFlintIndex.java @@ -10,9 +10,9 @@ import lombok.SneakyThrows; import org.opensearch.action.admin.indices.delete.DeleteIndexRequest; import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse; -import org.opensearch.client.Client; import org.opensearch.sql.spark.flint.FlintIndexType; import org.opensearch.sql.spark.utils.TestUtils; +import org.opensearch.transport.client.Client; @Getter public class MockFlintIndex { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImplTest.java b/async-query/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImplTest.java index b1321cc132..ae53fec4f3 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImplTest.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/flint/FlintIndexMetadataServiceImplTest.java @@ -22,7 +22,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.common.xcontent.XContentType; @@ -34,6 +33,7 @@ import org.opensearch.sql.spark.dispatcher.model.FullyQualifiedTableName; import org.opensearch.sql.spark.dispatcher.model.IndexQueryActionType; import org.opensearch.sql.spark.dispatcher.model.IndexQueryDetails; +import org.opensearch.transport.client.Client; @ExtendWith(MockitoExtension.class) public class FlintIndexMetadataServiceImplTest { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClientTest.java b/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClientTest.java index d9f2e58dba..04b369c8d8 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClientTest.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/flint/OpenSearchFlintIndexClientTest.java @@ -16,8 +16,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.action.admin.indices.delete.DeleteIndexRequest; -import org.opensearch.action.support.master.AcknowledgedResponse; -import org.opensearch.client.Client; +import org.opensearch.action.support.clustermanager.AcknowledgedResponse; +import org.opensearch.transport.client.Client; @ExtendWith(MockitoExtension.class) public class OpenSearchFlintIndexClientTest { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReaderTest.java b/async-query/src/test/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReaderTest.java index 4de3a56dd9..d33635f56a 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReaderTest.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/response/OpenSearchJobExecutionResponseReaderTest.java @@ -23,13 +23,13 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.action.ActionFuture; import org.opensearch.core.rest.RestStatus; import org.opensearch.index.IndexNotFoundException; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata; +import org.opensearch.transport.client.Client; @ExtendWith(MockitoExtension.class) public class OpenSearchJobExecutionResponseReaderTest { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementActionTest.java b/async-query/src/test/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementActionTest.java index ccee3eb642..ee233fad1b 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementActionTest.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/rest/RestAsyncQueryManagementActionTest.java @@ -9,13 +9,13 @@ import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.sql.common.setting.Settings; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.node.NodeClient; public class RestAsyncQueryManagementActionTest { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQuerySchedulerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQuerySchedulerTest.java index d6e672f7a2..d43eb6ce81 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQuerySchedulerTest.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/OpenSearchAsyncQuerySchedulerTest.java @@ -36,7 +36,6 @@ import org.opensearch.action.support.WriteRequest; import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.action.ActionFuture; import org.opensearch.index.engine.DocumentMissingException; @@ -45,6 +44,7 @@ import org.opensearch.sql.spark.asyncquery.model.AsyncQueryRequestContext; import org.opensearch.sql.spark.scheduler.model.AsyncQuerySchedulerRequest; import org.opensearch.sql.spark.scheduler.model.ScheduledAsyncQueryJobRequest; +import org.opensearch.transport.client.Client; public class OpenSearchAsyncQuerySchedulerTest { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunnerTest.java b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunnerTest.java index fdfb138ddb..30b242db81 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunnerTest.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/scheduler/job/ScheduledAsyncQueryJobRunnerTest.java @@ -27,7 +27,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.jobscheduler.spi.JobExecutionContext; import org.opensearch.jobscheduler.spi.ScheduledJobParameter; @@ -38,6 +37,7 @@ import org.opensearch.sql.spark.rest.model.LangType; import org.opensearch.sql.spark.scheduler.model.ScheduledAsyncQueryJobRequest; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; public class ScheduledAsyncQueryJobRunnerTest { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModuleTest.java b/async-query/src/test/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModuleTest.java index d45950852f..45f1a52415 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModuleTest.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/transport/config/AsyncExecutorServiceModuleTest.java @@ -11,7 +11,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Injector; import org.opensearch.common.inject.ModulesBuilder; @@ -19,6 +18,7 @@ import org.opensearch.sql.datasource.DataSourceService; import org.opensearch.sql.legacy.metrics.Metrics; import org.opensearch.sql.spark.asyncquery.AsyncQueryExecutorService; +import org.opensearch.transport.client.node.NodeClient; @ExtendWith(MockitoExtension.class) public class AsyncExecutorServiceModuleTest { diff --git a/async-query/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java b/async-query/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java index 24c10ebea9..bc7026dbf4 100644 --- a/async-query/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java +++ b/async-query/src/test/java/org/opensearch/sql/spark/utils/TestUtils.java @@ -10,8 +10,8 @@ import java.net.URL; import lombok.SneakyThrows; import org.opensearch.action.admin.indices.create.CreateIndexRequest; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.transport.client.Client; public class TestUtils { @SneakyThrows diff --git a/build.gradle b/build.gradle index 33ac741673..4d9618f363 100644 --- a/build.gradle +++ b/build.gradle @@ -6,9 +6,9 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "3.0.0-alpha1-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") - buildVersionQualifier = System.getProperty("build.version_qualifier", "") + buildVersionQualifier = System.getProperty("build.version_qualifier", "alpha1") version_tokens = opensearch_version.tokenize('-') opensearch_build = version_tokens[0] + '.0' prometheus_binary_version = "2.37.2" @@ -129,7 +129,7 @@ allprojects { configurations.all { resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib:1.9.10" resolutionStrategy.force "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10" - resolutionStrategy.force "net.bytebuddy:byte-buddy:1.14.9" + resolutionStrategy.force "net.bytebuddy:byte-buddy:1.14.19" } } @@ -138,7 +138,7 @@ subprojects { mavenLocal() maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } mavenCentral() - maven { url "https://d1nvenhzbhpy0q.cloudfront.net/snapshots/lucene/" } + maven { url "https://ci.opensearch.org/ci/dbc/snapshots/lucene/" } maven { url 'https://jitpack.io' } } } @@ -165,7 +165,7 @@ compileTestJava { } jacoco { - toolVersion = "0.8.7" + toolVersion = "0.8.12" } jacocoTestReport { reports { diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImpl.java b/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImpl.java index c8f6754710..af21a8e827 100644 --- a/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImpl.java +++ b/datasources/src/main/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImpl.java @@ -10,11 +10,11 @@ import java.util.List; import lombok.AllArgsConstructor; import org.opensearch.OpenSearchSecurityException; -import org.opensearch.client.Client; import org.opensearch.commons.ConfigConstants; import org.opensearch.commons.authuser.User; import org.opensearch.core.rest.RestStatus; import org.opensearch.sql.datasource.model.DataSourceMetadata; +import org.opensearch.transport.client.Client; @AllArgsConstructor public class DataSourceUserAuthorizationHelperImpl implements DataSourceUserAuthorizationHelper { diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java b/datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java index 558a7fe4b2..87424ac06a 100644 --- a/datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java +++ b/datasources/src/main/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryAction.java @@ -23,7 +23,6 @@ import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchSecurityException; import org.opensearch.OpenSearchStatusException; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.rest.BaseRestHandler; @@ -42,6 +41,7 @@ import org.opensearch.sql.legacy.utils.MetricUtils; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; import org.opensearch.sql.opensearch.util.RestRequestUtil; +import org.opensearch.transport.client.node.NodeClient; @RequiredArgsConstructor public class RestDataSourceQueryAction extends BaseRestHandler { diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java b/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java index 682d79c972..d753c43ece 100644 --- a/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java +++ b/datasources/src/main/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorage.java @@ -31,7 +31,6 @@ import org.opensearch.action.support.WriteRequest; import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.action.ActionFuture; import org.opensearch.common.util.concurrent.ThreadContext; @@ -49,6 +48,7 @@ import org.opensearch.sql.datasources.service.DataSourceMetadataStorage; import org.opensearch.sql.datasources.utils.XContentParserUtils; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; +import org.opensearch.transport.client.Client; public class OpenSearchDataSourceMetadataStorage implements DataSourceMetadataStorage { diff --git a/datasources/src/main/java/org/opensearch/sql/datasources/utils/Scheduler.java b/datasources/src/main/java/org/opensearch/sql/datasources/utils/Scheduler.java index eaac8a7fa3..1cf54ffd88 100644 --- a/datasources/src/main/java/org/opensearch/sql/datasources/utils/Scheduler.java +++ b/datasources/src/main/java/org/opensearch/sql/datasources/utils/Scheduler.java @@ -8,9 +8,9 @@ import java.util.Map; import lombok.experimental.UtilityClass; import org.apache.logging.log4j.ThreadContext; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.unit.TimeValue; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.node.NodeClient; /** The scheduler which schedule the task run in sql-worker thread pool. */ @UtilityClass diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImplTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImplTest.java index 761115b7af..092d937ad4 100644 --- a/datasources/src/test/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImplTest.java +++ b/datasources/src/test/java/org/opensearch/sql/datasources/auth/DataSourceUserAuthorizationHelperImplTest.java @@ -18,10 +18,10 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.OpenSearchSecurityException; -import org.opensearch.client.Client; import org.opensearch.core.rest.RestStatus; import org.opensearch.sql.datasource.model.DataSourceMetadata; import org.opensearch.sql.datasource.model.DataSourceType; +import org.opensearch.transport.client.Client; @ExtendWith(MockitoExtension.class) public class DataSourceUserAuthorizationHelperImplTest { diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryActionTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryActionTest.java index fbe1b3bee5..d1f19338d8 100644 --- a/datasources/src/test/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryActionTest.java +++ b/datasources/src/test/java/org/opensearch/sql/datasources/rest/RestDataSourceQueryActionTest.java @@ -9,13 +9,13 @@ import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Mockito; -import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.sql.common.setting.Settings; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.node.NodeClient; public class RestDataSourceQueryActionTest { diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java index 03abe73763..a1c2425c66 100644 --- a/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java +++ b/datasources/src/test/java/org/opensearch/sql/datasources/storage/OpenSearchDataSourceMetadataStorageTest.java @@ -37,7 +37,6 @@ import org.opensearch.action.index.IndexResponse; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.update.UpdateResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.action.ActionFuture; import org.opensearch.core.index.shard.ShardId; @@ -52,6 +51,7 @@ import org.opensearch.sql.datasources.encryptor.Encryptor; import org.opensearch.sql.datasources.exceptions.DataSourceNotFoundException; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; +import org.opensearch.transport.client.Client; @ExtendWith(MockitoExtension.class) public class OpenSearchDataSourceMetadataStorageTest { diff --git a/datasources/src/test/java/org/opensearch/sql/datasources/utils/SchedulerTest.java b/datasources/src/test/java/org/opensearch/sql/datasources/utils/SchedulerTest.java index ff23cdcabb..62230e547d 100644 --- a/datasources/src/test/java/org/opensearch/sql/datasources/utils/SchedulerTest.java +++ b/datasources/src/test/java/org/opensearch/sql/datasources/utils/SchedulerTest.java @@ -13,8 +13,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.client.node.NodeClient; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.node.NodeClient; @ExtendWith(MockitoExtension.class) public class SchedulerTest { diff --git a/docs/user/dql/functions.rst b/docs/user/dql/functions.rst index bc967b305f..c8a61e417d 100644 --- a/docs/user/dql/functions.rst +++ b/docs/user/dql/functions.rst @@ -4327,20 +4327,20 @@ Example boosting score:: os> select id, title, author, _score from books where score(query('title:Pooh House', default_operator='AND'), 2.0); fetched rows / total rows = 1/1 - +----+--------------------------+----------------------+-----------+ - | id | title | author | _score | - |----+--------------------------+----------------------+-----------| - | 1 | The House at Pooh Corner | Alan Alexander Milne | 1.5884793 | - +----+--------------------------+----------------------+-----------+ + +----+--------------------------+----------------------+----------+ + | id | title | author | _score | + |----+--------------------------+----------------------+----------| + | 1 | The House at Pooh Corner | Alan Alexander Milne | 0.722036 | + +----+--------------------------+----------------------+----------+ os> select id, title, author, _score from books where score(query('title:Pooh House', default_operator='AND'), 5.0) OR score(query('title:Winnie', default_operator='AND'), 1.5); fetched rows / total rows = 2/2 - +----+--------------------------+----------------------+-----------+ - | id | title | author | _score | - |----+--------------------------+----------------------+-----------| - | 1 | The House at Pooh Corner | Alan Alexander Milne | 3.9711983 | - | 2 | Winnie-the-Pooh | Alan Alexander Milne | 1.1581701 | - +----+--------------------------+----------------------+-----------+ + +----+--------------------------+----------------------+------------+ + | id | title | author | _score | + |----+--------------------------+----------------------+------------| + | 1 | The House at Pooh Corner | Alan Alexander Milne | 1.8050902 | + | 2 | Winnie-the-Pooh | Alan Alexander Milne | 0.52644086 | + +----+--------------------------+----------------------+------------+ HIGHLIGHT diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8d1ea75dcd..6acc1431ea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,9 +1,8 @@ -# Copyright OpenSearch Contributors -# SPDX-License-Identifier: Apache-2.0 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab diff --git a/gradlew b/gradlew index 02fae2493a..f5feea6d6b 100755 --- a/gradlew +++ b/gradlew @@ -86,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 0ebb4c6c76..9b42019c79 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -45,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -59,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/integ-test/build.gradle b/integ-test/build.gradle index 4ef4b81151..a7c0c9b928 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -47,7 +47,7 @@ apply plugin: 'com.wiredforcode.spawn' // The next major version is only API compat w/ the last minor of the previous major. // baseVersion need to roll-froward accordingly, as new 2.x of OpenSearch being released. // See: https://github.com/opensearch-project/OpenSearch/issues/3615 -String baseVersion = "2.19.0" +String baseVersion = "2.20.0" String bwcVersion = baseVersion + ".0"; String baseName = "sqlBwcCluster" String bwcFilePath = "src/test/resources/bwc/" diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/TestUtils.java b/integ-test/src/test/java/org/opensearch/sql/legacy/TestUtils.java index 27963e3787..c0feed35b9 100644 --- a/integ-test/src/test/java/org/opensearch/sql/legacy/TestUtils.java +++ b/integ-test/src/test/java/org/opensearch/sql/legacy/TestUtils.java @@ -27,11 +27,11 @@ import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.index.IndexRequest; -import org.opensearch.client.Client; import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.client.RestClient; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.transport.client.Client; public class TestUtils { diff --git a/integ-test/src/test/java/org/opensearch/sql/util/TestUtils.java b/integ-test/src/test/java/org/opensearch/sql/util/TestUtils.java index d8bf9153f3..d63a938002 100644 --- a/integ-test/src/test/java/org/opensearch/sql/util/TestUtils.java +++ b/integ-test/src/test/java/org/opensearch/sql/util/TestUtils.java @@ -36,13 +36,13 @@ import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.index.IndexRequest; -import org.opensearch.client.Client; import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.client.ResponseException; import org.opensearch.client.RestClient; import org.opensearch.common.xcontent.XContentType; import org.opensearch.sql.legacy.cursor.CursorType; +import org.opensearch.transport.client.Client; public class TestUtils { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/domain/SearchResult.java b/legacy/src/main/java/org/opensearch/sql/legacy/domain/SearchResult.java index e951c84961..e415b9b618 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/domain/SearchResult.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/domain/SearchResult.java @@ -38,7 +38,7 @@ public class SearchResult { public SearchResult(SearchResponse resp) { SearchHits hits = resp.getHits(); this.total = - Optional.ofNullable(hits.getTotalHits()).map(totalHits -> totalHits.value).orElse(0L); + Optional.ofNullable(hits.getTotalHits()).map(totalHits -> totalHits.value()).orElse(0L); results = new ArrayList<>(hits.getHits().length); for (SearchHit searchHit : hits.getHits()) { if (searchHit.getSourceAsMap() != null) { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/LocalClusterState.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/LocalClusterState.java index 02384d3656..f89ea97684 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/LocalClusterState.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/LocalClusterState.java @@ -16,7 +16,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.support.IndicesOptions; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Setting; @@ -24,6 +23,7 @@ import org.opensearch.sql.common.setting.Settings; import org.opensearch.sql.legacy.esdomain.mapping.IndexMappings; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; +import org.opensearch.transport.client.Client; /** * Local cluster state information which may be stale but help avoid blocking operation in NIO diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/OpenSearchClient.java b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/OpenSearchClient.java index fd02486fae..3dc710e0e9 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/OpenSearchClient.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/esdomain/OpenSearchClient.java @@ -13,8 +13,8 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.search.MultiSearchRequest; import org.opensearch.action.search.MultiSearchResponse; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.query.join.BackOffRetryStrategy; +import org.opensearch.transport.client.Client; public class OpenSearchClient { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/AsyncRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/AsyncRestExecutor.java index 4fdf6391bd..2b16b58445 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/AsyncRestExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/AsyncRestExecutor.java @@ -12,7 +12,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.OpenSearchException; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.rest.RestStatus; import org.opensearch.rest.BytesRestResponse; @@ -27,6 +26,7 @@ import org.opensearch.sql.legacy.query.join.BackOffRetryStrategy; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transports; +import org.opensearch.transport.client.Client; /** A RestExecutor wrapper to execute request asynchronously to avoid blocking transport thread. */ public class AsyncRestExecutor implements RestExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticDefaultRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticDefaultRestExecutor.java index 54c4dd5abb..5b18defbdc 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticDefaultRestExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticDefaultRestExecutor.java @@ -15,7 +15,6 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.SearchScrollRequest; -import org.opensearch.client.Client; import org.opensearch.common.action.ActionFuture; import org.opensearch.core.rest.RestStatus; import org.opensearch.index.reindex.BulkIndexByScrollResponseContentListener; @@ -33,6 +32,7 @@ import org.opensearch.sql.legacy.query.SqlElasticRequestBuilder; import org.opensearch.sql.legacy.query.join.JoinRequestBuilder; import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder; +import org.opensearch.transport.client.Client; public class ElasticDefaultRestExecutor implements RestExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticHitsExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticHitsExecutor.java index 052cdb7b36..cf5189b3c9 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticHitsExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/ElasticHitsExecutor.java @@ -16,7 +16,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.search.SearchRequestBuilder; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.search.SearchHits; import org.opensearch.search.builder.PointInTimeBuilder; @@ -25,6 +24,7 @@ import org.opensearch.sql.legacy.esdomain.LocalClusterState; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.pit.PointInTimeHandler; +import org.opensearch.transport.client.Client; /** Executor for search requests with pagination. */ public abstract class ElasticHitsExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/QueryActionElasticExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/QueryActionElasticExecutor.java index 2e45fb45b7..1dfe1f5a07 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/QueryActionElasticExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/QueryActionElasticExecutor.java @@ -8,7 +8,6 @@ import java.io.IOException; import java.util.List; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.core.action.ActionResponse; import org.opensearch.search.SearchHits; import org.opensearch.search.aggregations.Aggregations; @@ -29,6 +28,7 @@ import org.opensearch.sql.legacy.query.join.OpenSearchJoinQueryAction; import org.opensearch.sql.legacy.query.multi.MultiQueryAction; import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder; +import org.opensearch.transport.client.Client; /** Created by Eliran on 3/10/2015. */ public class QueryActionElasticExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/RestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/RestExecutor.java index 8a0ab65970..8372e45c24 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/RestExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/RestExecutor.java @@ -6,9 +6,9 @@ package org.opensearch.sql.legacy.executor; import java.util.Map; -import org.opensearch.client.Client; import org.opensearch.rest.RestChannel; import org.opensearch.sql.legacy.query.QueryAction; +import org.opensearch.transport.client.Client; /** Created by Eliran on 26/12/2015. */ public interface RestExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultRestExecutor.java index a69ff31a49..0f6db9f225 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultRestExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/csv/CSVResultRestExecutor.java @@ -8,7 +8,6 @@ import com.google.common.base.Joiner; import java.util.List; import java.util.Map; -import org.opensearch.client.Client; import org.opensearch.core.rest.RestStatus; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestChannel; @@ -16,6 +15,7 @@ import org.opensearch.sql.legacy.executor.RestExecutor; import org.opensearch.sql.legacy.query.QueryAction; import org.opensearch.sql.legacy.query.join.BackOffRetryStrategy; +import org.opensearch.transport.client.Client; /** Created by Eliran on 26/12/2015. */ public class CSVResultRestExecutor implements RestExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorAsyncRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorAsyncRestExecutor.java index ffcf2adbf3..799aa55cf4 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorAsyncRestExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorAsyncRestExecutor.java @@ -10,7 +10,6 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.rest.RestStatus; import org.opensearch.rest.BytesRestResponse; @@ -22,6 +21,7 @@ import org.opensearch.sql.legacy.metrics.Metrics; import org.opensearch.sql.legacy.query.join.BackOffRetryStrategy; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; public class CursorAsyncRestExecutor { /** Custom thread pool name managed by OpenSearch */ diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorCloseExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorCloseExecutor.java index b94ef51b7d..f9c2870c0f 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorCloseExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorCloseExecutor.java @@ -14,7 +14,6 @@ import org.json.JSONException; import org.opensearch.OpenSearchException; import org.opensearch.action.search.ClearScrollResponse; -import org.opensearch.client.Client; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestChannel; import org.opensearch.sql.legacy.cursor.CursorType; @@ -25,6 +24,7 @@ import org.opensearch.sql.legacy.pit.PointInTimeHandler; import org.opensearch.sql.legacy.pit.PointInTimeHandlerImpl; import org.opensearch.sql.legacy.rewriter.matchtoterm.VerificationException; +import org.opensearch.transport.client.Client; public class CursorCloseExecutor implements CursorRestExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorRestExecutor.java index 4c4b854379..e2fa7e02e6 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorRestExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorRestExecutor.java @@ -6,8 +6,8 @@ package org.opensearch.sql.legacy.executor.cursor; import java.util.Map; -import org.opensearch.client.Client; import org.opensearch.rest.RestChannel; +import org.opensearch.transport.client.Client; /** Interface to execute cursor request. */ public interface CursorRestExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorResultExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorResultExecutor.java index 14ca3aea62..47b7136791 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorResultExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/cursor/CursorResultExecutor.java @@ -18,7 +18,6 @@ import org.opensearch.action.search.ClearScrollResponse; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.rest.RestStatus; import org.opensearch.rest.BytesRestResponse; @@ -38,6 +37,7 @@ import org.opensearch.sql.legacy.pit.PointInTimeHandlerImpl; import org.opensearch.sql.legacy.rewriter.matchtoterm.VerificationException; import org.opensearch.sql.opensearch.response.error.ErrorMessageFactory; +import org.opensearch.transport.client.Client; public class CursorResultExecutor implements CursorRestExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DeleteResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DeleteResultSet.java index 2e040d78fb..62c5c5cf4c 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DeleteResultSet.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DeleteResultSet.java @@ -8,9 +8,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.opensearch.client.Client; import org.opensearch.index.reindex.BulkByScrollResponse; import org.opensearch.sql.legacy.domain.Delete; +import org.opensearch.transport.client.Client; public class DeleteResultSet extends ResultSet { private final Delete query; diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DescribeResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DescribeResultSet.java index 74df2ddeeb..a485ad9e6a 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DescribeResultSet.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/DescribeResultSet.java @@ -11,12 +11,12 @@ import java.util.Map; import java.util.Map.Entry; import org.opensearch.action.admin.indices.get.GetIndexResponse; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.sql.legacy.domain.IndexStatement; import org.opensearch.sql.legacy.executor.format.DataRows.Row; import org.opensearch.sql.legacy.executor.format.Schema.Column; import org.opensearch.sql.legacy.executor.format.Schema.Type; +import org.opensearch.transport.client.Client; public class DescribeResultSet extends ResultSet { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java index 3344829859..473088d040 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/PrettyFormatRestExecutor.java @@ -14,7 +14,6 @@ import org.opensearch.OpenSearchException; import org.opensearch.action.search.SearchRequestBuilder; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.core.common.Strings; import org.opensearch.core.rest.RestStatus; import org.opensearch.rest.BytesRestResponse; @@ -32,6 +31,7 @@ import org.opensearch.sql.legacy.query.QueryAction; import org.opensearch.sql.legacy.query.SqlOpenSearchRequestBuilder; import org.opensearch.sql.legacy.query.join.BackOffRetryStrategy; +import org.opensearch.transport.client.Client; public class PrettyFormatRestExecutor implements RestExecutor { @@ -136,7 +136,7 @@ private Protocol buildProtocolForDefaultQuery(Client client, DefaultQueryAction protected boolean isDefaultCursor(SearchResponse searchResponse, DefaultQueryAction queryAction) { if (LocalClusterState.state().getSettingValue(SQL_PAGINATION_API_SEARCH_AFTER)) { return queryAction.getSqlRequest().fetchSize() != 0 - && Objects.requireNonNull(searchResponse.getHits().getTotalHits()).value + && Objects.requireNonNull(searchResponse.getHits().getTotalHits()).value() >= queryAction.getSqlRequest().fetchSize(); } else { return !Strings.isNullOrEmpty(searchResponse.getScrollId()); diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Protocol.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Protocol.java index 95600d234a..3c3bbdc51b 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Protocol.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/Protocol.java @@ -13,7 +13,6 @@ import java.util.stream.StreamSupport; import org.json.JSONArray; import org.json.JSONObject; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.cursor.Cursor; import org.opensearch.sql.legacy.cursor.NullCursor; import org.opensearch.sql.legacy.domain.ColumnTypeProvider; @@ -29,6 +28,7 @@ import org.opensearch.sql.legacy.query.DefaultQueryAction; import org.opensearch.sql.legacy.query.QueryAction; import org.opensearch.sql.legacy.query.planner.core.ColumnNode; +import org.opensearch.transport.client.Client; public class Protocol { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ResultSet.java index 079a738eb3..240e9229aa 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ResultSet.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ResultSet.java @@ -7,7 +7,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; public abstract class ResultSet { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java index 84b7c00857..9c272005d6 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java @@ -31,7 +31,6 @@ import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsRequest; import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse; import org.opensearch.action.search.ClearScrollResponse; -import org.opensearch.client.Client; import org.opensearch.common.document.DocumentField; import org.opensearch.core.common.Strings; import org.opensearch.search.SearchHit; @@ -61,6 +60,7 @@ import org.opensearch.sql.legacy.pit.PointInTimeHandler; import org.opensearch.sql.legacy.pit.PointInTimeHandlerImpl; import org.opensearch.sql.legacy.utils.SQLFunctions; +import org.opensearch.transport.client.Client; public class SelectResultSet extends ResultSet { @@ -541,7 +541,7 @@ private void extractData() { this.rows = populateRows(searchHits); this.size = rows.size(); this.internalTotalHits = - Optional.ofNullable(searchHits.getTotalHits()).map(th -> th.value).orElse(0L); + Optional.ofNullable(searchHits.getTotalHits()).map(th -> th.value()).orElse(0L); // size may be greater than totalHits after nested rows be flatten this.totalHits = Math.max(size, internalTotalHits); } else if (queryResult instanceof Aggregations) { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ShowResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ShowResultSet.java index 9b7d15807b..87955bbe2d 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ShowResultSet.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/ShowResultSet.java @@ -12,11 +12,11 @@ import java.util.Map; import java.util.stream.Collectors; import org.opensearch.action.admin.indices.get.GetIndexResponse; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.IndexStatement; import org.opensearch.sql.legacy.executor.format.DataRows.Row; import org.opensearch.sql.legacy.executor.format.Schema.Column; import org.opensearch.sql.legacy.executor.format.Schema.Type; +import org.opensearch.transport.client.Client; public class ShowResultSet extends ResultSet { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java index 5ff52cf657..286dd0b400 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticJoinExecutor.java @@ -18,7 +18,6 @@ import org.apache.lucene.search.TotalHits; import org.apache.lucene.search.TotalHits.Relation; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.document.DocumentField; import org.opensearch.core.rest.RestStatus; import org.opensearch.core.xcontent.XContentBuilder; @@ -40,6 +39,7 @@ import org.opensearch.sql.legacy.query.join.NestedLoopsElasticRequestBuilder; import org.opensearch.sql.legacy.query.join.TableInJoinRequestBuilder; import org.opensearch.sql.legacy.query.planner.HashJoinQueryPlanRequestBuilder; +import org.opensearch.transport.client.Client; /** Created by Eliran on 15/9/2015. */ public abstract class ElasticJoinExecutor extends ElasticHitsExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticUtils.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticUtils.java index 70e7118ad5..257e8dc195 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticUtils.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/ElasticUtils.java @@ -16,7 +16,6 @@ import org.apache.lucene.search.TotalHits.Relation; import org.opensearch.action.search.SearchRequestBuilder; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.XContentFactory; @@ -29,6 +28,7 @@ import org.opensearch.search.sort.SortOrder; import org.opensearch.sql.legacy.domain.Select; import org.opensearch.sql.legacy.query.join.BackOffRetryStrategy; +import org.opensearch.transport.client.Client; /** Created by Eliran on 2/9/2016. */ public class ElasticUtils { @@ -62,7 +62,10 @@ public static String hitsAsStringResult(SearchHits results, MetaSearchResult met Object[] searchHits; searchHits = new Object - [Optional.ofNullable(results.getTotalHits()).map(th -> th.value).orElse(0L).intValue()]; + [Optional.ofNullable(results.getTotalHits()) + .map(th -> th.value()) + .orElse(0L) + .intValue()]; int i = 0; for (SearchHit hit : results) { HashMap value = new HashMap<>(); @@ -76,10 +79,10 @@ public static String hitsAsStringResult(SearchHits results, MetaSearchResult met hits.put( "total", ImmutableMap.of( - "value", Optional.ofNullable(results.getTotalHits()).map(th -> th.value).orElse(0L), + "value", Optional.ofNullable(results.getTotalHits()).map(th -> th.value()).orElse(0L), "relation", Optional.ofNullable(results.getTotalHits()) - .map(th -> th.relation) + .map(th -> th.relation()) .orElse(Relation.EQUAL_TO))); hits.put("max_score", results.getMaxScore()); hits.put("hits", searchHits); diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinElasticExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinElasticExecutor.java index 46b31b447d..137e35907a 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinElasticExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/HashJoinElasticExecutor.java @@ -18,7 +18,6 @@ import java.util.Set; import org.opensearch.action.search.SearchRequestBuilder; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.document.DocumentField; import org.opensearch.index.mapper.MapperService; import org.opensearch.index.query.BoolQueryBuilder; @@ -31,6 +30,7 @@ import org.opensearch.sql.legacy.query.join.HashJoinElasticRequestBuilder; import org.opensearch.sql.legacy.query.join.TableInJoinRequestBuilder; import org.opensearch.sql.legacy.query.maker.QueryMaker; +import org.opensearch.transport.client.Client; /** Created by Eliran on 22/8/2015. */ public class HashJoinElasticExecutor extends ElasticJoinExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/NestedLoopsElasticExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/NestedLoopsElasticExecutor.java index f4e4347e06..2430e991f0 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/NestedLoopsElasticExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/NestedLoopsElasticExecutor.java @@ -16,7 +16,6 @@ import org.opensearch.action.search.MultiSearchResponse; import org.opensearch.action.search.SearchRequestBuilder; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.document.DocumentField; import org.opensearch.index.mapper.MapperService; import org.opensearch.search.SearchHit; @@ -31,6 +30,7 @@ import org.opensearch.sql.legacy.query.join.NestedLoopsElasticRequestBuilder; import org.opensearch.sql.legacy.query.join.TableInJoinRequestBuilder; import org.opensearch.sql.legacy.query.maker.Maker; +import org.opensearch.transport.client.Client; /** Created by Eliran on 15/9/2015. */ public class NestedLoopsElasticExecutor extends ElasticJoinExecutor { @@ -305,7 +305,7 @@ private FetchWithScrollResponse firstFetch(TableInJoinRequestBuilder tableReques // scroll request with max. responseWithHits = getResponseWithHits(tableRequest, MAX_RESULTS_ON_ONE_FETCH, null); if (responseWithHits.getHits().getTotalHits() != null - && responseWithHits.getHits().getTotalHits().value < MAX_RESULTS_ON_ONE_FETCH) { + && responseWithHits.getHits().getTotalHits().value() < MAX_RESULTS_ON_ONE_FETCH) { needScrollForFirstTable = true; } } diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/QueryPlanElasticExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/QueryPlanElasticExecutor.java index d8e9d41376..3aa4ba391a 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/QueryPlanElasticExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/join/QueryPlanElasticExecutor.java @@ -6,10 +6,10 @@ package org.opensearch.sql.legacy.executor.join; import java.util.List; -import org.opensearch.client.Client; import org.opensearch.search.SearchHit; import org.opensearch.sql.legacy.query.planner.HashJoinQueryPlanRequestBuilder; import org.opensearch.sql.legacy.query.planner.core.QueryPlanner; +import org.opensearch.transport.client.Client; /** * Executor for generic QueryPlanner execution. This executor is just acting as adaptor to integrate diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusExecutor.java index a3f8596eb4..af60accfe3 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MinusExecutor.java @@ -18,7 +18,6 @@ import org.apache.lucene.search.TotalHits; import org.apache.lucene.search.TotalHits.Relation; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.document.DocumentField; import org.opensearch.common.util.ArrayUtils; import org.opensearch.index.mapper.MapperService; @@ -39,6 +38,7 @@ import org.opensearch.sql.legacy.query.DefaultQueryAction; import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder; import org.opensearch.sql.legacy.utils.Util; +import org.opensearch.transport.client.Client; /** Created by Eliran on 26/8/2016. */ public class MinusExecutor extends ElasticHitsExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MultiRequestExecutorFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MultiRequestExecutorFactory.java index 03c6958076..bd24552f63 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MultiRequestExecutorFactory.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/MultiRequestExecutorFactory.java @@ -6,10 +6,10 @@ package org.opensearch.sql.legacy.executor.multi; import com.alibaba.druid.sql.ast.statement.SQLUnionOperator; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.antlr.semantic.SemanticAnalysisException; import org.opensearch.sql.legacy.executor.ElasticHitsExecutor; import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder; +import org.opensearch.transport.client.Client; /** Created by Eliran on 21/8/2016. */ public class MultiRequestExecutorFactory { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/UnionExecutor.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/UnionExecutor.java index 024d1bb4c3..da1201cb45 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/UnionExecutor.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/multi/UnionExecutor.java @@ -13,7 +13,6 @@ import org.apache.lucene.search.TotalHits; import org.apache.lucene.search.TotalHits.Relation; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.document.DocumentField; import org.opensearch.index.mapper.MapperService; import org.opensearch.search.SearchHit; @@ -21,6 +20,7 @@ import org.opensearch.sql.legacy.executor.ElasticHitsExecutor; import org.opensearch.sql.legacy.query.multi.MultiQueryRequestBuilder; import org.opensearch.sql.legacy.utils.Util; +import org.opensearch.transport.client.Client; /** Created by Eliran on 21/8/2016. */ public class UnionExecutor extends ElasticHitsExecutor { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/pit/PointInTimeHandlerImpl.java b/legacy/src/main/java/org/opensearch/sql/legacy/pit/PointInTimeHandlerImpl.java index db3530e91e..448fe1b277 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/pit/PointInTimeHandlerImpl.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/pit/PointInTimeHandlerImpl.java @@ -18,9 +18,9 @@ import org.opensearch.action.search.DeletePitAction; import org.opensearch.action.search.DeletePitRequest; import org.opensearch.action.search.DeletePitResponse; -import org.opensearch.client.Client; import org.opensearch.common.action.ActionFuture; import org.opensearch.sql.legacy.esdomain.LocalClusterState; +import org.opensearch.transport.client.Client; /** Handler for Point In Time */ public class PointInTimeHandlerImpl implements PointInTimeHandler { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSQLQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSQLQueryAction.java index 4440219f1b..10756e25e2 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSQLQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSQLQueryAction.java @@ -13,7 +13,6 @@ import java.util.function.BiConsumer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.inject.Injector; import org.opensearch.core.rest.RestStatus; import org.opensearch.rest.BaseRestHandler; @@ -38,6 +37,7 @@ import org.opensearch.sql.protocol.response.format.ResponseFormatter; import org.opensearch.sql.sql.SQLService; import org.opensearch.sql.sql.domain.SQLQueryRequest; +import org.opensearch.transport.client.node.NodeClient; /** * New SQL REST action handler. This will not be registered to OpenSearch unless: diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java index c47e5f05bd..d01e59e88e 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlAction.java @@ -24,8 +24,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.OpenSearchException; -import org.opensearch.client.Client; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.inject.Injector; import org.opensearch.common.settings.Settings; import org.opensearch.core.rest.RestStatus; @@ -64,6 +62,8 @@ import org.opensearch.sql.legacy.utils.JsonPrettyFormatter; import org.opensearch.sql.legacy.utils.QueryDataAnonymizer; import org.opensearch.sql.sql.domain.SQLQueryRequest; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.node.NodeClient; public class RestSqlAction extends BaseRestHandler { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlStatsAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlStatsAction.java index 6f9d1e4117..388ab38504 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlStatsAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/RestSqlStatsAction.java @@ -16,7 +16,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.ThreadContext; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.rest.RestStatus; @@ -28,6 +27,7 @@ import org.opensearch.sql.legacy.executor.format.ErrorMessageFactory; import org.opensearch.sql.legacy.metrics.Metrics; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.node.NodeClient; /** * Currently this interface is for node level. Cluster level is coming up soon. diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/SearchDao.java b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/SearchDao.java index ea4e08281c..415b98f6b8 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/plugin/SearchDao.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/plugin/SearchDao.java @@ -8,12 +8,12 @@ import java.sql.SQLFeatureNotSupportedException; import java.util.HashSet; import java.util.Set; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.QueryActionRequest; import org.opensearch.sql.legacy.exception.SQLFeatureDisabledException; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.query.OpenSearchActionFactory; import org.opensearch.sql.legacy.query.QueryAction; +import org.opensearch.transport.client.Client; public class SearchDao { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/AggregationQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/AggregationQueryAction.java index c7a1f82df1..2f8bed9436 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/AggregationQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/AggregationQueryAction.java @@ -13,7 +13,6 @@ import org.opensearch.action.search.SearchAction; import org.opensearch.action.search.SearchRequestBuilder; import org.opensearch.action.search.SearchType; -import org.opensearch.client.Client; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.join.aggregations.JoinAggregationBuilders; import org.opensearch.search.aggregations.AggregationBuilder; @@ -36,6 +35,7 @@ import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.query.maker.AggMaker; import org.opensearch.sql.legacy.query.maker.QueryMaker; +import org.opensearch.transport.client.Client; /** Transform SQL query to OpenSearch aggregations query */ public class AggregationQueryAction extends QueryAction { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/DefaultQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/DefaultQueryAction.java index 0e9d09d3e7..5c62219850 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/DefaultQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/DefaultQueryAction.java @@ -24,7 +24,6 @@ import org.opensearch.action.search.SearchAction; import org.opensearch.action.search.SearchRequestBuilder; import org.opensearch.action.search.SearchType; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.script.Script; @@ -51,6 +50,7 @@ import org.opensearch.sql.legacy.query.maker.QueryMaker; import org.opensearch.sql.legacy.rewriter.nestedfield.NestedFieldProjection; import org.opensearch.sql.legacy.utils.SQLFunctions; +import org.opensearch.transport.client.Client; /** Transform SQL query to standard OpenSearch search query */ public class DefaultQueryAction extends QueryAction { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/DeleteQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/DeleteQueryAction.java index 331921345f..beddc46fd7 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/DeleteQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/DeleteQueryAction.java @@ -5,7 +5,6 @@ package org.opensearch.sql.legacy.query; -import org.opensearch.client.Client; import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilders; import org.opensearch.index.reindex.DeleteByQueryAction; @@ -15,6 +14,7 @@ import org.opensearch.sql.legacy.domain.Where; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.query.maker.QueryMaker; +import org.opensearch.transport.client.Client; public class DeleteQueryAction extends QueryAction { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/DescribeQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/DescribeQueryAction.java index ffc9695d81..390925d103 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/DescribeQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/DescribeQueryAction.java @@ -6,10 +6,10 @@ package org.opensearch.sql.legacy.query; import org.opensearch.action.admin.indices.get.GetIndexRequestBuilder; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.IndexStatement; import org.opensearch.sql.legacy.domain.QueryStatement; import org.opensearch.sql.legacy.utils.Util; +import org.opensearch.transport.client.Client; public class DescribeQueryAction extends QueryAction { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/OpenSearchActionFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/OpenSearchActionFactory.java index a5bfeebfbd..ee58a8c5c0 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/OpenSearchActionFactory.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/OpenSearchActionFactory.java @@ -26,7 +26,6 @@ import java.sql.SQLFeatureNotSupportedException; import java.util.ArrayList; import java.util.List; -import org.opensearch.client.Client; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.sql.common.setting.Settings; @@ -62,6 +61,7 @@ import org.opensearch.sql.legacy.rewriter.parent.SQLExprParentSetterRule; import org.opensearch.sql.legacy.rewriter.subquery.SubQueryRewriteRule; import org.opensearch.sql.legacy.utils.StringUtils; +import org.opensearch.transport.client.Client; public class OpenSearchActionFactory { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/QueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/QueryAction.java index 4d40701964..122ff641b2 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/QueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/QueryAction.java @@ -13,7 +13,6 @@ import java.util.Optional; import org.opensearch.action.search.SearchRequestBuilder; import org.opensearch.action.support.IndicesOptions; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.json.JsonXContentParser; import org.opensearch.core.xcontent.NamedXContentRegistry; @@ -29,6 +28,7 @@ import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.executor.Format; import org.opensearch.sql.legacy.request.SqlRequest; +import org.opensearch.transport.client.Client; /** * Abstract class. used to transform Select object (Represents SQL query) to SearchRequestBuilder diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/ShowQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/ShowQueryAction.java index d9baa901fa..be4dd01911 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/ShowQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/ShowQueryAction.java @@ -8,9 +8,9 @@ import static org.opensearch.sql.legacy.utils.Util.prepareIndexRequestBuilder; import org.opensearch.action.admin.indices.get.GetIndexRequestBuilder; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.IndexStatement; import org.opensearch.sql.legacy.domain.QueryStatement; +import org.opensearch.transport.client.Client; public class ShowQueryAction extends QueryAction { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchHashJoinQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchHashJoinQueryAction.java index 078ed6bcce..e38e679d58 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchHashJoinQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchHashJoinQueryAction.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.Condition; import org.opensearch.sql.legacy.domain.Field; import org.opensearch.sql.legacy.domain.JoinSelect; @@ -18,6 +17,7 @@ import org.opensearch.sql.legacy.domain.hints.HintType; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.query.planner.HashJoinQueryPlanRequestBuilder; +import org.opensearch.transport.client.Client; /** Created by Eliran on 22/8/2015. */ public class OpenSearchHashJoinQueryAction extends OpenSearchJoinQueryAction { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryAction.java index b317ef9740..58f3f8dab4 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryAction.java @@ -6,7 +6,6 @@ package org.opensearch.sql.legacy.query.join; import java.util.List; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.Field; import org.opensearch.sql.legacy.domain.JoinSelect; import org.opensearch.sql.legacy.domain.Select; @@ -18,6 +17,7 @@ import org.opensearch.sql.legacy.query.SqlElasticRequestBuilder; import org.opensearch.sql.legacy.query.planner.HashJoinQueryPlanRequestBuilder; import org.opensearch.sql.legacy.query.planner.core.Config; +import org.opensearch.transport.client.Client; /** Created by Eliran on 15/9/2015. */ public abstract class OpenSearchJoinQueryAction extends QueryAction { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryActionFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryActionFactory.java index c638f43519..5f68d1eae5 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryActionFactory.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchJoinQueryActionFactory.java @@ -6,12 +6,12 @@ package org.opensearch.sql.legacy.query.join; import java.util.List; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.Condition; import org.opensearch.sql.legacy.domain.JoinSelect; import org.opensearch.sql.legacy.domain.hints.Hint; import org.opensearch.sql.legacy.domain.hints.HintType; import org.opensearch.sql.legacy.query.QueryAction; +import org.opensearch.transport.client.Client; /** Created by Eliran on 15/9/2015. */ public class OpenSearchJoinQueryActionFactory { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchNestedLoopsQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchNestedLoopsQueryAction.java index e9e9169605..b9354158c4 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchNestedLoopsQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/join/OpenSearchNestedLoopsQueryAction.java @@ -5,12 +5,12 @@ package org.opensearch.sql.legacy.query.join; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.JoinSelect; import org.opensearch.sql.legacy.domain.Where; import org.opensearch.sql.legacy.domain.hints.Hint; import org.opensearch.sql.legacy.domain.hints.HintType; import org.opensearch.sql.legacy.exception.SqlParseException; +import org.opensearch.transport.client.Client; /** Created by Eliran on 15/9/2015. */ public class OpenSearchNestedLoopsQueryAction extends OpenSearchJoinQueryAction { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryAction.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryAction.java index 549fdfc077..e1422f2b65 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryAction.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/MultiQueryAction.java @@ -9,13 +9,13 @@ import java.util.List; import java.util.Set; import org.opensearch.action.search.SearchRequestBuilder; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.Field; import org.opensearch.sql.legacy.domain.Select; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.query.DefaultQueryAction; import org.opensearch.sql.legacy.query.QueryAction; import org.opensearch.sql.legacy.query.SqlElasticRequestBuilder; +import org.opensearch.transport.client.Client; /** Created by Eliran on 19/8/2016. */ public class MultiQueryAction extends QueryAction { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/OpenSearchMultiQueryActionFactory.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/OpenSearchMultiQueryActionFactory.java index 1f934e9a80..cfb8d6971e 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/OpenSearchMultiQueryActionFactory.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/multi/OpenSearchMultiQueryActionFactory.java @@ -5,9 +5,9 @@ package org.opensearch.sql.legacy.query.multi; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.query.QueryAction; +import org.opensearch.transport.client.Client; /** Created by Eliran on 19/8/2016. */ public class OpenSearchMultiQueryActionFactory { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/HashJoinQueryPlanRequestBuilder.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/HashJoinQueryPlanRequestBuilder.java index 25146294bc..fee2dc01db 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/HashJoinQueryPlanRequestBuilder.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/HashJoinQueryPlanRequestBuilder.java @@ -5,12 +5,12 @@ package org.opensearch.sql.legacy.query.planner; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.query.join.HashJoinElasticRequestBuilder; import org.opensearch.sql.legacy.query.planner.core.Config; import org.opensearch.sql.legacy.query.planner.core.QueryParams; import org.opensearch.sql.legacy.query.planner.core.QueryPlanner; import org.opensearch.sql.legacy.request.SqlRequest; +import org.opensearch.transport.client.Client; /** * QueryPlanner builder for Hash Join query. In the future, different queries could have its own diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLToOperatorConverter.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLToOperatorConverter.java index 4d1ab58160..bd52de846b 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLToOperatorConverter.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/converter/SQLToOperatorConverter.java @@ -12,7 +12,6 @@ import lombok.SneakyThrows; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.ColumnTypeProvider; import org.opensearch.sql.legacy.domain.Select; import org.opensearch.sql.legacy.expression.domain.BindingTuple; @@ -22,6 +21,7 @@ import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator; import org.opensearch.sql.legacy.query.planner.physical.node.project.PhysicalProject; import org.opensearch.sql.legacy.query.planner.physical.node.scroll.PhysicalScroll; +import org.opensearch.transport.client.Client; /** Definition of SQL to PhysicalOperator converter. */ public class SQLToOperatorConverter extends MySqlASTVisitorAdapter { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/BindingTupleQueryPlanner.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/BindingTupleQueryPlanner.java index e4cb323e71..118ded6e73 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/BindingTupleQueryPlanner.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/BindingTupleQueryPlanner.java @@ -9,12 +9,12 @@ import java.util.ArrayList; import java.util.List; import lombok.Getter; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.ColumnTypeProvider; import org.opensearch.sql.legacy.expression.domain.BindingTuple; import org.opensearch.sql.legacy.query.planner.converter.SQLToOperatorConverter; import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator; import org.opensearch.sql.legacy.query.planner.physical.node.scroll.PhysicalScroll; +import org.opensearch.transport.client.Client; /** The definition of QueryPlanner which return the {@link BindingTuple} as result. */ public class BindingTupleQueryPlanner { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryPlanner.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryPlanner.java index 0a1c2fd24b..e7d31c6200 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryPlanner.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/core/QueryPlanner.java @@ -10,7 +10,6 @@ import static org.opensearch.sql.legacy.query.planner.core.ExecuteParams.ExecuteParamType.TIMEOUT; import java.util.List; -import org.opensearch.client.Client; import org.opensearch.search.SearchHit; import org.opensearch.sql.legacy.executor.join.MetaSearchResult; import org.opensearch.sql.legacy.query.planner.explain.Explanation; @@ -19,6 +18,7 @@ import org.opensearch.sql.legacy.query.planner.physical.PhysicalPlan; import org.opensearch.sql.legacy.query.planner.resource.ResourceManager; import org.opensearch.sql.legacy.query.planner.resource.Stats; +import org.opensearch.transport.client.Client; /** Query planner that driver the logical planning, physical planning, execute and explain. */ public class QueryPlanner { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/Paginate.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/Paginate.java index 5bf31bb691..33d3daeec6 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/Paginate.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/physical/node/Paginate.java @@ -4,7 +4,6 @@ import java.util.Collection; import java.util.Objects; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.common.Strings; import org.opensearch.index.query.BoolQueryBuilder; @@ -19,6 +18,7 @@ import org.opensearch.sql.legacy.query.planner.physical.Row; import org.opensearch.sql.legacy.query.planner.physical.estimation.Cost; import org.opensearch.sql.legacy.query.planner.resource.ResourceManager; +import org.opensearch.transport.client.Client; public abstract class Paginate extends BatchPhysicalOperator { diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/Stats.java b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/Stats.java index ac830d2595..a05ac21d71 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/Stats.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/query/planner/resource/Stats.java @@ -5,7 +5,7 @@ package org.opensearch.sql.legacy.query.planner.resource; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; /** * Statistics collector collects from OpenSearch stats, JVM etc for other components: diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/utils/Util.java b/legacy/src/main/java/org/opensearch/sql/legacy/utils/Util.java index 632074bbbe..500c64ed94 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/utils/Util.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/utils/Util.java @@ -31,11 +31,11 @@ import java.util.concurrent.atomic.AtomicInteger; import org.opensearch.action.admin.indices.get.GetIndexRequest; import org.opensearch.action.admin.indices.get.GetIndexRequestBuilder; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.IndexStatement; import org.opensearch.sql.legacy.domain.KVValue; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.parser.ElasticSqlExprParser; +import org.opensearch.transport.client.Client; public class Util { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/executor/AsyncRestExecutorTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/executor/AsyncRestExecutorTest.java index eea1c9a87a..61009710cd 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/executor/AsyncRestExecutorTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/executor/AsyncRestExecutorTest.java @@ -23,7 +23,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.rest.RestChannel; @@ -32,6 +31,7 @@ import org.opensearch.sql.legacy.request.SqlRequest; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; /** Test AsyncRestExecutor behavior. */ @RunWith(MockitoJUnitRunner.Silent.class) diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/pit/PointInTimeHandlerImplTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/pit/PointInTimeHandlerImplTest.java index d9fcf4e87e..bb5f22c26c 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/pit/PointInTimeHandlerImplTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/pit/PointInTimeHandlerImplTest.java @@ -27,13 +27,13 @@ import org.opensearch.action.search.DeletePitAction; import org.opensearch.action.search.DeletePitRequest; import org.opensearch.action.search.DeletePitResponse; -import org.opensearch.client.Client; import org.opensearch.common.action.ActionFuture; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.rest.RestStatus; import org.opensearch.sql.common.setting.Settings; import org.opensearch.sql.legacy.esdomain.LocalClusterState; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; +import org.opensearch.transport.client.Client; public class PointInTimeHandlerImplTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionCursorFallbackTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionCursorFallbackTest.java index 30d8c9d27d..1241f6c23e 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionCursorFallbackTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionCursorFallbackTest.java @@ -19,7 +19,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.inject.Injector; import org.opensearch.common.inject.ModulesBuilder; import org.opensearch.common.util.concurrent.ThreadContext; @@ -33,6 +32,7 @@ import org.opensearch.sql.sql.antlr.SQLSyntaxParser; import org.opensearch.sql.sql.domain.SQLQueryRequest; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.node.NodeClient; /** A test suite that verifies fallback behaviour of cursor queries. */ @RunWith(MockitoJUnitRunner.class) diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionTest.java index b14b2c09cb..e6c6da5c12 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/plugin/RestSQLQueryActionTest.java @@ -21,7 +21,6 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.inject.Injector; import org.opensearch.common.inject.ModulesBuilder; import org.opensearch.common.util.concurrent.ThreadContext; @@ -35,6 +34,7 @@ import org.opensearch.sql.sql.antlr.SQLSyntaxParser; import org.opensearch.sql.sql.domain.SQLQueryRequest; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.node.NodeClient; @RunWith(MockitoJUnitRunner.class) public class RestSQLQueryActionTest extends BaseRestHandler { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFormatTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFormatTest.java index 3bb7b4a2b6..6a2c852f7d 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFormatTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/DateFormatTest.java @@ -23,7 +23,6 @@ import org.json.JSONObject; import org.junit.Ignore; import org.junit.Test; -import org.opensearch.client.Client; import org.opensearch.common.lucene.BytesRefs; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.QueryBuilder; @@ -36,6 +35,7 @@ import org.opensearch.sql.legacy.query.AggregationQueryAction; import org.opensearch.sql.legacy.query.maker.QueryMaker; import org.opensearch.sql.legacy.util.MatcherUtils; +import org.opensearch.transport.client.Client; public class DateFormatTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/JSONRequestTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/JSONRequestTest.java index e90d721f23..2a8cfbdfb5 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/JSONRequestTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/JSONRequestTest.java @@ -28,7 +28,6 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnitRunner; -import org.opensearch.client.Client; import org.opensearch.sql.common.setting.Settings; import org.opensearch.sql.common.utils.StringUtils; import org.opensearch.sql.legacy.domain.ColumnTypeProvider; @@ -44,6 +43,7 @@ import org.opensearch.sql.legacy.request.SqlRequest; import org.opensearch.sql.legacy.util.CheckScriptContents; import org.opensearch.sql.legacy.util.TestsConstants; +import org.opensearch.transport.client.Client; @RunWith(MockitoJUnitRunner.Silent.class) public class JSONRequestTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldProjectionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldProjectionTest.java index 859259756f..be12eb6cfa 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldProjectionTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/NestedFieldProjectionTest.java @@ -33,7 +33,6 @@ import org.opensearch.action.search.SearchAction; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchRequestBuilder; -import org.opensearch.client.Client; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.NestedQueryBuilder; import org.opensearch.index.query.QueryBuilder; @@ -48,6 +47,7 @@ import org.opensearch.sql.legacy.rewriter.nestedfield.NestedFieldProjection; import org.opensearch.sql.legacy.rewriter.nestedfield.NestedFieldRewriter; import org.opensearch.sql.legacy.util.HasFieldWithValue; +import org.opensearch.transport.client.Client; public class NestedFieldProjectionTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/OpenSearchClientTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/OpenSearchClientTest.java index fec029a638..c548d92269 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/OpenSearchClientTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/OpenSearchClientTest.java @@ -20,9 +20,9 @@ import org.opensearch.action.search.MultiSearchResponse; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.action.ActionFuture; import org.opensearch.sql.legacy.esdomain.OpenSearchClient; +import org.opensearch.transport.client.Client; public class OpenSearchClientTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/QueryFunctionsTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/QueryFunctionsTest.java index b5a82f6737..a0e197ecab 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/QueryFunctionsTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/QueryFunctionsTest.java @@ -22,7 +22,6 @@ import org.hamcrest.Matcher; import org.junit.Test; import org.mockito.Mockito; -import org.opensearch.client.Client; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.common.Strings; import org.opensearch.index.query.AbstractQueryBuilder; @@ -33,6 +32,7 @@ import org.opensearch.sql.legacy.query.OpenSearchActionFactory; import org.opensearch.sql.legacy.util.CheckScriptContents; import org.opensearch.sql.legacy.util.TestsConstants; +import org.opensearch.transport.client.Client; public class QueryFunctionsTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/WhereWithBoolConditionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/WhereWithBoolConditionTest.java index de6f2c8dda..ca0d4eb6a2 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/WhereWithBoolConditionTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/WhereWithBoolConditionTest.java @@ -15,7 +15,6 @@ import java.sql.SQLFeatureNotSupportedException; import org.junit.Test; import org.mockito.Mockito; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.exception.SQLFeatureDisabledException; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.query.OpenSearchActionFactory; @@ -23,6 +22,7 @@ import org.opensearch.sql.legacy.util.CheckScriptContents; import org.opensearch.sql.legacy.util.TestsConstants; import org.opensearch.sql.legacy.utils.StringUtils; +import org.opensearch.transport.client.Client; public class WhereWithBoolConditionTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/DeleteResultSetTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/DeleteResultSetTest.java index 533c2b2989..2c029e6d14 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/DeleteResultSetTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/executor/DeleteResultSetTest.java @@ -11,7 +11,6 @@ import java.io.IOException; import org.junit.Test; import org.mockito.Mock; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.xcontent.DeprecationHandler; import org.opensearch.core.xcontent.NamedXContentRegistry; @@ -21,6 +20,7 @@ import org.opensearch.sql.legacy.executor.format.DataRows; import org.opensearch.sql.legacy.executor.format.DeleteResultSet; import org.opensearch.sql.legacy.executor.format.Schema; +import org.opensearch.transport.client.node.NodeClient; public class DeleteResultSetTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SqlParserTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SqlParserTest.java index a81e4f4dfd..f00abac812 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SqlParserTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/parser/SqlParserTest.java @@ -29,7 +29,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.opensearch.client.Client; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.search.builder.SearchSourceBuilder.ScriptField; import org.opensearch.sql.legacy.domain.Condition; @@ -52,6 +51,7 @@ import org.opensearch.sql.legacy.query.multi.MultiQuerySelect; import org.opensearch.sql.legacy.util.CheckScriptContents; import org.opensearch.sql.legacy.util.TestsConstants; +import org.opensearch.transport.client.Client; public class SqlParserTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/BindingTupleQueryPlannerExecuteTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/BindingTupleQueryPlannerExecuteTest.java index 5cb0bcf124..c2d094fb5f 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/BindingTupleQueryPlannerExecuteTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/BindingTupleQueryPlannerExecuteTest.java @@ -23,7 +23,6 @@ import org.mockito.junit.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.opensearch.action.search.SearchResponse; -import org.opensearch.client.Client; import org.opensearch.common.action.ActionFuture; import org.opensearch.search.aggregations.Aggregations; import org.opensearch.sql.legacy.domain.ColumnTypeProvider; @@ -31,6 +30,7 @@ import org.opensearch.sql.legacy.query.planner.core.BindingTupleQueryPlanner; import org.opensearch.sql.legacy.util.AggregationUtils; import org.opensearch.sql.legacy.util.SqlParserUtils; +import org.opensearch.transport.client.Client; @RunWith(MockitoJUnitRunner.class) public class BindingTupleQueryPlannerExecuteTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerTest.java index 6ff907ba30..0ff8143bab 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/QueryPlannerTest.java @@ -34,7 +34,6 @@ import org.opensearch.action.search.ClearScrollResponse; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.SearchScrollRequestBuilder; -import org.opensearch.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.common.action.ActionFuture; import org.opensearch.common.settings.ClusterSettings; @@ -57,6 +56,7 @@ import org.opensearch.sql.legacy.query.planner.core.QueryPlanner; import org.opensearch.sql.legacy.request.SqlRequest; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; +import org.opensearch.transport.client.Client; /** Test base class for all query planner tests. */ @Ignore diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLToOperatorConverterTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLToOperatorConverterTest.java index b9e48b27e4..aafe755c85 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLToOperatorConverterTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/planner/converter/SQLToOperatorConverterTest.java @@ -15,12 +15,12 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.domain.ColumnTypeProvider; import org.opensearch.sql.legacy.expression.domain.BindingTuple; import org.opensearch.sql.legacy.query.planner.converter.SQLToOperatorConverter; import org.opensearch.sql.legacy.query.planner.physical.PhysicalOperator; import org.opensearch.sql.legacy.query.planner.physical.node.project.PhysicalProject; +import org.opensearch.transport.client.Client; @RunWith(MockitoJUnitRunner.class) public class SQLToOperatorConverterTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/query/DefaultQueryActionTest.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/query/DefaultQueryActionTest.java index 50f094bf72..d290e4dd5b 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/query/DefaultQueryActionTest.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/query/DefaultQueryActionTest.java @@ -15,7 +15,6 @@ import org.junit.Test; import org.mockito.Mockito; import org.opensearch.action.search.SearchRequestBuilder; -import org.opensearch.client.Client; import org.opensearch.common.unit.TimeValue; import org.opensearch.script.Script; import org.opensearch.search.sort.FieldSortBuilder; @@ -31,6 +30,7 @@ import org.opensearch.sql.legacy.metrics.Metrics; import org.opensearch.sql.legacy.query.DefaultQueryAction; import org.opensearch.sql.legacy.request.SqlRequest; +import org.opensearch.transport.client.Client; public class DefaultQueryActionTest { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/inline/AliasInliningTests.java b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/inline/AliasInliningTests.java index 168725ed11..b943f4edac 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/inline/AliasInliningTests.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/unittest/rewriter/inline/AliasInliningTests.java @@ -19,12 +19,12 @@ import org.json.JSONObject; import org.junit.Before; import org.junit.Test; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.parser.SqlParser; import org.opensearch.sql.legacy.query.AggregationQueryAction; import org.opensearch.sql.legacy.query.DefaultQueryAction; import org.opensearch.sql.legacy.request.SqlRequest; +import org.opensearch.transport.client.Client; public class AliasInliningTests { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/CheckScriptContents.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/CheckScriptContents.java index 811d05c16a..2fe711c3b0 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/util/CheckScriptContents.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/CheckScriptContents.java @@ -29,9 +29,6 @@ import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsRequest; import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse; import org.opensearch.action.search.SearchRequestBuilder; -import org.opensearch.client.AdminClient; -import org.opensearch.client.Client; -import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.action.ActionFuture; @@ -52,6 +49,9 @@ import org.opensearch.sql.legacy.query.QueryAction; import org.opensearch.sql.legacy.query.SqlElasticRequestBuilder; import org.opensearch.sql.opensearch.setting.OpenSearchSettings; +import org.opensearch.transport.client.AdminClient; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.IndicesAdminClient; public class CheckScriptContents { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/MultipleIndexClusterUtils.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/MultipleIndexClusterUtils.java index 85b8cffb59..a9546bb5c9 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/util/MultipleIndexClusterUtils.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/MultipleIndexClusterUtils.java @@ -21,11 +21,11 @@ import org.mockito.ArgumentMatcher; import org.mockito.Mockito; import org.mockito.stubbing.Answer; -import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.cluster.service.ClusterService; import org.opensearch.sql.legacy.esdomain.LocalClusterState; +import org.opensearch.transport.client.Client; /** Test Utility which provide the cluster have 2 indices. */ public class MultipleIndexClusterUtils { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlExplainUtils.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlExplainUtils.java index 3ad1cae211..ca5b93dbf7 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlExplainUtils.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/SqlExplainUtils.java @@ -8,11 +8,11 @@ import com.alibaba.druid.sql.parser.ParserException; import java.sql.SQLFeatureNotSupportedException; import org.mockito.Mockito; -import org.opensearch.client.Client; import org.opensearch.sql.legacy.exception.SQLFeatureDisabledException; import org.opensearch.sql.legacy.exception.SqlParseException; import org.opensearch.sql.legacy.query.OpenSearchActionFactory; import org.opensearch.sql.legacy.query.QueryAction; +import org.opensearch.transport.client.Client; /** Test utils class that explains a query */ public class SqlExplainUtils { diff --git a/legacy/src/test/java/org/opensearch/sql/legacy/util/TestUtils.java b/legacy/src/test/java/org/opensearch/sql/legacy/util/TestUtils.java index ab9a0ded14..9527e8d30f 100644 --- a/legacy/src/test/java/org/opensearch/sql/legacy/util/TestUtils.java +++ b/legacy/src/test/java/org/opensearch/sql/legacy/util/TestUtils.java @@ -27,11 +27,11 @@ import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.index.IndexRequest; -import org.opensearch.client.Client; import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.client.RestClient; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.transport.client.Client; public class TestUtils { diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/MLClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/MLClient.java index 4bc6009875..f395fa85d6 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/MLClient.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/MLClient.java @@ -1,7 +1,7 @@ package org.opensearch.sql.opensearch.client; -import org.opensearch.client.node.NodeClient; import org.opensearch.ml.client.MachineLearningNodeClient; +import org.opensearch.transport.client.node.NodeClient; public class MLClient { private static MachineLearningNodeClient INSTANCE; diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchClient.java index cdc3d4462f..db09074da4 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchClient.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchClient.java @@ -9,10 +9,10 @@ import java.util.Map; import org.opensearch.action.search.CreatePitRequest; import org.opensearch.action.search.DeletePitRequest; -import org.opensearch.client.node.NodeClient; import org.opensearch.sql.opensearch.mapping.IndexMapping; import org.opensearch.sql.opensearch.request.OpenSearchRequest; import org.opensearch.sql.opensearch.response.OpenSearchResponse; +import org.opensearch.transport.client.node.NodeClient; /** * OpenSearch client abstraction to wrap different OpenSearch client implementation. For example, diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java index 7a9487ef6a..96567f599c 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClient.java @@ -23,7 +23,6 @@ import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse; import org.opensearch.action.search.*; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.common.action.ActionFuture; import org.opensearch.common.settings.Settings; @@ -33,6 +32,7 @@ import org.opensearch.sql.opensearch.request.OpenSearchRequest; import org.opensearch.sql.opensearch.request.OpenSearchScrollRequest; import org.opensearch.sql.opensearch.response.OpenSearchResponse; +import org.opensearch.transport.client.node.NodeClient; /** OpenSearch connection by node client. */ public class OpenSearchNodeClient implements OpenSearchClient { diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java index 5cb6a69918..ee4ac641a9 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/client/OpenSearchRestClient.java @@ -27,13 +27,13 @@ import org.opensearch.client.indices.GetIndexResponse; import org.opensearch.client.indices.GetMappingsRequest; import org.opensearch.client.indices.GetMappingsResponse; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.common.settings.Settings; import org.opensearch.sql.opensearch.mapping.IndexMapping; import org.opensearch.sql.opensearch.request.OpenSearchRequest; import org.opensearch.sql.opensearch.request.OpenSearchScrollRequest; import org.opensearch.sql.opensearch.response.OpenSearchResponse; +import org.opensearch.transport.client.node.NodeClient; /** * OpenSearch REST client to support standalone mode that runs entire engine from remote. diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManager.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManager.java index dbe91dc398..2aa10ef885 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManager.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManager.java @@ -11,12 +11,12 @@ import java.util.Map; import lombok.RequiredArgsConstructor; import org.apache.logging.log4j.ThreadContext; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.unit.TimeValue; import org.opensearch.sql.executor.QueryId; import org.opensearch.sql.executor.QueryManager; import org.opensearch.sql.executor.execution.AbstractPlan; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.node.NodeClient; /** QueryManager implemented in OpenSearch cluster. */ @RequiredArgsConstructor diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/ADOperator.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/ADOperator.java index f9c32b7424..06d416c9f9 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/ADOperator.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/ADOperator.java @@ -27,7 +27,6 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.tuple.Pair; -import org.opensearch.client.node.NodeClient; import org.opensearch.ml.common.FunctionName; import org.opensearch.ml.common.dataframe.DataFrame; import org.opensearch.ml.common.dataframe.Row; @@ -39,6 +38,7 @@ import org.opensearch.sql.data.model.ExprValue; import org.opensearch.sql.planner.physical.PhysicalPlan; import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor; +import org.opensearch.transport.client.node.NodeClient; /** AD Physical operator to call AD interface to get results for algorithm execution. */ @RequiredArgsConstructor diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperator.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperator.java index ef60782a24..e368fc9a58 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperator.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperator.java @@ -17,7 +17,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.opensearch.client.node.NodeClient; import org.opensearch.ml.common.FunctionName; import org.opensearch.ml.common.dataframe.DataFrame; import org.opensearch.ml.common.dataframe.Row; @@ -28,6 +27,7 @@ import org.opensearch.sql.data.model.ExprValue; import org.opensearch.sql.planner.physical.PhysicalPlan; import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor; +import org.opensearch.transport.client.node.NodeClient; /** * ml-commons Physical operator to call machine learning interface to get results for algorithm diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorActions.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorActions.java index ddb0e2d5f4..c82e723f19 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorActions.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorActions.java @@ -20,7 +20,6 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.opensearch.client.node.NodeClient; import org.opensearch.ml.client.MachineLearningNodeClient; import org.opensearch.ml.common.FunctionName; import org.opensearch.ml.common.dataframe.ColumnMeta; @@ -46,6 +45,7 @@ import org.opensearch.sql.data.model.ExprValue; import org.opensearch.sql.opensearch.client.MLClient; import org.opensearch.sql.planner.physical.PhysicalPlan; +import org.opensearch.transport.client.node.NodeClient; /** Common method actions for ml-commons related operators. */ public abstract class MLCommonsOperatorActions extends PhysicalPlan { diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLOperator.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLOperator.java index 6dc7078a0d..e914090f0c 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLOperator.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/MLOperator.java @@ -14,7 +14,6 @@ import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.opensearch.client.node.NodeClient; import org.opensearch.ml.common.dataframe.DataFrame; import org.opensearch.ml.common.dataframe.Row; import org.opensearch.ml.common.output.MLOutput; @@ -23,6 +22,7 @@ import org.opensearch.sql.data.model.ExprValue; import org.opensearch.sql.planner.physical.PhysicalPlan; import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor; +import org.opensearch.transport.client.node.NodeClient; /** * ml-commons Physical operator to call machine learning interface to get results for algorithm diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalOperator.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalOperator.java index c76ba76a79..b52c1dc3f8 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalOperator.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalOperator.java @@ -14,7 +14,6 @@ import java.util.Map; import lombok.Getter; import org.apache.commons.lang3.tuple.Pair; -import org.opensearch.client.node.NodeClient; import org.opensearch.sql.data.model.ExprValue; import org.opensearch.sql.expression.Expression; import org.opensearch.sql.expression.ReferenceExpression; @@ -22,6 +21,7 @@ import org.opensearch.sql.expression.function.OpenSearchFunctions; import org.opensearch.sql.planner.physical.EvalOperator; import org.opensearch.sql.planner.physical.PhysicalPlan; +import org.opensearch.transport.client.node.NodeClient; /** * OpenSearch version of eval operator, which contains nodeClient, in order to perform OpenSearch diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalProcessor.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalProcessor.java index 3bd48405b8..85834efe53 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalProcessor.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalProcessor.java @@ -13,7 +13,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.opensearch.client.node.NodeClient; import org.opensearch.geospatial.action.IpEnrichmentActionClient; import org.opensearch.sql.common.utils.StringUtils; import org.opensearch.sql.data.model.ExprStringValue; @@ -23,6 +22,7 @@ import org.opensearch.sql.expression.env.Environment; import org.opensearch.sql.expression.function.BuiltinFunctionName; import org.opensearch.sql.expression.function.OpenSearchFunctions; +import org.opensearch.transport.client.node.NodeClient; /** Class to centralise all OpenSearch specific eval operations. */ public class OpenSearchEvalProcessor { diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/util/RestRequestUtil.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/util/RestRequestUtil.java index e02bcf5af9..3da51c8ce1 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/util/RestRequestUtil.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/util/RestRequestUtil.java @@ -1,9 +1,9 @@ package org.opensearch.sql.opensearch.util; import lombok.NonNull; -import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestRequest; +import org.opensearch.transport.client.node.NodeClient; /** RestRequestUtil is a utility class for common operations on OpenSearch RestRequest's. */ public class RestRequestUtil { diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClientTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClientTest.java index ea6707e084..6e8cb789b4 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClientTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/client/OpenSearchNodeClientTest.java @@ -51,7 +51,6 @@ import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.opensearch.action.admin.indices.settings.get.GetSettingsResponse; import org.opensearch.action.search.*; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.MappingMetadata; @@ -79,6 +78,7 @@ import org.opensearch.sql.opensearch.request.OpenSearchRequest; import org.opensearch.sql.opensearch.request.OpenSearchScrollRequest; import org.opensearch.sql.opensearch.response.OpenSearchResponse; +import org.opensearch.transport.client.node.NodeClient; @ExtendWith(MockitoExtension.class) @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class) diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManagerTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManagerTest.java index 047a510180..d640825bba 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManagerTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/OpenSearchQueryManagerTest.java @@ -19,7 +19,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.client.node.NodeClient; import org.opensearch.sql.ast.tree.UnresolvedPlan; import org.opensearch.sql.common.response.ResponseListener; import org.opensearch.sql.executor.ExecutionEngine; @@ -28,6 +27,7 @@ import org.opensearch.sql.executor.execution.AbstractPlan; import org.opensearch.sql.executor.execution.QueryPlan; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.node.NodeClient; @ExtendWith(MockitoExtension.class) class OpenSearchQueryManagerTest { diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java index 18958c74db..16f71a7b81 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java @@ -38,7 +38,6 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.opensearch.client.node.NodeClient; import org.opensearch.sql.ast.dsl.AstDSL; import org.opensearch.sql.ast.expression.DataType; import org.opensearch.sql.ast.expression.Literal; @@ -75,6 +74,7 @@ import org.opensearch.sql.planner.physical.PhysicalPlanDSL; import org.opensearch.sql.planner.physical.TakeOrderedOperator; import org.opensearch.sql.planner.physical.TrendlineOperator; +import org.opensearch.transport.client.node.NodeClient; @ExtendWith(MockitoExtension.class) @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class) diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorTest.java index e6d2bac85b..efa937b0d1 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLCommonsOperatorTest.java @@ -33,7 +33,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import org.opensearch.client.node.NodeClient; import org.opensearch.ml.client.MachineLearningNodeClient; import org.opensearch.ml.common.dataframe.DataFrame; import org.opensearch.ml.common.dataframe.DataFrameBuilder; @@ -47,6 +46,7 @@ import org.opensearch.sql.opensearch.client.MLClient; import org.opensearch.sql.planner.physical.PhysicalPlan; import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor; +import org.opensearch.transport.client.node.NodeClient; @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLOperatorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLOperatorTest.java index fa328fd26c..5004965d58 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLOperatorTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/MLOperatorTest.java @@ -36,7 +36,6 @@ import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.client.node.NodeClient; import org.opensearch.ml.client.MachineLearningNodeClient; import org.opensearch.ml.common.dataframe.DataFrame; import org.opensearch.ml.common.dataframe.DataFrameBuilder; @@ -52,6 +51,7 @@ import org.opensearch.sql.opensearch.client.MLClient; import org.opensearch.sql.planner.physical.PhysicalPlan; import org.opensearch.sql.planner.physical.PhysicalPlanNodeVisitor; +import org.opensearch.transport.client.node.NodeClient; @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalOperatorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalOperatorTest.java index 9cd6a98f20..fe8f09a75a 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalOperatorTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/planner/physical/OpenSearchEvalOperatorTest.java @@ -26,7 +26,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.action.ActionFuture; import org.opensearch.core.action.ActionResponse; import org.opensearch.geospatial.action.IpEnrichmentAction; @@ -44,6 +43,7 @@ import org.opensearch.sql.opensearch.data.type.OpenSearchTextType; import org.opensearch.sql.opensearch.data.value.OpenSearchExprTextValue; import org.opensearch.sql.planner.physical.PhysicalPlan; +import org.opensearch.transport.client.node.NodeClient; /** To assert the original behaviour of eval operator. */ @ExtendWith(MockitoExtension.class) diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java b/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java index 21b747e9e2..f615313939 100644 --- a/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java +++ b/plugin/src/main/java/org/opensearch/sql/plugin/SQLPlugin.java @@ -23,8 +23,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionType; -import org.opensearch.client.Client; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; @@ -109,6 +107,8 @@ import org.opensearch.threadpool.ExecutorBuilder; import org.opensearch.threadpool.FixedExecutorBuilder; import org.opensearch.threadpool.ThreadPool; +import org.opensearch.transport.client.Client; +import org.opensearch.transport.client.node.NodeClient; import org.opensearch.watcher.ResourceWatcherService; public class SQLPlugin extends Plugin diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginModule.java b/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginModule.java index 33a785c498..0d2287a123 100644 --- a/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginModule.java +++ b/plugin/src/main/java/org/opensearch/sql/plugin/config/OpenSearchPluginModule.java @@ -6,7 +6,6 @@ package org.opensearch.sql.plugin.config; import lombok.RequiredArgsConstructor; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.inject.AbstractModule; import org.opensearch.common.inject.Provides; import org.opensearch.common.inject.Singleton; @@ -37,6 +36,7 @@ import org.opensearch.sql.sql.SQLService; import org.opensearch.sql.sql.antlr.SQLSyntaxParser; import org.opensearch.sql.storage.StorageEngine; +import org.opensearch.transport.client.node.NodeClient; @RequiredArgsConstructor public class OpenSearchPluginModule extends AbstractModule { diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java index 7e6d3c1422..2243fb4a67 100644 --- a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java +++ b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLQueryAction.java @@ -17,7 +17,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.OpenSearchException; -import org.opensearch.client.node.NodeClient; import org.opensearch.core.action.ActionListener; import org.opensearch.core.rest.RestStatus; import org.opensearch.index.IndexNotFoundException; @@ -37,6 +36,7 @@ import org.opensearch.sql.plugin.transport.PPLQueryAction; import org.opensearch.sql.plugin.transport.TransportPPLQueryRequest; import org.opensearch.sql.plugin.transport.TransportPPLQueryResponse; +import org.opensearch.transport.client.node.NodeClient; public class RestPPLQueryAction extends BaseRestHandler { public static final String QUERY_API_ENDPOINT = "/_plugins/_ppl"; diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLStatsAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLStatsAction.java index d3d7074b20..6ecaa489e4 100644 --- a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLStatsAction.java +++ b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestPPLStatsAction.java @@ -14,7 +14,6 @@ import java.util.Set; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.settings.Settings; import org.opensearch.core.rest.RestStatus; import org.opensearch.rest.BaseRestHandler; @@ -25,6 +24,7 @@ import org.opensearch.sql.datasources.utils.Scheduler; import org.opensearch.sql.legacy.executor.format.ErrorMessageFactory; import org.opensearch.sql.legacy.metrics.Metrics; +import org.opensearch.transport.client.node.NodeClient; /** PPL Node level status. */ public class RestPPLStatsAction extends BaseRestHandler { diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java index f9080051b4..e0736923d4 100644 --- a/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java +++ b/plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java @@ -15,8 +15,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.OpenSearchGenerationException; import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; -import org.opensearch.client.Requests; -import org.opensearch.client.node.NodeClient; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.core.xcontent.XContentBuilder; @@ -28,6 +26,8 @@ import org.opensearch.rest.action.RestToXContentListener; import org.opensearch.sql.common.utils.QueryContext; import org.opensearch.sql.legacy.executor.format.ErrorMessageFactory; +import org.opensearch.transport.client.Requests; +import org.opensearch.transport.client.node.NodeClient; public class RestQuerySettingsAction extends BaseRestHandler { private static final Logger LOG = LogManager.getLogger(RestQuerySettingsAction.class); diff --git a/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java b/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java index 76283ac63a..9ba6eb6475 100644 --- a/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java +++ b/plugin/src/main/java/org/opensearch/sql/plugin/transport/TransportPPLQueryAction.java @@ -14,7 +14,6 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.inject.Injector; @@ -43,6 +42,7 @@ import org.opensearch.sql.protocol.response.format.VisualizationResponseFormatter; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; +import org.opensearch.transport.client.node.NodeClient; /** Send PPL query transport action. */ public class TransportPPLQueryAction