From 905c9cb9f491fe8359ff0b685b90030bb900aaeb Mon Sep 17 00:00:00 2001 From: Balasubramanian Date: Mon, 10 Feb 2025 11:54:59 -0800 Subject: [PATCH] Update package name to fix compilation issue Core renamed this package in https://github.com/opensearch-project/OpenSearch/pull/17272 This commit renames package accordingly Signed-off-by: Balasubramanian --- CHANGELOG.md | 1 + src/main/java/org/opensearch/knn/index/KNNCircuitBreaker.java | 2 +- src/main/java/org/opensearch/knn/index/KNNSettings.java | 2 +- src/main/java/org/opensearch/knn/indices/ModelDao.java | 2 +- src/main/java/org/opensearch/knn/plugin/KNNPlugin.java | 2 +- .../org/opensearch/knn/plugin/rest/RestClearCacheHandler.java | 2 +- .../org/opensearch/knn/plugin/rest/RestDeleteModelHandler.java | 2 +- .../org/opensearch/knn/plugin/rest/RestGetModelHandler.java | 2 +- .../org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java | 2 +- .../org/opensearch/knn/plugin/rest/RestKNNWarmupHandler.java | 2 +- .../org/opensearch/knn/plugin/rest/RestSearchModelHandler.java | 2 +- .../org/opensearch/knn/plugin/rest/RestTrainModelHandler.java | 2 +- .../knn/plugin/transport/TrainingJobRouterTransportAction.java | 2 +- src/main/java/org/opensearch/knn/training/VectorReader.java | 2 +- .../plugin/transport/TrainingJobRouterTransportActionTests.java | 2 +- .../models/quantizationState/QuantizationStateCacheTests.java | 2 +- 16 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44986af0cb..6a31b50da8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), * Upgrade min JDK compatibility to JDK 21 [#2422](https://github.com/opensearch-project/k-NN/pull/2422) ### Documentation ### Maintenance +* Update package name to fix compilation issue [#2513](https://github.com/opensearch-project/k-NN/pull/2513) ### Refactoring ## [Unreleased 2.x](https://github.com/opensearch-project/k-NN/compare/2.18...2.x) diff --git a/src/main/java/org/opensearch/knn/index/KNNCircuitBreaker.java b/src/main/java/org/opensearch/knn/index/KNNCircuitBreaker.java index f5d49e1a3a..fbb025c973 100644 --- a/src/main/java/org/opensearch/knn/index/KNNCircuitBreaker.java +++ b/src/main/java/org/opensearch/knn/index/KNNCircuitBreaker.java @@ -13,7 +13,7 @@ import org.opensearch.knn.plugin.transport.KNNStatsResponse; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.unit.TimeValue; import org.opensearch.threadpool.ThreadPool; diff --git a/src/main/java/org/opensearch/knn/index/KNNSettings.java b/src/main/java/org/opensearch/knn/index/KNNSettings.java index 035bddd814..db80fe3e19 100644 --- a/src/main/java/org/opensearch/knn/index/KNNSettings.java +++ b/src/main/java/org/opensearch/knn/index/KNNSettings.java @@ -11,7 +11,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Booleans; diff --git a/src/main/java/org/opensearch/knn/indices/ModelDao.java b/src/main/java/org/opensearch/knn/indices/ModelDao.java index 387a23587d..f7e2f77779 100644 --- a/src/main/java/org/opensearch/knn/indices/ModelDao.java +++ b/src/main/java/org/opensearch/knn/indices/ModelDao.java @@ -36,7 +36,7 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.WriteRequest; import org.opensearch.action.support.clustermanager.AcknowledgedResponse; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.cluster.health.ClusterIndexHealth; import org.opensearch.cluster.metadata.IndexMetadata; diff --git a/src/main/java/org/opensearch/knn/plugin/KNNPlugin.java b/src/main/java/org/opensearch/knn/plugin/KNNPlugin.java index 7fb880f192..44c824862a 100644 --- a/src/main/java/org/opensearch/knn/plugin/KNNPlugin.java +++ b/src/main/java/org/opensearch/knn/plugin/KNNPlugin.java @@ -49,7 +49,7 @@ import com.google.common.collect.ImmutableList; import org.opensearch.action.ActionRequest; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; diff --git a/src/main/java/org/opensearch/knn/plugin/rest/RestClearCacheHandler.java b/src/main/java/org/opensearch/knn/plugin/rest/RestClearCacheHandler.java index 2cbc9cd760..d66c187ea9 100644 --- a/src/main/java/org/opensearch/knn/plugin/rest/RestClearCacheHandler.java +++ b/src/main/java/org/opensearch/knn/plugin/rest/RestClearCacheHandler.java @@ -8,7 +8,7 @@ import com.google.common.collect.ImmutableList; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.opensearch.client.node.NodeClient; +import org.opensearch.transport.client.node.NodeClient; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.core.common.Strings; diff --git a/src/main/java/org/opensearch/knn/plugin/rest/RestDeleteModelHandler.java b/src/main/java/org/opensearch/knn/plugin/rest/RestDeleteModelHandler.java index 750001e580..ea9a8e23da 100644 --- a/src/main/java/org/opensearch/knn/plugin/rest/RestDeleteModelHandler.java +++ b/src/main/java/org/opensearch/knn/plugin/rest/RestDeleteModelHandler.java @@ -12,7 +12,7 @@ package org.opensearch.knn.plugin.rest; import com.google.common.collect.ImmutableList; -import org.opensearch.client.node.NodeClient; +import org.opensearch.transport.client.node.NodeClient; import org.opensearch.core.common.Strings; import org.opensearch.knn.plugin.KNNPlugin; import org.opensearch.knn.plugin.transport.DeleteModelAction; diff --git a/src/main/java/org/opensearch/knn/plugin/rest/RestGetModelHandler.java b/src/main/java/org/opensearch/knn/plugin/rest/RestGetModelHandler.java index 8b1f0676b7..9ab221525e 100644 --- a/src/main/java/org/opensearch/knn/plugin/rest/RestGetModelHandler.java +++ b/src/main/java/org/opensearch/knn/plugin/rest/RestGetModelHandler.java @@ -13,7 +13,7 @@ import com.google.common.collect.ImmutableList; import org.apache.commons.lang.StringUtils; -import org.opensearch.client.node.NodeClient; +import org.opensearch.transport.client.node.NodeClient; import org.opensearch.knn.plugin.KNNPlugin; import org.opensearch.knn.plugin.transport.GetModelAction; import org.opensearch.knn.plugin.transport.GetModelRequest; diff --git a/src/main/java/org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java b/src/main/java/org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java index 9049a83db7..faeb715584 100644 --- a/src/main/java/org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java +++ b/src/main/java/org/opensearch/knn/plugin/rest/RestKNNStatsHandler.java @@ -11,7 +11,7 @@ import org.opensearch.knn.plugin.transport.KNNStatsAction; import org.opensearch.knn.plugin.transport.KNNStatsRequest; import com.google.common.collect.ImmutableList; -import org.opensearch.client.node.NodeClient; +import org.opensearch.transport.client.node.NodeClient; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestActions; diff --git a/src/main/java/org/opensearch/knn/plugin/rest/RestKNNWarmupHandler.java b/src/main/java/org/opensearch/knn/plugin/rest/RestKNNWarmupHandler.java index 42991af13b..e8ab5e6754 100644 --- a/src/main/java/org/opensearch/knn/plugin/rest/RestKNNWarmupHandler.java +++ b/src/main/java/org/opensearch/knn/plugin/rest/RestKNNWarmupHandler.java @@ -13,7 +13,7 @@ import com.google.common.collect.ImmutableList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.client.node.NodeClient; +import org.opensearch.transport.client.node.NodeClient; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; diff --git a/src/main/java/org/opensearch/knn/plugin/rest/RestSearchModelHandler.java b/src/main/java/org/opensearch/knn/plugin/rest/RestSearchModelHandler.java index 675e3c1d1f..07eb16650d 100644 --- a/src/main/java/org/opensearch/knn/plugin/rest/RestSearchModelHandler.java +++ b/src/main/java/org/opensearch/knn/plugin/rest/RestSearchModelHandler.java @@ -13,7 +13,7 @@ import com.google.common.collect.ImmutableList; import org.opensearch.action.search.SearchRequest; -import org.opensearch.client.node.NodeClient; +import org.opensearch.transport.client.node.NodeClient; import org.opensearch.knn.plugin.KNNPlugin; import org.opensearch.knn.plugin.transport.SearchModelAction; import org.opensearch.rest.BaseRestHandler; diff --git a/src/main/java/org/opensearch/knn/plugin/rest/RestTrainModelHandler.java b/src/main/java/org/opensearch/knn/plugin/rest/RestTrainModelHandler.java index 3c835af608..339cdffb32 100644 --- a/src/main/java/org/opensearch/knn/plugin/rest/RestTrainModelHandler.java +++ b/src/main/java/org/opensearch/knn/plugin/rest/RestTrainModelHandler.java @@ -12,7 +12,7 @@ package org.opensearch.knn.plugin.rest; import com.google.common.collect.ImmutableList; -import org.opensearch.client.node.NodeClient; +import org.opensearch.transport.client.node.NodeClient; import org.opensearch.core.xcontent.XContentParser; import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.knn.common.KNNConstants; diff --git a/src/main/java/org/opensearch/knn/plugin/transport/TrainingJobRouterTransportAction.java b/src/main/java/org/opensearch/knn/plugin/transport/TrainingJobRouterTransportAction.java index 4ad6227d59..3e59cc6621 100644 --- a/src/main/java/org/opensearch/knn/plugin/transport/TrainingJobRouterTransportAction.java +++ b/src/main/java/org/opensearch/knn/plugin/transport/TrainingJobRouterTransportAction.java @@ -17,7 +17,7 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.ActionFilters; import org.opensearch.action.support.HandledTransportAction; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.ValidationException; diff --git a/src/main/java/org/opensearch/knn/training/VectorReader.java b/src/main/java/org/opensearch/knn/training/VectorReader.java index 3935ee9564..20045260f9 100644 --- a/src/main/java/org/opensearch/knn/training/VectorReader.java +++ b/src/main/java/org/opensearch/knn/training/VectorReader.java @@ -17,7 +17,7 @@ import org.opensearch.action.search.SearchRequestBuilder; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.SearchScrollRequestBuilder; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.ValidationException; diff --git a/src/test/java/org/opensearch/knn/plugin/transport/TrainingJobRouterTransportActionTests.java b/src/test/java/org/opensearch/knn/plugin/transport/TrainingJobRouterTransportActionTests.java index 30c5d33a1e..0507788f0f 100644 --- a/src/test/java/org/opensearch/knn/plugin/transport/TrainingJobRouterTransportActionTests.java +++ b/src/test/java/org/opensearch/knn/plugin/transport/TrainingJobRouterTransportActionTests.java @@ -16,7 +16,7 @@ import org.opensearch.core.action.ActionListener; import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.ActionFilters; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/src/test/java/org/opensearch/knn/quantization/models/quantizationState/QuantizationStateCacheTests.java b/src/test/java/org/opensearch/knn/quantization/models/quantizationState/QuantizationStateCacheTests.java index 3886e0c9ae..87cb57cdcb 100644 --- a/src/test/java/org/opensearch/knn/quantization/models/quantizationState/QuantizationStateCacheTests.java +++ b/src/test/java/org/opensearch/knn/quantization/models/quantizationState/QuantizationStateCacheTests.java @@ -9,7 +9,7 @@ import lombok.SneakyThrows; import org.junit.After; import org.junit.Before; -import org.opensearch.client.Client; +import org.opensearch.transport.client.Client; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings;