Skip to content

Backport to branch(3) : Rename CheckedDistributedStorageAdmin #3018

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
+25 −22
Merged

Backport to branch(3) : Rename CheckedDistributedStorageAdmin #3018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b40480
Empty commit [skip ci]
brfrn169 Sep 16, 2025
2c85d1a
Rename CheckedDistributedStorageAdmin (#3009)
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
9 changes: 4 additions & 5 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,10 +13,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

private static final Logger logger =
LoggerFactory.getLogger(CheckedDistributedStorageAdmin.class);
private static final Logger logger = LoggerFactory.getLogger(CommonDistributedStorageAdmin.class);

private final DistributedStorageAdmin admin;

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

public CheckedDistributedStorageAdmin(DistributedStorageAdmin admin) {
public CommonDistributedStorageAdmin(DistributedStorageAdmin admin) {
this(admin, true);
}

@SuppressFBWarnings("EI_EXPOSE_REP2")
public CheckedDistributedStorageAdmin(DistributedStorageAdmin admin, boolean checkNamespace) {
public CommonDistributedStorageAdmin(DistributedStorageAdmin admin, boolean checkNamespace) {
this.admin = admin;
this.checkNamespace = checkNamespace;
}
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));
return new CommonDistributedStorageAdmin(new CassandraAdmin(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));
return new CommonDistributedStorageAdmin(new CosmosAdmin(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 @@ -20,6 +20,6 @@ public DistributedStorage createDistributedStorage(DatabaseConfig config) {
@Override
public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig config) {
// Set the namespace check to false because DynamoDB does not support namespaces.
return new CheckedDistributedStorageAdmin(new DynamoAdmin(config), false);
return new CommonDistributedStorageAdmin(new DynamoAdmin(config), false);
}
}
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 @@ -22,6 +22,6 @@ public DistributedStorageAdmin createDistributedStorageAdmin(DatabaseConfig conf
// If the database is SQLite, the namespace check is skipped because SQLite does not support
// namespaces.
boolean isSqlite = JdbcUtils.isSqlite(new JdbcConfig(config));
return new CheckedDistributedStorageAdmin(new JdbcAdmin(config), !isSqlite);
return new CommonDistributedStorageAdmin(new JdbcAdmin(config), !isSqlite);
}
}
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 @@ -26,7 +26,7 @@ public JdbcTransactionAdmin(DatabaseConfig databaseConfig) {
// If the database is SQLite, the namespace check is skipped because SQLite does not support
// namespaces.
boolean isSqlite = JdbcUtils.isSqlite(new JdbcConfig(databaseConfig));
jdbcAdmin = new CheckedDistributedStorageAdmin(new JdbcAdmin(databaseConfig), !isSqlite);
jdbcAdmin = new CommonDistributedStorageAdmin(new JdbcAdmin(databaseConfig), !isSqlite);
}

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

public class CheckedDistributedStorageAdminTest {
public class CommonDistributedStorageAdminTest {

@Mock private DistributedStorageAdmin admin;

private CheckedDistributedStorageAdmin checkedAdmin;
private CommonDistributedStorageAdmin commonDistributedStorageAdmin;

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

// Arrange
checkedAdmin = new CheckedDistributedStorageAdmin(admin);
commonDistributedStorageAdmin = new CommonDistributedStorageAdmin(admin);
}

@Test
Expand All @@ -42,7 +42,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 @@ -66,7 +66,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 @@ -80,7 +82,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 @@ -100,7 +102,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);
}
}