Skip to content

Commit a8be79d

Browse files
eliranmoyaleliranmoyal
committed
2.3.0 release
1 parent 9bb32e0 commit a8be79d

File tree

6 files changed

+23
-23
lines changed

6 files changed

+23
-23
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.2.1/elasticsearch-2.2.1.deb && sudo dpkg -i --force-confnew elasticsearch-2.2.1.deb
9+
- wget https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.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.2.1.0</version>
6+
<version>2.3.0.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.2.1</elasticsearch.version>
60+
<elasticsearch.version>2.3.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.2.1</version>
69+
<version>2.3.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.2.1</version>
75+
<version>2.3.0</version>
7676
<scope>provided</scope>
7777
</dependency>
7878
<dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public class CSVResultsExtractorTests {
3030

3131
@Test
3232
public void simpleSearchResultNotNestedNotFlatNoAggs() throws SqlParseException, SQLFeatureNotSupportedException, Exception {
33-
String query = String.format("select name,age from %s/dog order by age",TEST_INDEX);
33+
String query = String.format("select dog_name,age from %s/dog order by age",TEST_INDEX);
3434
CSVResult csvResult = getCsvResult(false, query);
3535

3636
List<String> headers = csvResult.getHeaders();
3737
Assert.assertEquals(2, headers.size());
38-
Assert.assertTrue("name should be on headers", headers.contains("name"));
38+
Assert.assertTrue("name should be on headers", headers.contains("dog_name"));
3939
Assert.assertTrue("age should be on headers", headers.contains("age"));
4040

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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void joinParseCheckSelectedFieldsSplitNL() throws SqlParseException, SQLF
3535
}
3636

3737
private void joinParseCheckSelectedFieldsSplit(boolean useNestedLoops) throws SqlParseException, SQLFeatureNotSupportedException, IOException {
38-
String query = "SELECT a.firstname ,a.lastname , a.gender ,d.name FROM elasticsearch-sql_test_index/people a " +
38+
String query = "SELECT a.firstname ,a.lastname , a.gender ,d.dog_name FROM elasticsearch-sql_test_index/people a " +
3939
" JOIN elasticsearch-sql_test_index/dog d on d.holdersName = a.firstname " +
4040
" WHERE " +
4141
" (a.age > 10 OR a.balance > 2000)" +
@@ -45,17 +45,17 @@ private void joinParseCheckSelectedFieldsSplit(boolean useNestedLoops) throws Sq
4545
Assert.assertEquals(2, hits.length);
4646

4747
Map<String,Object> oneMatch = ImmutableMap.of("a.firstname", (Object) "Daenerys", "a.lastname", "Targaryen",
48-
"a.gender", "M", "d.name", "rex");
48+
"a.gender", "M", "d.dog_name", "rex");
4949
Map<String,Object> secondMatch = ImmutableMap.of("a.firstname", (Object) "Hattie", "a.lastname", "Bond",
50-
"a.gender", "M", "d.name", "snoopy");
50+
"a.gender", "M", "d.dog_name", "snoopy");
5151

5252
Assert.assertTrue(hitsContains(hits, oneMatch));
5353
Assert.assertTrue(hitsContains(hits,secondMatch));
5454
}
5555

5656
@Test
5757
public void joinParseWithHintsCheckSelectedFieldsSplitHASH() throws SqlParseException, SQLFeatureNotSupportedException, IOException {
58-
String query = "SELECT /*! HASH_WITH_TERMS_FILTER*/ a.firstname ,a.lastname , a.gender ,d.name FROM elasticsearch-sql_test_index/people a " +
58+
String query = "SELECT /*! HASH_WITH_TERMS_FILTER*/ a.firstname ,a.lastname , a.gender ,d.dog_name FROM elasticsearch-sql_test_index/people a " +
5959
" JOIN elasticsearch-sql_test_index/dog d on d.holdersName = a.firstname " +
6060
" WHERE " +
6161
" (a.age > 10 OR a.balance > 2000)" +
@@ -418,22 +418,22 @@ public void joinWithOrNL() throws SQLFeatureNotSupportedException, IOException,
418418
}
419419

