es 9.3.0 support

Author: shi-yuan

.github/workflows/actions.yml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Install Elasticsearch
         env:
-          ES_VERSION: 9.2.5
+          ES_VERSION: 9.3.0
         run: |
           sudo rm -rf /var/lib/elasticsearch
           curl -fsSL --retry 3 --retry-delay 5 "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}-amd64.deb" -o elasticsearch.deb

.travis.yml

@@ -6,7 +6,7 @@ jdk:
 
 before_install:
   - sudo rm -rf /var/lib/elasticsearch
-  - curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-9.2.5-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
+  - curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-9.3.0-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
   - sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
   - sudo cat /etc/elasticsearch/elasticsearch.yml
   - sudo java -version

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>9.2.5.0</version>
+	<version>9.3.0.0</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -44,7 +44,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<runSuite>**/MainTestSuite.class</runSuite>
 		<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
-		<elasticsearch.version>9.2.5</elasticsearch.version>
+		<elasticsearch.version>9.3.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
         <druid.version>1.2.15</druid.version>
         <guava.version>32.0.0-jre</guava.version>

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

@@ -4,6 +4,7 @@
 import co.elastic.clients.elasticsearch._types.Time;
 import co.elastic.clients.elasticsearch.cluster.StateRequest;
 import co.elastic.clients.elasticsearch.cluster.StateResponse;
+import co.elastic.clients.elasticsearch.cluster.state.ClusterStateMetric;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonValue;
 import org.apache.logging.log4j.LogManager;
@@ -112,6 +113,8 @@ public class ClusterStateActionHandler extends ActionHandler<ClusterStateRequest
     private static final String KEY_SHARD_LIMITS_TYPE = "shard_limits";
     private static final String KEY_MAX_SHARDS_PER_NODE = "max_shards_per_node";
     private static final String KEY_MAX_SHARDS_PER_NODE_FROZEN = "max_shards_per_node_frozen";
+    private static final String KEY_SHARD_CAPACITY_UNHEALTHY_THRESHOLD_YELLOW = "shard_capacity_unhealthy_threshold_yellow";
+    private static final String KEY_SHARD_CAPACITY_UNHEALTHY_THRESHOLD_RED = "shard_capacity_unhealthy_threshold_red";
 
     public ClusterStateActionHandler(ElasticsearchClient client) {
         super(client);
@@ -132,19 +135,19 @@ protected StateRequest convertRequest(ClusterStateRequest clusterStateRequest) t
         StateRequest.Builder builder = new StateRequest.Builder();
         builder.index(Arrays.asList(clusterStateRequest.indices()));
         if (clusterStateRequest.routingTable()) {
-            builder.metric(ClusterState.Metric.ROUTING_TABLE.toString());
+            builder.metric(ClusterStateMetric.RoutingTable);
         }
         if (clusterStateRequest.nodes()) {
-            builder.metric(ClusterState.Metric.NODES.toString());
+            builder.metric(ClusterStateMetric.Nodes);
         }
         if (clusterStateRequest.metadata()) {
-            builder.metric(ClusterState.Metric.METADATA.toString());
+            builder.metric(ClusterStateMetric.Metadata);
         }
         if (clusterStateRequest.blocks()) {
-            builder.metric(ClusterState.Metric.BLOCKS.toString());
+            builder.metric(ClusterStateMetric.Blocks);
         }
         if (clusterStateRequest.customs()) {
-            builder.metric(ClusterState.Metric.CUSTOMS.toString());
+            builder.metric(ClusterStateMetric.Customs);
         }
         Optional.ofNullable(clusterStateRequest.masterTimeout()).ifPresent(e -> builder.masterTimeout(Time.of(t -> t.time(e.toString()))));
         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
                     ByteSizeValue.parseBytesSizeValue(disk.getString(KEY_FLOOD_STAGE_MAX_HEADROOM), KEY_FLOOD_STAGE_MAX_HEADROOM),
                     RelativeByteSizeValue.parseRelativeByteSizeValue(disk.getString(KEY_FROZEN_FLOOD_STAGE_WATERMARK), KEY_FROZEN_FLOOD_STAGE_WATERMARK),
                     ByteSizeValue.parseBytesSizeValue(disk.getString(KEY_FROZEN_FLOOD_STAGE_MAX_HEADROOM), KEY_FROZEN_FLOOD_STAGE_MAX_HEADROOM)),
-                    new HealthMetadata.ShardLimits(shardLimits.getInt(KEY_MAX_SHARDS_PER_NODE), shardLimits.getInt(KEY_MAX_SHARDS_PER_NODE_FROZEN))));
+                    new HealthMetadata.ShardLimits(shardLimits.getInt(KEY_MAX_SHARDS_PER_NODE), shardLimits.getInt(KEY_MAX_SHARDS_PER_NODE_FROZEN),
+                            shardLimits.getInt(KEY_SHARD_CAPACITY_UNHEALTHY_THRESHOLD_YELLOW), shardLimits.getInt(KEY_SHARD_CAPACITY_UNHEALTHY_THRESHOLD_RED))));
         }
         Map<ProjectId, RoutingTable> map = new HashMap<>(metadata.projects().size());
         for (Map.Entry<ProjectId, ProjectMetadata> entry : metadata.projects().entrySet()) {

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

@@ -8,6 +8,7 @@
 import co.elastic.clients.elasticsearch.nodes.info.NodeOperatingSystemInfo;
 import co.elastic.clients.elasticsearch.nodes.info.NodeProcessInfo;
 import co.elastic.clients.elasticsearch.nodes.info.NodeThreadPoolInfo;
+import co.elastic.clients.elasticsearch.nodes.info.NodesInfoMetric;
 import org.elasticsearch.Build;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
@@ -74,7 +75,9 @@ protected co.elastic.clients.elasticsearch.nodes.NodesInfoResponse doHandle(Node
     @Override
     protected NodesInfoRequest convertRequest(org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest nodesInfoRequest) throws IOException {
         NodesInfoRequest.Builder builder = new NodesInfoRequest.Builder();
-        builder.metric(new ArrayList<>(nodesInfoRequest.requestedMetrics()));
+        for (String metric : nodesInfoRequest.requestedMetrics()) {
+            builder.metric(NodesInfoMetric._DESERIALIZER.parse(metric));
+        }
         builder.nodeId(Arrays.asList(nodesInfoRequest.nodesIds()));
         Optional.ofNullable(nodesInfoRequest.timeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
         return builder.build();