Skip to content

Commit 2c85d1a

Browse files
brfrn169brfrn169
committed
Rename CheckedDistributedStorageAdmin (#3009)
1 parent 8b40480 commit 2c85d1a

File tree

7 files changed

+25
-22
lines changed

7 files changed

+25
-22
lines changed

‎core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java‎ renamed to ‎core/src/main/java/com/scalar/db/common/CommonDistributedStorageAdmin.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
import org.slf4j.Logger;
1414
import org.slf4j.LoggerFactory;
1515

16-
public class CheckedDistributedStorageAdmin implements DistributedStorageAdmin {
16+
public class CommonDistributedStorageAdmin implements DistributedStorageAdmin {
1717

18-
private static final Logger logger =
19-
LoggerFactory.getLogger(CheckedDistributedStorageAdmin.class);
18+
private static final Logger logger = LoggerFactory.getLogger(CommonDistributedStorageAdmin.class);
2019

2120
private final DistributedStorageAdmin admin;
2221

@@ -26,12 +25,12 @@ public class CheckedDistributedStorageAdmin implements DistributedStorageAdmin {
2625
*/
2726
private final boolean checkNamespace;
2827

29-
public CheckedDistributedStorageAdmin(DistributedStorageAdmin admin) {
28+
public CommonDistributedStorageAdmin(DistributedStorageAdmin admin) {
3029
this(admin, true);
3130
}
3231

3332
@SuppressFBWarnings("EI_EXPOSE_REP2")
34-
public CheckedDistributedStorageAdmin(DistributedStorageAdmin admin, boolean checkNamespace) {
33+
public CommonDistributedStorageAdmin(DistributedStorageAdmin admin, boolean checkNamespace) {
3534
this.admin = admin;
3635
this.checkNamespace = checkNamespace;
3736
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.scalar.db.api.DistributedStorage;
44
import com.scalar.db.api.DistributedStorageAdmin;
55
import com.scalar.db.api.DistributedStorageProvider;
6-
import com.scalar.db.common.CheckedDistributedStorageAdmin;
6+
import com.scalar.db.common.CommonDistributedStorageAdmin;
77
import com.scalar.db.config.DatabaseConfig;
88

99
public class CassandraProvider implements DistributedStorageProvider {
@@ -19,6 +19,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {
1919

2020
@Override
2121
public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
22-
return new CheckedDistributedStorageAdmin(new CassandraAdmin(config));
22+
return new CommonDistributedStorageAdmin(new CassandraAdmin(config));
2323
}
2424
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.scalar.db.api.DistributedStorage;
44
import com.scalar.db.api.DistributedStorageAdmin;
55
import com.scalar.db.api.DistributedStorageProvider;
6-
import com.scalar.db.common.CheckedDistributedStorageAdmin;
6+
import com.scalar.db.common.CommonDistributedStorageAdmin;
77
import com.scalar.db.config.DatabaseConfig;
88

99
public class CosmosProvider implements DistributedStorageProvider {
@@ -19,6 +19,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {
1919

2020
@Override
2121
public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
22-
return new CheckedDistributedStorageAdmin(new CosmosAdmin(config));
22+
return new CommonDistributedStorageAdmin(new CosmosAdmin(config));
2323
}
2424
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.scalar.db.api.DistributedStorage;
44
import com.scalar.db.api.DistributedStorageAdmin;
55
import com.scalar.db.api.DistributedStorageProvider;
6-
import com.scalar.db.common.CheckedDistributedStorageAdmin;
6+
import com.scalar.db.common.CommonDistributedStorageAdmin;
77
import com.scalar.db.config.DatabaseConfig;
88

99
public class DynamoProvider implements DistributedStorageProvider {
@@ -20,6 +20,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {
2020
@Override
2121
public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
2222
// Set the namespace check to false because DynamoDB does not support namespaces.
23-
return new CheckedDistributedStorageAdmin(new DynamoAdmin(config), false);
23+
return new CommonDistributedStorageAdmin(new DynamoAdmin(config), false);
2424
}
2525
}

‎core/src/main/java/com/scalar/db/storage/jdbc/JdbcProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.scalar.db.api.DistributedStorage;
44
import com.scalar.db.api.DistributedStorageAdmin;
55
import com.scalar.db.api.DistributedStorageProvider;
6-
import com.scalar.db.common.CheckedDistributedStorageAdmin;
6+
import com.scalar.db.common.CommonDistributedStorageAdmin;
77
import com.scalar.db.config.DatabaseConfig;
88

99
public class JdbcProvider implements DistributedStorageProvider {
@@ -22,6 +22,6 @@ public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig conf
2222
// If the database is SQLite, the namespace check is skipped because SQLite does not support
2323
// namespaces.
2424
boolean isSqlite = JdbcUtils.isSqlite(new JdbcConfig(config));
25-
return new CheckedDistributedStorageAdmin(new JdbcAdmin(config), !isSqlite);
25+
return new CommonDistributedStorageAdmin(new JdbcAdmin(config), !isSqlite);
2626
}
2727
}

‎core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.scalar.db.api.DistributedStorageAdmin;
66
import com.scalar.db.api.DistributedTransactionAdmin;
77
import com.scalar.db.api.TableMetadata;
8-
import com.scalar.db.common.CheckedDistributedStorageAdmin;
8+
import com.scalar.db.common.CommonDistributedStorageAdmin;
99
import com.scalar.db.config.DatabaseConfig;
1010
import com.scalar.db.exception.storage.ExecutionException;
1111
import com.scalar.db.io.DataType;
@@ -26,7 +26,7 @@ public JdbcTransactionAdmin(DatabaseConfig databaseConfig) {
2626
// If the database is SQLite, the namespace check is skipped because SQLite does not support
2727
// namespaces.
2828
boolean isSqlite = JdbcUtils.isSqlite(new JdbcConfig(databaseConfig));
29-
jdbcAdmin = new CheckedDistributedStorageAdmin(new JdbcAdmin(databaseConfig), !isSqlite);
29+
jdbcAdmin = new CommonDistributedStorageAdmin(new JdbcAdmin(databaseConfig), !isSqlite);
3030
}
3131

3232
@VisibleForTesting

‎core/src/test/java/com/scalar/db/common/CheckedDistributedStorageAdminTest.java‎ renamed to ‎core/src/test/java/com/scalar/db/common/CommonDistributedStorageAdminTest.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
import org.mockito.Mock;
1717
import org.mockito.MockitoAnnotations;
1818

19-
public class CheckedDistributedStorageAdminTest {
19+
public class CommonDistributedStorageAdminTest {
2020

2121
@Mock private DistributedStorageAdmin admin;
2222

23-
private CheckedDistributedStorageAdmin checkedAdmin;
23+
private CommonDistributedStorageAdmin commonDistributedStorageAdmin;
2424

2525
@BeforeEach
2626
public void setUp() throws Exception {
2727
MockitoAnnotations.openMocks(this).close();
2828

2929
// Arrange
30-
checkedAdmin = new CheckedDistributedStorageAdmin(admin);
30+
commonDistributedStorageAdmin = new CommonDistributedStorageAdmin(admin);
3131
}
3232

3333
@Test
@@ -42,7 +42,7 @@ public void createTable_ShouldCallAdminProperly() throws ExecutionException {
4242
when(admin.tableExists(namespaceName, tableName)).thenReturn(true);
4343

4444
// Act
45-
checkedAdmin.createTable(namespaceName, tableName, tableMetadata, options);
45+
commonDistributedStorageAdmin.createTable(namespaceName, tableName, tableMetadata, options);
4646

4747
// Assert
4848
verify(admin).createTable(namespaceName, tableName, tableMetadata, options);
@@ -66,7 +66,9 @@ public void createTable_ShouldCallAdminProperly() throws ExecutionException {
6666

6767
// Act Assert
6868
assertThatThrownBy(
69-
() -> checkedAdmin.createTable(namespaceName, tableName, tableMetadata, options))
69+
() ->
70+
commonDistributedStorageAdmin.createTable(
71+
namespaceName, tableName, tableMetadata, options))
7072
.isInstanceOf(UnsupportedOperationException.class);
7173
}
7274

@@ -80,7 +82,7 @@ public void repairTable_ShouldCallAdminProperly() throws ExecutionException {
8082
Map<String, String> options = ImmutableMap.of("name", "value");
8183

8284
// Act
83-
checkedAdmin.repairTable(namespaceName, tableName, tableMetadata, options);
85+
commonDistributedStorageAdmin.repairTable(namespaceName, tableName, tableMetadata, options);
8486

8587
// Assert
8688
verify(admin).repairTable(namespaceName, tableName, tableMetadata, options);
@@ -100,7 +102,9 @@ public void repairTable_ShouldCallAdminProperly() throws ExecutionException {
100102

101103
// Act Assert
102104
assertThatThrownBy(
103-
() -> checkedAdmin.repairTable(namespaceName, tableName, tableMetadata, options))
105+
() ->
106+
commonDistributedStorageAdmin.repairTable(
107+
namespaceName, tableName, tableMetadata, options))
104108
.isInstanceOf(UnsupportedOperationException.class);
105109
}
106110
}

0 commit comments

Comments
 (0)