Skip to content

Commit 974867d

Browse files
programmatixprogrammatix
committed
Fix Scala FIT performer breakage
A recent scalafmt sweep changed "//?" to "// ?". Change-Id: I768b4e3e9d9fdbf74de718391d66baa42f64632d Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/231780 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: Graham Pople <graham.pople@couchbase.com>
1 parent ecbd12d commit 974867d

File tree

3 files changed

+55
-50
lines changed

3 files changed

+55
-50
lines changed

‎scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/ScalaPerformer.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ class ScalaPerformer extends CorePerformer {
337337
)
338338
// [end]
339339
// [if:<1.7.2]
340-
// ?val cleaner = new TransactionsCleaner(connection.cluster.async.core, cleanupHooks)
340+
//?val cleaner = new TransactionsCleaner(connection.cluster.async.core, cleanupHooks)
341341
// [end]
342342
val l = new CoreTransactionLogger(null, "")
343343
val merged = new CoreMergedTransactionConfig(config.toCore)

‎scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/search/SearchHelper.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ object SearchHelper {
220220
// [if:1.4.5]
221221
opts = opts.timeout(Duration(o.getTimeoutMillis, TimeUnit.MILLISECONDS))
222222
// [else]
223-
// ? throw new UnsupportedOperationException()
223+
//? throw new UnsupportedOperationException()
224224
// [end]
225225
}
226226
if (o.hasParentSpanId) throw new UnsupportedOperationException()
@@ -538,8 +538,8 @@ object SearchHelper {
538538
com.couchbase.client.scala.search.vector.VectorQuery(vq.getVectorFieldName, query)
539539
}
540540
// [else]
541-
// ? val query: Array[Float] = vq.getVectorQueryList.asScala.toArray.map(v => v.asInstanceOf[Float])
542-
// ? var out = com.couchbase.client.scala.search.vector.VectorQuery(vq.getVectorFieldName, query)
541+
//? val query: Array[Float] = vq.getVectorQueryList.asScala.toArray.map(v => v.asInstanceOf[Float])
542+
//? var out = com.couchbase.client.scala.search.vector.VectorQuery(vq.getVectorFieldName, query)
543543
// [end]
544544
if (vq.hasOptions) {
545545
val opts = vq.getOptions
@@ -757,7 +757,7 @@ object SearchHelper {
757757
result.setElapsedNanos(System.nanoTime - start)
758758
setSuccess(result)
759759
// [else]
760-
// ? throw new UnsupportedOperationException()
760+
//? throw new UnsupportedOperationException()
761761
// [end]
762762
} else if (command.hasDropIndex) {
763763
val req = command.getDropIndex

‎scala-fit-performer/src/main/scala/com/couchbase/client/performer/scala/transaction/TransactionBlocking.scala‎

Lines changed: 50 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ object TransactionBlocking {
6464
}
6565

6666
private def getLogger(ctx: TransactionAttemptContext) = {
67-
ctx.logger()
67+
ctx.internal.internal.logger()
6868
}
6969
}
7070
class TransactionBlocking(executor: Option[TransactionCommandExecutor])
@@ -99,7 +99,12 @@ class TransactionBlocking(executor: Option[TransactionCommandExecutor])
9999
if (!performanceMode) logger.info("Reached end of all operations and lambda")
100100
Success()
101101
},
102+
// [if:3.9.0]
102103
ptcb.orNull
104+
// [end]
105+
// [if:<3.9.0]
106+
//? Option(ptcb.orNull)
107+
// [end]
103108
)
104109
if (TransactionMarkerOwner.get.block.isPresent)
105110
throw new InternalPerformerFailure(
@@ -175,12 +180,12 @@ class TransactionBlocking(executor: Option[TransactionCommandExecutor])
175180
}
176181
// [end]
177182
// [if:<1.9.0]
178-
// ? content match {
179-
// ? case ContentString(value) => ctx.insert(collection, request.getDocId.getDocId, value).get
180-
// ? case ContentJson(value) => ctx.insert(collection, request.getDocId.getDocId, value).get
181-
// ? case ContentByteArray(value) => ctx.insert(collection, request.getDocId.getDocId, value).get
182-
// ? case ContentNull(value) => ctx.insert(collection, request.getDocId.getDocId, value).get
183-
// ? }
183+
//? content match {
184+
//? case ContentString(value) => ctx.insert(collection, request.getDocId.getDocId, value).get
185+
//? case ContentJson(value) => ctx.insert(collection, request.getDocId.getDocId, value).get
186+
//? case ContentByteArray(value) => ctx.insert(collection, request.getDocId.getDocId, value).get
187+
//? case ContentNull(value) => ctx.insert(collection, request.getDocId.getDocId, value).get
188+
//? }
184189
// [end]
185190
}
186191
)
@@ -307,40 +312,40 @@ class TransactionBlocking(executor: Option[TransactionCommandExecutor])
307312
}
308313
// [end]
309314
// [if:<1.9.0]
310-
// ? if (request.getUseStashedResult) {
311-
// ? content match {
312-
// ? case ContentString(value) => ctx.replace(stashedGet.get, value).get
313-
// ? case ContentJson(value) => ctx.replace(stashedGet.get, value).get
314-
// ? case ContentByteArray(value) => ctx.replace(stashedGet.get, value).get
315-
// ? case ContentNull(value) => ctx.replace(stashedGet.get, value).get
316-
// ? }
317-
// ? } else if (request.hasUseStashedSlot) {
318-
// ? if (!stashedGetMap.contains(request.getUseStashedSlot))
319-
// ? throw new IllegalStateException(
320-
// ? "Do not have a stashed get in slot " + request.getUseStashedSlot
321-
// ? )
322-
// ? content match {
323-
// ? case ContentString(value) => ctx.replace(stashedGetMap(request.getUseStashedSlot), value).get
324-
// ? case ContentJson(value) => ctx.replace(stashedGetMap(request.getUseStashedSlot), value).get
325-
// ? case ContentByteArray(value) => ctx.replace(stashedGetMap(request.getUseStashedSlot), value).get
326-
// ? case ContentNull(value) => ctx.replace(stashedGetMap(request.getUseStashedSlot), value).get
327-
// ? }
328-
// ? } else {
329-
// ? val collection = connection.collection(request.getDocId)
330-
// ? logger.info(
331-
// ? "{} Performing replace operation on docId {} to new content on collection {}",
332-
// ? dbg,
333-
// ? request.getDocId.getDocId,
334-
// ? request.getDocId.getCollectionName
335-
// ? )
336-
// ? val r = ctx.get(collection, request.getDocId.getDocId).get
337-
// ? content match {
338-
// ? case ContentString(value) => ctx.replace(r, value).get
339-
// ? case ContentJson(value) => ctx.replace(r, value).get
340-
// ? case ContentByteArray(value) => ctx.replace(r, value).get
341-
// ? case ContentNull(value) => ctx.replace(r, value).get
342-
// ? }
343-
// ? }
315+
//? if (request.getUseStashedResult) {
316+
//? content match {
317+
//? case ContentString(value) => ctx.replace(stashedGet.get, value).get
318+
//? case ContentJson(value) => ctx.replace(stashedGet.get, value).get
319+
//? case ContentByteArray(value) => ctx.replace(stashedGet.get, value).get
320+
//? case ContentNull(value) => ctx.replace(stashedGet.get, value).get
321+
//? }
322+
//? } else if (request.hasUseStashedSlot) {
323+
//? if (!stashedGetMap.contains(request.getUseStashedSlot))
324+
//? throw new IllegalStateException(
325+
//? "Do not have a stashed get in slot " + request.getUseStashedSlot
326+
//? )
327+
//? content match {
328+
//? case ContentString(value) => ctx.replace(stashedGetMap(request.getUseStashedSlot), value).get
329+
//? case ContentJson(value) => ctx.replace(stashedGetMap(request.getUseStashedSlot), value).get
330+
//? case ContentByteArray(value) => ctx.replace(stashedGetMap(request.getUseStashedSlot), value).get
331+
//? case ContentNull(value) => ctx.replace(stashedGetMap(request.getUseStashedSlot), value).get
332+
//? }
333+
//? } else {
334+
//? val collection = connection.collection(request.getDocId)
335+
//? logger.info(
336+
//? "{} Performing replace operation on docId {} to new content on collection {}",
337+
//? dbg,
338+
//? request.getDocId.getDocId,
339+
//? request.getDocId.getCollectionName
340+
//? )
341+
//? val r = ctx.get(collection, request.getDocId.getDocId).get
342+
//? content match {
343+
//? case ContentString(value) => ctx.replace(r, value).get
344+
//? case ContentJson(value) => ctx.replace(r, value).get
345+
//? case ContentByteArray(value) => ctx.replace(r, value).get
346+
//? case ContentNull(value) => ctx.replace(r, value).get
347+
//? }
348+
//? }
344349
// [end]
345350

