Support Search Agg & GroupBy and SQL Query

Author: xiaozhiqing.xzq

.gitignore

@@ -1,5 +1,218 @@
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
 packages
-*\bin
-*\obj
-.vs
 .DS_Store
+log.txt
+internalTest
+*.csproj.user
+
+*.userprefs
+
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+.vs/
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# StyleCop
+StyleCopReport.xml
+
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+*.e2e
+
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+*.dotCover
+
+.axoCover/*
+!.axoCover/settings.json
+
+coverage*.json
+coverage*.xml
+coverage*.info
+
+*.coverage
+*.coveragexml
+
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+*.[Pp]ublish.xml
+*.azurePubxml
+*.pubxml
+*.publishproj
+
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+*.sln.iml
+

CHANGELOG.md

@@ -27,7 +27,14 @@
 - 支持多版本
 
 ## 版本号 4.1.0 日期：2018/12/17
-###　变更内容
+### 变更内容
 - 支持多元索引(SearchIndex）
 - 支持全局二级索引(GlobalIndex)
-- 支持原子增
+- 支持原子增
+
+## 版本号 5.0.0 日期：2020/08/15
+### 变更内容
+- 多元索引支持统计聚合功能(Aggregation & GroupBy)
+- 多元索引支持创建虚拟列、日期列
+- 多元索引支持索引TTL
+- 支持SQL查询

README.md

@@ -9,7 +9,7 @@
  - 阿里云表格存储是构建在阿里云飞天分布式系统之上的NoSQL数据存储服务，提供海量结构化数据的存储和实时访问。
 
 ## 版本
- - 当前版本：4.1.1
+ - 当前版本：5.0.0
 
 ## 运行环境
 ### Windows

aliyun-tablestore-csharp-sdk.sln

@@ -1,14 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2050
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.32630.194
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aliyun-tablestore-sdk", "sdk\aliyun-tablestore-sdk.csproj", "{AB5EFCA2-53A9-42B5-861E-3FD6F865036B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aliyun-tablestore-sdk-test", "test\aliyun-tablestore-sdk-test.csproj", "{F30E0874-399A-4FBD-B72B-74EE36B31AF6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aliyun-tablestore-sdk-sample", "sample\aliyun-tablestore-sdk-sample.csproj", "{D151C869-BC8F-4465-9460-5103A25D21E9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "internalTest", "internalTest\internalTest.csproj", "{BBC62040-3F72-419D-BF9E-606DE4B8BF1E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
 		{D151C869-BC8F-4465-9460-5103A25D21E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D151C869-BC8F-4465-9460-5103A25D21E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D151C869-BC8F-4465-9460-5103A25D21E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBC62040-3F72-419D-BF9E-606DE4B8BF1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBC62040-3F72-419D-BF9E-606DE4B8BF1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBC62040-3F72-419D-BF9E-606DE4B8BF1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBC62040-3F72-419D-BF9E-606DE4B8BF1E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

sample/Samples/AtomicIncrementSample.cs

@@ -107,7 +107,7 @@ public static void Increment(int incrementValue)
             };
             RowUpdateChange rowUpdateChange = new RowUpdateChange(TableName, primaryKey);
             rowUpdateChange.ReturnType = ReturnType.RT_AFTER_MODIFY;
-            rowUpdateChange.ReturnColumnNames = new List<string>() { IncrementCol};
+            rowUpdateChange.ReturnColumnNames = new List<string>() { IncrementCol };
             //设置一个原子自增列，这一列从0开始自增，每次增增加1。
             rowUpdateChange.Increment(new Column(IncrementCol, new ColumnValue(incrementValue)));
 

sample/Samples/AutoIncrementSample.cs

@@ -26,7 +26,7 @@ static void Main(string[] args)
 
             //写入10行，自增列Pk2将
             for (int i = 0; i < 10; i++)
-            {  
+            {
                 PutRow(i.ToString());
             }
 
@@ -39,15 +39,15 @@ static void Main(string[] args)
         /// </summary>
         private static void CreateTableWithAutoIncrementPk()
         {
-            
+
             OTSClient otsClient = Config.GetClient();
 
             IList<string> tables = otsClient.ListTable(new ListTableRequest()).TableNames;
             if (tables.Contains(TableName))
             {
                 return;
             }
-            
+
             PrimaryKeySchema primaryKeySchema = new PrimaryKeySchema
             {
                 { Pk1, ColumnValueType.String },
@@ -82,9 +82,9 @@ public static void PutRow(string pk1Value)
             PutRowRequest request = new PutRowRequest(TableName, new Condition(RowExistenceExpectation.IGNORE), primaryKey, attribute);
             request.RowPutChange.ReturnType = ReturnType.RT_PK;
 
-            var response =  otsClient.PutRow(request);
-            Console.WriteLine("Put row succeed，autoIncrement Pk value:"+ response.Row.GetPrimaryKey()[Pk2].IntegerValue);
+            var response = otsClient.PutRow(request);
+            Console.WriteLine("Put row succeed，autoIncrement Pk value:" + response.Row.GetPrimaryKey()[Pk2].IntegerValue);
         }
-        
+
     }
 }