Skip to content

Commit 309e61f

Browse files
committed
[skip ci] Rename
1 parent b55e890 commit 309e61f

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ public static int getNextTxVersion(@Nullable Integer currentTxVersion) {
319319
}
320320
}
321321

322-
static void extractAfterImageColumnsFromBeforeImage(
322+
static void createAfterImageColumnsFromBeforeImage(
323323
Map<String, Column<?>> columns,
324324
TransactionResult result,
325325
Set<String> beforeImageColumnNames) {

core/src/main/java/com/scalar/db/transaction/consensuscommit/RecoveryExecutor.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.scalar.db.transaction.consensuscommit;
22

3-
import static com.scalar.db.transaction.consensuscommit.ConsensusCommitUtils.extractAfterImageColumnsFromBeforeImage;
3+
import static com.scalar.db.transaction.consensuscommit.ConsensusCommitUtils.createAfterImageColumnsFromBeforeImage;
44

55
import com.google.common.annotations.VisibleForTesting;
66
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -102,10 +102,10 @@ private Optional<TransactionResult> createRecoveredResult(
102102
throwUncommittedRecordExceptionIfTransactionNotExpired(state, selection, result, transactionId);
103103

104104
if (!state.isPresent() || state.get().getState() == TransactionState.ABORTED) {
105-
return createRolledBackRecord(selection, result, transactionId);
105+
return createRecordFromBeforeImage(selection, result, transactionId);
106106
} else {
107107
assert state.get().getState() == TransactionState.COMMITTED;
108-
return createRolledForwardResult(selection, result, transactionId);
108+
return createResultFromAfterImage(selection, result, transactionId);
109109
}
110110
}
111111

@@ -124,7 +124,7 @@ private void throwUncommittedRecordExceptionIfTransactionNotExpired(
124124
}
125125
}
126126

127-
private Optional<TransactionResult> createRolledBackRecord(
127+
private Optional<TransactionResult> createRecordFromBeforeImage(
128128
Selection selection, TransactionResult result, String transactionId) throws CrudException {
129129
if (!result.hasBeforeImage()) {
130130
return Optional.empty();
@@ -138,7 +138,7 @@ private Optional<TransactionResult> createRolledBackRecord(
138138

139139
Map<String, Column<?>> columns = new HashMap<>();
140140

141-
extractAfterImageColumnsFromBeforeImage(columns, result, beforeImageColumnNames);
141+
createAfterImageColumnsFromBeforeImage(columns, result, beforeImageColumnNames);
142142

143143
Key partitionKey = ScalarDbUtils.getPartitionKey(result, tableMetadata);
144144
partitionKey.getColumns().forEach(c -> columns.put(c.getName(), c));
@@ -151,7 +151,7 @@ private Optional<TransactionResult> createRolledBackRecord(
151151
return Optional.of(new TransactionResult(new ResultImpl(columns, tableMetadata)));
152152
}
153153

154-
private Optional<TransactionResult> createRolledForwardResult(
154+
private Optional<TransactionResult> createResultFromAfterImage(
155155
Selection selection, TransactionResult result, String transactionId) throws CrudException {
156156
if (result.getState() == TransactionState.DELETED) {
157157
return Optional.empty();

core/src/main/java/com/scalar/db/transaction/consensuscommit/RollbackMutationComposer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import static com.scalar.db.transaction.consensuscommit.Attribute.STATE;
66
import static com.scalar.db.transaction.consensuscommit.Attribute.toIdValue;
77
import static com.scalar.db.transaction.consensuscommit.Attribute.toStateValue;
8-
import static com.scalar.db.transaction.consensuscommit.ConsensusCommitUtils.extractAfterImageColumnsFromBeforeImage;
8+
import static com.scalar.db.transaction.consensuscommit.ConsensusCommitUtils.createAfterImageColumnsFromBeforeImage;
99
import static com.scalar.db.transaction.consensuscommit.ConsensusCommitUtils.getTransactionTableMetadata;
1010

1111
import com.scalar.db.api.ConditionBuilder;
@@ -106,7 +106,7 @@ private Put composePut(Operation base, TransactionResult result) throws Executio
106106
clusteringKey.ifPresent(putBuilder::clusteringKey);
107107

108108
Map<String, Column<?>> columns = new HashMap<>();
109-
extractAfterImageColumnsFromBeforeImage(columns, result, beforeImageColumnNames);
109+
createAfterImageColumnsFromBeforeImage(columns, result, beforeImageColumnNames);
110110
columns.values().forEach(putBuilder::value);
111111

112112
// Set before image columns to null

core/src/test/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitUtilsTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ void getNextTxVersion_LargeValueGiven_shouldReturnNextVersion() {
625625
}
626626

627627
@Test
628-
public void extractAfterImageColumnsFromBeforeImage_shouldExtractCorrectly() {
628+
public void createAfterImageColumnsFromBeforeImage_shouldExtractCorrectly() {
629629
// Arrange
630630
Map<String, Column<?>> columns = new HashMap<>();
631631
Set<String> beforeImageColumnNames = new HashSet<>();
@@ -641,7 +641,7 @@ public void extractAfterImageColumnsFromBeforeImage_shouldExtractCorrectly() {
641641
when(result.getColumns()).thenReturn(resultColumns);
642642

643643
// Act
644-
ConsensusCommitUtils.extractAfterImageColumnsFromBeforeImage(
644+
ConsensusCommitUtils.createAfterImageColumnsFromBeforeImage(
645645
columns, result, beforeImageColumnNames);
646646

647647
// Assert
@@ -655,7 +655,7 @@ public void extractAfterImageColumnsFromBeforeImage_shouldExtractCorrectly() {
655655

656656
@Test
657657
public void
658-
extractAfterImageColumnsFromBeforeImage_versionColumnWithZero_shouldCreateNullVersion() {
658+
createAfterImageColumnsFromBeforeImage_versionColumnWithZero_shouldCreateNullVersion() {
659659
// Arrange
660660
Map<String, Column<?>> columns = new HashMap<>();
661661
Set<String> beforeImageColumnNames = new HashSet<>();
@@ -668,7 +668,7 @@ public void extractAfterImageColumnsFromBeforeImage_shouldExtractCorrectly() {
668668
when(result.getColumns()).thenReturn(resultColumns);
669669

670670
// Act
671-
ConsensusCommitUtils.extractAfterImageColumnsFromBeforeImage(
671+
ConsensusCommitUtils.createAfterImageColumnsFromBeforeImage(
672672
columns, result, beforeImageColumnNames);
673673

674674
// Assert
@@ -678,7 +678,7 @@ public void extractAfterImageColumnsFromBeforeImage_shouldExtractCorrectly() {
678678
}
679679

680680
@Test
681-
public void extractAfterImageColumnsFromBeforeImage_versionColumnWithNonZero_shouldCopyValue() {
681+
public void createAfterImageColumnsFromBeforeImage_versionColumnWithNonZero_shouldCopyValue() {
682682
// Arrange
683683
Map<String, Column<?>> columns = new HashMap<>();
684684
Set<String> beforeImageColumnNames = new HashSet<>();
@@ -691,7 +691,7 @@ public void extractAfterImageColumnsFromBeforeImage_versionColumnWithNonZero_sho
691691
when(result.getColumns()).thenReturn(resultColumns);
692692

693693
// Act
694-
ConsensusCommitUtils.extractAfterImageColumnsFromBeforeImage(
694+
ConsensusCommitUtils.createAfterImageColumnsFromBeforeImage(
695695
columns, result, beforeImageColumnNames);
696696

697697
// Assert

0 commit comments

Comments
 (0)