Skip to content

Commit 14c4c38

Browse files
Couch-Mattavsej
authored andcommitted
Update gRPC after changes in FIT
Change-Id: Id88a63e671aee616b5e1426fa6d5443a3f7d4fcb Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/181672 Tested-by: <[email protected]> Reviewed-by: Sergey Avseyev <[email protected]> Reviewed-by: Graham Pople <[email protected]>
1 parent a26ac32 commit 14c4c38

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

java-fit-performer/src/main/java/com/couchbase/PerformerService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ public void clientRecordProcess(ClientRecordProcessRequest request,
359359
ClientRecordProcessResponse.Builder response = ClientRecordProcessResponse.newBuilder();
360360

361361
try {
362-
ClientRecordDetails result = cr.processClient(request.getClientUUID(),
362+
ClientRecordDetails result = cr.processClient(request.getClientUuid(),
363363
collection,
364364
config,
365365
null)
@@ -375,7 +375,7 @@ public void clientRecordProcess(ClientRecordProcessRequest request,
375375
.setOverrideEnabled(result.overrideEnabled())
376376
.setOverrideExpires(result.overrideExpires())
377377
.setCasNowNanos(result.casNow())
378-
.setClientUUID(request.getClientUUID())
378+
.setClientUuid(request.getClientUuid())
379379
.build();
380380
}
381381
catch (RuntimeException err) {

java-fit-performer/src/main/java/com/couchbase/twoway/TwoWayTransactionBlocking.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ private void performOperation(ClusterConnection connection,
149149
TransactionCommand op,
150150
@Nullable StreamObserver<TransactionStreamPerformerToDriver> toTest,
151151
boolean performanceMode) {
152-
if (op.getWaitMSecs() != 0) {
152+
if (op.getWaitMsecs() != 0) {
153153
try {
154-
logger.info("Sleeping for Msecs: "+op.getWaitMSecs());
155-
Thread.sleep(op.getWaitMSecs());
154+
logger.info("Sleeping for Msecs: "+op.getWaitMsecs());
155+
Thread.sleep(op.getWaitMsecs());
156156
} catch (InterruptedException e) {
157157
throw new InternalPerformerFailure(new RuntimeException(e));
158158
}
@@ -318,26 +318,26 @@ private void performOperation(ClusterConnection connection,
318318
performCommandBatch(request, (parallelOp) -> Mono.fromRunnable(() -> {
319319
performOperation(connection, ctx, parallelOp, toTest, performanceMode);
320320
}).then()).block();
321-
} else if (op.hasInsertRegularKV()) {
322-
final CommandInsertRegularKV request = op.getInsertRegularKV();
321+
} else if (op.hasInsertRegularKv()) {
322+
final CommandInsertRegularKV request = op.getInsertRegularKv();
323323
final Collection collection = connection.collection(request.getDocId());
324324

325325
performOperation("KV insert " + request.getDocId().getDocId(), ctx, Collections.singletonList(EXPECT_SUCCESS), op.getDoNotPropagateError(), performanceMode,
326326
() -> {
327327
JsonObject content = JsonObject.fromJson(request.getContentJson());
328328
collection.insert(request.getDocId().getDocId(), content);
329329
});
330-
} else if (op.hasReplaceRegularKV()) {
331-
final CommandReplaceRegularKV request = op.getReplaceRegularKV();
330+
} else if (op.hasReplaceRegularKv()) {
331+
final CommandReplaceRegularKV request = op.getReplaceRegularKv();
332332
final Collection collection = connection.collection(request.getDocId());
333333

334334
performOperation("KV replace " + request.getDocId().getDocId(), ctx, Collections.singletonList(EXPECT_SUCCESS), op.getDoNotPropagateError(), performanceMode,
335335
() -> {
336336
JsonObject content = JsonObject.fromJson(request.getContentJson());
337337
collection.replace(request.getDocId().getDocId(), content);
338338
});
339-
} else if (op.hasRemoveRegularKV()) {
340-
final CommandRemoveRegularKV request = op.getRemoveRegularKV();
339+
} else if (op.hasRemoveRegularKv()) {
340+
final CommandRemoveRegularKV request = op.getRemoveRegularKv();
341341
final Collection collection = connection.collection(request.getDocId());
342342

343343
performOperation("KV remove " + request.getDocId().getDocId(), ctx, Collections.singletonList(EXPECT_SUCCESS), op.getDoNotPropagateError(), performanceMode,

java-fit-performer/src/main/java/com/couchbase/twoway/TwoWayTransactionReactive.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ private Mono<?> performOperation(ClusterConnection connection,
135135
TransactionCommand op,
136136
@Nullable StreamObserver<TransactionStreamPerformerToDriver> toTest,
137137
boolean performanceMode) {
138-
Mono<Void> waitIfNeeded = op.getWaitMSecs() == 0 ? Mono.empty()
139-
: Mono.delay(Duration.ofMillis(op.getWaitMSecs())).then();
138+
Mono<Void> waitIfNeeded = op.getWaitMsecs() == 0 ? Mono.empty()
139+
: Mono.delay(Duration.ofMillis(op.getWaitMsecs())).then();
140140

141141
if (op.hasInsert()) {
142142
final CommandInsert request = op.getInsert();
@@ -242,26 +242,26 @@ private Mono<?> performOperation(ClusterConnection connection,
242242
final CommandBatch request = op.getParallelize();
243243

244244
return waitIfNeeded.then(performCommandBatch(request, (parallelOp) -> performOperation(connection, ctx, parallelOp, toTest, performanceMode)));
245-
} else if (op.hasInsertRegularKV()) {
246-
final CommandInsertRegularKV request = op.getInsertRegularKV();
245+
} else if (op.hasInsertRegularKv()) {
246+
final CommandInsertRegularKV request = op.getInsertRegularKv();
247247
final Collection collection = connection.collection(request.getDocId());
248248

249249
return performOperation(waitIfNeeded, "KV insert " + request.getDocId().getDocId(), ctx, Collections.singletonList(EXPECT_SUCCESS), op.getDoNotPropagateError(), performanceMode,
250250
() -> {
251251
JsonObject content = JsonObject.fromJson(request.getContentJson());
252252
return collection.reactive().insert(request.getDocId().getDocId(), content).then();
253253
});
254-
} else if (op.hasReplaceRegularKV()) {
255-
final CommandReplaceRegularKV request = op.getReplaceRegularKV();
254+
} else if (op.hasReplaceRegularKv()) {
255+
final CommandReplaceRegularKV request = op.getReplaceRegularKv();
256256
final Collection collection = connection.collection(request.getDocId());
257257

258258
return performOperation(waitIfNeeded, "KV replace " + request.getDocId().getDocId(), ctx, Collections.singletonList(EXPECT_SUCCESS), op.getDoNotPropagateError(), performanceMode,
259259
() -> {
260260
JsonObject content = JsonObject.fromJson(request.getContentJson());
261261
return collection.reactive().replace(request.getDocId().getDocId(), content).then();
262262
});
263-
} else if (op.hasRemoveRegularKV()) {
264-
final CommandRemoveRegularKV request = op.getRemoveRegularKV();
263+
} else if (op.hasRemoveRegularKv()) {
264+
final CommandRemoveRegularKV request = op.getRemoveRegularKv();
265265
final Collection collection = connection.collection(request.getDocId());
266266

267267
return performOperation(waitIfNeeded, "KV remove " + request.getDocId().getDocId(), ctx, Collections.singletonList(EXPECT_SUCCESS), op.getDoNotPropagateError(), performanceMode,

0 commit comments

Comments
 (0)