Skip to content

Rename CheckedDistributedStorageAdmin #3009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2025
Merged

Rename CheckedDistributedStorageAdmin #3009

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58b47f2
Rename CheckedDistributedStorageAdmin
brfrn169 Sep 12, 2025
bb0a67c
Merge branch 'master' into rename-CheckedDistributedStorageAdmin
brfrn169 Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ommon/CheckedDistributedStorageAdmin.java → ...common/CommonDistributedStorageAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
import java.util.Set;
import javax.annotation.Nullable;

public class CheckedDistributedStorageAdmin implements DistributedStorageAdmin {
public class CommonDistributedStorageAdmin implements DistributedStorageAdmin {

private final DistributedStorageAdmin admin;
private final String systemNamespaceName;

@SuppressFBWarnings("EI_EXPOSE_REP2")
public CheckedDistributedStorageAdmin(DistributedStorageAdmin admin, DatabaseConfig config) {
public CommonDistributedStorageAdmin(DistributedStorageAdmin admin, DatabaseConfig config) {
this.admin = admin;
systemNamespaceName = config.getSystemNamespaceName();
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/scalar/db/storage/cassandra/CassandraProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.scalar.db.api.DistributedStorage;
import com.scalar.db.api.DistributedStorageAdmin;
import com.scalar.db.api.DistributedStorageProvider;
import com.scalar.db.common.CheckedDistributedStorageAdmin;
import com.scalar.db.common.CommonDistributedStorageAdmin;
import com.scalar.db.config.DatabaseConfig;

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

@Override
public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
return new CheckedDistributedStorageAdmin(new CassandraAdmin(config), config);
return new CommonDistributedStorageAdmin(new CassandraAdmin(config), config);
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/com/scalar/db/storage/cosmos/CosmosProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.scalar.db.api.DistributedStorage;
import com.scalar.db.api.DistributedStorageAdmin;
import com.scalar.db.api.DistributedStorageProvider;
import com.scalar.db.common.CheckedDistributedStorageAdmin;
import com.scalar.db.common.CommonDistributedStorageAdmin;
import com.scalar.db.config.DatabaseConfig;

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

@Override
public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
return new CheckedDistributedStorageAdmin(new CosmosAdmin(config), config);
return new CommonDistributedStorageAdmin(new CosmosAdmin(config), config);
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/com/scalar/db/storage/dynamo/DynamoProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.scalar.db.api.DistributedStorage;
import com.scalar.db.api.DistributedStorageAdmin;
import com.scalar.db.api.DistributedStorageProvider;
import com.scalar.db.common.CheckedDistributedStorageAdmin;
import com.scalar.db.common.CommonDistributedStorageAdmin;
import com.scalar.db.config.DatabaseConfig;

public class DynamoProvider implements DistributedStorageProvider {
Expand All @@ -19,6 +19,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {

@Override
public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
return new CheckedDistributedStorageAdmin(new DynamoAdmin(config), config);
return new CommonDistributedStorageAdmin(new DynamoAdmin(config), config);
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/com/scalar/db/storage/jdbc/JdbcProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.scalar.db.api.DistributedStorage;
import com.scalar.db.api.DistributedStorageAdmin;
import com.scalar.db.api.DistributedStorageProvider;
import com.scalar.db.common.CheckedDistributedStorageAdmin;
import com.scalar.db.common.CommonDistributedStorageAdmin;
import com.scalar.db.config.DatabaseConfig;

public class JdbcProvider implements DistributedStorageProvider {
Expand All @@ -19,6 +19,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {

@Override
public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
return new CheckedDistributedStorageAdmin(new JdbcAdmin(config), config);
return new CommonDistributedStorageAdmin(new JdbcAdmin(config), config);
}
}
4 changes: 2 additions & 2 deletions core/src/main/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.scalar.db.api.DistributedStorageAdmin;
import com.scalar.db.api.DistributedTransactionAdmin;
import com.scalar.db.api.TableMetadata;
import com.scalar.db.common.CheckedDistributedStorageAdmin;
import com.scalar.db.common.CommonDistributedStorageAdmin;
import com.scalar.db.config.DatabaseConfig;
import com.scalar.db.exception.storage.ExecutionException;
import com.scalar.db.io.DataType;
Expand All @@ -21,7 +21,7 @@ public class JdbcTransactionAdmin implements DistributedTransactionAdmin {

@Inject
public JdbcTransactionAdmin(DatabaseConfig databaseConfig) {
jdbcAdmin = new CheckedDistributedStorageAdmin(new JdbcAdmin(databaseConfig), databaseConfig);
jdbcAdmin = new CommonDistributedStorageAdmin(new JdbcAdmin(databaseConfig), databaseConfig);
}

@VisibleForTesting
Expand Down
26 changes: 15 additions & 11 deletions ...n/CheckedDistributedStorageAdminTest.java → ...on/CommonDistributedStorageAdminTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,30 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;

public class CheckedDistributedStorageAdminTest {
public class CommonDistributedStorageAdminTest {

private static final String SYSTEM_NAMESPACE = "scalardb";

@Mock private DistributedStorageAdmin admin;
@Mock private DatabaseConfig databaseConfig;

private CheckedDistributedStorageAdmin checkedAdmin;
private CommonDistributedStorageAdmin commonDistributedStorageAdmin;

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

// Arrange
when(databaseConfig.getSystemNamespaceName()).thenReturn(SYSTEM_NAMESPACE);
checkedAdmin = new CheckedDistributedStorageAdmin(admin, databaseConfig);
commonDistributedStorageAdmin = new CommonDistributedStorageAdmin(admin, databaseConfig);
}

@Test
public void createNamespace_SystemNamespaceNameGiven_ShouldThrowIllegalArgumentException() {
// Arrange

// Act Assert
assertThatThrownBy(() -> checkedAdmin.createNamespace(SYSTEM_NAMESPACE))
assertThatThrownBy(() -> commonDistributedStorageAdmin.createNamespace(SYSTEM_NAMESPACE))
.isInstanceOf(IllegalArgumentException.class);
}

Expand All @@ -51,7 +51,7 @@ public void dropNamespace_SystemNamespaceNameGiven_ShouldThrowIllegalArgumentExc
// Arrange

// Act Assert
assertThatThrownBy(() -> checkedAdmin.dropNamespace(SYSTEM_NAMESPACE))
assertThatThrownBy(() -> commonDistributedStorageAdmin.dropNamespace(SYSTEM_NAMESPACE))
.isInstanceOf(IllegalArgumentException.class);
}

Expand All @@ -67,7 +67,7 @@ public void createTable_ShouldCallAdminProperly() throws ExecutionException {
when(admin.tableExists(namespaceName, tableName)).thenReturn(true);

// Act
checkedAdmin.createTable(namespaceName, tableName, tableMetadata, options);
commonDistributedStorageAdmin.createTable(namespaceName, tableName, tableMetadata, options);

// Assert
verify(admin).createTable(namespaceName, tableName, tableMetadata, options);
Expand All @@ -91,7 +91,9 @@ public void createTable_ShouldCallAdminProperly() throws ExecutionException {

// Act Assert
assertThatThrownBy(
() -> checkedAdmin.createTable(namespaceName, tableName, tableMetadata, options))
() ->
commonDistributedStorageAdmin.createTable(
namespaceName, tableName, tableMetadata, options))
.isInstanceOf(UnsupportedOperationException.class);
}

Expand All @@ -101,7 +103,7 @@ public void namespaceExists_SystemNamespaceNameGiven_ShouldReturnTrue()
// Arrange

// Act
boolean actual = checkedAdmin.namespaceExists(SYSTEM_NAMESPACE);
boolean actual = commonDistributedStorageAdmin.namespaceExists(SYSTEM_NAMESPACE);

// Assert
assertThat(actual).isTrue();
Expand All @@ -114,7 +116,7 @@ public void getNamespaceNames_ShouldReturnListWithSystemNamespaceName()
when(admin.getNamespaceNames()).thenReturn(Collections.emptySet());

// Act
Set<String> actual = checkedAdmin.getNamespaceNames();
Set<String> actual = commonDistributedStorageAdmin.getNamespaceNames();

// Assert
assertThat(actual).containsExactly(SYSTEM_NAMESPACE);
Expand All @@ -130,7 +132,7 @@ public void repairTable_ShouldCallAdminProperly() throws ExecutionException {
Map<String, String> options = ImmutableMap.of("name", "value");

// Act
checkedAdmin.repairTable(namespaceName, tableName, tableMetadata, options);
commonDistributedStorageAdmin.repairTable(namespaceName, tableName, tableMetadata, options);

// Assert
verify(admin).repairTable(namespaceName, tableName, tableMetadata, options);
Expand All @@ -150,7 +152,9 @@ public void repairTable_ShouldCallAdminProperly() throws ExecutionException {

// Act Assert
assertThatThrownBy(
() -> checkedAdmin.repairTable(namespaceName, tableName, tableMetadata, options))
() ->
commonDistributedStorageAdmin.repairTable(
namespaceName, tableName, tableMetadata, options))
.isInstanceOf(UnsupportedOperationException.class);
}
}
Loading