es 8.8.0 support

Author: shi-yuan

.travis.yml

@@ -5,7 +5,7 @@ jdk:
 
 before_install:
   - sudo rm -rf /var/lib/elasticsearch
-  - curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.7.1-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
+  - curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.8.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>8.7.1.0</version>
+	<version>8.8.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>8.7.1</elasticsearch.version>
+		<elasticsearch.version>8.8.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>
@@ -94,6 +94,12 @@
 			<artifactId>elasticsearch</artifactId>
 			<version>${elasticsearch.version}</version>
 			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.elasticsearch</groupId>
+					<artifactId>elasticsearch-preallocate</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>

src/main/java/org/elasticsearch/plugin/nlpcn/client/ResponseConverter.java

@@ -235,6 +235,9 @@ public class ResponseConverter {
     private static final String KEY_FLOOD_STAGE_MAX_HEADROOM = "flood_stage_max_headroom";
     private static final String KEY_FROZEN_FLOOD_STAGE_WATERMARK = "frozen_flood_stage_watermark";
     private static final String KEY_FROZEN_FLOOD_STAGE_MAX_HEADROOM = "frozen_flood_stage_max_headroom";
+    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_KEEP_ALIVE = "keep_alive";
 
     private final JsonpMapper jsonpMapper;
@@ -330,19 +333,21 @@ public ClusterStateResponse clusterStateResponse(StateResponse stateResponse) th
         JsonObject health = jsonObject.getJsonObject(HealthMetadata.TYPE);
         if (Objects.nonNull(health)) {
             JsonObject disk = health.getJsonObject(HealthMetadata.Disk.TYPE);
+            JsonObject shardLimits = health.getJsonObject(KEY_SHARD_LIMITS_TYPE);
             customs.put(HealthMetadata.TYPE, new HealthMetadata(new HealthMetadata.Disk(
                     RelativeByteSizeValue.parseRelativeByteSizeValue(disk.getString(KEY_HIGH_WATERMARK), KEY_HIGH_WATERMARK),
                     ByteSizeValue.parseBytesSizeValue(disk.getString(KEY_HIGH_MAX_HEADROOM), KEY_HIGH_MAX_HEADROOM),
                     RelativeByteSizeValue.parseRelativeByteSizeValue(disk.getString(KEY_FLOOD_STAGE_WATERMARK), KEY_FLOOD_STAGE_WATERMARK),
                     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))));
+                    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))));
         }
         RoutingTable routingTable = RoutingTable.EMPTY_ROUTING_TABLE;
         ClusterBlocks blocks = ClusterBlocks.EMPTY_CLUSTER_BLOCK;
         RoutingNodes routingNodes = RoutingNodes.immutable(RoutingTable.EMPTY_ROUTING_TABLE, DiscoveryNodes.EMPTY_NODES);
         return new ClusterStateResponse(clusterName,
-                new ClusterState(clusterName, version, stateUUID, metadata, routingTable, nodesBuilder.build(), blocks, customs, false, routingNodes),
+                new ClusterState(clusterName, version, stateUUID, metadata, routingTable, nodesBuilder.build(), Collections.emptyMap(), blocks, customs, false, routingNodes),
                 false);
     }
 
@@ -414,7 +419,7 @@ public NodesInfoResponse nodesInfoResponse(co.elastic.clients.elasticsearch.node
                 if (Objects.nonNull(nodeInfo.totalIndexingBuffer())) {
                     totalIndexingBuffer = ByteSizeValue.ofBytes(nodeInfo.totalIndexingBuffer());
                 }
-                nodes.add(new NodeInfo(version, build, node, settings, os, process, jvm, threadPool, transport, http, plugins, ingest, aggsInfo, totalIndexingBuffer));
+                nodes.add(new NodeInfo(version, version.transportVersion, build, node, settings, os, process, jvm, threadPool, transport, http, null, plugins, ingest, aggsInfo, totalIndexingBuffer));
             }
         }
         return new NodesInfoResponse(new ClusterName(nodesInfoResponse.clusterName()), nodes, Collections.emptyList());

src/main/java/org/nlpcn/es4sql/query/QueryAction.java

@@ -195,7 +195,7 @@ protected HighlightBuilder.Field parseHighlightField(Object[] params)
                     field.boundaryMaxScan((Integer) param.getValue());
                     break;
                 case "force_source":
-                    field.forceSource((Boolean) param.getValue());
+                    //field.forceSource((Boolean) param.getValue());
                     break;
                 case "fragmenter":
                     field.fragmenter((String) param.getValue());