Skip to content

OAK-10187: oak-search-elastic: update Java Client independently of HLRC #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 14, 2023
Merged

OAK-10187: oak-search-elastic: update Java Client independently of HLRC #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b374b9
OAK-10187: oak-search-elastic: update Java Client independently of HLRC
fabriziofortino Apr 13, 2023
2d8b001
Update oak-search-elastic/pom.xml
fabriziofortino Apr 14, 2023
c0c95f2
Update oak-search-elastic/pom.xml
fabriziofortino Apr 14, 2023
ff03107
OAK-10187: use elasticsearch java client 8.7.0
fabriziofortino Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions oak-search-elastic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
<description>Oak Elasticsearch integration subproject</description>

<properties>
<elasticsearch.version>7.17.7</elasticsearch.version>
<elasticsearch.hlrc.version>7.17.9</elasticsearch.hlrc.version>
<elasticsearch.java.client.version>8.7.0</elasticsearch.java.client.version>
</properties>

<build>
Expand Down Expand Up @@ -117,17 +118,17 @@
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>${elasticsearch.version}</version>
<version>${elasticsearch.hlrc.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client</artifactId>
<version>${elasticsearch.version}</version>
<version>${elasticsearch.hlrc.version}</version>
</dependency>
<dependency>
<groupId>co.elastic.clients</groupId>
<artifactId>elasticsearch-java</artifactId>
<version>${elasticsearch.version}</version>
<version>${elasticsearch.java.client.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -137,7 +138,7 @@
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
<version>${elasticsearch.hlrc.version}</version>
<exclusions>
<exclusion>
<groupId>org.elasticsearch</groupId>
Expand Down
3 changes: 2 additions & 1 deletion ...pache/jackrabbit/oak/plugins/index/elastic/query/async/ElasticResultRowAsyncIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.elastic.query.async;

import co.elastic.clients.elasticsearch._types.FieldValue;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch._types.SortOptions;
import co.elastic.clients.elasticsearch.core.SearchRequest;
Expand Down Expand Up @@ -202,7 +203,7 @@ class ElasticQueryScanner {
private long searchStartTime;

// reference to the last document sort values for search_after queries
private List<String> lastHitSortValues;
private List<FieldValue> lastHitSortValues;

// Semaphore to guarantee only one in-flight request to Elastic
private final Semaphore semaphore = new Semaphore(1);
Expand Down
3 changes: 2 additions & 1 deletion ...stic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ public class ElasticTestServer implements AutoCloseable {
"8.4.1.0", "56797a1bac6ceeaa36d2358f818b14633124d79c5e04630fa3544603d82eaa01",
"8.4.2.0", "5ce81ad043816900a496ad5b3cce7de1d99547ebf92aa1f9856343e48580c71c",
"8.4.3.0", "5c00d43cdd56c5c5d8e9032ad507acea482fb5ca9445861c5cc12ad63af66425",
"8.5.3.0", "d4c13f68650f9df5ff8c74ec83abc2e416de9c45f991d459326e0e2baf7b0e3f");
"8.5.3.0", "d4c13f68650f9df5ff8c74ec83abc2e416de9c45f991d459326e0e2baf7b0e3f",
"8.7.0.0", "7aeac9b7ac4dea1ded3f8e477e26bcc7fe62e313edf6352f4bdf973c43d25819");

private static final ElasticTestServer SERVER = new ElasticTestServer();
private static volatile ElasticsearchContainer CONTAINER;
Expand Down