support SearchIndex and GlobalIndex

Author: wangtantan

README.md

@@ -10,7 +10,11 @@
  - 阿里云表格存储是阿里云自主研发的NoSQL数据存储服务，提供海量结构化数据的存储和实时访问。
 
 ## 版本
- - 当前版本：4.0.14
+ - 当前版本：4.1.0
+
+## 版本特性
+ - 支持SearchIndex
+ - 支持GlobalIndex
 
 ## 安装
 

lib/client.js

@@ -238,7 +238,57 @@ TableStore.Client = inherit({
    */
   batchWriteRow: function batchWriteRow(params, callback) {
     return this.makeRequest('batchWriteRow', params, callback);
-  }
+  },
+
+  /**
+   * 获取表下所有SearchIndex索引名。
+   */
+  listSearchIndex: function listSearchIndex(params, callback) {
+      return this.makeRequest('listSearchIndex', params, callback);
+  },
+
+  /**
+   * 获取SearchIndex索引描述信息。
+   */
+  describeSearchIndex: function describeSearchIndex(params, callback) {
+    return this.makeRequest('describeSearchIndex', params, callback);
+  },
+
+  /**
+   * SearchIndex创建新索引。
+   */
+  createSearchIndex: function createSearchIndex(params, callback) {
+    return this.makeRequest('createSearchIndex', params, callback);
+  },
+
+  /**
+   * SearchIndex删除索引。
+   */
+  deleteSearchIndex: function deleteSearchIndex(params, callback) {
+    return this.makeRequest('deleteSearchIndex', params, callback);
+  },
+
+
+  /**
+   * SearchIndex搜索。
+   */
+  search: function search(params, callback) {
+    return this.makeRequest('search', params, callback);
+  },
+
+  /**
+   * 创建GlobalIndex索引名。
+   */
+  createIndex: function createIndex(params, callback) {
+      return this.makeRequest('createIndex', params, callback);
+  },
+
+  /**
+   * 删除GlobalIndex索引名。
+   */
+  dropIndex: function dropIndex(params, callback) {
+      return this.makeRequest('dropIndex', params, callback);
+  },
 
   /**********************************  数据操作 结束 ******************************************/
 });

lib/config.js

