Search Support Collapse

Author: xjtushilei

README-EN.md

@@ -13,6 +13,8 @@
 
 
 ## Version Feature Updates
+- Version: 5.2.2
+    - Search Support Collapse
 - Version: 5.2.1
   - SQL use default SQLPayloadVersion SQL_FLAT_BUFFERS
 - Version: 5.2.0

README.md

@@ -13,6 +13,8 @@
 
 
 ## 版本特性
+- 版本：5.2.2
+  - Search 支持折叠功能
 - 版本：5.2.1
   - SQL使用默认序列化协议SQL_FLAT_BUFFERS
 - 版本：5.2.0

lib/protocol/encoder.js

@@ -737,6 +737,9 @@ TableStore.encoder = {
         if (aSearchQuery.groupBys) {
             properties.groupBys = TableStore.encoder._makeGroupBys(aSearchQuery.groupBys)
         }
+        if (aSearchQuery.collapse) {
+            properties.collapse = TableStore.encoder._makeCollapse(aSearchQuery.collapse)
+        }
         var searchQuery = tsSearchProtos.SearchQuery.create(properties);
         var writer = tsSearchProtos.SearchQuery.encode(searchQuery);
 
@@ -755,6 +758,13 @@ TableStore.encoder = {
 
         return query;
     },
+    _makeCollapse(aCollapse) {
+        const properties = {};
+        if (aCollapse.fieldName) {
+            properties.fieldName = aCollapse.fieldName;
+        }
+        return tsSearchProtos.Collapse.create(properties);
+    },
     _makeAggregations(aggs) {
         let aggArray = [];
         for (let agg of aggs.aggs) {

package.json

@@ -2,7 +2,7 @@
   "name": "tablestore",
   "main": "index.js",
   "description": "TableStore SDK for JavaScript",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "devDependencies": {
     "mocha": "^3.2.0",
     "coveralls": "^2.13.1",

samples/search.js

@@ -264,7 +264,10 @@ client.search({
                     // }
                 }
             ]
-        }
+        },
+        // collapse: {
+        //     fieldName: "col_keyword",
+        // },
     },
     columnToGet: {
         returnType: TableStore.ColumnReturnType.RETURN_NONE,

test/search.test.js

@@ -371,6 +371,30 @@ describe('Search Query', () => {
         return otsTestUtils.emptyPromise
     });
 
+    it('collapse test ', async function () {
+        this.timeout(160000);
+        const tableName = "js_agg_and_group_by"
+        const indexName = tableName + "_index"
+        let searchResp = await otsTestUtils.search(tableName, indexName, {
+                offset: 0,
+                limit: 100,
+                query: {
+                    queryType: TableStore.QueryType.MATCH_ALL_QUERY,
+                },
+                getTotalCount: true,
+                collapse: {
+                    fieldName: "col_keyword",
+                },
+            },
+            {
+                returnType: TableStore.ColumnReturnType.RETURN_ALL_FROM_INDEX,
+            })
+        console.log(JSON.stringify(searchResp))
+        // 本case复用上述case索引，因此需要先运行上面case，让索引创建出来
+        assert.equal(12, searchResp.rows.length)
+        return otsTestUtils.emptyPromise
+    });
+
     it("weight", async function () {
         this.timeout(30000);
         const tableName = "js_weight"