Skip to content

Commit 78f67d1

Browse files
committed
es 9.2.3 support
1 parent 9757968 commit 78f67d1

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

.github/workflows/actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Install Elasticsearch
2121
env:
22-
ES_VERSION: 9.1.10
22+
ES_VERSION: 9.2.3
2323
run: |
2424
sudo rm -rf /var/lib/elasticsearch
2525
curl -fsSL --retry 3 --retry-delay 5 "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-amd64.deb" -o elasticsearch.deb

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jdk:
66

77
before_install:
88
- sudo rm -rf /var/lib/elasticsearch
9-
- curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-9.1.10-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
9+
- curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-9.2.3-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
1010
- sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
1111
- sudo cat /etc/elasticsearch/elasticsearch.yml
1212
- sudo java -version

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.nlpcn</groupId>
55
<artifactId>elasticsearch-sql</artifactId>
6-
<version>9.1.10.0</version>
6+
<version>9.2.3.0</version>
77
<packaging>jar</packaging>
88
<description>Query elasticsearch using SQL</description>
99
<name>elasticsearch-sql</name>
@@ -44,7 +44,7 @@
4444
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4545
<runSuite>**/MainTestSuite.class</runSuite>
4646
<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
47-
<elasticsearch.version>9.1.10</elasticsearch.version>
47+
<elasticsearch.version>9.2.3</elasticsearch.version>
4848
<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
4949
<druid.version>1.2.15</druid.version>
5050
<guava.version>32.0.0-jre</guava.version>

src/main/java/org/elasticsearch/plugin/nlpcn/client/handler/ClusterStateActionHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ protected StateRequest convertRequest(ClusterStateRequest clusterStateRequest) t
146146
if (clusterStateRequest.customs()) {
147147
builder.metric(ClusterState.Metric.CUSTOMS.toString());
148148
}
149-
builder.local(clusterStateRequest.local());
150-
Optional.ofNullable(clusterStateRequest.masterNodeTimeout()).ifPresent(e -> builder.masterTimeout(Time.of(t -> t.time(e.toString()))));
149+
Optional.ofNullable(clusterStateRequest.masterTimeout()).ifPresent(e -> builder.masterTimeout(Time.of(t -> t.time(e.toString()))));
151150
Optional.ofNullable(clusterStateRequest.waitForTimeout()).ifPresent(e -> builder.waitForTimeout(Time.of(t -> t.time(e.toString()))));
152151
builder.waitForMetadataVersion(clusterStateRequest.waitForMetadataVersion());
153152
Optional.ofNullable(clusterStateRequest.indicesOptions()).ifPresent(options -> {

src/main/java/org/elasticsearch/plugin/nlpcn/client/handler/NodesInfoActionHandler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.common.transport.TransportAddress;
2424
import org.elasticsearch.common.unit.ByteSizeValue;
2525
import org.elasticsearch.common.unit.Processors;
26-
import org.elasticsearch.common.unit.SizeValue;
2726
import org.elasticsearch.core.TimeValue;
2827
import org.elasticsearch.http.HttpInfo;
2928
import org.elasticsearch.index.IndexVersion;
@@ -131,7 +130,7 @@ protected NodesInfoResponse convertResponse(co.elastic.clients.elasticsearch.nod
131130
Optional.ofNullable(threadPoolInfo.core()).orElse(-1),
132131
Optional.ofNullable(threadPoolInfo.max()).orElse(-1),
133132
Objects.nonNull(keepAlive) ? TimeValue.parseTimeValue(keepAlive.time(), KEY_KEEP_ALIVE) : null,
134-
threadPoolInfo.queueSize() >= 0 ? SizeValue.parseSizeValue(String.valueOf(threadPoolInfo.queueSize())) : null));
133+
(long) threadPoolInfo.queueSize()));
135134
}
136135
threadPool = new ThreadPoolInfo(infos);
137136
}

0 commit comments

Comments
 (0)