Skip to content

Commit 3d5cab3

Browse files
shi-yuanshi-yuan
committed
es 9.3.0 support
1 parent bc8fec8 commit 3d5cab3

File tree

9 files changed

+45
-20
lines changed

9 files changed

+45
-20
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.2.5
22+
ES_VERSION: 9.3.0
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.2.5-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
9+
- curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-9.3.0-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: 3 additions & 3 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.2.5.0</version>
6+
<version>9.3.0.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.2.5</elasticsearch.version>
47+
<elasticsearch.version>9.3.0</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>
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>co.elastic.clients</groupId>
107107
<artifactId>elasticsearch-java</artifactId>
108-
<version>${elasticsearch.version}</version>
108+
<version>9.3.1</version>
109109
<scope>provided</scope>
110110
</dependency>
111111

‎src/main/java/org/elasticsearch/plugin/nlpcn/client/handler/BulkActionHandler.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ protected BulkRequest convertRequest(org.elasticsearch.action.bulk.BulkRequest b
6565
IndexOperation.Builder<Map<String, Object>> indexOperationBuilder = new IndexOperation.Builder<>();
6666
indexOperationBuilder.id(indexRequest.id());
6767
indexOperationBuilder.index(indexRequest.index());
68-
indexOperationBuilder.routing(indexRequest.routing());
68+
if (Objects.nonNull(indexRequest.routing())) {
69+
indexOperationBuilder.routing(indexRequest.routing());
70+
}
6971
indexOperationBuilder.ifPrimaryTerm(indexRequest.ifPrimaryTerm());
7072
indexOperationBuilder.ifSeqNo(indexRequest.ifSeqNo());
7173
indexOperationBuilder.pipeline(indexRequest.getPipeline());
@@ -81,7 +83,9 @@ protected BulkRequest convertRequest(org.elasticsearch.action.bulk.BulkRequest b
8183
CreateOperation.Builder<Map<String, Object>> createOperationBuilder = new CreateOperation.Builder<>();
8284
createOperationBuilder.id(createRequest.id());
8385
createOperationBuilder.index(createRequest.index());
84-
createOperationBuilder.routing(createRequest.routing());
86+
if (Objects.nonNull(createRequest.routing())) {
87+
createOperationBuilder.routing(createRequest.routing());
88+
}
8589
createOperationBuilder.ifPrimaryTerm(createRequest.ifPrimaryTerm());
8690
createOperationBuilder.ifSeqNo(createRequest.ifSeqNo());
8791
createOperationBuilder.pipeline(createRequest.getPipeline());
@@ -97,7 +101,9 @@ protected BulkRequest convertRequest(org.elasticsearch.action.bulk.BulkRequest b
97101
DeleteOperation.Builder deleteOperationBuilder = new DeleteOperation.Builder();
98102
deleteOperationBuilder.id(deleteRequest.id());
99103
deleteOperationBuilder.index(deleteRequest.index());
100-
deleteOperationBuilder.routing(deleteRequest.routing());
104+
if (Objects.nonNull(deleteRequest.routing())) {
105+
deleteOperationBuilder.routing(deleteRequest.routing());
106+
}
101107
deleteOperationBuilder.ifPrimaryTerm(deleteRequest.ifPrimaryTerm());
102108
deleteOperationBuilder.ifSeqNo(deleteRequest.ifSeqNo());
103109
deleteOperationBuilder.version(deleteRequest.version());
@@ -109,7 +115,9 @@ protected BulkRequest convertRequest(org.elasticsearch.action.bulk.BulkRequest b
109115
UpdateOperation.Builder<Map<String, Object>, Map<String, Object>> updateOperationBuilder = new UpdateOperation.Builder<>();
110116
updateOperationBuilder.id(updateRequest.id());
111117
updateOperationBuilder.index(updateRequest.index());
112-
updateOperationBuilder.routing(updateRequest.routing());
118+
if (Objects.nonNull(updateRequest.routing())) {
119+
updateOperationBuilder.routing(updateRequest.routing());
120+
}
113121
updateOperationBuilder.ifPrimaryTerm(updateRequest.ifPrimaryTerm());
114122
updateOperationBuilder.ifSeqNo(updateRequest.ifSeqNo());
115123
updateOperationBuilder.requireAlias(updateRequest.isRequireAlias());
@@ -133,7 +141,9 @@ protected BulkRequest convertRequest(org.elasticsearch.action.bulk.BulkRequest b
133141
builder.refresh(getRefreshPolicy(bulkRequest.getRefreshPolicy()));
134142
builder.requireAlias(bulkRequest.requireAlias());
135143
builder.pipeline(bulkRequest.pipeline());
136-
builder.routing(bulkRequest.routing());
144+
if (Objects.nonNull(bulkRequest.routing())) {
145+
builder.routing(bulkRequest.routing());
146+
}
137147
Optional.ofNullable(bulkRequest.timeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
138148
ActiveShardCount activeShardCount = bulkRequest.waitForActiveShards();
139149
if (Objects.nonNull(activeShardCount) && activeShardCount.value() > -1) {

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import co.elastic.clients.elasticsearch._types.Time;
55
import co.elastic.clients.elasticsearch.cluster.StateRequest;
66
import co.elastic.clients.elasticsearch.cluster.StateResponse;
7+
import co.elastic.clients.elasticsearch.cluster.state.ClusterStateMetric;
78
import jakarta.json.JsonObject;
89
import jakarta.json.JsonValue;
910
import org.apache.logging.log4j.LogManager;
@@ -112,6 +113,8 @@ public class ClusterStateActionHandler extends ActionHandler<ClusterStateRequest
112113
private static final String KEY_SHARD_LIMITS_TYPE = "shard_limits";
113114
private static final String KEY_MAX_SHARDS_PER_NODE = "max_shards_per_node";
114115
private static final String KEY_MAX_SHARDS_PER_NODE_FROZEN = "max_shards_per_node_frozen";
116+
private static final String KEY_SHARD_CAPACITY_UNHEALTHY_THRESHOLD_YELLOW = "shard_capacity_unhealthy_threshold_yellow";
117+
private static final String KEY_SHARD_CAPACITY_UNHEALTHY_THRESHOLD_RED = "shard_capacity_unhealthy_threshold_red";
115118

116119
public ClusterStateActionHandler(ElasticsearchClient client) {
117120
super(client);
@@ -132,19 +135,19 @@ protected StateRequest convertRequest(ClusterStateRequest clusterStateRequest) t
132135
StateRequest.Builder builder = new StateRequest.Builder();
133136
builder.index(Arrays.asList(clusterStateRequest.indices()));
134137
if (clusterStateRequest.routingTable()) {
135-
builder.metric(ClusterState.Metric.ROUTING_TABLE.toString());
138+
builder.metric(ClusterStateMetric.RoutingTable);
136139
}
137140
if (clusterStateRequest.nodes()) {
138-
builder.metric(ClusterState.Metric.NODES.toString());
141+
builder.metric(ClusterStateMetric.Nodes);
139142
}
140143
if (clusterStateRequest.metadata()) {
141-
builder.metric(ClusterState.Metric.METADATA.toString());
144+
builder.metric(ClusterStateMetric.Metadata);
142145
}
143146
if (clusterStateRequest.blocks()) {
144-
builder.metric(ClusterState.Metric.BLOCKS.toString());
147+
builder.metric(ClusterStateMetric.Blocks);
145148
}
146149
if (clusterStateRequest.customs()) {
147-
builder.metric(ClusterState.Metric.CUSTOMS.toString());
150+
builder.metric(ClusterStateMetric.Customs);
148151
}
149152
Optional.ofNullable(clusterStateRequest.masterTimeout()).ifPresent(e -> builder.masterTimeout(Time.of(t -> t.time(e.toString()))));
150153
Optional.ofNullable(clusterStateRequest.waitForTimeout()).ifPresent(e -> builder.waitForTimeout(Time.of(t -> t.time(e.toString()))));
@@ -199,7 +202,8 @@ protected ClusterStateResponse convertResponse(StateResponse stateResponse) thro
199202
ByteSizeValue.parseBytesSizeValue(disk.getString(KEY_FLOOD_STAGE_MAX_HEADROOM), KEY_FLOOD_STAGE_MAX_HEADROOM),
200203
RelativeByteSizeValue.parseRelativeByteSizeValue(disk.getString(KEY_FROZEN_FLOOD_STAGE_WATERMARK), KEY_FROZEN_FLOOD_STAGE_WATERMARK),
201204
ByteSizeValue.parseBytesSizeValue(disk.getString(KEY_FROZEN_FLOOD_STAGE_MAX_HEADROOM), KEY_FROZEN_FLOOD_STAGE_MAX_HEADROOM)),
202-
new HealthMetadata.ShardLimits(shardLimits.getInt(KEY_MAX_SHARDS_PER_NODE), shardLimits.getInt(KEY_MAX_SHARDS_PER_NODE_FROZEN))));
205+
new HealthMetadata.ShardLimits(shardLimits.getInt(KEY_MAX_SHARDS_PER_NODE), shardLimits.getInt(KEY_MAX_SHARDS_PER_NODE_FROZEN),
206+
shardLimits.getInt(KEY_SHARD_CAPACITY_UNHEALTHY_THRESHOLD_YELLOW), shardLimits.getInt(KEY_SHARD_CAPACITY_UNHEALTHY_THRESHOLD_RED))));
203207
}
204208
Map<ProjectId, RoutingTable> map = new HashMap<>(metadata.projects().size());
205209
for (Map.Entry<ProjectId, ProjectMetadata> entry : metadata.projects().entrySet()) {

‎src/main/java/org/elasticsearch/plugin/nlpcn/client/handler/DeleteByQueryActionHandler.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ protected DeleteByQueryRequest convertRequest(org.elasticsearch.index.reindex.De
6060
}
6161
builder.conflicts(deleteByQueryRequest.isAbortOnVersionConflict() ? Conflicts.Abort : Conflicts.Proceed);
6262
builder.index(Arrays.asList(deleteByQueryRequest.indices()));
63-
builder.routing(deleteByQueryRequest.getRouting());
63+
if (Objects.nonNull(deleteByQueryRequest.getRouting())) {
64+
builder.routing(deleteByQueryRequest.getRouting());
65+
}
6466
if (deleteByQueryRequest.getMaxDocs() > -1) {
6567
builder.maxDocs((long) deleteByQueryRequest.getMaxDocs());
6668
}

‎src/main/java/org/elasticsearch/plugin/nlpcn/client/handler/MultiSearchActionHandler.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.io.Reader;
1919
import java.io.StringReader;
2020
import java.util.Arrays;
21+
import java.util.Objects;
2122
import java.util.Optional;
2223

2324
/**
@@ -56,7 +57,9 @@ protected MsearchRequest convertRequest(MultiSearchRequest multiSearchRequest) t
5657
msearchHeaderBuilder.allowPartialSearchResults(request.allowPartialSearchResults());
5758
msearchHeaderBuilder.ccsMinimizeRoundtrips(request.isCcsMinimizeRoundtrips());
5859
msearchHeaderBuilder.preference(request.preference());
59-
msearchHeaderBuilder.routing(request.routing());
60+
if (Objects.nonNull(request.routing())) {
61+
msearchHeaderBuilder.routing(request.routing());
62+
}
6063
msearchHeaderBuilder.searchType(getSearchType(request.searchType()));
6164
Optional.ofNullable(request.indicesOptions()).ifPresent(options -> {
6265
msearchHeaderBuilder.allowNoIndices(options.allowNoIndices());

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import co.elastic.clients.elasticsearch.nodes.info.NodeOperatingSystemInfo;
99
import co.elastic.clients.elasticsearch.nodes.info.NodeProcessInfo;
1010
import co.elastic.clients.elasticsearch.nodes.info.NodeThreadPoolInfo;
11+
import co.elastic.clients.elasticsearch.nodes.info.NodesInfoMetric;
1112
import org.elasticsearch.Build;
1213
import org.elasticsearch.Version;
1314
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
@@ -74,7 +75,9 @@ protected co.elastic.clients.elasticsearch.nodes.NodesInfoResponse doHandle(Node
7475
@Override
7576
protected NodesInfoRequest convertRequest(org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest nodesInfoRequest) throws IOException {
7677
NodesInfoRequest.Builder builder = new NodesInfoRequest.Builder();
77-
builder.metric(new ArrayList<>(nodesInfoRequest.requestedMetrics()));
78+
for (String metric : nodesInfoRequest.requestedMetrics()) {
79+
builder.metric(NodesInfoMetric._DESERIALIZER.parse(metric));
80+
}
7881
builder.nodeId(Arrays.asList(nodesInfoRequest.nodesIds()));
7982
Optional.ofNullable(nodesInfoRequest.timeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
8083
return builder.build();

‎src/main/java/org/elasticsearch/plugin/nlpcn/client/handler/SearchActionHandler.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import java.io.Reader;
1414
import java.io.StringReader;
1515
import java.util.Arrays;
16+
import java.util.Objects;
1617
import java.util.Optional;
1718

1819
/**
@@ -50,7 +51,9 @@ protected SearchRequest convertRequest(org.elasticsearch.action.search.SearchReq
5051
builder.allowPartialSearchResults(searchRequest.allowPartialSearchResults());
5152
builder.ccsMinimizeRoundtrips(searchRequest.isCcsMinimizeRoundtrips());
5253
builder.preference(searchRequest.preference());
53-
builder.routing(searchRequest.routing());
54+
if (Objects.nonNull(searchRequest.routing())) {
55+
builder.routing(searchRequest.routing());
56+
}
5457
builder.searchType(getSearchType(searchRequest.searchType()));
5558
builder.batchedReduceSize((long) searchRequest.getBatchedReduceSize());
5659
builder.maxConcurrentShardRequests(searchRequest.getMaxConcurrentShardRequests());

0 commit comments

Comments
 (0)