From b82ca8b894d57b934be6ae323fff1dedbddd487f Mon Sep 17 00:00:00 2001 From: agam20821mg <118214241+agam20821mg@users.noreply.github.com> Date: Tue, 28 Jan 2025 16:22:48 +0530 Subject: [PATCH] chores: bumps to ES 8.17.0 (#506) * Compatibility fixes for ES 8.17.0 * Update LtrQueryTests.java Test works when uncommenting this, so I'd rather keep the test. * Update LtrQueryTests.java fixing the indentation I did wrong. --------- Co-authored-by: Daniel Wrigley <54574577+wrigleyDan@users.noreply.github.com> --- gradle.properties | 4 ++-- .../o19s/es/ltr/action/BaseIntegrationTest.java | 15 +++++++++++++++ .../action/TransportAddFeatureToSetAction.java | 2 +- .../es/ltr/action/TransportCacheStatsAction.java | 4 ++-- .../es/ltr/action/TransportClearCachesAction.java | 4 ++-- .../action/TransportCreateModelFromSetAction.java | 2 +- .../ltr/action/TransportFeatureStoreAction.java | 2 +- .../es/ltr/action/TransportLTRStatsAction.java | 4 ++-- .../es/ltr/action/TransportListStoresAction.java | 8 ++++++-- .../suppliers/PluginHealthStatusSupplier.java | 4 ++-- .../ltr/stats/suppliers/StoreStatsSupplier.java | 3 ++- .../es/explore/ExplorerQueryBuilderTests.java | 3 +-- .../o19s/es/ltr/query/LtrQueryBuilderTests.java | 3 +-- .../es/ltr/query/StoredLtrQueryBuilderTests.java | 3 +-- .../ltr/query/ValidatingLtrQueryBuilderTests.java | 3 +-- .../es/termstat/TermStatQueryBuilderTests.java | 3 +-- 16 files changed, 41 insertions(+), 26 deletions(-) diff --git a/gradle.properties b/gradle.properties index ffa6ff31..bf015c47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ ltrVersion = 1.5.9 -elasticsearchVersion = 8.15.5 -luceneVersion = 9.11.1 +elasticsearchVersion = 8.17.0 +luceneVersion = 9.12.0 ow2Version = 8.0.1 antlrVersion = 4.5.1-1 diff --git a/src/javaRestTest/java/com/o19s/es/ltr/action/BaseIntegrationTest.java b/src/javaRestTest/java/com/o19s/es/ltr/action/BaseIntegrationTest.java index 56a96807..e2019c63 100644 --- a/src/javaRestTest/java/com/o19s/es/ltr/action/BaseIntegrationTest.java +++ b/src/javaRestTest/java/com/o19s/es/ltr/action/BaseIntegrationTest.java @@ -194,6 +194,11 @@ public double execute(ExplanationHolder explainationHolder) { public boolean needs_score() { return false; } + + @Override + public boolean needs_termStats() { + return false; + } }; return context.factoryClazz.cast(factory); @@ -284,6 +289,11 @@ public double execute(ExplanationHolder explainationHolder ) { public boolean needs_score() { return false; } + + @Override + public boolean needs_termStats() { + return false; + } }; return context.factoryClazz.cast(factory); @@ -321,6 +331,11 @@ public double execute(ExplanationHolder explanation) { public boolean needs_score() { return false; } + + @Override + public boolean needs_termStats() { + return false; + } }; return context.factoryClazz.cast(factory); diff --git a/src/main/java/com/o19s/es/ltr/action/TransportAddFeatureToSetAction.java b/src/main/java/com/o19s/es/ltr/action/TransportAddFeatureToSetAction.java index 6aeaed8e..ef7f30e7 100644 --- a/src/main/java/com/o19s/es/ltr/action/TransportAddFeatureToSetAction.java +++ b/src/main/java/com/o19s/es/ltr/action/TransportAddFeatureToSetAction.java @@ -36,7 +36,7 @@ import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.injection.guice.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.CountDown; import org.elasticsearch.index.query.BoolQueryBuilder; diff --git a/src/main/java/com/o19s/es/ltr/action/TransportCacheStatsAction.java b/src/main/java/com/o19s/es/ltr/action/TransportCacheStatsAction.java index 44fcf4b7..3b983166 100644 --- a/src/main/java/com/o19s/es/ltr/action/TransportCacheStatsAction.java +++ b/src/main/java/com/o19s/es/ltr/action/TransportCacheStatsAction.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.injection.guice.Inject; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.threadpool.ThreadPool; @@ -38,7 +38,7 @@ import java.util.List; public class TransportCacheStatsAction extends TransportNodesAction { + TransportCacheStatsAction.CachesStatsNodeRequest, CachesStatsNodeResponse, CachesStatsAction> { private final Caches caches; @Inject diff --git a/src/main/java/com/o19s/es/ltr/action/TransportClearCachesAction.java b/src/main/java/com/o19s/es/ltr/action/TransportClearCachesAction.java index 7f3a94ee..e5b91c17 100644 --- a/src/main/java/com/o19s/es/ltr/action/TransportClearCachesAction.java +++ b/src/main/java/com/o19s/es/ltr/action/TransportClearCachesAction.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.injection.guice.Inject; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.Settings; @@ -39,7 +39,7 @@ import java.util.List; public class TransportClearCachesAction extends TransportNodesAction { + TransportClearCachesAction.ClearCachesNodeRequest, ClearCachesNodeResponse, ClearCachesAction> { private final Caches caches; @Inject diff --git a/src/main/java/com/o19s/es/ltr/action/TransportCreateModelFromSetAction.java b/src/main/java/com/o19s/es/ltr/action/TransportCreateModelFromSetAction.java index e3099079..cfc77b21 100644 --- a/src/main/java/com/o19s/es/ltr/action/TransportCreateModelFromSetAction.java +++ b/src/main/java/com/o19s/es/ltr/action/TransportCreateModelFromSetAction.java @@ -31,7 +31,7 @@ import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.injection.guice.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.tasks.Task; diff --git a/src/main/java/com/o19s/es/ltr/action/TransportFeatureStoreAction.java b/src/main/java/com/o19s/es/ltr/action/TransportFeatureStoreAction.java index 83fac239..c90dd578 100644 --- a/src/main/java/com/o19s/es/ltr/action/TransportFeatureStoreAction.java +++ b/src/main/java/com/o19s/es/ltr/action/TransportFeatureStoreAction.java @@ -39,7 +39,7 @@ import org.elasticsearch.action.support.WriteRequest; import org.elasticsearch.client.internal.Client; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.injection.guice.Inject; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.tasks.Task; import org.elasticsearch.transport.TransportService; diff --git a/src/main/java/com/o19s/es/ltr/action/TransportLTRStatsAction.java b/src/main/java/com/o19s/es/ltr/action/TransportLTRStatsAction.java index 3e46ed48..fb80a200 100644 --- a/src/main/java/com/o19s/es/ltr/action/TransportLTRStatsAction.java +++ b/src/main/java/com/o19s/es/ltr/action/TransportLTRStatsAction.java @@ -10,7 +10,7 @@ import org.elasticsearch.action.support.nodes.TransportNodesAction; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.injection.guice.Inject; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; public class TransportLTRStatsAction extends - TransportNodesAction { + TransportNodesAction { private final LTRStats ltrStats; diff --git a/src/main/java/com/o19s/es/ltr/action/TransportListStoresAction.java b/src/main/java/com/o19s/es/ltr/action/TransportListStoresAction.java index 66c2605d..2259d227 100644 --- a/src/main/java/com/o19s/es/ltr/action/TransportListStoresAction.java +++ b/src/main/java/com/o19s/es/ltr/action/TransportListStoresAction.java @@ -20,6 +20,7 @@ import com.o19s.es.ltr.action.ListStoresAction.ListStoresActionResponse; import com.o19s.es.ltr.feature.store.index.IndexFeatureStore; import org.elasticsearch.action.ActionListener; +import org.elasticsearch.core.TimeValue; import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest; import org.elasticsearch.action.search.MultiSearchRequestBuilder; import org.elasticsearch.action.search.MultiSearchResponse; @@ -35,7 +36,7 @@ import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.core.Tuple; import org.elasticsearch.tasks.Task; -import org.elasticsearch.common.inject.Inject; +import org.elasticsearch.injection.guice.Inject; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation; @@ -73,7 +74,10 @@ public TransportListStoresAction(TransportService transportService, protected void masterOperation(Task task, ListStoresActionRequest request, ClusterState state, ActionListener listener) throws Exception { String[] names = indexNameExpressionResolver.concreteIndexNames(state, - new ClusterStateRequest().indices(IndexFeatureStore.DEFAULT_STORE, IndexFeatureStore.STORE_PREFIX + "*")); + new ClusterStateRequest( + TimeValue.timeValueMinutes(1)).indices( + IndexFeatureStore.DEFAULT_STORE, IndexFeatureStore.STORE_PREFIX + "*") + ); final MultiSearchRequestBuilder req = client.prepareMultiSearch(); final List> versions = new ArrayList<>(); Stream.of(names) diff --git a/src/main/java/com/o19s/es/ltr/stats/suppliers/PluginHealthStatusSupplier.java b/src/main/java/com/o19s/es/ltr/stats/suppliers/PluginHealthStatusSupplier.java index 82daa208..f1f2b2d7 100644 --- a/src/main/java/com/o19s/es/ltr/stats/suppliers/PluginHealthStatusSupplier.java +++ b/src/main/java/com/o19s/es/ltr/stats/suppliers/PluginHealthStatusSupplier.java @@ -6,7 +6,7 @@ import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.util.concurrent.ThreadContext; - +import org.elasticsearch.core.TimeValue; import java.util.Arrays; import java.util.Locale; import java.util.function.Supplier; @@ -38,7 +38,7 @@ public String get() { private String getAggregateStoresStatus() { String[] names = indexNameExpressionResolver.concreteIndexNames(clusterService.state(), - new ClusterStateRequest().indices( + new ClusterStateRequest(TimeValue.timeValueMinutes(1)).indices( IndexFeatureStore.DEFAULT_STORE, IndexFeatureStore.STORE_PREFIX + "*")); return Arrays.stream(names) .filter(IndexFeatureStore::isIndexStore) diff --git a/src/main/java/com/o19s/es/ltr/stats/suppliers/StoreStatsSupplier.java b/src/main/java/com/o19s/es/ltr/stats/suppliers/StoreStatsSupplier.java index dc5084ce..ce670685 100644 --- a/src/main/java/com/o19s/es/ltr/stats/suppliers/StoreStatsSupplier.java +++ b/src/main/java/com/o19s/es/ltr/stats/suppliers/StoreStatsSupplier.java @@ -12,6 +12,7 @@ import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.service.ClusterService; +import org.elasticsearch.core.TimeValue; import org.elasticsearch.index.Index; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders; @@ -67,7 +68,7 @@ public StoreStatsSupplier(Client client, ClusterService clusterService, IndexNam @Override public Map> get() { String[] names = indexNameExpressionResolver.concreteIndexNames(clusterService.state(), - new ClusterStateRequest().indices( + new ClusterStateRequest(TimeValue.timeValueMinutes(1)).indices( IndexFeatureStore.DEFAULT_STORE, IndexFeatureStore.STORE_PREFIX + "*")); final MultiSearchRequestBuilder requestBuilder = client.prepareMultiSearch(); List indices = new ArrayList<>(); diff --git a/src/test/java/com/o19s/es/explore/ExplorerQueryBuilderTests.java b/src/test/java/com/o19s/es/explore/ExplorerQueryBuilderTests.java index 65794abc..1d1ae98d 100644 --- a/src/test/java/com/o19s/es/explore/ExplorerQueryBuilderTests.java +++ b/src/test/java/com/o19s/es/explore/ExplorerQueryBuilderTests.java @@ -24,7 +24,6 @@ import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import java.io.IOException; import java.util.Collection; @@ -35,7 +34,7 @@ public class ExplorerQueryBuilderTests extends AbstractQueryTestCase { // TODO: Remove the TestGeoShapeFieldMapperPlugin once upstream has completed the migration. protected Collection> getPlugins() { - return asList(LtrQueryParserPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return asList(LtrQueryParserPlugin.class); } @Override diff --git a/src/test/java/com/o19s/es/ltr/query/LtrQueryBuilderTests.java b/src/test/java/com/o19s/es/ltr/query/LtrQueryBuilderTests.java index f23742ad..a8d03092 100644 --- a/src/test/java/com/o19s/es/ltr/query/LtrQueryBuilderTests.java +++ b/src/test/java/com/o19s/es/ltr/query/LtrQueryBuilderTests.java @@ -27,7 +27,6 @@ import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptType; import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import java.io.IOException; import java.util.ArrayList; @@ -45,7 +44,7 @@ public class LtrQueryBuilderTests extends AbstractQueryTestCase // TODO: Remove the TestGeoShapeFieldMapperPlugin once upstream has completed the migration. protected Collection> getPlugins() { - return Arrays.asList(LtrQueryParserPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return Arrays.asList(LtrQueryParserPlugin.class); } private static final String simpleModel = "## LambdaMART\\n" + diff --git a/src/test/java/com/o19s/es/ltr/query/StoredLtrQueryBuilderTests.java b/src/test/java/com/o19s/es/ltr/query/StoredLtrQueryBuilderTests.java index 8c820085..6705c01e 100644 --- a/src/test/java/com/o19s/es/ltr/query/StoredLtrQueryBuilderTests.java +++ b/src/test/java/com/o19s/es/ltr/query/StoredLtrQueryBuilderTests.java @@ -46,7 +46,6 @@ import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.junit.Before; import java.io.IOException; @@ -67,7 +66,7 @@ public class StoredLtrQueryBuilderTests extends AbstractQueryTestCase> getPlugins() { - return Arrays.asList(TestPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return Arrays.asList(TestPlugin.class); } @Override diff --git a/src/test/java/com/o19s/es/ltr/query/ValidatingLtrQueryBuilderTests.java b/src/test/java/com/o19s/es/ltr/query/ValidatingLtrQueryBuilderTests.java index c5f31e3b..ee234dd0 100644 --- a/src/test/java/com/o19s/es/ltr/query/ValidatingLtrQueryBuilderTests.java +++ b/src/test/java/com/o19s/es/ltr/query/ValidatingLtrQueryBuilderTests.java @@ -32,7 +32,6 @@ import org.elasticsearch.index.query.SearchExecutionContext; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.junit.runner.RunWith; import java.io.IOException; @@ -57,7 +56,7 @@ public class ValidatingLtrQueryBuilderTests extends AbstractQueryTestCase> getPlugins() { - return asList(LtrQueryParserPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return asList(LtrQueryParserPlugin.class); } @Override diff --git a/src/test/java/com/o19s/es/termstat/TermStatQueryBuilderTests.java b/src/test/java/com/o19s/es/termstat/TermStatQueryBuilderTests.java index cdb725f1..00f415a1 100644 --- a/src/test/java/com/o19s/es/termstat/TermStatQueryBuilderTests.java +++ b/src/test/java/com/o19s/es/termstat/TermStatQueryBuilderTests.java @@ -8,7 +8,6 @@ import org.elasticsearch.index.query.SearchExecutionContext; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import java.io.IOException; import java.util.Collection; @@ -19,7 +18,7 @@ public class TermStatQueryBuilderTests extends AbstractQueryTestCase { // TODO: Remove the TestGeoShapeFieldMapperPlugin once upstream has completed the migration. protected Collection> getPlugins() { - return asList(LtrQueryParserPlugin.class, TestGeoShapeFieldMapperPlugin.class); + return asList(LtrQueryParserPlugin.class); } @Override