Skip to content

Commit ae443c6

Browse files
shi-yuanshi-yuan
committed
es 8.15.0 support
1 parent a95dacb commit ae443c6

File tree

10 files changed

+39
-24
lines changed

10 files changed

+39
-24
lines changed

‎.travis.yml‎

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

66
before_install:
77
- sudo rm -rf /var/lib/elasticsearch
8-
- curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.14.3-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
8+
- curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.15.0-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
99
- sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
1010
- sudo cat /etc/elasticsearch/elasticsearch.yml
1111
- 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>8.14.3.0</version>
6+
<version>8.15.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>8.14.3</elasticsearch.version>
47+
<elasticsearch.version>8.15.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>

‎src/main/java/org/elasticsearch/action/search/ParsedSearchResponse.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
package org.elasticsearch.action.search;
1010

11+
import org.elasticsearch.common.bytes.BytesArray;
1112
import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
1213
import org.elasticsearch.core.RefCounted;
1314
import org.elasticsearch.core.TimeValue;
@@ -28,6 +29,7 @@
2829
import java.util.List;
2930
import java.util.Locale;
3031
import java.util.Map;
32+
import java.util.Objects;
3133

3234
import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
3335

@@ -151,7 +153,7 @@ public static SearchResponse innerFromXContent(XContentParser parser) throws IOE
151153
tookInMillis,
152154
failures.toArray(ShardSearchFailure.EMPTY_ARRAY),
153155
clusters,
154-
searchContextId
156+
Objects.nonNull(searchContextId) ? new BytesArray(searchContextId) : null
155157
));
156158
}
157159

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.elasticsearch.common.unit.RelativeByteSizeValue;
3838
import org.elasticsearch.common.xcontent.XContentParserUtils;
3939
import org.elasticsearch.health.metadata.HealthMetadata;
40+
import org.elasticsearch.index.IndexVersion;
4041
import org.elasticsearch.index.shard.IndexLongFieldRange;
4142
import org.elasticsearch.xcontent.XContentParser;
4243

