Skip to content

Commit c409367

Browse files
shi-yuanshi-yuan
committed
es 8.6.0 support
1 parent 3223919 commit c409367

15 files changed

+75
-57
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.5.3-amd64.deb -o elasticsearch.deb && sudo dpkg -i --force-confnew elasticsearch.deb
8+
- curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-8.6.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

‎lib/aggregations.jar

191 KB
Binary file not shown.

‎lib/parent-join.jar

140 Bytes
Binary file not shown.

‎lib/reindex.jar

11 Bytes
Binary file not shown.

‎pom.xml

Lines changed: 41 additions & 33 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.5.3.0</version>
6+
<version>8.6.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.5.3</elasticsearch.version>
47+
<elasticsearch.version>8.6.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>31.1-jre</guava.version>
@@ -64,20 +64,6 @@
6464
</repositories>
6565

6666
<dependencies>
67-
<dependency>
68-
<groupId>org.hamcrest</groupId>
69-
<artifactId>hamcrest-all</artifactId>
70-
<version>1.3</version>
71-
<scope>test</scope>
72-
</dependency>
73-
74-
<dependency>
75-
<groupId>junit</groupId>
76-
<artifactId>junit</artifactId>
77-
<version>4.13.2</version>
78-
<scope>test</scope>
79-
</dependency>
80-
8167
<dependency>
8268
<groupId>com.alibaba</groupId>
8369
<artifactId>druid</artifactId>
@@ -90,7 +76,37 @@
9076
<version>0.8</version>
9177
</dependency>
9278

93-
<dependency>
79+
<dependency>
80+
<groupId>com.google.guava</groupId>
81+
<artifactId>guava</artifactId>
82+
<version>${guava.version}</version>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>org.elasticsearch.plugin</groupId>
87+
<artifactId>reindex-client</artifactId>
88+
<version>${elasticsearch.version}</version>
89+
<systemPath>${project.basedir}/lib/reindex.jar</systemPath>
90+
<scope>system</scope>
91+
</dependency>
92+
93+
<dependency>
94+
<groupId>org.elasticsearch.plugin</groupId>
95+
<artifactId>parent-join-client</artifactId>
96+
<version>${elasticsearch.version}</version>
97+
<systemPath>${project.basedir}/lib/parent-join.jar</systemPath>
98+
<scope>system</scope>
99+
</dependency>
100+
101+
<dependency>
102+
<groupId>org.elasticsearch.plugin</groupId>
103+
<artifactId>aggregations</artifactId>
104+
<version>${elasticsearch.version}</version>
105+
<systemPath>${project.basedir}/lib/aggregations.jar</systemPath>
106+
<scope>system</scope>
107+
</dependency>
108+
109+
<dependency>
94110
<groupId>org.locationtech.jts</groupId>
95111
<artifactId>jts-core</artifactId>
96112
<version>1.19.0</version>
@@ -133,26 +149,18 @@
133149
</dependency>
134150

135151
<dependency>
136-
<groupId>org.elasticsearch.plugin</groupId>
137-
<artifactId>reindex-client</artifactId>
138-
<version>${elasticsearch.version}</version>
139-
<systemPath>${project.basedir}/lib/reindex.jar</systemPath>
140-
<scope>system</scope>
152+
<groupId>org.hamcrest</groupId>
153+
<artifactId>hamcrest-all</artifactId>
154+
<version>1.3</version>
155+
<scope>test</scope>
141156
</dependency>
142157

143158
<dependency>
144-
<groupId>org.elasticsearch.plugin</groupId>
145-
<artifactId>parent-join-client</artifactId>
146-
<version>${elasticsearch.version}</version>
147-
<systemPath>${project.basedir}/lib/parent-join.jar</systemPath>
148-
<scope>system</scope>
159+
<groupId>junit</groupId>
160+
<artifactId>junit</artifactId>
161+
<version>4.13.2</version>
162+
<scope>test</scope>
149163
</dependency>
150-
151-
<dependency>
152-
<groupId>com.google.guava</groupId>
153-
<artifactId>guava</artifactId>
154-
<version>${guava.version}</version>
155-
</dependency>
156164
</dependencies>
157165

158166
<build>

