x

README.md

@@ -399,6 +399,8 @@ select totalPrice, product.*, product.$seller.* from index.order
 ```
 
 ```bash
+select min(price),avg(price) from index.product group by terms(category),terms(color),range(price, segment(0,100), segment(100,200), segment(200,300))
+
 #聚合统计
 {
   "from" : 0,

src/main/java/org/elasticsearch/dsl/parser/syntax/QueryWhereConditionParser.java

@@ -78,8 +78,8 @@ public class QueryWhereConditionParser implements QueryParser {
         }
         else {
             //todo binOperator -> sqlCondition.getOperator()
-            BoolFilterBuilder subBoolFilter = mergeAtomFilter(sqlCondition.getFilterList(), sqlCondition.getOperator());
-            combiner.add(new AtomFilter(subBoolFilter));
+            BoolFilterBuilder boolFilter = mergeAtomFilter(sqlCondition.getFilterList(), sqlCondition.getOperator());
+            combiner.add(new AtomFilter(boolFilter));
         }
     }
 

src/test/java/org/elasticsearch/SqlParserOrderByTest.java

@@ -59,7 +59,7 @@ public class SqlParserOrderByTest {
 
     @Test
     public void testX() {
-        String sql = "select totalPrice, product.*, product.$seller.* from index.order";
+        String sql = "select * from index.order where (a=0 and d=0) or (b=0 and c=0)";
         ElasticSql2DslParser sql2DslParser = new ElasticSql2DslParser();
         System.out.println(sql2DslParser.parse(sql).toDsl());
     }