@@ -61,7 +61,7 @@ TableStore.Config = TableStore.util.inherit({
     securityToken: null, // the same with stsToken
     logger: null,
     endpoint: undefined,
-    httpOptions: {},//timeout
+    httpOptions: {},//timeout,maxSockets。default maxSockets = 300 
     maxRetries: undefined,
     instancename: undefined,
     computeChecksums: true,

lib/core.js

@@ -26,3 +26,4 @@ require('./http/node');
 require('./retry/retry_util');
 require('./retry/default_retry_policy');
 require('./client');
+require('./search');

lib/http/node.js

@@ -15,7 +15,11 @@ TableStore.NodeHttpClient = TableStore.util.inherit({
 
     var useSSL = endpoint.protocol === 'https:';
     var http = useSSL ? require('https') : require('http');
-    http.globalAgent.maxSockets = 300;
+    if (httpOptions.maxSockets) {
+      http.globalAgent.maxSockets = httpOptions.maxSockets;
+    } else {
+      http.globalAgent.maxSockets = 300;
+    }
     var options = {
       host: endpoint.hostname,
       port: endpoint.port,
@@ -31,6 +35,7 @@ TableStore.NodeHttpClient = TableStore.util.inherit({
     TableStore.util.update(options, httpOptions);
     delete options.proxy; // proxy isn't an HTTP option
     delete options.timeout; // timeout isn't an HTTP option
+    delete options.maxSockets; // maxSockets isn't an HTTP option
 
     var stream = http.request(options, function (httpResp) {
       callback(httpResp);
@@ -40,15 +45,15 @@ TableStore.NodeHttpClient = TableStore.util.inherit({
 
     // timeout support
     stream.setTimeout(httpOptions.timeout || 0);
-    stream.once('timeout', function() {
+    stream.once('timeout', function () {
       var msg = 'Connection timed out after ' + httpOptions.timeout + 'ms';
-      errCallback(TableStore.util.error(new Error(msg), {code: 'TimeoutError'}));
+      errCallback(TableStore.util.error(new Error(msg), { code: 'TimeoutError' }));
 
       // HACK - abort the connection without tripping our error handler
       // since we already raised our TimeoutError. Otherwise the connection
       // comes back with ECONNRESET, which is not a helpful error message
       stream.removeListener('error', errCallback);
-      stream.on('error', function() { });
+      stream.on('error', function () { });
       stream.abort();
     });
 
@@ -78,13 +83,13 @@ TableStore.NodeHttpClient = TableStore.util.inherit({
     var https = require('https');
 
     if (!TableStore.NodeHttpClient.sslAgent) {
-      TableStore.NodeHttpClient.sslAgent = new https.Agent({rejectUnauthorized: true});
+      TableStore.NodeHttpClient.sslAgent = new https.Agent({ rejectUnauthorized: true });
       TableStore.NodeHttpClient.sslAgent.setMaxListeners(0);
 
       // delegate maxSockets to globalAgent
       Object.defineProperty(TableStore.NodeHttpClient.sslAgent, 'maxSockets', {
         enumerable: true,
-        get: function() { return https.globalAgent.maxSockets; }
+        get: function () { return https.globalAgent.maxSockets; }
       });
     }
     return TableStore.NodeHttpClient.sslAgent;
@@ -94,7 +99,7 @@ TableStore.NodeHttpClient = TableStore.util.inherit({
     var numBytes = 0;
     var totalBytes = httpRequest.headers['Content-Length'];
     var writer = new WritableStream();
-    writer._write = function(chunk, encoding, callback) {
+    writer._write = function (chunk, encoding, callback) {
       if (chunk) {
         numBytes += chunk.length;
         stream.emit('sendProgress', {
@@ -111,7 +116,7 @@ TableStore.NodeHttpClient = TableStore.util.inherit({
 
     var readable = new ReadableStream();
     var pos = 0;
-    readable._read = function(size) {
+    readable._read = function (size) {
       if (pos >= buffer.length) return readable.push(null);
 
       var end = pos + size;

lib/metadata.js

@@ -23,6 +23,19 @@ TableStore.ReturnType = {
     Primarykey: 1
 };
 
+TableStore.DefinedColumnType = {
+    DCT_INTEGER: 1,
+    DCT_DOUBLE: 2,
+    DCT_BOOLEAN: 3,
+    DCT_STRING: 4
+};
+
+TableStore.PrimaryKeyType = {
+    INTEGER: 1,
+    STRING: 2,
+    BINARY: 3
+}
+
 TableStore.INF_MIN = {};
 
 TableStore.INF_MAX = {};

lib/protocol/decoder.js

@@ -1,6 +1,7 @@
 var TableStore = require('../core');
 var tsProtos = require('./tablestore_proto.js').tablestore.proto;
 var tsFilterProtos = require('./tablestore_filter_proto.js').tablestore.filter.proto;
+var tsSearchProtos = require('./tablestore_search_proto.js').tablestore.search.proto;
 
 TableStore.decoder = {
     decode: function (operation, buffers) {
@@ -164,7 +165,56 @@ TableStore.decoder = {
         };
 
         return writeRowItem;
-    }
+    },
+    decodeListSearchIndex: function (buffers) {
+        var response = tsSearchProtos.ListSearchIndexResponse.decode(buffers);
+        return response;
+    },
+    decodeDescribeSearchIndex: function (buffers) {
+        var response = tsSearchProtos.DescribeSearchIndexResponse.decode(buffers);
+        if (response.sync_stat && response.sync_stat.current_sync_timestamp) {//nino second
+            response.sync_stat.current_sync_timestamp = response.sync_stat.current_sync_timestamp.toString();
+        }
+
+        return response;
+    },
+    decodeCreateSearchIndex: function (buffers) {
+        var response = tsSearchProtos.CreateSearchIndexResponse.decode(buffers);
+        return response;
+    },
+    decodeDeleteSearchIndex: function (buffers) {
+        var response = tsSearchProtos.DeleteSearchIndexResponse.decode(buffers);
+        return response;
+    },
+    decodeSearch: function (buffers) {
+        var response = tsSearchProtos.SearchResponse.decode(buffers);
+        var result = {};
+        var totalCounts = response.total_hits.toString();
+        if (totalCounts != "-1") {
+            result.totalCounts = totalCounts;
+        }
+        result.isAllSucceeded = response.is_all_succeeded;
+        result.nextToken = response.next_token;
+
+        var rows = [];
+        TableStore.util.arrayEach(response.rows, function(aRow) {
+            var inputStream = new TableStore.PlainBufferInputStream(aRow);
+            var codedInputStream = new TableStore.PlainBufferCodedInputStream(inputStream);
+            var row = codedInputStream.readRow();
+            rows.push(row);
+        });
+        result.rows = rows;
+
+        return result;
+    },
+    decodeCreateIndex: function (buffers) {
+        var response = tsSearchProtos.CreateSearchIndexResponse.decode(buffers);
+        return response;
+    },
+    decodeDropIndex: function (buffers) {
+        var response = tsSearchProtos.DeleteSearchIndexResponse.decode(buffers);
+        return response;
+    },
 };
 
 var tsMap = {
@@ -179,5 +229,12 @@ var tsMap = {
     'deleteRow': TableStore.decoder.decodeDeleteRow,
     'getRange': TableStore.decoder.decodeGetRange,
     'batchGetRow': TableStore.decoder.decodeBatchGetRow,
-    'batchWriteRow': TableStore.decoder.decodeBatchWriteRow
+    'batchWriteRow': TableStore.decoder.decodeBatchWriteRow,
+    'listSearchIndex': TableStore.decoder.decodeListSearchIndex,
+    'describeSearchIndex': TableStore.decoder.decodeDescribeSearchIndex,
+    'createSearchIndex': TableStore.decoder.decodeCreateSearchIndex,
+    'deleteSearchIndex': TableStore.decoder.decodeDeleteSearchIndex,
+    'search': TableStore.decoder.decodeSearch,
+    'createIndex': TableStore.decoder.decodeCreateIndex,
+    'dropIndex': TableStore.decoder.decodeDropIndex,
 };