Skip to content
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

Refactor ShardingSphereDatabasesFactory's return value as collection #34395

Merged
merged 3 commits into from
Jan 19, 2025
Merged

Refactor ShardingSphereDatabasesFactory's return value as collection #34395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4be280
Refactor ShardingSphereDatabasesFactory's return value as collection
terrymanu Jan 19, 2025
6eb4801
Refactor ShardingSphereDatabasesFactory's return value as collection
terrymanu Jan 19, 2025
1fe4130
Refactor ShardingSphereDatabasesFactory's return value as collection
terrymanu Jan 19, 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
46 changes: 22 additions & 24 deletions ...ava/org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabasesFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@

import java.sql.SQLException;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;

/**
Expand All @@ -47,17 +47,15 @@ public final class ShardingSphereDatabasesFactory {
* @param databaseConfigMap database configuration map
* @param schemas schemas
* @param props properties
* @param computeNodeInstanceContext compute node instance context
* @param instanceContext compute node instance context
* @return created databases
*/
public static Map<String, ShardingSphereDatabase> create(final Map<String, DatabaseConfiguration> databaseConfigMap,
final Map<String, Collection<ShardingSphereSchema>> schemas,
final ConfigurationProperties props, final ComputeNodeInstanceContext computeNodeInstanceContext) {
public static Collection<ShardingSphereDatabase> create(final Map<String, DatabaseConfiguration> databaseConfigMap,
final Map<String, Collection<ShardingSphereSchema>> schemas,
final ConfigurationProperties props, final ComputeNodeInstanceContext instanceContext) {
DatabaseType protocolType = DatabaseTypeEngine.getProtocolType(databaseConfigMap, props);
return databaseConfigMap.entrySet().stream()
.collect(Collectors.toMap(entry -> entry.getKey().toLowerCase(),
entry -> create(entry.getKey(), entry.getValue(), protocolType, schemas.get(entry.getKey()), props, computeNodeInstanceContext),
(a, b) -> b, () -> new ConcurrentHashMap<>(databaseConfigMap.size(), 1F)));
.map(entry -> create(entry.getKey(), entry.getValue(), protocolType, schemas.get(entry.getKey()), props, instanceContext)).collect(Collectors.toList());
}

private static ShardingSphereDatabase create(final String databaseName, final DatabaseConfiguration databaseConfig, final DatabaseType protocolType,
Expand All @@ -73,39 +71,39 @@ private static ShardingSphereDatabase create(final String databaseName, final Da
*
* @param databaseConfigMap database configuration map
* @param props properties
* @param computeNodeInstanceContext compute node instance context
* @param instanceContext compute node instance context
* @return created databases
* @throws SQLException SQL exception
*/
public static Map<String, ShardingSphereDatabase> create(final Map<String, DatabaseConfiguration> databaseConfigMap,
final ConfigurationProperties props, final ComputeNodeInstanceContext computeNodeInstanceContext) throws SQLException {
public static Collection<ShardingSphereDatabase> create(final Map<String, DatabaseConfiguration> databaseConfigMap,
final ConfigurationProperties props, final ComputeNodeInstanceContext instanceContext) throws SQLException {
DatabaseType protocolType = DatabaseTypeEngine.getProtocolType(databaseConfigMap, props);
SystemDatabase systemDatabase = new SystemDatabase(protocolType);
Map<String, ShardingSphereDatabase> result = new ConcurrentHashMap<>(databaseConfigMap.size() + systemDatabase.getSystemDatabaseSchemaMap().size(), 1F);
result.putAll(createGenericDatabases(databaseConfigMap, protocolType, systemDatabase, props, computeNodeInstanceContext));
result.putAll(createSystemDatabases(databaseConfigMap, protocolType, systemDatabase, props));
Collection<ShardingSphereDatabase> result = new LinkedList<>();
result.addAll(createGenericDatabases(databaseConfigMap, protocolType, systemDatabase, props, instanceContext));
result.addAll(createSystemDatabases(databaseConfigMap, protocolType, systemDatabase, props));
return result;
}

private static Map<String, ShardingSphereDatabase> createGenericDatabases(final Map<String, DatabaseConfiguration> databaseConfigMap,
final DatabaseType protocolType, final SystemDatabase systemDatabase,
final ConfigurationProperties props, final ComputeNodeInstanceContext computeNodeInstanceContext) throws SQLException {
Map<String, ShardingSphereDatabase> result = new HashMap<>(databaseConfigMap.size(), 1F);
private static Collection<ShardingSphereDatabase> createGenericDatabases(final Map<String, DatabaseConfiguration> databaseConfigMap,
final DatabaseType protocolType, final SystemDatabase systemDatabase,
final ConfigurationProperties props, final ComputeNodeInstanceContext instanceContext) throws SQLException {
Collection<ShardingSphereDatabase> result = new HashSet<>(databaseConfigMap.size(), 1F);
for (Entry<String, DatabaseConfiguration> entry : databaseConfigMap.entrySet()) {
String databaseName = entry.getKey();
if (!entry.getValue().getStorageUnits().isEmpty() || !systemDatabase.getSystemSchemas().contains(databaseName)) {
result.put(databaseName.toLowerCase(), ShardingSphereDatabase.create(databaseName, protocolType, entry.getValue(), props, computeNodeInstanceContext));
result.add(ShardingSphereDatabase.create(databaseName, protocolType, entry.getValue(), props, instanceContext));
}
}
return result;
}

private static Map<String, ShardingSphereDatabase> createSystemDatabases(final Map<String, DatabaseConfiguration> databaseConfigMap, final DatabaseType protocolType,
final SystemDatabase systemDatabase, final ConfigurationProperties props) {
Map<String, ShardingSphereDatabase> result = new HashMap<>(systemDatabase.getSystemDatabaseSchemaMap().size(), 1F);
private static Collection<ShardingSphereDatabase> createSystemDatabases(final Map<String, DatabaseConfiguration> databaseConfigMap, final DatabaseType protocolType,
final SystemDatabase systemDatabase, final ConfigurationProperties props) {
Collection<ShardingSphereDatabase> result = new HashSet<>(systemDatabase.getSystemDatabaseSchemaMap().size(), 1F);
for (String each : systemDatabase.getSystemDatabaseSchemaMap().keySet()) {
if (!databaseConfigMap.containsKey(each) || databaseConfigMap.get(each).getStorageUnits().isEmpty()) {
result.put(each.toLowerCase(), ShardingSphereDatabase.create(each, protocolType, props));
result.add(ShardingSphereDatabase.create(each, protocolType, props));
}
}
return result;
Expand Down
22 changes: 8 additions & 14 deletions ...org/apache/shardingsphere/infra/metadata/database/ShardingSphereDatabasesFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@
import org.junit.jupiter.api.Test;

import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Map;
import java.util.List;
import java.util.Properties;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;

Expand All @@ -36,18 +39,9 @@ class ShardingSphereDatabasesFactoryTest {
@Test
void assertCreateDatabases() throws SQLException {
DatabaseConfiguration databaseConfig = new DataSourceProvidedDatabaseConfiguration(Collections.emptyMap(), Collections.emptyList());
Map<String, ShardingSphereDatabase> actual = ShardingSphereDatabasesFactory.create(
Collections.singletonMap("foo_db", databaseConfig), new ConfigurationProperties(new Properties()), mock(ComputeNodeInstanceContext.class));
assertTrue(actual.containsKey("foo_db"));
assertTrue(actual.get("foo_db").getResourceMetaData().getStorageUnits().isEmpty());
}

@Test
void assertCreateDatabasesWhenConfigUppercaseDatabaseName() throws SQLException {
DatabaseConfiguration databaseConfig = new DataSourceProvidedDatabaseConfiguration(Collections.emptyMap(), Collections.emptyList());
Map<String, ShardingSphereDatabase> actual = ShardingSphereDatabasesFactory.create(
Collections.singletonMap("FOO_DB", databaseConfig), new ConfigurationProperties(new Properties()), mock(ComputeNodeInstanceContext.class));
assertTrue(actual.containsKey("foo_db"));
assertTrue(actual.get("foo_db").getResourceMetaData().getStorageUnits().isEmpty());
List<ShardingSphereDatabase> actual = new ArrayList<>(ShardingSphereDatabasesFactory.create(
Collections.singletonMap("foo_db", databaseConfig), new ConfigurationProperties(new Properties()), mock(ComputeNodeInstanceContext.class)));
assertThat(actual.get(0).getName(), is("foo_db"));
assertTrue(actual.get(0).getResourceMetaData().getStorageUnits().isEmpty());
}
}
Loading
Loading