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.filter.Filter;
 
 import java.util.concurrent.Future;
 

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/filter/Attribute.java

@@ -2,7 +2,6 @@
 
 import com.alicloud.openservices.tablestore.model.ColumnValue;
 import com.alicloud.openservices.tablestore.model.search.query.Query;
-import com.alicloud.openservices.tablestore.timestream.internal.TableMetaGenerator;
 import com.alicloud.openservices.tablestore.timestream.model.expression.*;
 
 import java.util.List;

src/main/java/com/alicloud/openservices/tablestore/timestream/model/filter/LastUpdateTime.java

@@ -7,8 +7,6 @@
 import com.alicloud.openservices.tablestore.timestream.model.expression.Expression;
 import com.alicloud.openservices.tablestore.timestream.model.expression.RangeExpression;
 
-import java.util.concurrent.TimeUnit;
-
 /**
  * {@link com.alicloud.openservices.tablestore.timestream.model.TimestreamMeta#updateTime}过滤器，查询满足条件的TimestreamMeta
  */

src/main/java/com/alicloud/openservices/tablestore/timestream/model/filter/Name.java

@@ -5,10 +5,6 @@
 import com.alicloud.openservices.tablestore.timestream.internal.TableMetaGenerator;
 import com.alicloud.openservices.tablestore.timestream.model.expression.*;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * {@link com.alicloud.openservices.tablestore.timestream.model.TimestreamIdentifier#name}过滤器，查询满足条件的TimestreamMeta
  */

src/main/java/com/alicloud/openservices/tablestore/timestream/model/filter/Tag.java

@@ -4,6 +4,7 @@
 import com.alicloud.openservices.tablestore.model.search.query.Query;
 import com.alicloud.openservices.tablestore.timestream.internal.TableMetaGenerator;
 import com.alicloud.openservices.tablestore.timestream.model.expression.*;
+
 import static com.alicloud.openservices.tablestore.timestream.internal.Utils.buildTagValue;
 
 /**

src/main/java/com/alicloud/openservices/tablestore/timestream/model/query/DataGetter.java

@@ -1,6 +1,8 @@
 package com.alicloud.openservices.tablestore.timestream.model.query;
 
 import com.alicloud.openservices.tablestore.AsyncClient;
+import com.alicloud.openservices.tablestore.ClientException;
+import com.alicloud.openservices.tablestore.model.filter.Filter;
 import com.alicloud.openservices.tablestore.timestream.model.*;
 
 import java.util.concurrent.TimeUnit;
@@ -19,6 +21,16 @@ public DataGetter(AsyncClient asyncClient, String tableName, TimestreamIdentifie
         this.identifier = identifier;
     }
 
+    /**
+     * 设置数据行的过滤条件，仅支持对数据行的fields进行过滤
+     * @param filter
+     * @return
+     */
+    public DataGetter filter(Filter filter) {
+        setFilter(filter);
+        return this;
+    }
+
     /**
      * 设置需要读取的field列表
      * @param fields 需要查询的数据字段
@@ -50,6 +62,24 @@ public DataGetter timestamp(long timestamp, TimeUnit unit) {
         return this;
     }
 
+    /**
+     * 按照数据点的时间戳进行逆序排序，默认正序
+     * @return
+     */
+    public DataGetter descTimestamp() {
+        setOrderByTimestampDesc();
+        return this;
+    }
+
+    /**
+     * 设置查询时单次请求返回的行数
+     * @param limit
+     */
+    public DataGetter limit(int limit) {
+        setLimit(limit);
+        return this;
+    }
+
     /**
      * 查询
      * @return

src/main/java/com/alicloud/openservices/tablestore/timestream/model/query/DataQuery.java

@@ -3,11 +3,11 @@
 import com.alicloud.openservices.tablestore.AsyncClient;
 import com.alicloud.openservices.tablestore.ClientException;
 import com.alicloud.openservices.tablestore.model.*;
+import com.alicloud.openservices.tablestore.model.filter.Filter;
 import com.alicloud.openservices.tablestore.timestream.internal.TableMetaGenerator;
 import com.alicloud.openservices.tablestore.timestream.internal.Utils;
 import com.alicloud.openservices.tablestore.timestream.model.*;
 import com.alicloud.openservices.tablestore.timestream.model.TimeRange;
-import com.alicloud.openservices.tablestore.timestream.model.filter.Filter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -20,6 +20,9 @@ public class DataQuery {
     private List<String> columnToGet = new ArrayList<String>();
     private TimeRange timeRange;
     private long timestamp = -1;
+    private boolean isDesc = false;
+    private Filter filter;
+    private int limit = -1;
 
     public DataQuery(AsyncClient asyncClient, String tableName) {
         this.asyncClient = asyncClient;
@@ -57,21 +60,38 @@ private  PointIterator getTimestreamWithRange(TimestreamIdentifier identifier) {
             end = timeRange.getEndTime();
         }
         PrimaryKeyBuilder beginPk = Utils.convertIdentifierToPK(identifier);
-        beginPk.addPrimaryKeyColumn(
-                TableMetaGenerator.CN_TAMESTAMP_NAME,
-                PrimaryKeyValue.fromLong(start)
-        );
-
         PrimaryKeyBuilder endPk = Utils.convertIdentifierToPK(identifier);
-        endPk.addPrimaryKeyColumn(
-                TableMetaGenerator.CN_TAMESTAMP_NAME,
-                PrimaryKeyValue.fromLong(end)
-        );
+        if (isDesc) {
+            beginPk.addPrimaryKeyColumn(
+                    TableMetaGenerator.CN_TAMESTAMP_NAME,
+                    PrimaryKeyValue.fromLong(end)
+            );
+            endPk.addPrimaryKeyColumn(
+                    TableMetaGenerator.CN_TAMESTAMP_NAME,
+                    PrimaryKeyValue.fromLong(start)
+            );
+            rangeRowQueryCriteria.setDirection(Direction.BACKWARD);
+        } else {
+            beginPk.addPrimaryKeyColumn(
+                    TableMetaGenerator.CN_TAMESTAMP_NAME,
+                    PrimaryKeyValue.fromLong(start)
+            );
+            endPk.addPrimaryKeyColumn(
+                    TableMetaGenerator.CN_TAMESTAMP_NAME,
+                    PrimaryKeyValue.fromLong(end)
+            );
+        }
 
         rangeRowQueryCriteria.setInclusiveStartPrimaryKey(beginPk.build());
         rangeRowQueryCriteria.setExclusiveEndPrimaryKey(endPk.build());
         rangeRowQueryCriteria.setMaxVersions(1);
         rangeRowQueryCriteria.addColumnsToGet(columnToGet);
+        if (filter != null) {
+            rangeRowQueryCriteria.setFilter(filter);
+        }
+        if (limit > 0) {
+            rangeRowQueryCriteria.setLimit(limit);
+        }
         GetRangeRequest request = new GetRangeRequest();
         request.setRangeRowQueryCriteria(rangeRowQueryCriteria);
 
@@ -88,6 +108,9 @@ private  PointIterator getTimestreamWithTimestamp(TimestreamIdentifier identifie
         singleRowQueryCriteria.setPrimaryKey(pkBuilder.build());
         singleRowQueryCriteria.setMaxVersions(1);
         singleRowQueryCriteria.addColumnsToGet(columnToGet);
+        if (filter != null) {
+            singleRowQueryCriteria.setFilter(filter);
+        }
         GetRowRequest request = new GetRowRequest(singleRowQueryCriteria);
         return new PointIterator(new GetRowIterator(asyncClient, request), identifier);
     }
@@ -111,4 +134,54 @@ public TimeRange getTimeRange() {
     public long getTimestamp() {
         return timestamp;
     }
+
+    /**
+     * 设置按照数据的时间戳进行逆序排序
+     */
+    protected void setOrderByTimestampDesc() {
+        this.isDesc = true;
+    }
+
+    /**
+     *
+     * @return 查询是否按照数据的时间戳进行逆序排序
+     */
+    public boolean isDescTimestamp() {
+        return this.isDesc;
+    }
+
+    /**
+     * 数据查询的过滤条件
+     * @param filter 数据查询过滤条件
+     */
+    protected void setFilter(Filter filter) {
+        this.filter = filter;
+    }
+
+    /**
+	 * 获取数据查询的过滤条件
+     * @return
+     */
+    public Filter getFilter() {
+        return this.filter;
+    }
+
+    /**
+     * 设置查询时单次请求返回的行数
+     * @param limit
+     */
+    protected void setLimit(int limit) {
+        if (limit <= 0) {
+            throw new ClientException("The limit must be greater than 0.");
+        }
+        this.limit = limit;
+    }
+
+    /**
+     * 获取查询时单次请求返回的行数
+     * @return
+     */
+    public int getLimit() {
+        return limit;
+    }
 }