fix: include transactionId in gRPC CRUD requests to support external transactions (#3524)

saveRecord() and deleteRecord() in RemoteGrpcDatabase did not include the
active transactionId in gRPC requests, and the server-side handlers did not
look up external transactions from the activeTransactions map. This caused
"Transaction not active" errors when using begin()/commit() with vertex
save or delete operations. Refactored server handlers to follow the same
pattern as executeCommand() — dispatching to the transaction's dedicated
executor thread when an external transaction is active.

Co-Authored-By: Claude Opus 4.6 <[email protected]>

Author: robfrank

grpc-client/src/main/java/com/arcadedb/remote/grpc/RemoteGrpcDatabase.java

@@ -372,9 +372,14 @@ public void deleteRecord(final Record record) {
     if (record.getIdentity() == null)
       throw new IllegalArgumentException("Cannot delete a non persistent record");
 
-    final DeleteRecordRequest req =
+    final DeleteRecordRequest.Builder deleteBuilder =
         DeleteRecordRequest.newBuilder().setDatabase(getName()).setRid(record.getIdentity().toString())
-            .setCredentials(buildCredentials()).build();
+            .setCredentials(buildCredentials());
+
+    if (transactionId != null)
+      deleteBuilder.setTransaction(TransactionContext.newBuilder().setTransactionId(transactionId).setDatabase(getName()).build());
+
+    final DeleteRecordRequest req = deleteBuilder.build();
 
     try {
       if (LogManager.instance().isDebugEnabled()) {
@@ -402,9 +407,13 @@ public boolean deleteRecord(final String rid, final long timeoutMs) {
     checkDatabaseIsOpen();
     stats.deleteRecord.incrementAndGet();
 
-    final DeleteRecordRequest req = DeleteRecordRequest.newBuilder().setDatabase(getName()).setRid(rid)
-        .setCredentials(buildCredentials())
-        .build();
+    final DeleteRecordRequest.Builder deleteBuilder = DeleteRecordRequest.newBuilder().setDatabase(getName()).setRid(rid)
+        .setCredentials(buildCredentials());
+
+    if (transactionId != null)
+      deleteBuilder.setTransaction(TransactionContext.newBuilder().setTransactionId(transactionId).setDatabase(getName()).build());
+
+    final DeleteRecordRequest req = deleteBuilder.build();
 
     try {
       if (LogManager.instance().isDebugEnabled()) {
@@ -654,15 +663,17 @@ protected RID saveRecord(final MutableDocument record) {
           PropertiesUpdate.newBuilder().putAllProperties(convertParamsToGrpcValue(record.toMap(false)))
               .build();
 
-      UpdateRecordRequest request = UpdateRecordRequest.newBuilder().setDatabase(getName()).setRid(rid.toString())
-          .setPartial(partial)
-          .setDatabase(databaseName).setCredentials(buildCredentials()).build();
+      UpdateRecordRequest.Builder updateBuilder = UpdateRecordRequest.newBuilder().setDatabase(getName())
+          .setRid(rid.toString()).setPartial(partial).setDatabase(databaseName).setCredentials(buildCredentials());
+
+      if (transactionId != null)
+        updateBuilder.setTransaction(TransactionContext.newBuilder().setTransactionId(transactionId).setDatabase(getName()).build());
 
       try {
 
         @SuppressWarnings("unused")
         UpdateRecordResponse response =
-            blockingStub.withDeadlineAfter(getTimeout(), TimeUnit.MILLISECONDS).updateRecord(request);
+            blockingStub.withDeadlineAfter(getTimeout(), TimeUnit.MILLISECONDS).updateRecord(updateBuilder.build());
 
         // If your proto has flags, you can check response.getSuccess()/getUpdated()
         // Otherwise, treat non-exception as success.
@@ -679,12 +690,14 @@ protected RID saveRecord(final MutableDocument record) {
       GrpcRecord recMsg =
           GrpcRecord.newBuilder().putAllProperties(convertParamsToGrpcValue(record.toMap(false))).build();
 
-      CreateRecordRequest request =
+      CreateRecordRequest.Builder createBuilder =
           CreateRecordRequest.newBuilder().setDatabase(getName()).setType(record.getTypeName())
-              .setRecord(recMsg) // nested
-              // GrpcRecord
-              // payload
-              .setCredentials(buildCredentials()).build();
+              .setRecord(recMsg).setCredentials(buildCredentials());
+
+      if (transactionId != null)
+        createBuilder.setTransaction(TransactionContext.newBuilder().setTransactionId(transactionId).setDatabase(getName()).build());
+
+      final CreateRecordRequest request = createBuilder.build();
 
       try {
         CreateRecordResponse response =

grpc-client/src/test/java/com/arcadedb/remote/grpc/RemoteGrpcDatabaseRegressionTest.java

@@ -19,6 +19,7 @@
 package com.arcadedb.remote.grpc;
 
 import com.arcadedb.GlobalConfiguration;
+import com.arcadedb.graph.MutableVertex;
 import com.arcadedb.query.sql.executor.Result;
 import com.arcadedb.query.sql.executor.ResultSet;
 import com.arcadedb.test.BaseGraphServerTest;
@@ -305,6 +306,96 @@ void embeddedAuditMetadataRoundTrip() {
     }
   }
 
+  @Test
+  @DisplayName("Issue #3524: newVertex().save() and newEdge() within a transaction should not throw 'Transaction not active'")
+  void vertexSaveAndEdgeCreationWithinTransaction() {
+    final String VERTEX_TYPE = "SVEx3524";
+    final String EDGE_TYPE = "SVEx3524_Edge";
+
+    grpc.command("sql", "CREATE VERTEX TYPE `" + VERTEX_TYPE + "` IF NOT EXISTS", Map.of());
+    grpc.command("sql", "CREATE PROPERTY `" + VERTEX_TYPE + "`.svex IF NOT EXISTS STRING", Map.of());
+    grpc.command("sql", "CREATE EDGE TYPE `" + EDGE_TYPE + "` IF NOT EXISTS", Map.of());
+
+    try {
+      grpc.begin();
+
+      MutableVertex svt1 = grpc.newVertex(VERTEX_TYPE);
+      svt1.set("svex", "svt1");
+      svt1.save();
+
+      MutableVertex svt2 = grpc.newVertex(VERTEX_TYPE);
+      svt2.set("svex", "svt2");
+      svt2.save();
+
+      // This should not throw 'Transaction not active'
+      svt1.newEdge(EDGE_TYPE, svt2);
+
+      // This save (updating the vertex after edge creation) should also work within the transaction
+      svt1.save();
+
+      grpc.commit();
+
+      // Verify both vertices exist
+      try (ResultSet rs = grpc.query("sql", "SELECT count(*) AS c FROM `" + VERTEX_TYPE + "`", Map.of())) {
+        assertThat(rs.hasNext()).isTrue();
+        Number count = rs.next().getProperty("c");
+        assertThat(count.longValue()).as("both vertices should be persisted").isEqualTo(2L);
+      }
+
+      // Verify the edge exists
+      try (ResultSet rs = grpc.query("sql",
+          "SELECT count(*) AS c FROM `" + EDGE_TYPE + "`", Map.of())) {
+        assertThat(rs.hasNext()).isTrue();
+        Number count = rs.next().getProperty("c");
+        assertThat(count.longValue()).as("edge should be persisted").isEqualTo(1L);
+      }
+    } finally {
+      grpc.command("sql", "DELETE FROM `" + EDGE_TYPE + "`", Map.of());
+      grpc.command("sql", "DELETE FROM `" + VERTEX_TYPE + "`", Map.of());
+    }
+  }
+
+  @Test
+  @DisplayName("Issue #3524: newVertex().save() within a transaction should persist only on commit and rollback on abort")
+  void vertexSaveRollbackWithinTransaction() {
+    final String VERTEX_TYPE = "SVEx3524Roll";
+
+    grpc.command("sql", "CREATE VERTEX TYPE `" + VERTEX_TYPE + "` IF NOT EXISTS", Map.of());
+    grpc.command("sql", "CREATE PROPERTY `" + VERTEX_TYPE + "`.svex IF NOT EXISTS STRING", Map.of());
+
+    try {
+      // Verify rollback: creates vertices and then rolls back
+      grpc.begin();
+
+      MutableVertex svt1 = grpc.newVertex(VERTEX_TYPE);
+      svt1.set("svex", "rollback1");
+      svt1.save();
+
+      grpc.rollback();
+
+      try (ResultSet rs = grpc.query("sql", "SELECT count(*) AS c FROM `" + VERTEX_TYPE + "`", Map.of())) {
+        Number count = rs.next().getProperty("c");
+        assertThat(count.longValue()).as("vertex should NOT be persisted after rollback").isEqualTo(0L);
+      }
+
+      // Verify commit: creates a vertex and commits
+      grpc.begin();
+
+      MutableVertex svt2 = grpc.newVertex(VERTEX_TYPE);
+      svt2.set("svex", "committed");
+      svt2.save();
+
+      grpc.commit();
+
+      try (ResultSet rs = grpc.query("sql", "SELECT count(*) AS c FROM `" + VERTEX_TYPE + "`", Map.of())) {
+        Number count = rs.next().getProperty("c");
+        assertThat(count.longValue()).as("vertex should be persisted after commit").isEqualTo(1L);
+      }
+    } finally {
+      grpc.command("sql", "DELETE FROM `" + VERTEX_TYPE + "`", Map.of());
+    }
+  }
+
   @Test
   @DisplayName("Issue #2854: gRPC ResultSet should preserve SQL aliases")
   void sqlAliasesArePreservedInGrpcResultSet() {