Skip to content

Commit d4b1421

Browse files
ndimidukndimiduk
committed
DRY up usage of TableOperationSpanBuilder
1 parent b58e5bc commit d4b1421

File tree

1 file changed

+23
-38
lines changed

1 file changed

+23
-38
lines changed

‎hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncTableImpl.java‎

Lines changed: 23 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,13 @@ private CompletableFuture<Result> get(Get get, int replicaId) {
222222
.replicaId(replicaId).call();
223223
}
224224

225+
private TableOperationSpanBuilder newTableOperationSpanBuilder() {
226+
return new TableOperationSpanBuilder().setTableName(tableName);
227+
}
228+
225229
@Override
226230
public CompletableFuture<Result> get(Get get) {
227-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
228-
.setTableName(tableName)
231+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
229232
.setOperation(get);
230233
return tracedFuture(
231234
() -> timelineConsistentRead(conn.getLocator(), tableName, get, get.getRow(),
@@ -237,8 +240,7 @@ public CompletableFuture<Result> get(Get get) {
237240
@Override
238241
public CompletableFuture<Void> put(Put put) {
239242
validatePut(put, conn.connConf.getMaxKeyValueSize());
240-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
241-
.setTableName(tableName)
243+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
242244
.setOperation(put);
243245
return tracedFuture(() -> this.<Void, Put> newCaller(put, writeRpcTimeoutNs)
244246
.action((controller, loc, stub) -> RawAsyncTableImpl.<Put> voidMutate(controller, loc, stub,
@@ -248,8 +250,7 @@ public CompletableFuture<Void> put(Put put) {
248250

249251
@Override
250252
public CompletableFuture<Void> delete(Delete delete) {
251-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
252-
.setTableName(tableName)
253+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
253254
.setOperation(delete);
254255
return tracedFuture(
255256
() -> this.<Void, Delete> newCaller(delete, writeRpcTimeoutNs)
@@ -262,8 +263,7 @@ public CompletableFuture<Void> delete(Delete delete) {
262263
@Override
263264
public CompletableFuture<Result> append(Append append) {
264265
checkHasFamilies(append);
265-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
266-
.setTableName(tableName)
266+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
267267
.setOperation(append);
268268
return tracedFuture(() -> {
269269
long nonceGroup = conn.getNonceGenerator().getNonceGroup();
@@ -279,8 +279,7 @@ public CompletableFuture<Result> append(Append append) {
279279
@Override
280280
public CompletableFuture<Result> increment(Increment increment) {
281281
checkHasFamilies(increment);
282-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
283-
.setTableName(tableName)
282+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
284283
.setOperation(increment);
285284
return tracedFuture(() -> {
286285
long nonceGroup = conn.getNonceGenerator().getNonceGroup();
@@ -348,8 +347,7 @@ private void preCheck() {
348347
public CompletableFuture<Boolean> thenPut(Put put) {
349348
validatePut(put, conn.connConf.getMaxKeyValueSize());
350349
preCheck();
351-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
352-
.setTableName(tableName)
350+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
353351
.setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
354352
return tracedFuture(
355353
() -> RawAsyncTableImpl.this.<Boolean> newCaller(row, put.getPriority(), rpcTimeoutNs)
@@ -364,8 +362,7 @@ public CompletableFuture<Boolean> thenPut(Put put) {
364362
@Override
365363
public CompletableFuture<Boolean> thenDelete(Delete delete) {
366364
preCheck();
367-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
368-
.setTableName(tableName)
365+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
369366
.setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
370367
return tracedFuture(
371368
() -> RawAsyncTableImpl.this.<Boolean> newCaller(row, delete.getPriority(), rpcTimeoutNs)
@@ -381,8 +378,7 @@ public CompletableFuture<Boolean> thenDelete(Delete delete) {
381378
public CompletableFuture<Boolean> thenMutate(RowMutations mutations) {
382379
preCheck();
383380
validatePutsInRowMutations(mutations, conn.connConf.getMaxKeyValueSize());
384-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
385-
.setTableName(tableName)
381+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
386382
.setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
387383
return tracedFuture(
388384
() -> RawAsyncTableImpl.this
@@ -425,8 +421,7 @@ public CheckAndMutateWithFilterBuilder timeRange(TimeRange timeRange) {
425421
@Override
426422
public CompletableFuture<Boolean> thenPut(Put put) {
427423
validatePut(put, conn.connConf.getMaxKeyValueSize());
428-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
429-
.setTableName(tableName)
424+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
430425
.setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
431426
return tracedFuture(
432427
() -> RawAsyncTableImpl.this.<Boolean> newCaller(row, put.getPriority(), rpcTimeoutNs)
@@ -441,8 +436,7 @@ public CompletableFuture<Boolean> thenPut(Put put) {
441436

442437
@Override
443438
public CompletableFuture<Boolean> thenDelete(Delete delete) {
444-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
445-
.setTableName(tableName)
439+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
446440
.setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
447441
return tracedFuture(
448442
() -> RawAsyncTableImpl.this.<Boolean> newCaller(row, delete.getPriority(), rpcTimeoutNs)
@@ -457,8 +451,7 @@ public CompletableFuture<Boolean> thenDelete(Delete delete) {
457451
@Override
458452
public CompletableFuture<Boolean> thenMutate(RowMutations mutations) {
459453
validatePutsInRowMutations(mutations, conn.connConf.getMaxKeyValueSize());
460-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
461-
.setTableName(tableName)
454+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
462455
.setOperation(HBaseSemanticAttributes.Operation.CHECK_AND_MUTATE);
463456
return tracedFuture(
464457
() -> RawAsyncTableImpl.this
@@ -480,8 +473,7 @@ public CheckAndMutateWithFilterBuilder checkAndMutate(byte[] row, Filter filter)
480473

481474
@Override
482475
public CompletableFuture<CheckAndMutateResult> checkAndMutate(CheckAndMutate checkAndMutate) {
483-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
484-
.setTableName(tableName)
476+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
485477
.setOperation(checkAndMutate);
486478
return tracedFuture(() -> {
487479
if (checkAndMutate.getAction() instanceof Put ||
@@ -534,8 +526,7 @@ public CompletableFuture<CheckAndMutateResult> checkAndMutate(CheckAndMutate che
534526
@Override
535527
public List<CompletableFuture<CheckAndMutateResult>>
536528
checkAndMutate(List<CheckAndMutate> checkAndMutates) {
537-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
538-
.setTableName(tableName)
529+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
539530
.setOperation(checkAndMutates);
540531
return tracedFutures(
541532
() -> batch(checkAndMutates, rpcTimeoutNs).stream()
@@ -591,8 +582,7 @@ public CompletableFuture<Result> mutateRow(RowMutations mutations) {
591582
validatePutsInRowMutations(mutations, conn.connConf.getMaxKeyValueSize());
592583
long nonceGroup = conn.getNonceGenerator().getNonceGroup();
593584
long nonce = conn.getNonceGenerator().newNonce();
594-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
595-
.setTableName(tableName)
585+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
596586
.setOperation(mutations);
597587
return tracedFuture(
598588
() -> this
@@ -637,8 +627,7 @@ public ResultScanner getScanner(Scan scan) {
637627

638628
@Override
639629
public CompletableFuture<List<Result>> scanAll(Scan scan) {
640-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
641-
.setTableName(tableName)
630+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
642631
.setOperation(scan);
643632
return tracedFuture(() -> {
644633
CompletableFuture<List<Result>> future = new CompletableFuture<>();
@@ -666,32 +655,28 @@ public void onComplete() {
666655

667656
@Override
668657
public List<CompletableFuture<Result>> get(List<Get> gets) {
669-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
670-
.setTableName(tableName)
658+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
671659
.setOperation(gets);
672660
return tracedFutures(() -> batch(gets, readRpcTimeoutNs), supplier);
673661
}
674662

675663
@Override
676664
public List<CompletableFuture<Void>> put(List<Put> puts) {
677-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
678-
.setTableName(tableName)
665+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
679666
.setOperation(puts);
680667
return tracedFutures(() -> voidMutate(puts), supplier);
681668
}
682669

683670
@Override
684671
public List<CompletableFuture<Void>> delete(List<Delete> deletes) {
685-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
686-
.setTableName(tableName)
672+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
687673
.setOperation(deletes);
688674
return tracedFutures(() -> voidMutate(deletes), supplier);
689675
}
690676

691677
@Override
692678
public <T> List<CompletableFuture<T>> batch(List<? extends Row> actions) {
693-
final Supplier<Span> supplier = new TableOperationSpanBuilder()
694-
.setTableName(tableName)
679+
final Supplier<Span> supplier = newTableOperationSpanBuilder()
695680
.setOperation(actions);
696681
return tracedFutures(() -> batch(actions, rpcTimeoutNs), supplier);
697682
}

0 commit comments

Comments
 (0)