chore: add options for numRows and encoding

Author: olavloite

spannerlib/api/rows.go

@@ -13,6 +13,12 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
+type EncodeRowOption int32
+
+const (
+	EncodeRowOptionProto EncodeRowOption = iota
+)
+
 func Metadata(poolId, connId, rowsId int64) (*spannerpb.ResultSetMetadata, error) {
 	res, err := findRows(poolId, connId, rowsId)
 	if err != nil {

spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/Google.Cloud.SpannerLib.Native.csproj

@@ -8,7 +8,7 @@
     <PackageId>Experimental.SpannerLib.Native</PackageId>
     <Title>Experimental native library for Spanner</Title>
     <Authors />
-    <Version>1.0.10</Version>
+    <Version>1.0.11</Version>
   </PropertyGroup>
 
   <ItemGroup>

spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/SpannerLib.cs

@@ -8,7 +8,6 @@ namespace Google.Cloud.SpannerLib.Native
     public static class SpannerLib
     {
         private const string SpannerLibName = "spannerlib";
-        //private const string SpannerLibName = "/Users/loite/CLionProjects/spannerlib/cmake-build-release/libspannerlib.dylib";
 
         [DllImport(SpannerLibName, EntryPoint = "Release")]
         [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
@@ -61,7 +60,7 @@ internal static extern Message BufferWrite(long poolId, long connectionId, long
 
         [DllImport(SpannerLibName, EntryPoint = "Next")]
         [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]
-        internal static extern Message Next(long poolId, long connectionId, long rowsId);
+        internal static extern Message Next(long poolId, long connectionId, long rowsId, int numRows, int encodeRowOption);
 
         [DllImport(SpannerLibName, EntryPoint = "CloseRows")]
         [DefaultDllImportSearchPaths(DllImportSearchPath.AssemblyDirectory)]

spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib.Native/build.sh

@@ -5,8 +5,8 @@ mkdir -p libraries/any
 
 # Clear all local nuget cache
 dotnet nuget locals --clear all
-go build -o ../../spannerlib.so -buildmode=c-shared ../../shared_lib.go
-cp ../../spannerlib.so $DEST
+go build -o ../../shared/spannerlib.so -buildmode=c-shared ../../shared/shared_lib.go
+cp ../../shared/spannerlib.so $DEST
 dotnet pack
 dotnet nuget remove source local 2>/dev/null
 dotnet nuget add source "$PWD"/bin/Release --name local

spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/GrpcLibSpanner.cs

@@ -149,7 +149,7 @@ await stream.RequestStream.WriteAsync(new ConnectionStreamRequest
         return _lib.ResultSetStats(ToProto(rows));
     }
 
-    public ListValue? Next(Rows rows)
+    public ListValue? Next(Rows rows, int numRows, ISpanner.RowEncoding encoding)
     {
         var row = _lib.Next(ToProto(rows));
         if (row.Values.Count == 0)
@@ -159,13 +159,13 @@ await stream.RequestStream.WriteAsync(new ConnectionStreamRequest
         return row;
     }
 
-    public async Task<ListValue?> NextAsync(Rows rows)
+    public async Task<ListValue?> NextAsync(Rows rows, int numRows, ISpanner.RowEncoding encoding)
     {
         if (_streams.TryGetValue(rows.Connection.Id, out var stream))
         {
             return await NextStreaming(stream, rows);
         }
-        return await Task.Run(() => Next(rows));
+        return await Task.Run(() => Next(rows, numRows, encoding));
     }
 
     private async Task<ListValue?> NextStreaming(AsyncDuplexStreamingCall<ConnectionStreamRequest, ConnectionStreamResponse> stream, Rows rows)

spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/ISpanner.cs

@@ -6,6 +6,11 @@ namespace Google.Cloud.SpannerLib;
 
 public interface ISpanner
 {
+    public enum RowEncoding
+    {
+        Proto,
+    }
+    
     public Pool CreatePool(string dsn);
 
     public void ClosePool(Pool pool);
@@ -34,9 +39,9 @@ public interface ISpanner
 
     public ResultSetStats? Stats(Rows rows);
 
-    public ListValue? Next(Rows rows);
+    public ListValue? Next(Rows rows, int numRows, RowEncoding encoding);
 
-    public Task<ListValue?> NextAsync(Rows rows);
+    public Task<ListValue?> NextAsync(Rows rows, int numRows, RowEncoding encoding);
 
     public void CloseRows(Rows rows);
 

spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/Rows.cs

@@ -70,7 +70,7 @@ public async Task InitMetadataAsync()
     {
         if (_stream == null)
         {
-            var res = Spanner.Next(this);
+            var res = Spanner.Next(this, 1, ISpanner.RowEncoding.Proto);
             if (res == null && !_stats.IsValueCreated)
             {
                 // initialize stats.
@@ -95,7 +95,7 @@ public async Task InitMetadataAsync()
     {
         if (_stream == null)
         {
-            return await Spanner.NextAsync(this);
+            return await Spanner.NextAsync(this, 1, ISpanner.RowEncoding.Proto);
         }
         if (await _stream.ResponseStream.MoveNext())
         {

spannerlib/dotnet-spannerlib/Google.Cloud.SpannerLib/SharedLibSpanner.cs

@@ -158,15 +158,15 @@ public Task<long[]> ExecuteBatchAsync(Connection connection, ExecuteBatchDmlRequ
         return handler.Length == 0 ? null : ResultSetStats.Parser.ParseFrom(handler.Value());
     }
 
-    public ListValue? Next(Rows rows)
+    public ListValue? Next(Rows rows, int numRows, ISpanner.RowEncoding encoding)
     {
-        using var handler = ExecuteLibraryFunction(() => Native.SpannerLib.Next(rows.Connection.Pool.Id, rows.Connection.Id, rows.Id));
+        using var handler = ExecuteLibraryFunction(() => Native.SpannerLib.Next(rows.Connection.Pool.Id, rows.Connection.Id, rows.Id, numRows, (int) encoding));
         return handler.Length == 0 ? null : ListValue.Parser.ParseFrom(handler.Value());
     }
 
-    public async Task<ListValue?> NextAsync(Rows rows)
+    public async Task<ListValue?> NextAsync(Rows rows, int numRows, ISpanner.RowEncoding encoding)
     {
-        return await Task.Run(() => Next(rows));
+        return await Task.Run(() => Next(rows, numRows, encoding));
     }
 
     public void CloseRows(Rows rows)

spannerlib/shared/shared_lib.go

@@ -54,14 +54,15 @@ func pin(msg *lib.Message) (int64, int32, int64, int32, unsafe.Pointer) {
 }
 
 // CreatePool creates a pool of database connections. A Pool is equivalent to a *sql.DB.
+// All connections that are created from a pool share the same underlying Spanner client.
 //
 //export CreatePool
 func CreatePool(dsn string) (int64, int32, int64, int32, unsafe.Pointer) {
 	msg := lib.CreatePool(dsn)
 	return pin(msg)
 }
 
-// ClosePool closes a previously opened Pool.
+// ClosePool closes a previously opened Pool. All connections in the pool are also closed.
 //
 //export ClosePool
 func ClosePool(id int64) (int64, int32, int64, int32, unsafe.Pointer) {
@@ -81,6 +82,9 @@ func CreateConnection(poolId int64) (int64, int32, int64, int32, unsafe.Pointer)
 	return pin(msg)
 }
 
+// CloseConnection closes a previously opened connection and releases all resources
+// associated with the connection.
+//
 //export CloseConnection
 func CloseConnection(poolId, connId int64) (int64, int32, int64, int32, unsafe.Pointer) {
 	msg := lib.CloseConnection(poolId, connId)
@@ -155,12 +159,11 @@ func ResultSetStats(poolId, connId, rowsId int64) (int64, int32, int64, int32, u
 // ListValue that contains all the columns of the row. The message is empty if there are
 // no more rows in the Rows object.
 //
-// TODO: Add support for:
-//  1. Fetching more than one row at a time.
-//  2. Specifying the return type (e.g. proto, struct, ...)
-//
 //export Next
-func Next(poolId, connId, rowsId int64) (int64, int32, int64, int32, unsafe.Pointer) {
+func Next(poolId, connId, rowsId int64, numRows int32, encodeRowOption int32) (int64, int32, int64, int32, unsafe.Pointer) {
+	// TODO: Implement support for:
+	//  1. Fetching more than one row at a time.
+	//  2. Specifying the return type (e.g. proto, struct, ...)
 	msg := lib.Next(poolId, connId, rowsId)
 	return pin(msg)
 }