es 8.18.0 support

shi-yuan · shi-yuan · commit 9598381ccdbc · 2025-05-04T22:15:43.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ jdk:
 
 before_install:
   - sudo rm -rf /var/lib/elasticsearch
-  - curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.17.5-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
+  - curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.18.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
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>8.17.5.0</version>
+	<version>8.18.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.17.5</elasticsearch.version>
+		<elasticsearch.version>8.18.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>
diff --git a/src/main/java/org/elasticsearch/search/ParsedSearchHit.java b/src/main/java/org/elasticsearch/search/ParsedSearchHit.java
@@ -206,7 +206,6 @@ public static SearchHit createFromMap(Map<String, Object> values) {
                 shardTarget,
                 index,
                 clusterAlias,
-                null,
                 get(SearchHit.Fields.INNER_HITS, values, null),
                 get(SearchHit.DOCUMENT_FIELDS, values, Collections.emptyMap()),
                 get(SearchHit.METADATA_FIELDS, values, Collections.emptyMap()),
diff --git a/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java b/src/main/java/org/elasticsearch/search/aggregations/ParsedMultiBucketAggregation.java
@@ -13,6 +13,7 @@
 import org.elasticsearch.core.CheckedFunction;
 import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation;
 import org.elasticsearch.xcontent.ObjectParser;
+import org.elasticsearch.xcontent.ToXContent;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
 
@@ -23,7 +24,7 @@
 
 import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
 
-public abstract class ParsedMultiBucketAggregation<B extends ParsedMultiBucketAggregation.Bucket> extends ParsedAggregation
+public abstract class ParsedMultiBucketAggregation<B extends ParsedMultiBucketAggregation.ParsedBucket> extends ParsedAggregation
         implements
         MultiBucketsAggregation {
 
@@ -70,7 +71,7 @@ public static <A extends ParsedMultiBucketAggregation<T>, T extends ParsedBucket
         }, CommonFields.BUCKETS, ObjectParser.ValueType.OBJECT_ARRAY);
     }
 
