update to 4.0.0

Author: 伯箫

.gitignore

@@ -2,3 +2,4 @@ packages
 *\bin
 *\obj
 .vs
+.DS_Store

CHANGELOG.md

@@ -18,4 +18,10 @@
 ## 版本号：2.2.0  日期：2016/04/11
 ### 变更内容
 - 连接池的默认连接个数从50调整到300
-- 新增conditional update功能
+- 新增conditional update功能
+
+## 版本号 4.0.0 日期2018/09/07
+### 变更内容
+- 数据传输改为ProtocolBuffer加PlainBuffer
+- 支持自增列
+- 支持多版本

README.md

@@ -1,4 +1,4 @@
-# Aliyun TableStore SDK for C# 
+# Aliyun TableStore SDK for C# 
 
 [![Software License](https://img.shields.io/badge/license-apache2-brightgreen.svg)](LICENSE)
 [![GitHub version](https://badge.fury.io/gh/aliyun%2Faliyun-tablestore-csharp-sdk.svg)](https://badge.fury.io/gh/aliyun%2Faliyun-tablestore-csharp-sdk)
@@ -9,7 +9,7 @@
  - 阿里云表格存储是构建在阿里云飞天分布式系统之上的NoSQL数据存储服务，提供海量结构化数据的存储和实时访问。
 
 ## 版本
- - 当前版本：3.0.0
+ - 当前版本：4.0.0
 
 ## 运行环境
 ### Windows

sample/Config.cs

@@ -1,13 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Aliyun.OTS;
-
-namespace Aliyun.OTS.Samples
+namespace Aliyun.OTS.Samples
 {
-    internal class Config
+    internal static class Config
     {
         public static string AccessKeyId = "<your access key id>";
 
@@ -26,9 +19,11 @@ public static OTSClient GetClient()
                 return OtsClient;
             }
 
-            OTSClientConfig config = new OTSClientConfig(Endpoint, AccessKeyId, AccessKeySecret, InstanceName);
-            config.OTSDebugLogHandler = null;
-            config.OTSErrorLogHandler = null;
+            OTSClientConfig config = new OTSClientConfig(Endpoint, AccessKeyId, AccessKeySecret, InstanceName)
+            {
+                OTSDebugLogHandler = null,
+                OTSErrorLogHandler = null
+            };
             OtsClient = new OTSClient(config);
             return OtsClient;
         }

sample/Program.cs

@@ -14,27 +14,27 @@ static void Main(string[] args)
 
                 CreateTableSample.TableOperations();
 
-                //SingleRowReadWriteSample.PutRow();
-                //SingleRowReadWriteSample.PutRowAsync();
+                SingleRowReadWriteSample.PutRow();
+                SingleRowReadWriteSample.PutRowAsync();
 
-                //SingleRowReadWriteSample.UpdateRow();
+                SingleRowReadWriteSample.UpdateRow();
 
-                //SingleRowReadWriteSample.GetRow();
-                //SingleRowReadWriteSample.GetRowWithFilter();
+                SingleRowReadWriteSample.GetRow();
+                SingleRowReadWriteSample.GetRowWithFilter();
 
-                //MultiRowReadWriteSample.BatchWriteRow();
+                MultiRowReadWriteSample.BatchWriteRow();
 
-                //MultiRowReadWriteSample.GetRange();
-                //MultiRowReadWriteSample.GetRangeWithFilter();
-                //MultiRowReadWriteSample.GetIterator();
+                MultiRowReadWriteSample.GetRange();
+                MultiRowReadWriteSample.GetRangeWithFilter();
+                MultiRowReadWriteSample.GetIterator();
 
-                //MultiRowReadWriteSample.BatchGetRow();
-                //MultiRowReadWriteSample.BatchGetRowWithFilter();
+                MultiRowReadWriteSample.BatchGetRow();
+                MultiRowReadWriteSample.BatchGetRowWithFilter();
 
-                //ConditionUpdateSample.ConditionPutRow();
-                //ConditionUpdateSample.ConditionUpdateRow();
-                //ConditionUpdateSample.ConditionDeleteRow();
-                //ConditionUpdateSample.ConditionBatchWriteRow();
+                ConditionUpdateSample.ConditionPutRow();
+                ConditionUpdateSample.ConditionUpdateRow();
+                ConditionUpdateSample.ConditionDeleteRow();
+                ConditionUpdateSample.ConditionBatchWriteRow();
             }
             catch (OTSClientException ex)
             {

sample/Samples/ConditionUpdateSample.cs

@@ -67,7 +67,7 @@ public static void ConditionPutRow()
             try
             {
                 request.Condition.ColumnCondition = new RelationalCondition("col0",
-                                                    RelationalCondition.CompareOperator.NOT_EQUAL,
+                                                    CompareOperator.NOT_EQUAL,
                                                     new ColumnValue(5));
                 otsClient.PutRow(request);
 
@@ -82,7 +82,7 @@ public static void ConditionPutRow()
             {
                 // 新增条件：col0列的值等于5
                 request.Condition.ColumnCondition = new RelationalCondition("col0",
-                                                    RelationalCondition.CompareOperator.EQUAL,
+                                                    CompareOperator.EQUAL,
                                                     new ColumnValue(5));
                 otsClient.PutRow(request);
 
@@ -137,11 +137,11 @@ public static void ConditionUpdateRow()
             {
                 // 构造condition
                 var cond1 = new RelationalCondition("col0",
-                                                    RelationalCondition.CompareOperator.NOT_EQUAL,
+                                                    CompareOperator.NOT_EQUAL,
                                                     new ColumnValue(5));
-                var cond2 = new RelationalCondition("col1", RelationalCondition.CompareOperator.EQUAL,
+                var cond2 = new RelationalCondition("col1", CompareOperator.EQUAL,
                                                     new ColumnValue("a"));
-                var columenCondition = new CompositeCondition(CompositeCondition.LogicOperator.AND);
+                var columenCondition = new CompositeCondition(LogicOperator.AND);
                 columenCondition.AddCondition(cond1);
                 columenCondition.AddCondition(cond2);
 
@@ -203,7 +203,7 @@ public static void ConditionDeleteRow()
                 // 构造条件语句：col2列的值等于true
                 var condition = new Condition(RowExistenceExpectation.EXPECT_EXIST);
                 condition.ColumnCondition = new RelationalCondition("col2",
-                                            RelationalCondition.CompareOperator.EQUAL,
+                                            CompareOperator.EQUAL,
                                             new ColumnValue(true));
 
                 // 构造删除请求
@@ -260,15 +260,15 @@ public static void ConditionBatchWriteRow()
                 // 构造条件语句：col0列的值不等于5
                 var condition = new Condition(RowExistenceExpectation.IGNORE);
                 condition.ColumnCondition = new RelationalCondition("col0",
-                                            RelationalCondition.CompareOperator.NOT_EQUAL,
+                                            CompareOperator.NOT_EQUAL,
                                             new ColumnValue(5));
 
                 // 构造col2列的值
                 var attr1 = new AttributeColumns();
                 attr1.Add("col2", new ColumnValue(false));
 
                 // 构造批量写请求
-                var rowChange = new RowChanges();
+                var rowChange = new RowChanges(tableName);
                 rowChange.AddPut(condition, primaryKey, attr1);
 
                 var batchWriteRequest = new BatchWriteRowRequest();

sample/Samples/CreateTableSample.cs

@@ -9,17 +9,19 @@ namespace Aliyun.OTS.Samples
     public static class CreateTableSample
     {
 
-        private static string TableName = "createTableSample";
+        private static readonly string TableName = "createTableSample";
 
         public static void TableOperations()
         {
             // 创建表
             OTSClient otsClient = Config.GetClient();
             {
                 Console.WriteLine("Start create table...");
-                PrimaryKeySchema primaryKeySchema = new PrimaryKeySchema();
-                primaryKeySchema.Add("pk0", ColumnValueType.Integer);
-                primaryKeySchema.Add("pk1", ColumnValueType.String);
+                PrimaryKeySchema primaryKeySchema = new PrimaryKeySchema
+                {
+                    { "pk0", ColumnValueType.Integer },
+                    { "pk1", ColumnValueType.String }
+                };
                 TableMeta tableMeta = new TableMeta(TableName, primaryKeySchema);
 
                 CapacityUnit reservedThroughput = new CapacityUnit(1, 1);
@@ -56,12 +58,12 @@ public static void TableOperations()
             }
 
             // 删除表
-            //{
-                //Console.WriteLine("Start delete table...");
-                //DeleteTableRequest request = new DeleteTableRequest(TableName);
-                //otsClient.DeleteTable(request);
-                //Console.WriteLine("Table is deleted.");
-            //}
+            {
+                Console.WriteLine("Start delete table...");
+                DeleteTableRequest request = new DeleteTableRequest(TableName);
+                otsClient.DeleteTable(request);
+                Console.WriteLine("Table is deleted.");
+            }
         }
     }
 }