From 87597a41894765cab05e0e13528bcbcf758c5fc2 Mon Sep 17 00:00:00 2001 From: Ahmet Mircik Date: Wed, 13 Apr 2022 08:51:24 +0300 Subject: [PATCH] Address reviews --- .../hazelcast/map/impl/tx/MapTransactionLogRecord.java | 10 +++++----- .../map/impl/tx/TransactionalMapProxySupport.java | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/MapTransactionLogRecord.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/MapTransactionLogRecord.java index 098421035f20..5abf46d33683 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/MapTransactionLogRecord.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/MapTransactionLogRecord.java @@ -45,14 +45,14 @@ public class MapTransactionLogRecord implements TransactionLogRecord { private UUID ownerUuid; private Operation op; - private transient RemoteCallHook nearCachingHook = RemoteCallHook.EMPTY_HOOK; + private transient RemoteCallHook remoteCallHook = RemoteCallHook.EMPTY_HOOK; public MapTransactionLogRecord() { } public MapTransactionLogRecord(String name, Data key, int partitionId, Operation op, UUID ownerUuid, UUID transactionId, - @Nonnull RemoteCallHook nearCachingHook) { + @Nonnull RemoteCallHook remoteCallHook) { this.name = name; this.key = key; if (!(op instanceof MapTxnOperation)) { @@ -62,7 +62,7 @@ public MapTransactionLogRecord(String name, Data key, int partitionId, this.ownerUuid = ownerUuid; this.partitionId = partitionId; this.transactionId = transactionId; - this.nearCachingHook = nearCachingHook; + this.remoteCallHook = remoteCallHook; } @Override @@ -85,12 +85,12 @@ public Operation newCommitOperation() { @Override public void onCommitSuccess() { - nearCachingHook.onRemoteCallSuccess(op); + remoteCallHook.onRemoteCallSuccess(op); } @Override public void onCommitFailure() { - nearCachingHook.onRemoteCallFailure(); + remoteCallHook.onRemoteCallFailure(); } @Override diff --git a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxySupport.java b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxySupport.java index b82f0999d915..eec952f7ef53 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxySupport.java +++ b/hazelcast/src/main/java/com/hazelcast/map/impl/tx/TransactionalMapProxySupport.java @@ -424,9 +424,7 @@ public void onRemoteCallFailure() { } protected void updateOpStats(Operation op, long startNanos) { - if (!statisticsEnabled) { - return; - } + assert statisticsEnabled; incrementTxnOperationStats(op, localMapStats, startNanos); }