Tables functionality alpha release (#15)

Co-authored-by: jeffrey-elliott <[email protected]>
Co-authored-by: Steve Hewitt <[email protected]>

Author: a-random-steve

src/DataStax.AstraDB.DataApi/Collections/Collection.cs

@@ -53,7 +53,17 @@ public class Builders<T>
     /// sort = sort.Ascending(x => x.Name);
     /// </code>
     /// </example>
-    public static SortBuilder<T> Sort => new();
+    public static DocumentSortBuilder<T> Sort => new();
+    /// <summary>
+    /// A builder for creating sort definitions for tables
+    /// </summary>
+    /// <example>
+    /// <code>
+    /// var sort = Builders&lt;DocumentType&gt;.TableSort;
+    /// sort = sort.Ascending(x => x.Name);
+    /// </code>
+    /// </example>
+    public static TableSortBuilder<T> TableSort => new();
     /// <summary>
     /// A builder for creating update definitions
     /// </summary>

src/DataStax.AstraDB.DataApi/Core/Builders.cs

@@ -40,6 +40,8 @@ public class CommandOptions
     internal string Keyspace { get; set; }
     internal JsonConverter InputConverter { get; set; }
     internal JsonConverter OutputConverter { get; set; }
+    internal bool? SerializeGuidAsDollarUuid { get; set; }
+    internal bool? SerializeDateAsDollarDate { get; set; }
 
     /// <summary>
     /// The token to use for authentication
@@ -109,6 +111,8 @@ internal static CommandOptions Merge(params CommandOptions[] arr)
             InputConverter = list.Select(o => o.InputConverter).Merge(),
             OutputConverter = list.Select(o => o.OutputConverter).Merge(),
             IncludeKeyspaceInUrl = FirstNonNull(x => x.IncludeKeyspaceInUrl) ?? Defaults().IncludeKeyspaceInUrl,
+            SerializeGuidAsDollarUuid = FirstNonNull(x => x.SerializeGuidAsDollarUuid) ?? Defaults().SerializeGuidAsDollarUuid,
+            SerializeDateAsDollarDate = FirstNonNull(x => x.SerializeDateAsDollarDate) ?? Defaults().SerializeDateAsDollarDate,
         };
         return options;
     }
@@ -128,6 +132,8 @@ public static CommandOptions Defaults()
             HttpClientOptions = new HttpClientOptions(),
             Keyspace = Database.DefaultKeyspace,
             IncludeKeyspaceInUrl = true,
+            SerializeGuidAsDollarUuid = true,
+            SerializeDateAsDollarDate = true,
         };
     }
 }

src/DataStax.AstraDB.DataApi/Core/CommandOptions.cs

@@ -16,6 +16,7 @@
 
 using DataStax.AstraDB.DataApi.Collections;
 using DataStax.AstraDB.DataApi.SerDes;
+using DataStax.AstraDB.DataApi.Tables;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -109,7 +110,7 @@ internal async Task<ApiResponseWithStatus<TStatus>> RunAsyncReturnStatus<TStatus
         return response;
     }
 
-    internal async Task<ApiResponseWithData<TData, TStatus>> RunAsyncReturnData<TData, TDocument, TStatus>(bool runSynchronously)
+    internal async Task<ApiResponseWithData<TData, TStatus>> RunAsyncReturnDocumentData<TData, TDocument, TStatus>(bool runSynchronously)
     {
         var useDocumentConverter = typeof(TDocument) != typeof(Document);
         if (useDocumentConverter)
@@ -127,6 +128,16 @@ internal async Task<ApiResponseWithData<TData, TStatus>> RunAsyncReturnData<TDat
         return response;
     }
 
+    internal async Task<ApiResponseWithData<TData, TStatus>> RunAsyncReturnData<TData, TStatus>(bool runSynchronously)
+    {
+        var response = await RunCommandAsync<ApiResponseWithData<TData, TStatus>>(HttpMethod.Post, runSynchronously).ConfigureAwait(false);
+        if (response.Errors != null && response.Errors.Count > 0)
+        {
+            throw new CommandException(response.Errors);
+        }
+        return response;
+    }
+
     internal async Task<T> RunAsyncRaw<T>(bool runSynchronously)
     {
         return await RunAsyncRaw<T>(HttpMethod.Post, runSynchronously).ConfigureAwait(false);
@@ -142,9 +153,18 @@ internal string Serialize<T>(T input, JsonSerializerOptions serializeOptions = n
         var commandOptions = CommandOptions.Merge(_commandOptionsTree.ToArray());
         serializeOptions ??= new JsonSerializerOptions();
         serializeOptions.Converters.Add(new ObjectIdConverter());
-        serializeOptions.Converters.Add(new SerDes.GuidConverter());
-        serializeOptions.Converters.Add(new DateTimeConverter<DateTimeOffset>());
-        serializeOptions.Converters.Add(new DateTimeConverter<DateTime>());
+        serializeOptions.Converters.Add(new DurationConverter());
+        serializeOptions.Converters.Add(new ByteArrayAsBinaryJsonConverter());
+        if (commandOptions.SerializeDateAsDollarDate == true)
+        {
+            serializeOptions.Converters.Add(new DateTimeConverter<DateTimeOffset>());
+            serializeOptions.Converters.Add(new DateTimeConverter<DateTime>());
+        }
+        if (commandOptions.SerializeGuidAsDollarUuid == true)
+        {
+            serializeOptions.Converters.Add(new GuidConverter());
+        }
+        serializeOptions.Converters.Add(new IpAddressConverter());
         if (commandOptions.InputConverter != null)
         {
             serializeOptions.Converters.Add(commandOptions.InputConverter);
@@ -166,15 +186,23 @@ internal T Deserialize<T>(string input)
     {
         var commandOptions = CommandOptions.Merge(_commandOptionsTree.ToArray());
         var deserializeOptions = new JsonSerializerOptions();
-
+        deserializeOptions.Converters.Add(new DurationConverter());
+        deserializeOptions.Converters.Add(new ByteArrayAsBinaryJsonConverter());
         if (commandOptions.OutputConverter != null)
         {
             deserializeOptions.Converters.Add(commandOptions.OutputConverter);
         }
         deserializeOptions.Converters.Add(new ObjectIdConverter());
-        deserializeOptions.Converters.Add(new SerDes.GuidConverter());
-        deserializeOptions.Converters.Add(new DateTimeConverter<DateTimeOffset>());
-        deserializeOptions.Converters.Add(new DateTimeConverter<DateTime>());
+        if (commandOptions.SerializeGuidAsDollarUuid == true)
+        {
+            deserializeOptions.Converters.Add(new GuidConverter());
+        }
+        if (commandOptions.SerializeDateAsDollarDate == true)
+        {
+            deserializeOptions.Converters.Add(new DateTimeConverter<DateTimeOffset>());
+            deserializeOptions.Converters.Add(new DateTimeConverter<DateTime>());
+        }
+        deserializeOptions.Converters.Add(new IpAddressConverter());
 
         return JsonSerializer.Deserialize<T>(input, deserializeOptions);
     }

src/DataStax.AstraDB.DataApi/Core/Commands/Command.cs

@@ -30,4 +30,7 @@ internal static class DataApiKeywords
     internal const string Vector = "$vector";
     internal const string SortVector = "sortVector";
     internal const string Vectorize = "$vectorize";
+    internal const string Binary = "$binary";
+    internal const int SortAscending = 1;
+    internal const int SortDescending = -1;
 }