Skip to content

Commit 79f8163

Browse files
eliranmoyaleliranmoyal
committed
2.2.0 enhancments
1 parent 773164e commit 79f8163

File tree

10 files changed

+47
-47
lines changed

10 files changed

+47
-47
lines changed

‎.travis.yml

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

77

88
script:
9-
- wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.1.1/elasticsearch-2.1.1.deb && sudo dpkg -i --force-confnew elasticsearch-2.1.1.deb
9+
- wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.2.0/elasticsearch-2.2.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.2.0.deb
1010
- sudo /usr/share/elasticsearch/bin/plugin install delete-by-query
1111
- sudo service elasticsearch start
1212
- sleep 10

‎pom.xml

Lines changed: 4 additions & 4 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>2.1.1</version>
6+
<version>2.2.0</version>
77
<packaging>jar</packaging>
88
<description>Query elasticsearch using SQL</description>
99
<name>elasticsearch-sql</name>
@@ -57,7 +57,7 @@
5757
<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
5858
<elasticsearch.plugin.site>true</elasticsearch.plugin.site>
5959
<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
60-
<elasticsearch.version>2.1.1</elasticsearch.version>
60+
<elasticsearch.version>2.2.0</elasticsearch.version>
6161
<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
6262

6363
</properties>
@@ -66,13 +66,13 @@
6666
<dependency>
6767
<groupId>org.elasticsearch</groupId>
6868
<artifactId>elasticsearch</artifactId>
69-
<version>2.1.1</version>
69+
<version>2.2.0</version>
7070
<scope>provided</scope>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.elasticsearch.plugin</groupId>
7474
<artifactId>delete-by-query</artifactId>
75-
<version>2.1.1</version>
75+
<version>2.2.0</version>
7676
<scope>provided</scope>
7777
</dependency>
7878
<dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.elasticsearch.action.search.SearchResponse;
66
import org.elasticsearch.action.search.SearchType;
77
import org.elasticsearch.client.Client;
8-
import org.elasticsearch.common.text.StringText;
8+
import org.elasticsearch.common.text.Text;
99
import org.elasticsearch.common.unit.TimeValue;
1010
import org.elasticsearch.common.xcontent.XContentBuilder;
1111
import org.elasticsearch.common.xcontent.XContentFactory;
@@ -197,7 +197,7 @@ protected void addUnmatchedResults(List<InternalSearchHit> combinedResults, Coll
197197

198198
protected InternalSearchHit createUnmachedResult( List<Field> secondTableReturnedFields, int docId, String t1Alias, String t2Alias, SearchHit hit) {
199199
String unmatchedId = hit.id() + "|0";
200-
StringText unamatchedType = new StringText(hit.getType() + "|null");
200+
Text unamatchedType = new Text(hit.getType() + "|null");
201201

202202
InternalSearchHit searchHit = new InternalSearchHit(docId, unmatchedId, unamatchedType, hit.getFields());
203203

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.elasticsearch.action.search.SearchResponse;
66
import org.elasticsearch.action.search.SearchType;
77
import org.elasticsearch.client.Client;
8-
import org.elasticsearch.common.text.StringText;
8+
import org.elasticsearch.common.text.Text;
99
import org.elasticsearch.common.unit.TimeValue;
1010

1111
import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -161,7 +161,7 @@ private List<InternalSearchHit> createCombinedResults( TableInJoinRequestBuilder
161161

162162

163163

164-
InternalSearchHit searchHit = new InternalSearchHit(matchingHit.docId(), combinedId, new StringText(matchingHit.getType() + "|" + secondTableHit.getType()), matchingHit.getFields());
164+
InternalSearchHit searchHit = new InternalSearchHit(matchingHit.docId(), combinedId, new Text(matchingHit.getType() + "|" + secondTableHit.getType()), matchingHit.getFields());
165165
searchHit.sourceRef(matchingHit.getSourceRef());
166166
searchHit.sourceAsMap().clear();
167167
searchHit.sourceAsMap().putAll(matchingHit.sourceAsMap());
@@ -208,7 +208,7 @@ private void createKeyToResultsAndFillOptimizationStructure(Map<String,Map<Strin
208208
String key = getComparisonKey(t1ToT2FieldsComparison, hit, true, optimizationTermsFilterStructure.get(comparisonID));
209209

210210
//int docid , id
211-
InternalSearchHit searchHit = new InternalSearchHit(resultIds, hit.id(), new StringText(hit.getType()), hit.getFields());
211+
InternalSearchHit searchHit = new InternalSearchHit(resultIds, hit.id(), new Text(hit.getType()), hit.getFields());
212212
searchHit.sourceRef(hit.getSourceRef());
213213

214214
onlyReturnedFields(searchHit.sourceAsMap(), firstTableRequest.getReturnedFields());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
44
import org.elasticsearch.action.search.*;
55
import org.elasticsearch.client.Client;
6-
import org.elasticsearch.common.text.StringText;
6+
import org.elasticsearch.common.text.Text;
77
import org.elasticsearch.common.unit.TimeValue;
88
import org.elasticsearch.search.SearchHit;
99
import org.elasticsearch.search.SearchHits;
@@ -115,7 +115,7 @@ private int combineResultsFromMultiResponses(List<InternalSearchHit> combinedRes
115115

116116
private InternalSearchHit getMergedHit(int currentCombinedResults, String t1Alias, String t2Alias, SearchHit hitFromFirstTable, SearchHit matchedHit) {
117117
onlyReturnedFields(matchedHit.sourceAsMap(), nestedLoopsRequest.getSecondTable().getReturnedFields());
118-
InternalSearchHit searchHit = new InternalSearchHit(currentCombinedResults, hitFromFirstTable.id() + "|" + matchedHit.getId(), new StringText(hitFromFirstTable.getType() + "|" + matchedHit.getType()), hitFromFirstTable.getFields());
118+
InternalSearchHit searchHit = new InternalSearchHit(currentCombinedResults, hitFromFirstTable.id() + "|" + matchedHit.getId(), new Text(hitFromFirstTable.getType() + "|" + matchedHit.getType()), hitFromFirstTable.getFields());
119119
searchHit.sourceRef(hitFromFirstTable.getSourceRef());
120120
searchHit.sourceAsMap().clear();
121121
searchHit.sourceAsMap().putAll(hitFromFirstTable.sourceAsMap());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ public void geoHashGrid() throws SQLFeatureNotSupportedException, SqlParseExcept
457457
InternalGeoHashGrid grid = result.get("geohash_grid(field=center,precision=5)");
458458
Collection<GeoHashGrid.Bucket> buckets = grid.getBuckets();
459459
for (GeoHashGrid.Bucket bucket : buckets) {
460-
Assert.assertTrue(bucket.getKey().toString().equals("[4.9658203125, 104.9853515625]") || bucket.getKey().toString().equals("[0.4833984375, 100.458984375]") );
460+
Assert.assertTrue(bucket.getKey().toString().equals("4.9658203125,104.9853515625") || bucket.getKey().toString().equals("0.4833984375,100.458984375") );
461461
Assert.assertEquals(1,bucket.getDocCount());
462462
}
463463
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ public void simpleSearchResultWithNestedWithFlatNoAggs() throws SqlParseExceptio
131131
}
132132
@Test
133133
public void joinSearchResultNotNestedNotFlatNoAggs() throws SqlParseException, SQLFeatureNotSupportedException, Exception {
134-
String query = String.format("select c.gender , h.name,h.words from %s/gotCharacters c " +
134+
String query = String.format("select c.gender , h.hname,h.words from %s/gotCharacters c " +
135135
"JOIN %s/gotHouses h " +
136-
"on h.name = c.house ",TEST_INDEX,TEST_INDEX);
136+
"on h.hname = c.house ",TEST_INDEX,TEST_INDEX);
137137
CSVResult csvResult = getCsvResult(false, query);
138138

139139
List<String> headers = csvResult.getHeaders();
140140
Assert.assertEquals(3, headers.size());
141141
Assert.assertTrue("c.gender should be on headers", headers.contains("c.gender"));
142-
Assert.assertTrue("h.words should be on headers", headers.contains("h.words"));
142+
Assert.assertTrue("h.hname should be on headers", headers.contains("h.hname"));
143143
Assert.assertTrue("h.words should be on headers", headers.contains("h.words"));
144144

145145
List<String> lines = csvResult.getLines();

0 commit comments

Comments
 (0)