update

shi-yuan · shi-yuan · commit 92375e5ac888 · 2018-01-15T23:22:21.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>5.6.5.3</version>
+	<version>5.6.5.4</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
diff --git a/src/main/java/org/nlpcn/es4sql/domain/hints/HintFactory.java b/src/main/java/org/nlpcn/es4sql/domain/hints/HintFactory.java
@@ -141,18 +141,20 @@ public static Hint getHintFromString(String hintAsString) throws SqlParseExcepti
             return new Hint(HintType.MINUS_USE_TERMS_OPTIMIZATION, new Object[]{shouldLowerStringOnTerms});
         }
         if (hintAsString.startsWith("! COLLAPSE")) {
-            String[] collapses = getParamsFromHint(hintAsString, "! COLLAPSE");
-            return new Hint(HintType.COLLAPSE, new String[]{"{" + String.join(",", collapses) + "}"});
+            String collapse = getParamFromHint(hintAsString, "! COLLAPSE");
+            return new Hint(HintType.COLLAPSE, new String[]{collapse});
         }
 
         return null;
     }
 
-
+    private static String getParamFromHint(String hint, String prefix) {
+        if (!hint.contains("(")) return null;
+        return hint.replace(prefix, "").replaceAll("\\s*\\(\\s*", "").replaceAll("\\s*\\,\\s*", ",").replaceAll("\\s*\\)\\s*", "");
+    }
     private static String[] getParamsFromHint(String hint, String prefix) {
-        if(!hint.contains("(")) return null;
-        String onlyParams = hint.replace(prefix, "").replaceAll("\\s*\\(\\s*","").replaceAll("\\s*\\,\\s*", ",").replaceAll("\\s*\\)\\s*", "");
-        return onlyParams.split(",");
+        String param = getParamFromHint(hint, prefix);
+        return param != null ? param.split(",") : null;
     }
     private static Integer[] parseParamsAsInts(String hintAsString,String startWith) {
         String[] number = getParamsFromHint(hintAsString,startWith);
diff --git a/src/test/java/org/nlpcn/es4sql/QueryTest.java b/src/test/java/org/nlpcn/es4sql/QueryTest.java
@@ -920,7 +920,7 @@ public void highlightPreTagsAndPostTags() throws IOException, SqlParseException,
 
     @Test
     public void fieldCollapsingTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
-        String query = String.format("select /*! COLLAPSE(\"field\":\"age\",\"inner_hits\":{\"name\":\"account\",\"size\":1,\"sort\":[{\"age\":\"asc\"}]},\"max_concurrent_group_searches\": 4) */ * from %s/account", TEST_INDEX);
+        String query = String.format("select /*! COLLAPSE({\"field\":\"age\",\"inner_hits\":{\"name\":\"account\",\"size\":1,\"sort\":[{\"age\":\"asc\"}]},\"max_concurrent_group_searches\": 4}) */ * from %s/account", TEST_INDEX);
         SearchHits hits = query(query);
         Assert.assertEquals(21, hits.getHits().length);
     }

Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ public void highlightPreTagsAndPostTags() throws IOException, SqlParseException,`
`920`	`920`
`921`	`921`	`@Test`
`922`	`922`	`public void fieldCollapsingTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {`
`923`		`- String query = String.format("select /! COLLAPSE(\"field\":\"age\",\"inner_hits\":{\"name\":\"account\",\"size\":1,\"sort\":[{\"age\":\"asc\"}]},\"max_concurrent_group_searches\": 4) / * from %s/account", TEST_INDEX);`
	`923`	`+ String query = String.format("select /! COLLAPSE({\"field\":\"age\",\"inner_hits\":{\"name\":\"account\",\"size\":1,\"sort\":[{\"age\":\"asc\"}]},\"max_concurrent_group_searches\": 4}) / * from %s/account", TEST_INDEX);`
`924`	`924`	`SearchHits hits = query(query);`
`925`	`925`	`Assert.assertEquals(21, hits.getHits().length);`
`926`	`926`	`}`