update version to 5.17.3

Author: yunjinlxp

README.md

@@ -9,19 +9,19 @@
  - 阿里云表格存储是阿里云自主研发的NoSQL数据存储服务，提供海量结构化数据的存储和实时访问。
 
 ## 版本
- - 当前版本：5.17.2
+ - 当前版本：5.17.3
 
 ## 运行环境
  - JDK 6及其以上
 
 ## 安装
 #### Maven方式
-下载[最新版JAR包](https://search.maven.org/remotecontent?filepath=com/aliyun/openservices/tablestore/5.17.2/tablestore-5.17.2.jar)或者通过Maven：
+下载[最新版JAR包](https://search.maven.org/remotecontent?filepath=com/aliyun/openservices/tablestore/5.17.3/tablestore-5.17.3.jar)或者通过Maven：
 ```xml
 <dependency>
   <groupId>com.aliyun.openservices</groupId>
   <artifactId>tablestore</artifactId>
-  <version>5.17.2</version>
+  <version>5.17.3</version>
 </dependency>
 ```
 

pom.xml

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

src/main/java/com/alicloud/openservices/tablestore/core/Constants.java

@@ -5,7 +5,7 @@
 public class Constants {
     // ALL HTTP HEADERS SHOULD BE DEFINED IN LOWERCASE
     // request headers
-    public static final String USER_AGENT = "ots-java-sdk 5.17.2";
+    public static final String USER_AGENT = "ots-java-sdk 5.17.3";
     public static final String OTS_HEADER_API_VERSION = "x-ots-apiversion";
     public static final String OTS_HEADER_ACCESS_KEY_ID = "x-ots-accesskeyid";
     public static final String OTS_HEADER_OTS_CONTENT_MD5 = "x-ots-contentmd5";

src/main/java/com/alicloud/openservices/tablestore/core/protocol/Search.java

@@ -148,6 +148,9 @@ static Search.Sort buildSort(Sort sort) {
         for (Sort.Sorter sorter : sort.getSorters()) {
             builder.addSorter(buildSorter(sorter));
         }
+        if (sort.getDisableDefaultPkSorter() != null) {
+            builder.setDisableDefaultPkSorter(sort.getDisableDefaultPkSorter());
+        }
         return builder.build();
     }
 

src/main/java/com/alicloud/openservices/tablestore/core/protocol/SearchSortBuilder.java

@@ -147,11 +147,16 @@ private static Sort.Sorter toSorter(Search.Sorter pb) throws IOException {
     }
 
     static Sort toSort(Search.Sort pb) throws IOException {
+        Sort sort = new Sort();
         List<Sorter> sorters = new ArrayList<Sorter>();
         for (Search.Sorter sorter : pb.getSorterList()) {
             sorters.add(toSorter(sorter));
         }
-        return new Sort(sorters);
+        sort.setSorters(sorters);
+        if (pb.hasDisableDefaultPkSorter()) {
+            sort.setDisableDefaultPkSorter(pb.getDisableDefaultPkSorter());
+        }
+        return sort;
     }
 
     static List<GroupBySorter> toGroupBySort(Search.GroupBySort groupBySort) {

src/main/java/com/alicloud/openservices/tablestore/core/protocol/SearchSortParser.java

@@ -920,6 +920,7 @@ message Sorter {
 
 message Sort {
     repeated Sorter sorter = 1;
+    optional bool disable_default_pk_sorter = 2;
 }
 
 message SearchQuery {

src/main/java/com/alicloud/openservices/tablestore/core/protocol/search.proto

@@ -12,15 +12,42 @@ public interface Sorter {
 
     private List<Sorter> sorters;
 
+    /**
+     * 是否允许默认主键排序；
+     * <p> 索引创建阶段：
+     * <p>  暂不支持显示指定该参数；默认情况下，不包含Nested类型字段索引，会自动添加PrimaryKeySort
+     * <p> 查询阶段：
+     * <p>  1. {@link com.alicloud.openservices.tablestore.model.search.SearchQuery}、{@link com.alicloud.openservices.tablestore.model.search.agg.TopRowsAggregation},
+     * 当指定非PrimaryKeySort的sorter时，默认情况下会主动添加PrimaryKeySort，通过该参数可禁止主动添加PrimaryKeySort
+     * <p>  2. {@link com.alicloud.openservices.tablestore.core.protocol.Search.InnerHits} 该参数不生效
+     */
+    private Boolean disableDefaultPkSorter;
+
+    public Sort() {
+    }
+
     public Sort(List<Sorter> sorters) {
         this.sorters = sorters;
     }
 
+    public Sort(List<Sorter> sorters, boolean disableDefaultPkSorter) {
+        this.sorters = sorters;
+        this.disableDefaultPkSorter = disableDefaultPkSorter;
+    }
+
     public List<Sorter> getSorters() {
         return sorters;
     }
 
     public void setSorters(List<Sorter> sorters) {
         this.sorters = sorters;
     }
+
+    public void setDisableDefaultPkSorter(boolean disableDefaultPkSorter) {
+        this.disableDefaultPkSorter = disableDefaultPkSorter;
+    }
+
+    public Boolean getDisableDefaultPkSorter() {
+        return this.disableDefaultPkSorter;
+    }
 }

src/main/java/com/alicloud/openservices/tablestore/model/search/sort/Sort.java

@@ -381,6 +381,10 @@ public static Sort randomSort() {
         for (int i = 0; i < size; i++) {
             sorters.add(randomSorter());
         }
+        if (RANDOM.nextBoolean()) {
+            return new Sort(sorters, RANDOM.nextBoolean());
+        }
+
         return new Sort(sorters);
     }
 

src/test/java/com/alicloud/openservices/tablestore/core/protocol/BaseSearchTest.java

@@ -15,12 +15,15 @@
 import com.alicloud.openservices.tablestore.model.search.highlight.HighlightParameter;
 import com.alicloud.openservices.tablestore.model.search.query.InnerHits;
 import com.alicloud.openservices.tablestore.model.search.sort.DocSort;
+import com.alicloud.openservices.tablestore.model.search.sort.FieldSort;
 import com.alicloud.openservices.tablestore.model.search.sort.ScoreSort;
 import com.alicloud.openservices.tablestore.model.search.sort.Sort;
+import com.alicloud.openservices.tablestore.model.search.sort.SortOrder;
 import com.google.protobuf.InvalidProtocolBufferException;
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -497,6 +500,30 @@ private void assertClientException(UpdateSearchIndexRequest req, String errMsg)
         }
     }
 
+    @Test
+    public void testBuildSort() {
+        {
+            Sort sort = new Sort(Collections.singletonList(new FieldSort("field1", SortOrder.ASC)));
+            Search.Sort pb = SearchSortBuilder.buildSort(sort);
+            assertEquals(1, pb.getSorterCount());
+            assertFalse(pb.hasDisableDefaultPkSorter());
+        }
+        {
+            Sort sort = new Sort(Collections.singletonList(new FieldSort("field1", SortOrder.ASC)), false);
+            Search.Sort pb = SearchSortBuilder.buildSort(sort);
+            assertEquals(1, pb.getSorterCount());
+            assertTrue(pb.hasDisableDefaultPkSorter());
+            assertFalse(pb.getDisableDefaultPkSorter());
+        }
+        {
+            Sort sort = new Sort(Collections.singletonList(new FieldSort("field1", SortOrder.ASC)), true);
+            Search.Sort pb = SearchSortBuilder.buildSort(sort);
+            assertEquals(1, pb.getSorterCount());
+            assertTrue(pb.hasDisableDefaultPkSorter());
+            assertTrue(pb.getDisableDefaultPkSorter());
+        }
+    }
+
     @Test
     public void buildUpdateSearchIndexRequestSwitchIndex() {
         UpdateSearchIndexRequest req = new UpdateSearchIndexRequest("table1", "index1_reindex", "index1");