You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ng...@apache.org on 2022/11/21 08:34:10 UTC
[jackrabbit-oak] branch trunk updated: OAK-10004 - Bump Elasticsearch client from 7.17.6 to 7.17.7 (#759)
This is an automated email from the ASF dual-hosted git repository.
ngupta pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 45169551b8 OAK-10004 - Bump Elasticsearch client from 7.17.6 to 7.17.7 (#759)
45169551b8 is described below
commit 45169551b88ced8068702879497d3be47820313f
Author: Nuno Santos <ns...@adobe.com>
AuthorDate: Mon Nov 21 09:34:03 2022 +0100
OAK-10004 - Bump Elasticsearch client from 7.17.6 to 7.17.7 (#759)
* Bump Elasticsearch client from 7.17.6 to 7.17.7.
* Increase timeout in an assetion in a test, give more time for a cache to be updated.
---
oak-search-elastic/pom.xml | 2 +-
.../elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java | 2 +-
.../query/async/facets/ElasticStatisticalFacetAsyncProvider.java | 2 +-
.../oak/plugins/index/elastic/ElasticIndexStatisticsTest.java | 2 +-
.../apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/oak-search-elastic/pom.xml b/oak-search-elastic/pom.xml
index ddce5127e7..f2dfcc3c8e 100644
--- a/oak-search-elastic/pom.xml
+++ b/oak-search-elastic/pom.xml
@@ -33,7 +33,7 @@
<description>Oak Elasticsearch integration subproject</description>
<properties>
- <elasticsearch.version>7.17.6</elasticsearch.version>
+ <elasticsearch.version>7.17.7</elasticsearch.version>
</properties>
<build>
diff --git a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java
index aa503af1b3..50f1bd13c2 100644
--- a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java
+++ b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticInsecureFacetAsyncProvider.java
@@ -53,7 +53,7 @@ class ElasticInsecureFacetAsyncProvider implements ElasticFacetProvider, Elastic
if (aggregations != null) {
Aggregate aggregate = aggregations.get(FulltextIndex.parseFacetField(columnName));
return aggregate.sterms().buckets().array().stream()
- .map(term -> new FulltextIndex.Facet(term.key(), (int) term.docCount()))
+ .map(term -> new FulltextIndex.Facet(term.key().stringValue(), (int) term.docCount()))
.collect(Collectors.toList());
} else return null;
}
diff --git a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticStatisticalFacetAsyncProvider.java b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticStatisticalFacetAsyncProvider.java
index c4ed6599f5..4611062dc1 100644
--- a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticStatisticalFacetAsyncProvider.java
+++ b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticStatisticalFacetAsyncProvider.java
@@ -95,7 +95,7 @@ public class ElasticStatisticalFacetAsyncProvider extends ElasticSecureFacetAsyn
for (String field : facetFields) {
List<StringTermsBucket> buckets = aggregations.get(field).sterms().buckets().array();
facetMap.put(field, buckets.stream()
- .map(b -> new FulltextIndex.Facet(b.key(), (int) b.docCount()))
+ .map(b -> new FulltextIndex.Facet(b.key().stringValue(), (int) b.docCount()))
.collect(Collectors.toList())
);
}
diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
index a06b18f921..1830c77e22 100644
--- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
+++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexStatisticsTest.java
@@ -105,7 +105,7 @@ public class ElasticIndexStatisticsTest {
}
// cache hit, latest value returned
assertEquals(1000, indexStatistics.numDocs());
- }, 500);
+ }, 1000);
verifyNoMoreInteractions(elasticClientMock);
// index count changes in elastic
diff --git a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
index 96580161ab..dcfc39abae 100644
--- a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
+++ b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
@@ -41,11 +41,11 @@ import java.util.Map;
import static org.junit.Assume.assumeNotNull;
public class ElasticTestServer implements AutoCloseable {
-
private static final Logger LOG = LoggerFactory.getLogger(ElasticTestServer.class);
private static final Map<String, String> PLUGIN_OFFICIAL_RELEASES_DIGEST_MAP = ImmutableMap.<String, String>builder()
.put("7.17.3.0", "5e3b40bb72b2813f927be9bf6ecdf88668d89d2ef20c7ebafaa51ab8407fd179")
.put("7.17.6.0", "326893bb98ef1a0c569d9f4c4a9a073e53361924f990b17e87077985ce8a7478")
+ .put("7.17.7.0", "4252eb55cc7775f1b889d624ac335abfa2e357931c40d0accb4d520144246b8b")
.put("8.3.3.0", "14d3223456f4b9f00f86628ec8400cb46513935e618ae0f5d0d1088739ccc233")
.put("8.4.1.0", "56797a1bac6ceeaa36d2358f818b14633124d79c5e04630fa3544603d82eaa01")
.put("8.4.2.0", "5ce81ad043816900a496ad5b3cce7de1d99547ebf92aa1f9856343e48580c71c")