es查询 includes 与解析

Author: hemiao

moql-querier/src/main/java/org/datayoo/moql/querier/es/EsDataQuerier.java

@@ -151,16 +151,16 @@ protected void transformSelectorDefinition(
 
   private List<ColumnMetadata> getIndexColumnsMetadata(String indexName)
       throws IOException {
-    String[] indexNameArray = StringUtils.split(indexName,",");
+    String[] indexNameArray = StringUtils.split(indexName, ",");
     List<String> columnNames = new ArrayList<>();
-    for (String index: indexNameArray) {
+    for (String index : indexNameArray) {
       Request request = new Request("GET", index);
       Response response = httpClient.performRequest(request);
       String data = EntityUtils.toString(response.getEntity());
       JsonParser jsonParser = new JsonParser();
       JsonObject root = (JsonObject) jsonParser.parse(data);
-      JsonObject properties = root.get(index).getAsJsonObject()
-          .get("mappings").getAsJsonObject().get("properties").getAsJsonObject();
+      JsonObject properties = root.get(index).getAsJsonObject().get("mappings")
+          .getAsJsonObject().get("properties").getAsJsonObject();
 
       properties.entrySet();
       for (Map.Entry<String, JsonElement> map : properties.entrySet()) {
@@ -337,8 +337,8 @@ protected Operand[] buildColumnOperands(
       String value = columnMetadata.getValue();
       int index = value.indexOf('(');
       if (index == -1) {
-        index = value.indexOf('.');
-        value = value.substring(index + 1);
+        //        index = value.indexOf('.');
+        //        value = value.substring(index + 1);
       } else {
         value = getAggregationFunctionExpression(columnMetadata);
       }
@@ -370,6 +370,7 @@ protected EntityMap toQueryEntityMap(JsonObject jsonObject) {
     return new EntityMapImpl(record);
   }
 
+
   protected void toMap(JsonObject jsonObject, Map<String, Object> record) {
     for (Map.Entry<String, JsonElement> entry : jsonObject.entrySet()) {
       if (entry.getKey().equals("_source")) {
@@ -379,10 +380,7 @@ protected void toMap(JsonObject jsonObject, Map<String, Object> record) {
       Object value = entry.getValue();
       if (entry.getValue() instanceof JsonPrimitive) {
         value = getValue((JsonPrimitive) entry.getValue());
-      } else {
-        value = entry.getValue().toString();
       }
-
       record.put(entry.getKey(), value);
     }
   }

moql-translator/src/main/java/org/datayoo/moql/sql/es/ElasticSearchTranslator.java

@@ -4,6 +4,7 @@
 import org.apache.commons.lang3.Validate;
 import org.datayoo.moql.*;
 import org.datayoo.moql.core.*;
+import org.datayoo.moql.core.Column;
 import org.datayoo.moql.core.group.GroupRecordSetOperator;
 import org.datayoo.moql.metadata.*;
 import org.datayoo.moql.operand.constant.StringConstant;
@@ -116,11 +117,11 @@ protected void translateSelectClause(SelectorDefinition selectorDefinition,
         throw new UnsupportedOperationException(
             "Unsupported nested selector in select clause!");
       String value = columnMetadata.getValue();
-      int index = value.indexOf('(');
-      if (index == -1) {
-        index = value.indexOf('.');
-        value = value.substring(index + 1);
-      }
+//      int index = value.indexOf('(');
+//      if (index == -1) {
+//        index = value.indexOf('.');
+//        value = value.substring(index + 1);
+//      }
       includes.add(value);
     }
     source.add("includes", includes);