Skip to content

Commit ac14dec

Browse files
brfrn169brfrn169
committed
Remove deprecated API usages (Part 2) (#2957)
1 parent 1d919bb commit ac14dec

File tree

61 files changed

+4612
-2360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+4612
-2360
lines changed

‎core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageIntegrationTest.java‎

Lines changed: 376 additions & 148 deletions
Large diffs are not rendered by default.

‎core/src/main/java/com/scalar/db/api/Mutation.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,6 @@ public Mutation(Mutation mutation) {
5454
condition = mutation.condition;
5555
}
5656

57-
Mutation(
58-
@Nullable String namespace,
59-
String tableName,
60-
Key partitionKey,
61-
@Nullable Key clusteringKey,
62-
@Nullable MutationCondition condition) {
63-
super(namespace, tableName, partitionKey, clusteringKey);
64-
this.condition = condition;
65-
}
66-
6757
/**
6858
* Returns the {@link MutationCondition}
6959
*

‎core/src/main/java/com/scalar/db/common/AbstractDistributedStorage.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,4 @@ protected Put copyAndSetTargetToIfNot(Put put) {
7676
protected Delete copyAndSetTargetToIfNot(Delete delete) {
7777
return ScalarDbUtils.copyAndSetTargetToIfNot(delete, namespace, tableName);
7878
}
79-
80-
protected Get copyAndPrepareForDynamicFiltering(Get get) {
81-
return ScalarDbUtils.copyAndPrepareForDynamicFiltering(get);
82-
}
83-
84-
protected Scan copyAndPrepareForDynamicFiltering(Scan scan) {
85-
return ScalarDbUtils.copyAndPrepareForDynamicFiltering(scan);
86-
}
8779
}

‎core/src/main/java/com/scalar/db/storage/cassandra/Cassandra.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.scalar.db.common.checker.OperationChecker;
2222
import com.scalar.db.config.DatabaseConfig;
2323
import com.scalar.db.exception.storage.ExecutionException;
24+
import com.scalar.db.util.ScalarDbUtils;
2425
import java.io.IOException;
2526
import java.util.List;
2627
import java.util.Optional;
@@ -100,7 +101,9 @@ public Optional<Result> get(Get get) throws ExecutionException {
100101
if (get.getConjunctions().isEmpty()) {
101102
scanner = getInternal(get);
102103
} else {
103-
scanner = new FilterableScanner(get, getInternal(copyAndPrepareForDynamicFiltering(get)));
104+
scanner =
105+
new FilterableScanner(
106+
get, getInternal(ScalarDbUtils.copyAndPrepareForDynamicFiltering(get)));
104107
}
105108
Optional<Result> ret = scanner.one();
106109
if (scanner.one().isPresent()) {
@@ -134,7 +137,8 @@ public Scanner scan(Scan scan) throws ExecutionException {
134137
if (scan.getConjunctions().isEmpty()) {
135138
return scanInternal(scan);
136139
} else {
137-
return new FilterableScanner(scan, scanInternal(copyAndPrepareForDynamicFiltering(scan)));
140+
return new FilterableScanner(
141+
scan, scanInternal(ScalarDbUtils.copyAndPrepareForDynamicFiltering(scan)));
138142
}
139143
}
140144

‎core/src/main/java/com/scalar/db/storage/cosmos/Cosmos.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.scalar.db.common.checker.OperationChecker;
2222
import com.scalar.db.config.DatabaseConfig;
2323
import com.scalar.db.exception.storage.ExecutionException;
24+
import com.scalar.db.util.ScalarDbUtils;
2425
import java.io.IOException;
2526
import java.util.List;
2627
import java.util.Optional;
@@ -105,7 +106,9 @@ public Optional<Result> get(Get get) throws ExecutionException {
105106
} else {
106107
scanner =
107108
new FilterableScanner(
108-
get, selectStatementHandler.handle(copyAndPrepareForDynamicFiltering(get)));
109+
get,
110+
selectStatementHandler.handle(
111+
ScalarDbUtils.copyAndPrepareForDynamicFiltering(get)));
109112
}
110113
Optional<Result> ret = scanner.one();
111114
if (scanner.one().isPresent()) {
@@ -133,7 +136,8 @@ public Scanner scan(Scan scan) throws ExecutionException {
133136
return selectStatementHandler.handle(scan);
134137
} else {
135138
return new FilterableScanner(
136-
scan, selectStatementHandler.handle(copyAndPrepareForDynamicFiltering(scan)));
139+
scan,
140+
selectStatementHandler.handle(ScalarDbUtils.copyAndPrepareForDynamicFiltering(scan)));
137141
}
138142
}
139143

‎core/src/main/java/com/scalar/db/storage/dynamo/Dynamo.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.scalar.db.common.checker.OperationChecker;
2121
import com.scalar.db.config.DatabaseConfig;
2222
import com.scalar.db.exception.storage.ExecutionException;
23+
import com.scalar.db.util.ScalarDbUtils;
2324
import java.io.IOException;
2425
import java.net.URI;
2526
import java.util.List;
@@ -125,7 +126,9 @@ public Optional<Result> get(Get get) throws ExecutionException {
125126
} else {
126127
scanner =
127128
new FilterableScanner(
128-
get, selectStatementHandler.handle(copyAndPrepareForDynamicFiltering(get)));
129+
get,
130+
selectStatementHandler.handle(
131+
ScalarDbUtils.copyAndPrepareForDynamicFiltering(get)));
129132
}
130133
Optional<Result> ret = scanner.one();
131134
if (scanner.one().isPresent()) {
@@ -153,7 +156,8 @@ public Scanner scan(Scan scan) throws ExecutionException {
153156
return selectStatementHandler.handle(scan);
154157
} else {
155158
return new FilterableScanner(
156-
scan, selectStatementHandler.handle(copyAndPrepareForDynamicFiltering(scan)));
159+
scan,
160+
selectStatementHandler.handle(ScalarDbUtils.copyAndPrepareForDynamicFiltering(scan)));
157161
}
158162
}
159163

‎core/src/main/java/com/scalar/db/transaction/consensuscommit/CommitMutationComposer.java‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,17 @@ private Put composePut(Operation base, @Nullable TransactionResult result)
114114

115115
private Delete composeDelete(Operation base, @Nullable TransactionResult result)
116116
throws ExecutionException {
117-
return new Delete(getPartitionKey(base, result), getClusteringKey(base, result).orElse(null))
118-
.forNamespace(base.forNamespace().get())
119-
.forTable(base.forTable().get())
120-
.withConsistency(Consistency.LINEARIZABLE)
121-
.withCondition(
117+
return Delete.newBuilder()
118+
.namespace(base.forNamespace().get())
119+
.table(base.forTable().get())
120+
.partitionKey(getPartitionKey(base, result))
121+
.clusteringKey(getClusteringKey(base, result).orElse(null))
122+
.consistency(Consistency.LINEARIZABLE)
123+
.condition(
122124
ConditionBuilder.deleteIf(ConditionBuilder.column(ID).isEqualToText(id))
123125
.and(ConditionBuilder.column(STATE).isEqualToInt(TransactionState.DELETED.get()))
124-
.build());
126+
.build())
127+
.build();
125128
}
126129

127130
private Key getPartitionKey(Operation base, @Nullable TransactionResult result)

‎core/src/main/java/com/scalar/db/transaction/consensuscommit/Coordinator.java‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.scalar.db.api.DistributedStorage;
1212
import com.scalar.db.api.Get;
1313
import com.scalar.db.api.Put;
14+
import com.scalar.db.api.PutBuilder;
1415
import com.scalar.db.api.Result;
1516
import com.scalar.db.api.TableMetadata;
1617
import com.scalar.db.api.TransactionState;
@@ -293,10 +294,12 @@ private void putStateForLazyRecoveryRollbackForGroupCommit(String id)
293294

294295
@VisibleForTesting
295296
Get createGetWith(String id) {
296-
return new Get(Key.ofText(Attribute.ID, id))
297-
.withConsistency(Consistency.LINEARIZABLE)
298-
.forNamespace(coordinatorNamespace)
299-
.forTable(TABLE);
297+
return Get.newBuilder()
298+
.namespace(coordinatorNamespace)
299+
.table(TABLE)
300+
.partitionKey(Key.ofText(Attribute.ID, id))
301+
.consistency(Consistency.LINEARIZABLE)
302+
.build();
300303
}
301304

302305
private Optional<Coordinator.State> get(Get get, String id) throws CoordinatorException {
@@ -334,17 +337,21 @@ private Optional<Coordinator.State> get(Get get, String id) throws CoordinatorEx
334337

335338
@VisibleForTesting
336339
Put createPutWith(Coordinator.State state) {
337-
Put put = new Put(Key.ofText(Attribute.ID, state.getId()));
338340
String childIds = state.getChildIdsAsString();
341+
PutBuilder.Buildable builder =
342+
Put.newBuilder()
343+
.namespace(coordinatorNamespace)
344+
.table(TABLE)
345+
.partitionKey(Key.ofText(Attribute.ID, state.getId()))
346+
.intValue(Attribute.STATE, state.getState().get())
347+
.bigIntValue(Attribute.CREATED_AT, state.getCreatedAt())
348+
.consistency(Consistency.LINEARIZABLE)
349+
.condition(ConditionBuilder.putIfNotExists());
350+
339351
if (!childIds.isEmpty()) {
340-
put.withTextValue(Attribute.CHILD_IDS, childIds);
352+
builder = builder.textValue(Attribute.CHILD_IDS, childIds);
341353
}
342-
return put.withIntValue(Attribute.STATE, state.getState().get())
343-
.withBigIntValue(Attribute.CREATED_AT, state.getCreatedAt())
344-
.withConsistency(Consistency.LINEARIZABLE)
345-
.withCondition(ConditionBuilder.putIfNotExists())
346-
.forNamespace(coordinatorNamespace)
347-
.forTable(TABLE);
354+
return builder.build();
348355
}
349356

350357
private void put(Put put, String id) throws CoordinatorException {

‎core/src/main/java/com/scalar/db/transaction/consensuscommit/CrudHandler.java‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -713,9 +713,19 @@ private Set<AndConditionSet> convertConjunctions(
713713
}
714714

715715
private Selection prepareStorageSelection(Selection selection) {
716-
selection.clearProjections();
717-
selection.withConsistency(Consistency.LINEARIZABLE);
718-
return selection;
716+
if (selection instanceof Get) {
717+
return Get.newBuilder((Get) selection)
718+
.clearProjections()
719+
.consistency(Consistency.LINEARIZABLE)
720+
.build();
721+
} else {
722+
assert selection instanceof Scan;
723+
724+
return Scan.newBuilder((Scan) selection)
725+
.clearProjections()
726+
.consistency(Consistency.LINEARIZABLE)
727+
.build();
728+
}
719729
}
720730

721731
private TransactionTableMetadata getTransactionTableMetadata(Operation operation)

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,17 @@ private Delete composeDelete(Operation base, TransactionResult result) throws Ex
121121
Key partitionKey = ScalarDbUtils.getPartitionKey(result, tableMetadata);
122122
Optional<Key> clusteringKey = ScalarDbUtils.getClusteringKey(result, tableMetadata);
123123

124-
return new Delete(partitionKey, clusteringKey.orElse(null))
125-
.forNamespace(base.forNamespace().get())
126-
.forTable(base.forTable().get())
127-
.withCondition(
124+
return Delete.newBuilder()
125+
.namespace(base.forNamespace().get())
126+
.table(base.forTable().get())
127+
.partitionKey(partitionKey)
128+
.clusteringKey(clusteringKey.orElse(null))
129+
.condition(
128130
ConditionBuilder.deleteIf(ConditionBuilder.column(ID).isEqualToText(id))
129131
.and(ConditionBuilder.column(STATE).isEqualToInt(result.getState().get()))
130132
.build())
131-
.withConsistency(Consistency.LINEARIZABLE);
133+
.consistency(Consistency.LINEARIZABLE)
134+
.build();
132135
}
133136

134137
private Optional<TransactionResult> getLatestResult(
@@ -155,10 +158,13 @@ private Optional<TransactionResult> getLatestResult(
155158
}
156159

157160
Get get =
158-
new Get(partitionKey, clusteringKey)
159-
.withConsistency(Consistency.LINEARIZABLE)
160-
.forNamespace(operation.forNamespace().get())
161-
.forTable(operation.forTable().get());
161+
Get.newBuilder()
162+
.namespace(operation.forNamespace().get())
163+
.table(operation.forTable().get())
164+
.partitionKey(partitionKey)
165+
.clusteringKey(clusteringKey)
166+
.consistency(Consistency.LINEARIZABLE)
167+
.build();
162168

163169
return storage.get(get).map(TransactionResult::new);
164170
}

0 commit comments

Comments
 (0)