Merge pull request NLPchina#102 from ottboy4/master

eliranmoyal · eliranmoyal · commit dc59c52bcc09 · 2015-10-16T18:36:00.000+03:00
Fixed a bug where not's would not evaluate properly.
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/FilterMaker.java b/src/main/java/org/nlpcn/es4sql/query/maker/FilterMaker.java
@@ -19,6 +19,9 @@ public class FilterMaker extends Maker {
 	 */
 	public static BoolFilterBuilder explan(Where where) throws SqlParseException {
 		BoolFilterBuilder boolFilter = FilterBuilders.boolFilter();
+		while (where.getWheres().size() == 1) {
+			where = where.getWheres().getFirst();
+		}
 		new FilterMaker().explanWhere(boolFilter, where);
 		return boolFilter;
 	}
@@ -28,9 +31,6 @@ private FilterMaker() {
 	}
 
 	private void explanWhere(BoolFilterBuilder boolFilter, Where where) throws SqlParseException {
-		while (where.getWheres().size() == 1) {
-			where = where.getWheres().getFirst();
-		}
 		if (where instanceof Condition) {
 			addSubFilter(boolFilter, where, (BaseFilterBuilder) make((Condition) where));
 		} else {
diff --git a/src/test/java/org/nlpcn/es4sql/QueryTest.java b/src/test/java/org/nlpcn/es4sql/QueryTest.java
@@ -219,6 +219,25 @@ public void notLikeTest() throws IOException, SqlParseException, SQLFeatureNotSu
 		}
 	}
 
+	@Test
+	public void doubleNotTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
+		SearchHits response1 = query(String.format("SELECT * FROM %s/account WHERE not gender like 'm' and not gender like 'f'", TEST_INDEX));
+		Assert.assertEquals(0, response1.getTotalHits());
+
+		SearchHits response2 = query(String.format("SELECT * FROM %s/account WHERE not gender like 'm' and gender not like 'f'", TEST_INDEX));
+		Assert.assertEquals(0, response2.getTotalHits());
+
+		SearchHits response3 = query(String.format("SELECT * FROM %s/account WHERE gender not like 'm' and gender not like 'f'", TEST_INDEX));
+		Assert.assertEquals(0, response3.getTotalHits());
+
+		SearchHits response4 = query(String.format("SELECT * FROM %s/account WHERE gender like 'm' and not gender like 'f'", TEST_INDEX));
+		// assert there are results and they all have gender 'm'
+		Assert.assertNotEquals(0, response4.getTotalHits());
+		for (SearchHit hit : response4.getHits()) {
+			Assert.assertEquals("m", hit.getSource().get("gender").toString().toLowerCase());
+		}
+	}
+
 	@Test
 	public void limitTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
 		SearchHits response = query(String.format("SELECT * FROM %s LIMIT 30", TEST_INDEX));
@@ -346,8 +365,8 @@ public void notInTest() throws IOException, SqlParseException, SQLFeatureNotSupp
 			}
 		}
 	}
-	
-	
+
+
 	@Test
 	public void dateSearch() throws IOException, SqlParseException, SQLFeatureNotSupportedException, ParseException {
 		DateTimeFormatter formatter = DateTimeFormat.forPattern(DATE_FORMAT);
@@ -429,7 +448,7 @@ public void notMissFilterSearch() throws IOException, SqlParseException, SQLFeat
 			assertThat(hit.getSource(), hasKey("insert_time"));
 		}
 	}
-	
+
 
 
 	@Test
