Skip to content

Commit 396ad31

Browse files
committed
Apply brfrn169 suggestion
1 parent 8fb916b commit 396ad31

File tree

4 files changed

+10
-23
lines changed

4 files changed

+10
-23
lines changed

core/src/main/java/com/scalar/db/common/checker/OperationChecker.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ private void check(ScanAll scanAll) throws ExecutionException {
159159
throw new IllegalArgumentException(
160160
CoreError.OPERATION_CHECK_ERROR_CROSS_PARTITION_SCAN_ORDERING.buildMessage(scanAll));
161161
}
162-
throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, metadata);
163-
checkOrderings(scanAll, metadata);
162+
checkOrderingsForScanAll(scanAll, metadata);
164163

165164
if (!config.isCrossPartitionScanFilteringEnabled() && !scanAll.getConjunctions().isEmpty()) {
166165
throw new IllegalArgumentException(
@@ -169,9 +168,6 @@ private void check(ScanAll scanAll) throws ExecutionException {
169168
checkConjunctions(scanAll, metadata);
170169
}
171170

172-
protected void throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(
173-
ScanAll scanAll, TableMetadata metadata) {};
174-
175171
private void checkProjections(Selection selection, TableMetadata metadata) {
176172
for (String projection : selection.getProjections()) {
177173
if (!metadata.getColumnNames().contains(projection)) {
@@ -262,7 +258,7 @@ private void checkOrderings(Scan scan, TableMetadata metadata) {
262258
}
263259
}
264260

265-
private void checkOrderings(ScanAll scanAll, TableMetadata metadata) {
261+
protected void checkOrderingsForScanAll(ScanAll scanAll, TableMetadata metadata) {
266262
for (Scan.Ordering ordering : scanAll.getOrderings()) {
267263
if (!metadata.getColumnNames().contains(ordering.getColumnName())) {
268264
throw new IllegalArgumentException(

core/src/main/java/com/scalar/db/storage/jdbc/JdbcOperationChecker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public JdbcOperationChecker(
2222
}
2323

2424
@Override
25-
protected void throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(
26-
ScanAll scanAll, TableMetadata metadata) {
25+
protected void checkOrderingsForScanAll(ScanAll scanAll, TableMetadata metadata) {
26+
super.checkOrderingsForScanAll(scanAll, metadata);
2727
rdbEngine.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(scanAll, metadata);
2828
}
2929
}

core/src/test/java/com/scalar/db/common/checker/OperationCheckerTest.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import static org.assertj.core.api.Assertions.assertThatCode;
55
import static org.assertj.core.api.Assertions.assertThatThrownBy;
66
import static org.assertj.core.api.Assertions.catchException;
7+
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
78
import static org.mockito.Mockito.any;
8-
import static org.mockito.Mockito.spy;
9-
import static org.mockito.Mockito.verify;
109
import static org.mockito.Mockito.when;
1110

1211
import com.scalar.db.api.ConditionBuilder;
@@ -19,7 +18,6 @@
1918
import com.scalar.db.api.Put;
2019
import com.scalar.db.api.Scan;
2120
import com.scalar.db.api.Scan.Ordering;
22-
import com.scalar.db.api.ScanAll;
2321
import com.scalar.db.api.StorageInfo;
2422
import com.scalar.db.api.TableMetadata;
2523
import com.scalar.db.api.Update;
@@ -442,15 +440,10 @@ public void whenCheckingScanAllOperationWithCrossPartitionScanEnabledWithOrderin
442440
when(databaseConfig.isCrossPartitionScanEnabled()).thenReturn(true);
443441
when(databaseConfig.isCrossPartitionScanOrderingEnabled()).thenReturn(true);
444442

445-
operationChecker =
446-
spy(new OperationChecker(databaseConfig, metadataManager, storageInfoProvider));
447-
448-
// Act
449-
operationChecker.check(scan);
443+
operationChecker = new OperationChecker(databaseConfig, metadataManager, storageInfoProvider);
450444

451-
// Assert
452-
verify(operationChecker)
453-
.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported((ScanAll) scan, metadata);
445+
// Act Assert
446+
assertDoesNotThrow(() -> operationChecker.check(scan));
454447
}
455448

456449
@Test

core/src/test/java/com/scalar/db/storage/jdbc/JdbcOperationCheckerTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,10 @@ public void setUp() throws Exception {
3232
}
3333

3434
@Test
35-
public void
36-
throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported_ShouldDelegateToRdbEngine() {
35+
public void checkOrderingsForScanAll_ShouldInvokeFurtherCheckOnRdbEngine() {
3736
// Arrange
3837
// Act
39-
operationChecker.throwIfCrossPartitionScanOrderingOnBlobColumnNotSupported(
40-
scanAll, tableMetadata);
38+
operationChecker.checkOrderingsForScanAll(scanAll, tableMetadata);
4139

4240
// Assert
4341
verify(rdbEngine)

0 commit comments

Comments
 (0)