-    public abstract static class ParsedBucket implements MultiBucketsAggregation.Bucket {
+    public abstract static class ParsedBucket implements MultiBucketsAggregation.Bucket, ToXContent {
 
         private InternalAggregations aggregations;
         private String keyAsString;
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedRareTerms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedRareTerms.java
@@ -26,14 +26,14 @@
 
 public abstract class ParsedRareTerms extends ParsedMultiBucketAggregation<ParsedRareTerms.ParsedBucket> implements RareTerms {
     @Override
-    public List<? extends RareTerms.Bucket> getBuckets() {
+    public List<ParsedRareTerms.ParsedBucket> getBuckets() {
         return buckets;
     }
 
     @Override
     public XContentBuilder doXContentBody(XContentBuilder builder, Params params) throws IOException {
         builder.startArray(CommonFields.BUCKETS.getPreferredName());
-        for (RareTerms.Bucket bucket : getBuckets()) {
+        for (ParsedRareTerms.ParsedBucket bucket : getBuckets()) {
             bucket.toXContent(builder, params);
         }
         builder.endArray();
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedSignificantTerms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedSignificantTerms.java
@@ -37,11 +37,11 @@ public abstract class ParsedSignificantTerms extends ParsedMultiBucketAggregatio
     protected long subsetSize;
     protected long supersetSize;
 
-    protected long getSubsetSize() {
+    public long getSubsetSize() {
         return subsetSize;
     }
 
-    protected long getSupersetSize() {
+    public long getSupersetSize() {
         return supersetSize;
     }
 
@@ -68,7 +68,7 @@ public XContentBuilder doXContentBody(XContentBuilder builder, Params params) th
         builder.field(CommonFields.DOC_COUNT.getPreferredName(), subsetSize);
         builder.field(InternalMappedSignificantTerms.BG_COUNT, supersetSize);
         builder.startArray(CommonFields.BUCKETS.getPreferredName());
-        for (SignificantTerms.Bucket bucket : buckets) {
+        for (ParsedSignificantTerms.ParsedBucket bucket : buckets) {
             bucket.toXContent(builder, params);
         }
         builder.endArray();
@@ -128,12 +128,10 @@ public double getSignificanceScore() {
             return score;
         }
 
-        @Override
         public long getSupersetSize() {
             return supersetSize;
         }
 
-        @Override
         public long getSubsetSize() {
             return subsetSize;
         }
diff --git a/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java b/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedTerms.java
@@ -43,7 +43,7 @@ public long getSumOfOtherDocCounts() {
     }
 
     @Override
-    public List<? extends Terms.Bucket> getBuckets() {
+    public List<ParsedTerms.ParsedBucket> getBuckets() {
         return buckets;
     }
 
@@ -62,7 +62,7 @@ public XContentBuilder doXContentBody(XContentBuilder builder, Params params) th
         builder.field(DOC_COUNT_ERROR_UPPER_BOUND_FIELD_NAME.getPreferredName(), getDocCountError());
         builder.field(SUM_OF_OTHER_DOC_COUNTS.getPreferredName(), getSumOfOtherDocCounts());
         builder.startArray(CommonFields.BUCKETS.getPreferredName());
-        for (Terms.Bucket bucket : getBuckets()) {
+        for (ParsedTerms.ParsedBucket bucket : getBuckets()) {
             bucket.toXContent(builder, params);
         }
         builder.endArray();
diff --git a/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedExtendedStats.java b/src/main/java/org/elasticsearch/search/aggregations/metrics/ParsedExtendedStats.java
@@ -132,7 +132,6 @@ public String getStdDeviationSamplingAsString() {
         return valueAsString.getOrDefault(Fields.STD_DEVIATION_SAMPLING_AS_STRING, Double.toString(stdDeviationSampling));
     }
 
-    @Override
     public String getStdDeviationBoundAsString(Bounds bound) {
         return switch (bound) {
             case UPPER -> valueAsString.getOrDefault(

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,11 @@ public abstract class ParsedSignificantTerms extends ParsedMultiBucketAggregatio`
`37`	`37`	`protected long subsetSize;`
`38`	`38`	`protected long supersetSize;`
`39`	`39`
`40`		`- protected long getSubsetSize() {`
	`40`	`+ public long getSubsetSize() {`
`41`	`41`	`return subsetSize;`
`42`	`42`	`}`
`43`	`43`
`44`		`- protected long getSupersetSize() {`
	`44`	`+ public long getSupersetSize() {`
`45`	`45`	`return supersetSize;`
`46`	`46`	`}`
`47`	`47`
`@@ -68,7 +68,7 @@ public XContentBuilder doXContentBody(XContentBuilder builder, Params params) th`
`68`	`68`	`builder.field(CommonFields.DOC_COUNT.getPreferredName(), subsetSize);`
`69`	`69`	`builder.field(InternalMappedSignificantTerms.BG_COUNT, supersetSize);`
`70`	`70`	`builder.startArray(CommonFields.BUCKETS.getPreferredName());`
`71`		`- for (SignificantTerms.Bucket bucket : buckets) {`
	`71`	`+ for (ParsedSignificantTerms.ParsedBucket bucket : buckets) {`
`72`	`72`	`bucket.toXContent(builder, params);`
`73`	`73`	`}`
`74`	`74`	`builder.endArray();`
`@@ -128,12 +128,10 @@ public double getSignificanceScore() {`
`128`	`128`	`return score;`
`129`	`129`	`}`
`130`	`130`
`131`		`- @Override`
`132`	`131`	`public long getSupersetSize() {`
`133`	`132`	`return supersetSize;`
`134`	`133`	`}`
`135`	`134`
`136`		`- @Override`
`137`	`135`	`public long getSubsetSize() {`
`138`	`136`	`return subsetSize;`
`139`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public long getSumOfOtherDocCounts() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public List<? extends Terms.Bucket> getBuckets() {`
	`46`	`+ public List<ParsedTerms.ParsedBucket> getBuckets() {`
`47`	`47`	`return buckets;`
`48`	`48`	`}`
`49`	`49`
`@@ -62,7 +62,7 @@ public XContentBuilder doXContentBody(XContentBuilder builder, Params params) th`
`62`	`62`	`builder.field(DOC_COUNT_ERROR_UPPER_BOUND_FIELD_NAME.getPreferredName(), getDocCountError());`
`63`	`63`	`builder.field(SUM_OF_OTHER_DOC_COUNTS.getPreferredName(), getSumOfOtherDocCounts());`
`64`	`64`	`builder.startArray(CommonFields.BUCKETS.getPreferredName());`
`65`		`- for (Terms.Bucket bucket : getBuckets()) {`
	`65`	`+ for (ParsedTerms.ParsedBucket bucket : getBuckets()) {`
`66`	`66`	`bucket.toXContent(builder, params);`
`67`	`67`	`}`
`68`	`68`	`builder.endArray();`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,6 @@ public String getStdDeviationSamplingAsString() {`
`132`	`132`	`return valueAsString.getOrDefault(Fields.STD_DEVIATION_SAMPLING_AS_STRING, Double.toString(stdDeviationSampling));`
`133`	`133`	`}`
`134`	`134`
`135`		`- @Override`
`136`	`135`	`public String getStdDeviationBoundAsString(Bounds bound) {`
`137`	`136`	`return switch (bound) {`
`138`	`137`	`case UPPER -> valueAsString.getOrDefault(`