@@ -83,6 +84,7 @@ public class ClusterStateActionHandler extends ActionHandler<ClusterStateRequest
8384
private static final String KEY_STATE = "state";
8485
private static final String KEY_MAPPINGS = "mappings";
8586
private static final String KEY_MAPPINGS_HASH = "mappings_hash";
87+
private static final String KEY_MAPPINGS_UPDATED_VERSION = "mappings_updated_version";
8688
private static final String KEY_ALIASES = "aliases";
8789
private static final String KEY_ROLLOVER_INFOS = "rollover_info";
8890
private static final String KEY_WARMERS = "warmers";
@@ -381,6 +383,9 @@ private IndexMetadata loadIndexMetadataFromXContent(XContentParser parser) throw
381383
case KEY_SYSTEM:
382384
builder.system(parser.booleanValue());
383385
break;
386+
case KEY_MAPPINGS_UPDATED_VERSION:
387+
builder.mappingsUpdatedVersion(IndexVersion.fromId(parser.intValue()));
388+
break;
384389
case KEY_MAPPINGS_HASH:
385390
logger.warn("Skipping mappings hash");
386391
parser.skipChildren();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected PutClusterSettingsRequest convertRequest(ClusterUpdateSettingsRequest
4747
builder.withJson(parser, jsonpMapper);
4848
}
4949
Optional.ofNullable(clusterUpdateSettingsRequest.masterNodeTimeout()).ifPresent(e -> builder.masterTimeout(Time.of(t -> t.time(e.toString()))));
50-
Optional.ofNullable(clusterUpdateSettingsRequest.timeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
50+
Optional.ofNullable(clusterUpdateSettingsRequest.ackTimeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
5151
return builder.build();
5252
}
5353

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected CreateIndexRequest convertRequest(org.elasticsearch.action.admin.indic
5353
builder.index(createIndexRequest.index());
5454
builder.mappings(fromJson(createIndexRequest.mappings(), TypeMapping._DESERIALIZER));
5555
builder.settings(fromJson(createIndexRequest.settings().toString(), IndexSettings._DESERIALIZER));
56-
Optional.ofNullable(createIndexRequest.timeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
56+
Optional.ofNullable(createIndexRequest.ackTimeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
5757
Optional.ofNullable(createIndexRequest.masterNodeTimeout()).ifPresent(e -> builder.masterTimeout(Time.of(t -> t.time(e.toString()))));
5858
ActiveShardCount activeShardCount = createIndexRequest.waitForActiveShards();
5959
if (Objects.nonNull(activeShardCount) && activeShardCount.value() > -1) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected DeleteIndexRequest convertRequest(org.elasticsearch.action.admin.indic
3939
DeleteIndexRequest.Builder builder = new DeleteIndexRequest.Builder();
4040
builder.index(Arrays.asList(deleteIndexRequest.indices()));
4141
Optional.ofNullable(deleteIndexRequest.masterNodeTimeout()).ifPresent(e -> builder.masterTimeout(Time.of(t -> t.time(e.toString()))));
42-
Optional.ofNullable(deleteIndexRequest.timeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
42+
Optional.ofNullable(deleteIndexRequest.ackTimeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
4343
Optional.ofNullable(deleteIndexRequest.indicesOptions()).ifPresent(options -> {
4444
builder.allowNoIndices(options.allowNoIndices());
4545
builder.ignoreUnavailable(options.ignoreUnavailable());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected PutMappingRequest convertRequest(org.elasticsearch.action.admin.indice
5454
builder.ignoreUnavailable(options.ignoreUnavailable());
5555
builder.expandWildcards(getExpandWildcard(options.wildcardOptions()));
5656
});
57-
Optional.ofNullable(putMappingRequest.timeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
57+
Optional.ofNullable(putMappingRequest.ackTimeout()).ifPresent(e -> builder.timeout(Time.of(t -> t.time(e.toString()))));
5858
Optional.ofNullable(putMappingRequest.masterNodeTimeout()).ifPresent(e -> builder.masterTimeout(Time.of(t -> t.time(e.toString()))));
5959
return builder.build();
6060
}

‎src/main/java/org/nlpcn/es4sql/domain/SearchResult.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
package org.nlpcn.es4sql.domain;
22

3-
import java.util.ArrayList;
4-
import java.util.Collection;
5-
import java.util.HashMap;
6-
import java.util.List;
7-
import java.util.Map;
8-
import java.util.Map.Entry;
9-
103
import org.elasticsearch.action.search.SearchResponse;
114
import org.elasticsearch.common.document.DocumentField;
5+
import org.elasticsearch.common.util.Maps;
126
import org.elasticsearch.search.SearchHit;
137
import org.elasticsearch.search.SearchHits;
148
import org.elasticsearch.search.aggregations.Aggregation;
@@ -23,6 +17,13 @@
2317
import org.elasticsearch.search.aggregations.metrics.InternalValueCount;
2418
import org.nlpcn.es4sql.exception.SqlParseException;
2519

20+
import java.util.ArrayList;
21+
import java.util.Collection;
22+
import java.util.HashMap;
23+
import java.util.List;
24+
import java.util.Map;
25+
import java.util.Map.Entry;
26+
2627
public class SearchResult {
2728
/**
2829
* 查询结果
@@ -60,7 +61,7 @@ public SearchResult(SearchResponse resp, Select select) throws SqlParseException
6061
this.total = buckets.size();
6162
results = new ArrayList<>(buckets.size());
6263
for (Bucket bucket : buckets) {
63-
Map<String, Object> aggsMap = toAggsMap(bucket.getAggregations().getAsMap());
64+
Map<String, Object> aggsMap = toAggsMap(bucket.getAggregations().asList());
6465
aggsMap.put("docCount", bucket.getDocCount());
6566
results.add(aggsMap);
6667
}
@@ -97,15 +98,15 @@ private Map<String, Object> toFieldsMap(Map<String, DocumentField> fields) {
9798

9899
/**
99100
* 讲es的field域转换为你Object
100-
*
101-
* @param fields
101+
*
102+
* @param aggregations
102103
* @return
103104
* @throws SqlParseException
104105
*/
105-
private Map<String, Object> toAggsMap(Map<String, InternalAggregation> fields) throws SqlParseException {
106-
Map<String, Object> result = new HashMap<>();
107-
for (Entry<String, InternalAggregation> entry : fields.entrySet()) {
108-
result.put(entry.getKey(), covenValue(entry.getValue()));
106+
private Map<String, Object> toAggsMap(List<InternalAggregation> aggregations) throws SqlParseException {
107+
Map<String, Object> result = Maps.newMapWithExpectedSize(aggregations.size());
108+
for (InternalAggregation aggregation : aggregations) {
109+
result.put(aggregation.getName(), covenValue(aggregation));
109110
}
110111
return result;
111112
}

‎src/test/java/org/nlpcn/es4sql/AggregationTest.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
import com.google.common.collect.DiscreteDomain;
55
import com.google.common.collect.Range;
66
import org.elasticsearch.action.search.SearchResponse;
7+
import org.elasticsearch.common.util.Maps;
78
import org.elasticsearch.search.SearchHit;
89
import org.elasticsearch.search.SearchHits;
10+
import org.elasticsearch.search.aggregations.InternalAggregation;
911
import org.elasticsearch.search.aggregations.InternalAggregations;
1012
import org.elasticsearch.search.aggregations.bucket.filter.Filters;
1113
import org.elasticsearch.search.aggregations.bucket.filter.ParsedFilter;
@@ -201,8 +203,13 @@ public void percentileTestSpecific() throws IOException, SqlParseException, SQLF
201203
@Test
202204
public void aliasTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
203205
InternalAggregations result = query(String.format("SELECT COUNT(*) AS mycount FROM %s", TEST_INDEX_ACCOUNT));
204-
assertThat(result.asMap(), hasKey("mycount"));
205-
}
206+
List<InternalAggregation> aggregations = result.asList();
207+
Map<String, InternalAggregation> aggregationsAsMap = Maps.newMapWithExpectedSize(aggregations.size());
208+
for (InternalAggregation aggregation : aggregations) {
209+
aggregationsAsMap.put(aggregation.getName(), aggregation);
210+
}
211+
assertThat(aggregationsAsMap, hasKey("mycount"));
212+
}
206213

207214
@Test
208215
public void groupByTest() throws Exception {

0 commit comments

Comments
 (0)