‎src/main/java/org/elasticsearch/plugin/nlpcn/ElasticJoinExecutor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.io.IOException;
2525
import java.util.Collection;
26+
import java.util.Collections;
2627
import java.util.HashMap;
2728
import java.util.HashSet;
2829
import java.util.List;
@@ -169,8 +170,8 @@ protected void addUnmatchedResults(List<SearchHit> combinedResults, Collection<S
169170
protected SearchHit createUnmachedResult( List<Field> secondTableReturnedFields, int docId, String t1Alias, String t2Alias, SearchHit hit) {
170171
String unmatchedId = hit.getId() + "|0";
171172

172-
SearchHit searchHit = new SearchHit(docId, unmatchedId, hit.getFields(), null);
173-
173+
SearchHit searchHit = new SearchHit(docId, unmatchedId);
174+
searchHit.addDocumentFields(hit.getDocumentFields(), Collections.emptyMap());
174175
searchHit.sourceRef(hit.getSourceRef());
175176
searchHit.getSourceAsMap().clear();
176177
searchHit.getSourceAsMap().putAll(hit.getSourceAsMap());

‎src/main/java/org/elasticsearch/plugin/nlpcn/HashJoinElasticExecutor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ private List<SearchHit> createCombinedResults( TableInJoinRequestBuilder secondT
164164

165165

166166

167-
SearchHit searchHit = new SearchHit(matchingHit.docId(), combinedId, matchingHit.getFields(), null);
167+
SearchHit searchHit = new SearchHit(matchingHit.docId(), combinedId);
168+
searchHit.addDocumentFields(matchingHit.getDocumentFields(), Collections.emptyMap());
168169
searchHit.sourceRef(matchingHit.getSourceRef());
169170
searchHit.getSourceAsMap().clear();
170171
searchHit.getSourceAsMap().putAll(matchingHit.getSourceAsMap());
@@ -211,7 +212,8 @@ private void createKeyToResultsAndFillOptimizationStructure(Map<String,Map<Strin
211212
String key = getComparisonKey(t1ToT2FieldsComparison, hit, true, optimizationTermsFilterStructure.get(comparisonID));
212213

213214
//int docid , id
214-
SearchHit searchHit = new SearchHit(resultIds, hit.getId(), hit.getFields(), null);
215+
SearchHit searchHit = new SearchHit(resultIds, hit.getId());
216+
searchHit.addDocumentFields(hit.getDocumentFields(), Collections.emptyMap());
215217
searchHit.sourceRef(hit.getSourceRef());
216218

217219
onlyReturnedFields(searchHit.getSourceAsMap(), firstTableRequest.getReturnedFields(),firstTableRequest.getOriginalSelect().isSelectAll());

‎src/main/java/org/elasticsearch/plugin/nlpcn/IntersectExecutor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ private void fillIntersectHitsFromResults(Set<ComperableHitResult> comparableHit
6868
Set<Map.Entry<String, String>> firstTableFieldToAlias = this.builder.getFirstTableFieldToAlias().entrySet();
6969
for (ComperableHitResult result : comparableHitResults) {
7070
SearchHit originalHit = result.getOriginalHit();
71-
SearchHit searchHit = new SearchHit(currentId, originalHit.getId(), originalHit.getFields(), null);
71+
SearchHit searchHit = new SearchHit(currentId, originalHit.getId());
72+
searchHit.addDocumentFields(originalHit.getDocumentFields(), Collections.emptyMap());
7273
searchHit.sourceRef(originalHit.getSourceRef());
7374
searchHit.getSourceAsMap().clear();
7475
Map<String, Object> sourceAsMap = result.getFlattenMap();

‎src/main/java/org/elasticsearch/plugin/nlpcn/MinusExecutor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ private void fillMinusHitsFromOneField(String fieldName, Set<Object> fieldValues
115115
ArrayList<Object> values = new ArrayList<Object>();
116116
values.add(result);
117117
fields.put(fieldName,new DocumentField(fieldName, values));
118-
SearchHit searchHit = new SearchHit(currentId,currentId+"", fields, null);
118+
SearchHit searchHit = new SearchHit(currentId, currentId + "");
119+
searchHit.addDocumentFields(fields, Collections.emptyMap());
119120
searchHit.sourceRef(someHit.getSourceRef());
120121
searchHit.getSourceAsMap().clear();
121122
Map<String, Object> sourceAsMap = new HashMap<>();
@@ -136,7 +137,8 @@ private void fillMinusHitsFromResults(Set<ComperableHitResult> comperableHitResu
136137
ArrayList<Object> values = new ArrayList<Object>();
137138
values.add(result);
138139
SearchHit originalHit = result.getOriginalHit();
139-
SearchHit searchHit = new SearchHit(currentId,originalHit.getId(), originalHit.getFields(), null);
140+
SearchHit searchHit = new SearchHit(currentId, originalHit.getId());
141+
searchHit.addDocumentFields(originalHit.getDocumentFields(), Collections.emptyMap());
140142
searchHit.sourceRef(originalHit.getSourceRef());
141143
searchHit.getSourceAsMap().clear();
142144
Map<String, Object> sourceAsMap = result.getFlattenMap();

‎src/main/java/org/elasticsearch/plugin/nlpcn/NestedLoopsElasticExecutor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.nlpcn.es4sql.query.join.TableInJoinRequestBuilder;
1919

2020
import java.util.ArrayList;
21+
import java.util.Collections;
2122
import java.util.List;
2223
import java.util.Map;
2324

@@ -116,7 +117,8 @@ private int combineResultsFromMultiResponses(List<SearchHit> combinedResults, in
116117

117118
private SearchHit getMergedHit(int currentCombinedResults, String t1Alias, String t2Alias, SearchHit hitFromFirstTable, SearchHit matchedHit) {
118119
onlyReturnedFields(matchedHit.getSourceAsMap(), nestedLoopsRequest.getSecondTable().getReturnedFields(),nestedLoopsRequest.getSecondTable().getOriginalSelect().isSelectAll());
119-
SearchHit searchHit = new SearchHit(currentCombinedResults, hitFromFirstTable.getId() + "|" + matchedHit.getId(), hitFromFirstTable.getFields(), null);
120+
SearchHit searchHit = new SearchHit(currentCombinedResults, hitFromFirstTable.getId() + "|" + matchedHit.getId());
121+
searchHit.addDocumentFields(hitFromFirstTable.getDocumentFields(), Collections.emptyMap());
120122
searchHit.sourceRef(hitFromFirstTable.getSourceRef());
121123
searchHit.getSourceAsMap().clear();
122124
searchHit.getSourceAsMap().putAll(hitFromFirstTable.getSourceAsMap());

0 commit comments

Comments
 (0)