420420
private void joinWithOr(boolean useNestedLoops) throws SQLFeatureNotSupportedException, IOException, SqlParseException {
421-
String query = String.format("select d.name , c.name.firstname from %s/gotCharacters c " +
421+
String query = String.format("select d.dog_name , c.name.firstname from %s/gotCharacters c " +
422422
"JOIN %s/dog d on d.holdersName = c.name.firstname" +
423423
" OR d.age = c.name.ofHisName"
424424
, TEST_INDEX, TEST_INDEX);
425425
if(useNestedLoops) query = query.replace("select","select /*! USE_NL*/ ");
426426
SearchHit[] hits = joinAndGetHits(query);
427427
Assert.assertEquals(2, hits.length);
428-
Map<String,Object> oneMatch = ImmutableMap.of("c.name.firstname", (Object) "Daenerys", "d.name", "rex");
429-
Map<String,Object> secondMatch = ImmutableMap.of("c.name.firstname", (Object) "Brandon", "d.name", "snoopy");
428+
Map<String,Object> oneMatch = ImmutableMap.of("c.name.firstname", (Object) "Daenerys", "d.dog_name", "rex");
429+
Map<String,Object> secondMatch = ImmutableMap.of("c.name.firstname", (Object) "Brandon", "d.dog_name", "snoopy");
430430
Assert.assertTrue("hits contains daenerys",hitsContains(hits, oneMatch));
431431
Assert.assertTrue("hits contains brandon",hitsContains(hits, secondMatch));
432432
}
433433

434434
@Test
435435
public void joinWithOrWithTermsFilterOpt() throws SQLFeatureNotSupportedException, IOException, SqlParseException {
436-
String query = String.format("select /*! HASH_WITH_TERMS_FILTER*/ d.name , c.name.firstname from %s/gotCharacters c " +
436+
String query = String.format("select /*! HASH_WITH_TERMS_FILTER*/ d.dog_name , c.name.firstname from %s/gotCharacters c " +
437437
"JOIN %s/dog d on d.holdersName = c.name.firstname" +
438438
" OR d.age = c.name.ofHisName"
439439
, TEST_INDEX, TEST_INDEX);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ public void innerQueryTest() throws SqlParseException, SQLFeatureNotSupportedExc
718718
SearchHit[] hits = query(query).getHits();
719719
Assert.assertEquals(1,hits.length);
720720
Map<String, Object> hitAsMap = hits[0].sourceAsMap();
721-
Assert.assertEquals("snoopy",hitAsMap.get("name"));
721+
Assert.assertEquals("snoopy",hitAsMap.get("dog_name"));
722722
Assert.assertEquals("Hattie",hitAsMap.get("holdersName"));
723723
Assert.assertEquals(4,hitAsMap.get("age"));
724724

@@ -730,7 +730,7 @@ public void twoSubQueriesTest() throws SqlParseException, SQLFeatureNotSupported
730730
SearchHit[] hits = query(query).getHits();
731731
Assert.assertEquals(1,hits.length);
732732
Map<String, Object> hitAsMap = hits[0].sourceAsMap();
733-
Assert.assertEquals("snoopy",hitAsMap.get("name"));
733+
Assert.assertEquals("snoopy",hitAsMap.get("dog_name"));
734734
Assert.assertEquals("Hattie",hitAsMap.get("holdersName"));
735735
Assert.assertEquals(4,hitAsMap.get("age"));
736736

@@ -742,7 +742,7 @@ public void inTermsSubQueryTest() throws SqlParseException, SQLFeatureNotSupport
742742
SearchHit[] hits = query(query).getHits();
743743
Assert.assertEquals(1,hits.length);
744744
Map<String, Object> hitAsMap = hits[0].sourceAsMap();
745-
Assert.assertEquals("snoopy",hitAsMap.get("name"));
745+
Assert.assertEquals("snoopy",hitAsMap.get("dog_name"));
746746
Assert.assertEquals("Hattie",hitAsMap.get("holdersName"));
747747
Assert.assertEquals(4, hitAsMap.get("age"));
748748

@@ -754,7 +754,7 @@ public void idsQueryOneId() throws SqlParseException, SQLFeatureNotSupportedExce
754754
SearchHit[] hits = query(query).getHits();
755755
Assert.assertEquals(1,hits.length);
756756
Map<String, Object> hitAsMap = hits[0].sourceAsMap();
757-
Assert.assertEquals("rex",hitAsMap.get("name"));
757+
Assert.assertEquals("rex",hitAsMap.get("dog_name"));
758758
Assert.assertEquals("Daenerys",hitAsMap.get("holdersName"));
759759
Assert.assertEquals(2, hitAsMap.get("age"));
760760

@@ -766,7 +766,7 @@ public void idsQueryMultipleId() throws SqlParseException, SQLFeatureNotSupporte
766766
SearchHit[] hits = query(query).getHits();
767767
Assert.assertEquals(1,hits.length);
768768
Map<String, Object> hitAsMap = hits[0].sourceAsMap();
769-
Assert.assertEquals("rex",hitAsMap.get("name"));
769+
Assert.assertEquals("rex",hitAsMap.get("dog_name"));
770770
Assert.assertEquals("Daenerys",hitAsMap.get("holdersName"));
771771
Assert.assertEquals(2, hitAsMap.get("age"));
772772

@@ -778,7 +778,7 @@ public void idsQuerySubQueryIds() throws SqlParseException, SQLFeatureNotSupport
778778
SearchHit[] hits = query(query).getHits();
779779
Assert.assertEquals(1,hits.length);
780780
Map<String, Object> hitAsMap = hits[0].sourceAsMap();
781-
Assert.assertEquals("rex",hitAsMap.get("name"));
781+
Assert.assertEquals("rex",hitAsMap.get("dog_name"));
782782
Assert.assertEquals("Daenerys",hitAsMap.get("holdersName"));
783783
Assert.assertEquals(2, hitAsMap.get("age"));
784784

‎src/test/resources/dogs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{"index":{"_type": "dog", "_id":"1"}}
2-
{"name":"rex","holdersName":"Daenerys","age":2}
2+
{"dog_name":"rex","holdersName":"Daenerys","age":2}
33
{"index":{"_type": "dog", "_id":"6"}}
4-
{"name":"snoopy","holdersName":"Hattie","age":4}
4+
{"dog_name":"snoopy","holdersName":"Hattie","age":4}

0 commit comments

Comments
 (0)