Merge branch 'main' into ado-net-driver

olavloite · olavloite · commit d6b8f7b40ed6 · 2025-10-22T10:53:11.000+02:00
diff --git a/conn_with_mockserver_test.go b/conn_with_mockserver_test.go
@@ -1501,6 +1501,7 @@ func TestGenericConnectionState_GoogleSQL(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
 func TestGenericConnectionState_PostgreSQL(t *testing.T) {
 	t.Parallel()
 
@@ -1751,6 +1752,40 @@ func TestGenericConnectionState_PostgreSQL(t *testing.T) {
 	}
 }
 
+func TestDmlBatchReturnsBatchUpdateCountsOutsideTransaction(t *testing.T) {
+	t.Parallel()
+	db, _, teardown := setupTestDBConnection(t)
+	defer teardown()
+	ctx := context.Background()
+
+	conn, err := db.Conn(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer silentClose(conn)
+
+	if _, err := conn.ExecContext(ctx, "start batch dml"); err != nil {
+		t.Fatal(err)
+	}
+	_, _ = conn.ExecContext(ctx, testutil.UpdateBarSetFoo)
+	_, _ = conn.ExecContext(ctx, testutil.UpdateSingersSetLastName)
+	var res SpannerResult
+	if err := conn.Raw(func(driverConn interface{}) error {
+		spannerConn, _ := driverConn.(SpannerConn)
+		res, err = spannerConn.RunDmlBatch(ctx)
+		return err
+	}); err != nil {
+		t.Fatal(err)
+	}
+	results, err := res.BatchRowsAffected()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if g, w := results, []int64{testutil.UpdateBarSetFooRowCount, testutil.UpdateSingersSetLastNameRowCount}; !reflect.DeepEqual(g, w) {
+		t.Fatalf("batch affected mismatch\n Got: %v\nWant: %v", g, w)
+	}
+}
+
 func verifyConnectionPropertyValue[T comparable](t *testing.T, c *sql.Conn, name string, value T) {
 	ctx := context.Background()
 	row := c.QueryRowContext(ctx, getShowStatement(c)+name)
diff --git a/spannerlib/.gitignore b/spannerlib/.gitignore
@@ -1,6 +1,9 @@
 spannerlib.h
 spannerlib.so
+spannerlib.dylib
+spannerlib.dll
 grpc_server
+grpc_server.exe
 vendor/bundle
 shared/
 *.gem
diff --git a/spannerlib/grpc-server/server.go b/spannerlib/grpc-server/server.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"log"
+	"math"
 	"net"
 	"os"
 	"os/signal"
@@ -46,6 +47,8 @@ func main() {
 		log.Fatalf("failed to listen: %v\n", err)
 	}
 	var opts []grpc.ServerOption
+	// Set a max message size that is essentially no limit.
+	opts = append(opts, grpc.MaxRecvMsgSize(math.MaxInt32))
 	grpcServer := grpc.NewServer(opts...)
 
 	server := spannerLibServer{}
diff --git a/spannerlib/grpc-server/server_test.go b/spannerlib/grpc-server/server_test.go
@@ -6,6 +6,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"reflect"
 	"runtime"
 	"testing"
 
@@ -310,6 +311,12 @@ func TestTransaction(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to create connection: %v", err)
 	}
+	if _, err := client.Execute(ctx, &pb.ExecuteRequest{
+		Connection:        connection,
+		ExecuteSqlRequest: &sppb.ExecuteSqlRequest{Sql: "set transaction_tag='test_tag'"},
+	}); err != nil {
+		t.Fatalf("failed to set transaction_tag: %v", err)
+	}
 	if _, err := client.BeginTransaction(ctx, &pb.BeginTransactionRequest{
 		Connection:         connection,
 		TransactionOptions: &sppb.TransactionOptions{},
@@ -347,6 +354,16 @@ func TestTransaction(t *testing.T) {
 	if _, err := client.ClosePool(ctx, pool); err != nil {
 		t.Fatalf("failed to close pool: %v", err)
 	}
+
+	requests := server.TestSpanner.DrainRequestsFromServer()
+	executeRequests := testutil.RequestsOfType(requests, reflect.TypeOf(&sppb.ExecuteSqlRequest{}))
+	if g, w := len(executeRequests), 1; g != w {
+		t.Fatalf("num execute requests mismatch\n Got: %v\nWant: %v", g, w)
+	}
+	request := executeRequests[0].(*sppb.ExecuteSqlRequest)
+	if g, w := request.RequestOptions.TransactionTag, "test_tag"; g != w {
+		t.Fatalf("transaction tag mismatch\n Got: %v\nWant: %v", g, w)
+	}
 }
 
 func TestRollback(t *testing.T) {
diff --git a/spannerlib/wrappers/spannerlib-dotnet/.gitignore b/spannerlib/wrappers/spannerlib-dotnet/.gitignore
@@ -2,3 +2,4 @@
 obj
 bin
 *DotSettings.user
+binaries
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-impl/GrpcLibSpanner.cs b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-impl/GrpcLibSpanner.cs
@@ -172,7 +172,25 @@ public async Task CloseConnectionAsync(Connection connection, CancellationToken
         }));
         return response.CommitTimestamp == null ? null : response;
     }
-
+    
+    public async Task<CommitResponse?> WriteMutationsAsync(Connection connection,
+        BatchWriteRequest.Types.MutationGroup mutations, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var response = await _client.WriteMutationsAsync(new WriteMutationsRequest
+            {
+                Connection = ToProto(connection),
+                Mutations = mutations,
+            }, cancellationToken: cancellationToken);
+            return response.CommitTimestamp == null ? null : response;
+        }
+        catch (RpcException exception)
+        {
+            throw SpannerException.ToSpannerException(exception);
+        }
+    }
+    
     public Rows Execute(Connection connection, ExecuteSqlRequest statement)
     {
         if (_useStreamingRows) 
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-tests/spannerlib-dotnet-grpc-tests.csproj b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-tests/spannerlib-dotnet-grpc-tests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.2"/>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
     <PackageReference Include="NUnit" Version="4.2.2"/>
     <PackageReference Include="NUnit.Analyzers" Version="4.4.0"/>
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-v1/spannerlib-dotnet-grpc-v1.csproj b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-v1/spannerlib-dotnet-grpc-v1.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Google.Cloud.Spanner.V1" Version="5.2.0" />
-    <PackageReference Include="Google.Protobuf" Version="3.31.1" />
+    <PackageReference Include="Google.Protobuf" Version="3.33.0" />
     <PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
   </ItemGroup>
 
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-mockserver/MockSpannerServer.cs b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-mockserver/MockSpannerServer.cs
@@ -420,6 +420,8 @@ public override Task<CommitResponse> Commit(CommitRequest request, ServerCallCon
         _contexts.Enqueue(context);
         _headers.Enqueue(context.RequestHeaders);
         TryFindSession(request.SessionAsSessionName);
+        _executionTimes.TryGetValue(nameof(Commit), out var executionTime);
+        executionTime?.SimulateExecutionTime();
         if (request.TransactionCase == CommitRequest.TransactionOneofCase.TransactionId)
         {
             TryFindTransaction(request.TransactionId, true);
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-native-impl/SharedLibSpanner.cs b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-native-impl/SharedLibSpanner.cs
@@ -104,6 +104,12 @@ public void CloseConnection(Connection connection)
         }
         return CommitResponse.Parser.ParseFrom(handler.Value());
     }
+    
+    public Task<CommitResponse?> WriteMutationsAsync(Connection connection,
+        BatchWriteRequest.Types.MutationGroup mutations, CancellationToken cancellationToken = default)
+    {
+        return Task.Run(() => WriteMutations(connection, mutations), cancellationToken);
+    }
 
     public Rows Execute(Connection connection, ExecuteSqlRequest statement)
     {
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-native/.gitignore b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-native/.gitignore
@@ -1 +1,2 @@
 libraries
+binaries
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/ConnectionTests.cs b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/ConnectionTests.cs
@@ -88,6 +88,50 @@ public void TestWriteMutations([Values] LibType libType)
         Assert.That(commit.Mutations[1].InsertOrUpdate.Values.Count, Is.EqualTo(1));
     }
 
+    [Test]
+    public async Task TestWriteMutationsAsync([Values] LibType libType)
+    {
+        await using var pool = Pool.Create(SpannerLibDictionary[libType], ConnectionString);
+        await using var connection = pool.CreateConnection();
+        var insertMutation = new Mutation
+        {
+            Insert = new Mutation.Types.Write
+            {
+                Table = "my_table",
+                Columns = { new[] { "id", "value" } },
+            }
+        };
+        insertMutation.Insert.Values.AddRange([
+            new ListValue{Values = { Value.ForString("1"), Value.ForString("One") }},
+            new ListValue{Values = { Value.ForString("2"), Value.ForString("Two") }}
+        ]);
+        var insertOrUpdateMutation = new Mutation
+        {
+            InsertOrUpdate = new Mutation.Types.Write
+            {
+                Table = "my_table",
+                Columns = { new[] { "id", "value" } },
+            }
+        };
+        insertOrUpdateMutation.InsertOrUpdate.Values.AddRange([
+            new ListValue{Values = { Value.ForString("0"), Value.ForString("Zero") }}
+        ]);
+        
+        var response = await connection.WriteMutationsAsync(new BatchWriteRequest.Types.MutationGroup
+        {
+            Mutations = { new []{insertMutation, insertOrUpdateMutation}}
+        });
+        Assert.That(response, Is.Not.Null);
+        Assert.That(response.CommitTimestamp, Is.Not.Null);
+        Assert.That(Fixture.SpannerMock.Requests.OfType<BeginTransactionRequest>().Count(), Is.EqualTo(1));
+        Assert.That(Fixture.SpannerMock.Requests.OfType<CommitRequest>().Count(), Is.EqualTo(1));
+        var commit = Fixture.SpannerMock.Requests.OfType<CommitRequest>().Single();
+        Assert.That(commit, Is.Not.Null);
+        Assert.That(commit.Mutations.Count, Is.EqualTo(2));
+        Assert.That(commit.Mutations[0].Insert.Values.Count, Is.EqualTo(2));
+        Assert.That(commit.Mutations[1].InsertOrUpdate.Values.Count, Is.EqualTo(1));
+    }
+
     [Test]
     public void TestWriteMutationsInTransaction([Values] LibType libType)
     {
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/TransactionTests.cs b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/TransactionTests.cs
@@ -16,6 +16,7 @@
 using Google.Cloud.SpannerLib.MockServer;
 using Google.Protobuf.WellKnownTypes;
 using Google.Rpc;
+using Grpc.Core;
 
 namespace Google.Cloud.SpannerLib.Tests;
 
@@ -133,4 +134,16 @@ public void TestBeginTwice([Values] LibType libType)
         var exception = Assert.Throws<SpannerException>(() => connection.BeginTransaction(new TransactionOptions()));
         Assert.That(exception.Code, Is.EqualTo(Code.FailedPrecondition));
     }
+
+    [Test]
+    public void TestCommitFailed([Values] LibType libType)
+    {
+        Fixture.SpannerMock.AddOrUpdateExecutionTime(nameof(Fixture.SpannerMock.Commit), ExecutionTime.CreateException(StatusCode.FailedPrecondition, "Invalid mutations"));
+        
+        using var pool = Pool.Create(SpannerLibDictionary[libType], ConnectionString);
+        using var connection = pool.CreateConnection();
+        var exception = Assert.Throws<SpannerException>(() => connection.WriteMutations(new BatchWriteRequest.Types.MutationGroup()));
+        Assert.That(exception.Code, Is.EqualTo(Code.FailedPrecondition));
+    }
+    
 }
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/spannerlib-dotnet-tests.csproj b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-tests/spannerlib-dotnet-tests.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.2"/>
     <PackageReference Include="Google.Cloud.Spanner.Data" Version="5.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
     <PackageReference Include="NUnit" Version="4.2.2"/>
     <PackageReference Include="NUnit.Analyzers" Version="4.4.0"/>
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet/Connection.cs b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet/Connection.cs
@@ -88,7 +88,25 @@ public Task RollbackAsync(CancellationToken cancellationToken = default)
     {
         return Spanner.WriteMutations(this, mutations);
     }
-
+    
+    /// <summary>
+    /// Writes the given list of mutations to Spanner. If the connection has an active read/write transaction, then the
+    /// mutations will be buffered in the current transaction and sent to Spanner when the transaction is committed.
+    /// If the connection does not have a transaction, then the mutations are sent to Spanner directly in a new
+    /// read/write transaction.
+    /// </summary>
+    /// <param name="mutations">The mutations to write to Spanner</param>
+    /// <param name="cancellationToken">The cancellation token</param>
+    /// <returns>
+    /// The CommitResponse that is returned by Spanner, or null if the mutations were only buffered in the current
+    /// transaction.
+    /// </returns>
+    public Task<CommitResponse?> WriteMutationsAsync(BatchWriteRequest.Types.MutationGroup mutations,
+        CancellationToken cancellationToken = default)
+    {
+        return Spanner.WriteMutationsAsync(this, mutations, cancellationToken);
+    }
+    
     /// <summary>
     /// Executes any type of SQL statement on this connection. The SQL statement will use the current transaction of the
     /// connection. The contents of the returned Rows object depends on the type of SQL statement.
diff --git a/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet/ISpannerLib.cs b/spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet/ISpannerLib.cs
@@ -91,6 +91,21 @@ public enum RowEncoding
     /// </returns>
     public CommitResponse? WriteMutations(Connection connection, BatchWriteRequest.Types.MutationGroup mutations);
 
+    /// <summary>
+    /// Writes an array of mutations to Spanner. The mutations are buffered in the current transaction of the given
+    /// connection (if any). Otherwise, the mutations are written directly to Spanner using a new read/write
+    /// transaction and the CommitResponse of that transaction is returned. The returned value is null if the mutations
+    /// were only buffered in an active transaction.
+    /// </summary>
+    /// <param name="connection">The connection to use to write the mutations</param>
+    /// <param name="mutations">The mutations to write</param>
+    /// <param name="cancellationToken">The cancellation token</param>
+    /// <returns>
+    /// The CommitResponse of the read/write transaction that was created to write the mutations, or null if the
+    /// mutations were buffered in an active transaction on the connection.
+    /// </returns>
+    public Task<CommitResponse?> WriteMutationsAsync(Connection connection, BatchWriteRequest.Types.MutationGroup mutations, CancellationToken cancellationToken = default);
+    
     /// <summary>
     /// Executes a SQL statement of any type on the given connection.
     /// </summary>
diff --git a/spannerlib/wrappers/spannerlib-java/pom.xml b/spannerlib/wrappers/spannerlib-java/pom.xml
@@ -30,7 +30,7 @@
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-bom</artifactId>
-        <version>4.32.1</version>
+        <version>4.33.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
-      <version>4.2.6.Final</version>
+      <version>4.2.7.Final</version>
     </dependency>
     <!-- Dependencies for using C library -->
     <dependency>
diff --git a/transaction.go b/transaction.go
@@ -744,7 +744,7 @@ func (tx *readWriteTransaction) runDmlBatch(ctx context.Context) (*result, error
 
 	if !tx.retryAborts() {
 		affected, err := tx.rwTx.BatchUpdateWithOptions(ctx, statements, options.QueryOptions)
-		return &result{rowsAffected: sum(affected)}, err
+		return &result{rowsAffected: sum(affected), batchUpdateCounts: affected}, err
 	}
 
 	var affected []int64
diff --git a/transaction_test.go b/transaction_test.go

Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,8 @@ public override Task<CommitResponse> Commit(CommitRequest request, ServerCallCon`
`420`	`420`	`_contexts.Enqueue(context);`
`421`	`421`	`_headers.Enqueue(context.RequestHeaders);`
`422`	`422`	`TryFindSession(request.SessionAsSessionName);`
	`423`	`+ _executionTimes.TryGetValue(nameof(Commit), out var executionTime);`
	`424`	`+ executionTime?.SimulateExecutionTime();`
`423`	`425`	`if (request.TransactionCase == CommitRequest.TransactionOneofCase.TransactionId)`
`424`	`426`	`{`
`425`	`427`	`TryFindTransaction(request.TransactionId, true);`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,12 @@ public void CloseConnection(Connection connection)`
`104`	`104`	`}`
`105`	`105`	`return CommitResponse.Parser.ParseFrom(handler.Value());`
`106`	`106`	`}`
	`107`	`+`
	`108`	`+ public Task<CommitResponse?> WriteMutationsAsync(Connection connection,`
	`109`	`+ BatchWriteRequest.Types.MutationGroup mutations, CancellationToken cancellationToken = default)`
	`110`	`+ {`
	`111`	`+ return Task.Run(() => WriteMutations(connection, mutations), cancellationToken);`
	`112`	`+ }`
`107`	`113`
`108`	`114`	`public Rows Execute(Connection connection, ExecuteSqlRequest statement)`
`109`	`115`	`{`