fix indexoption and analyzer default value error

aliyun · Jun 24, 2019 · 8f91881 · 8f91881
1 parent c1c5890
commit 8f91881
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/sdk/Aliyun/OTS/DataModel/Search/FieldSchema.cs b/sdk/Aliyun/OTS/DataModel/Search/FieldSchema.cs
@@ -5,7 +5,7 @@ namespace Aliyun.OTS.DataModel.Search
 {
     public enum Analyzer
     {
-
+        NotAnalyzed,
         SingleWord,
         MaxWord
 

diff --git a/sdk/Aliyun/OTS/DataModel/Search/IndexOptions.cs b/sdk/Aliyun/OTS/DataModel/Search/IndexOptions.cs
@@ -6,6 +6,7 @@
     /// </summary>
     public enum IndexOptions
     {
+        NULL,
         DOCS,
         FREQS,
         POSITIONS,

diff --git a/sdk/Aliyun/OTS/Handler/ProtocolBufferEncoder.cs b/sdk/Aliyun/OTS/Handler/ProtocolBufferEncoder.cs
@@ -374,7 +374,7 @@ private IMessage EncodeCreateSearchIndex(Request.OTSRequest request)
             var requestReal = (Request.CreateSearchIndexRequest)request;
             var builder = PB.CreateSearchIndexRequest.CreateBuilder();
             builder.SetTableName(requestReal.TableName);
-            builder.SetIndexName(requestReal.IndexName);  
+            builder.SetIndexName(requestReal.IndexName);
             builder.SetSchema(EncodeIndexSchema(requestReal.IndexSchame));
             return builder.Build();
         }
@@ -515,8 +515,11 @@ private PB.FieldSchema EncodingFieldSchema(DataModel.Search.FieldSchema fieldSch
                 builder.IsArray = fieldSchema.IsArray;
             }
 
-            builder.IndexOptions = EncodingIndexOptions(fieldSchema.IndexOptions);
-            if(fieldSchema.FieldType == DataModel.Search.FieldType.TEXT)
+            if (fieldSchema.IndexOptions != DataModel.Search.IndexOptions.NULL)
+            {
+                builder.IndexOptions = EncodingIndexOptions(fieldSchema.IndexOptions);
+            }
+            if (fieldSchema.Analyzer != DataModel.Search.Analyzer.NotAnalyzed)
             {
                 builder.Analyzer = EncodingAnalyzer(fieldSchema.Analyzer);
             }
@@ -525,7 +528,7 @@ private PB.FieldSchema EncodingFieldSchema(DataModel.Search.FieldSchema fieldSch
             {
                 for (var i = 0; i < fieldSchema.SubFieldSchemas.Count; i++)
                 {
-                    builder.SetFieldSchemas(i, EncodingFieldSchema(fieldSchema.SubFieldSchemas[i]));
+                    builder.AddFieldSchemas(EncodingFieldSchema(fieldSchema.SubFieldSchemas[i]));
                 }
             }