Fixing Scala FIT performer regression

programmatix · programmatix · commit 9503a25a6914 · 2025-07-28T15:05:11.000Z
Caused by recent Scala 3 work. Change-Id: I2ea2fc0dd50aac2b97347547226db8628a12fd3f Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/230730 Tested-by: Graham Pople <graham.pople@couchbase.com> Reviewed-by: Graham Pople <graham.pople@couchbase.com>
diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/transactions/AsyncTransactionAttemptContext.scala b/scala-client/src/main/scala/com/couchbase/client/scala/transactions/AsyncTransactionAttemptContext.scala
@@ -49,7 +49,7 @@ import scala.util.{Failure, Success};
   *                        [[https://docs.couchbase.com/scala-sdk/current/howtos/json.html these JSON docs]]
   */
 class AsyncTransactionAttemptContext private[scala] (
-    private[scala] val internal: CoreTransactionAttemptContext,
+    private[client] val internal: CoreTransactionAttemptContext,
     private val environment: ClusterEnvironment
 ) {
   implicit val executionContext: ExecutionContext = environment.ec
diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/transactions/TransactionAttemptContext.scala b/scala-client/src/main/scala/com/couchbase/client/scala/transactions/TransactionAttemptContext.scala
@@ -15,22 +15,14 @@
  */
 package com.couchbase.client.scala.transactions
 
-import com.couchbase.client.core.cnc.TracingIdentifiers.{
-  TRANSACTION_OP_INSERT,
-  TRANSACTION_OP_REMOVE,
-  TRANSACTION_OP_REPLACE
-}
+import com.couchbase.client.core.cnc.TracingIdentifiers.{TRANSACTION_OP_INSERT, TRANSACTION_OP_REMOVE, TRANSACTION_OP_REPLACE}
 import com.couchbase.client.core.cnc.{CbTracing, RequestSpan, TracingIdentifiers}
 import com.couchbase.client.core.error.CouchbaseException
 import com.couchbase.client.core.transaction.CoreTransactionAttemptContext
+import com.couchbase.client.core.transaction.log.CoreTransactionLogger
 import com.couchbase.client.core.transaction.support.SpanWrapper
 import com.couchbase.client.scala.codec.JsonSerializer
-import com.couchbase.client.scala.transactions.config.{
-  TransactionGetOptions,
-  TransactionGetReplicaFromPreferredServerGroupOptions,
-  TransactionInsertOptions,
-  TransactionReplaceOptions
-}
+import com.couchbase.client.scala.transactions.config.{TransactionGetOptions, TransactionGetReplicaFromPreferredServerGroupOptions, TransactionInsertOptions, TransactionReplaceOptions}
 import com.couchbase.client.scala.transactions.internal.EncodingUtil.encode
 import com.couchbase.client.scala.util.{AsyncUtils, FutureConversions}
 import com.couchbase.client.scala.{Collection, Scope}
@@ -214,4 +206,8 @@ class TransactionAttemptContext private[scala] (
   ): Try[TransactionQueryResult] = {
     AsyncUtils.block(internal.query(if (scope == null) null else scope.async, statement, options))
   }
+
+  private[client] def logger(): CoreTransactionLogger = {
+    internal.internal.logger()
+  }
 }
diff --git a/scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/ScalaPerformer.scala b/scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/ScalaPerformer.scala
@@ -269,7 +269,7 @@ class ScalaPerformer extends CorePerformer {
     new ScalaTransactionCommandExecutor(connection, counters, Map.empty)
     // [end:1.5.0]
     // [if:<1.5.0]
-    // ? null
+    //? null
     // [end]
   }
 
diff --git a/scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/transaction/TransactionBlocking.scala b/scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/transaction/TransactionBlocking.scala
@@ -63,8 +63,8 @@ object TransactionBlocking {
     txn.run(connection, req, None, performanceMode, spans)
   }
 
-  private def getLogger(ctx: TransactionAttemptContext) = try {
-    ctx.internal.internal.logger
+  private def getLogger(ctx: TransactionAttemptContext) = {
+    ctx.logger()
   }
 }
 class TransactionBlocking(executor: Option[TransactionCommandExecutor])
@@ -99,7 +99,7 @@ class TransactionBlocking(executor: Option[TransactionCommandExecutor])
         if (!performanceMode) logger.info("Reached end of all operations and lambda")
         Success()
       },
-      ptcb
+      ptcb.orNull
     )
     if (TransactionMarkerOwner.get.block.isPresent)
       throw new InternalPerformerFailure(

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ class ScalaPerformer extends CorePerformer {`
`269`	`269`	`new ScalaTransactionCommandExecutor(connection, counters, Map.empty)`
`270`	`270`	`// [end:1.5.0]`
`271`	`271`	`// [if:<1.5.0]`
`272`		`- // ? null`
	`272`	`+ //? null`
`273`	`273`	`// [end]`
`274`	`274`	`}`
`275`	`275`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,8 @@ object TransactionBlocking {`
`63`	`63`	`txn.run(connection, req, None, performanceMode, spans)`
`64`	`64`	`}`
`65`	`65`
`66`		`- private def getLogger(ctx: TransactionAttemptContext) = try {`
`67`		`- ctx.internal.internal.logger`
	`66`	`+ private def getLogger(ctx: TransactionAttemptContext) = {`
	`67`	`+ ctx.logger()`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`class TransactionBlocking(executor: Option[TransactionCommandExecutor])`
`@@ -99,7 +99,7 @@ class TransactionBlocking(executor: Option[TransactionCommandExecutor])`
`99`	`99`	`if (!performanceMode) logger.info("Reached end of all operations and lambda")`
`100`	`100`	`Success()`
`101`	`101`	`},`
`102`		`- ptcb`
	`102`	`+ ptcb.orNull`
`103`	`103`	`)`
`104`	`104`	`if (TransactionMarkerOwner.get.block.isPresent)`
`105`	`105`	`throw new InternalPerformerFailure(`