support sorter for MetaFilter and filter of fields for DataGetter

Author: 杨恋

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>  
   <groupId>com.aliyun.openservices</groupId>  
   <artifactId>tablestore</artifactId>  
-  <version>4.12.1</version>
+  <version>4.12.2</version>
   <packaging>jar</packaging>  
   <name>AliCloud TableStore SDK for Java</name>  
   <url>http://www.aliyun.com</url>  

src/main/java/com/alicloud/openservices/tablestore/timestream/TimestreamDBClient.java

@@ -17,8 +17,8 @@
 
 /**
  * {@link TimestreamDBClient}定义，提供删建表，以及数据读写功能。
- * <p>后台默认打开自动更新时间线updateTime功能，可以通过{@link TimestreamDBConfiguration#enableDumpMeta}选择关闭 </p>
- * <p>当后台打开自动更新时间线updateTime功能时（{@link TimestreamDBConfiguration#enableDumpMeta}），TimestreamDBClient后台会维护一个内存缓存最近更新过的时间线。数据写入时，会判断该时间线是否需要更新updateTime（缓存中没有或者上次更新时间线超过设置的阈值），
+ * <p>后台默认打开自动更新时间线updateTime功能，可以通过{@link TimestreamDBConfiguration#dumpMeta}选择关闭 </p>
+ * <p>当后台打开自动更新时间线updateTime功能时（{@link TimestreamDBConfiguration#dumpMeta}），TimestreamDBClient后台会维护一个内存缓存最近更新过的时间线。数据写入时，会判断该时间线是否需要更新updateTime（缓存中没有或者上次更新时间线超过设置的阈值），
  * 如果需要更新则往meta表中插入一条记录（只更新updateTime）。</p>
  * <p>数据写入的异步api是通过{@link TableStoreWriter}来实现的，如果需要获取异步写入的结果，可以传入{@link TableStoreCallback}，该callback是所有数据表写入共用的</p>
  */
@@ -187,9 +187,9 @@ private IndexSchema getIndexSchema(List<AttributeIndexSchema> indexForAttributes
         fieldSchemas.add(
                 new FieldSchema(TableMetaGenerator.CN_PK0, FieldType.KEYWORD));
         fieldSchemas.add(
-                new FieldSchema(TableMetaGenerator.CN_PK1, FieldType.KEYWORD).setIndex(true));
+                new FieldSchema(TableMetaGenerator.CN_PK1, FieldType.KEYWORD).setIndex(true).setEnableSortAndAgg(true));
         fieldSchemas.add(
-                new FieldSchema(TableMetaGenerator.CN_PK2, FieldType.KEYWORD).setIndex(true).setIsArray(true));
+                new FieldSchema(TableMetaGenerator.CN_PK2, FieldType.KEYWORD).setIndex(true).setIsArray(true).setEnableSortAndAgg(true));
         fieldSchemas.add(
                 new FieldSchema(TableMetaGenerator.CN_TAMESTAMP_NAME, FieldType.LONG).setIndex(true).setStore(true));
         indexSchema.setFieldSchemas(fieldSchemas);

src/main/java/com/alicloud/openservices/tablestore/timestream/TimestreamMetaTable.java

@@ -6,9 +6,9 @@
 import com.alicloud.openservices.tablestore.timestream.internal.Utils;
 import com.alicloud.openservices.tablestore.timestream.model.TimestreamIdentifier;
 import com.alicloud.openservices.tablestore.timestream.model.TimestreamMeta;
-import com.alicloud.openservices.tablestore.timestream.model.filter.Filter;
 import com.alicloud.openservices.tablestore.timestream.model.query.MetaGetter;
 import com.alicloud.openservices.tablestore.timestream.model.query.MetaFilter;
+import com.alicloud.openservices.tablestore.timestream.model.condition.Condition;
 
 import java.util.concurrent.Future;
 
@@ -97,16 +97,16 @@ public MetaGetter get(TimestreamIdentifier identifier) {
      * 查询所有时间线
      * @return
      */
-    public MetaFilter filter() {
+    public MetaFilter search() {
         return new MetaFilter(asyncClient, metaTableName, index, null);
     }
 
     /**
      * 查询满足条件的时间线
-     * @param filter 查询条件
+     * @param condition 查询条件
      * @return
      */
-    public MetaFilter filter(Filter filter) {
-        return new MetaFilter(asyncClient, metaTableName, index, filter);
+    public MetaFilter search(Condition condition) {
+        return new MetaFilter(asyncClient, metaTableName, index, condition);
     }
 }

src/main/java/com/alicloud/openservices/tablestore/timestream/model/AttributeIndexSchema.java

@@ -81,6 +81,15 @@ public Boolean isArray() {
         return this.fieldSchema.isArray();
     }
 
+    public AttributeIndexSchema setEnableSortAndAgg(boolean enableSortAndAgg) {
+        this.fieldSchema.setEnableSortAndAgg(enableSortAndAgg);
+        return this;
+    }
+
+    public Boolean isEnableSortAndAgg() {
+        return this.fieldSchema.isEnableSortAndAgg();
+    }
+
     public FieldSchema getFieldSchema() {
         return this.fieldSchema;
     }

src/main/java/com/alicloud/openservices/tablestore/timestream/model/condition/AndCondition.java

@@ -0,0 +1,29 @@
+package com.alicloud.openservices.tablestore.timestream.model.condition;
+
+import com.alicloud.openservices.tablestore.model.search.query.BoolQuery;
+import com.alicloud.openservices.tablestore.model.search.query.Query;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * and组合过滤器
+ */
+public class AndCondition implements Condition {
+    private List<Condition> conditionList;
+
+    public AndCondition(Condition... conditions) {
+        this.conditionList = Arrays.asList(conditions);
+    }
+
+    public Query getQuery() {
+        List<Query> queryList = new ArrayList<Query>();
+        for (Condition c : conditionList) {
+            queryList.add(c.getQuery());
+        }
+        BoolQuery boolQuery = new BoolQuery();
+        boolQuery.setMustQueries(queryList);
+        return boolQuery;
+    }
+}