346351
}
@@ -462,7 +467,7 @@ class TransactionBlocking(executor: Option[TransactionCommandExecutor])
462467
}
463468
// [end]
464469
// [if:<1.9.0]
465-
// ? val out = ctx.get(collection, request.getDocId.getDocId).get
470+
//? val out = ctx.get(collection, request.getDocId.getDocId).get
466471
// [end]
467472
val contentAsValidation =
468473
if (request.hasContentAsValidation) Some(request.getContentAsValidation) else None
@@ -489,7 +494,7 @@ class TransactionBlocking(executor: Option[TransactionCommandExecutor])
489494
}
490495
// [end]
491496
// [if:<1.9.0]
492-
// ? ctx.get(collection, executor.get.getDocId(request.getLocation)).get
497+
//? ctx.get(collection, executor.get.getDocId(request.getLocation)).get
493498
// [end]
494499
}
495500
)
@@ -519,7 +524,7 @@ class TransactionBlocking(executor: Option[TransactionCommandExecutor])
519524
}
520525
// [end]
521526
// [if:<1.9.0]
522-
// ? val out = ctx.get(collection, request.getDocId.getDocId)
527+
//? val out = ctx.get(collection, request.getDocId.getDocId)
523528
// [end]
524529
val contentAsValidation =
525530
if (request.hasContentAsValidation) Some(request.getContentAsValidation) else None
@@ -550,7 +555,7 @@ class TransactionBlocking(executor: Option[TransactionCommandExecutor])
550555
}
551556
// [end]
552557
// [if:<1.9.0]
553-
// ? val result = ctx.getReplicaFromPreferredServerGroup(collection, request.getDocId.getDocId).get
558+
//? val result = ctx.getReplicaFromPreferredServerGroup(collection, request.getDocId.getDocId).get
554559
// [end]
555560
handleGetReplicaFromPreferredServerGroupResult(request, result, connection)
556561
}

0 commit comments

Comments
 (0)