You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by to...@apache.org on 2023/06/28 04:39:21 UTC
[shardingsphere] branch master updated: Rename shardingSphereData field name to statistics (#26649)
This is an automated email from the ASF dual-hosted git repository.
totalo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 845bb7faf25 Rename shardingSphereData field name to statistics (#26649)
845bb7faf25 is described below
commit 845bb7faf25c344b677117c42e3686a06960da87
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Wed Jun 28 12:39:15 2023 +0800
Rename shardingSphereData field name to statistics (#26649)
---
...tgreSQLShardingSphereStatisticsBuilderTest.java | 8 ++---
.../driver/executor/DriverExecutor.java | 2 +-
.../ShardingSphereStatisticsScheduleCollector.java | 34 +++++++++---------
.../listener/ShardingSphereDataCollectorTest.java | 6 ++--
.../EnumerablePushDownTableScanExecutorTest.java | 6 ++--
.../mode/manager/ContextManager.java | 40 +++++++++++-----------
.../mode/metadata/MetaDataContexts.java | 18 +++++-----
.../mode/metadata/MetaDataContextsFactory.java | 2 +-
.../mode/metadata/NewMetaDataContextsFactory.java | 2 +-
.../proxy/backend/connector/ProxySQLExecutor.java | 2 +-
.../handler/distsql/rul/sql/PreviewExecutor.java | 2 +-
.../OpenGaussSystemCatalogAdminQueryExecutor.java | 2 +-
12 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/builder/PostgreSQLShardingSphereStatisticsBuilderTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/builder/PostgreSQLShardingSphereStatisticsBuilderTest.java
index bbfa34f30e3..67f655011c6 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/builder/PostgreSQLShardingSphereStatisticsBuilderTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/statistics/builder/PostgreSQLShardingSphereStatisticsBuilderTest.java
@@ -37,10 +37,10 @@ class PostgreSQLShardingSphereStatisticsBuilderTest {
@Test
void assertBuild() {
ShardingSphereMetaData metaData = mockMetaData();
- ShardingSphereStatistics shardingSphereData = new PostgreSQLShardingSphereStatisticsBuilder().build(metaData);
- assertTrue(shardingSphereData.getDatabaseData().containsKey("logic_db"));
- assertTrue(shardingSphereData.getDatabaseData().get("logic_db").getSchemaData().containsKey("pg_catalog"));
- assertTrue(shardingSphereData.getDatabaseData().get("logic_db").getSchemaData().get("pg_catalog").getTableData().containsKey("pg_class"));
+ ShardingSphereStatistics statistics = new PostgreSQLShardingSphereStatisticsBuilder().build(metaData);
+ assertTrue(statistics.getDatabaseData().containsKey("logic_db"));
+ assertTrue(statistics.getDatabaseData().get("logic_db").getSchemaData().containsKey("pg_catalog"));
+ assertTrue(statistics.getDatabaseData().get("logic_db").getSchemaData().get("pg_catalog").getTableData().containsKey("pg_class"));
}
private ShardingSphereMetaData mockMetaData() {
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
index dc75c071b61..6041b2972eb 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
@@ -52,7 +52,7 @@ public final class DriverExecutor implements AutoCloseable {
rawExecutor = new RawExecutor(executorEngine, connection.getDatabaseConnectionManager().getConnectionContext());
ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(connection.getDatabaseName());
String schemaName = DatabaseTypeEngine.getDefaultSchemaName(database.getProtocolType(), connection.getDatabaseName());
- sqlFederationEngine = new SQLFederationEngine(connection.getDatabaseName(), schemaName, metaDataContexts.getMetaData(), metaDataContexts.getShardingSphereData(), jdbcExecutor);
+ sqlFederationEngine = new SQLFederationEngine(connection.getDatabaseName(), schemaName, metaDataContexts.getMetaData(), metaDataContexts.getStatistics(), jdbcExecutor);
trafficExecutor = new TrafficExecutor();
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/listener/ShardingSphereStatisticsScheduleCollector.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/listener/ShardingSphereStatisticsScheduleCollector.java
index 75a73868350..9a6b99c0344 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/listener/ShardingSphereStatisticsScheduleCollector.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/listener/ShardingSphereStatisticsScheduleCollector.java
@@ -71,31 +71,31 @@ public final class ShardingSphereStatisticsScheduleCollector {
@Override
public void run() {
- ShardingSphereStatistics shardingSphereData = contextManager.getMetaDataContexts().getShardingSphereData();
+ ShardingSphereStatistics statistics = contextManager.getMetaDataContexts().getStatistics();
ShardingSphereMetaData metaData = contextManager.getMetaDataContexts().getMetaData();
- ShardingSphereStatistics changedShardingSphereData = new ShardingSphereStatistics();
- shardingSphereData.getDatabaseData().forEach((key, value) -> {
+ ShardingSphereStatistics changedStatistics = new ShardingSphereStatistics();
+ statistics.getDatabaseData().forEach((key, value) -> {
if (metaData.containsDatabase(key)) {
- collectForDatabase(key, value, metaData.getDatabases(), changedShardingSphereData);
+ collectForDatabase(key, value, metaData.getDatabases(), changedStatistics);
}
});
- compareUpdateAndSendEvent(shardingSphereData, changedShardingSphereData, metaData.getDatabases());
+ compareUpdateAndSendEvent(statistics, changedStatistics, metaData.getDatabases());
}
private void collectForDatabase(final String databaseName, final ShardingSphereDatabaseData databaseData,
- final Map<String, ShardingSphereDatabase> databases, final ShardingSphereStatistics changedShardingSphereData) {
+ final Map<String, ShardingSphereDatabase> databases, final ShardingSphereStatistics statistics) {
databaseData.getSchemaData().forEach((key, value) -> {
if (databases.get(databaseName.toLowerCase()).containsSchema(key)) {
- collectForSchema(databaseName, key, value, databases, changedShardingSphereData);
+ collectForSchema(databaseName, key, value, databases, statistics);
}
});
}
private void collectForSchema(final String databaseName, final String schemaName, final ShardingSphereSchemaData schemaData,
- final Map<String, ShardingSphereDatabase> databases, final ShardingSphereStatistics changedShardingSphereData) {
+ final Map<String, ShardingSphereDatabase> databases, final ShardingSphereStatistics statistics) {
schemaData.getTableData().forEach((key, value) -> {
if (databases.get(databaseName.toLowerCase()).getSchema(schemaName).containsTable(key)) {
- collectForTable(databaseName, schemaName, databases.get(databaseName).getSchema(schemaName).getTable(key), databases, changedShardingSphereData);
+ collectForTable(databaseName, schemaName, databases.get(databaseName).getSchema(schemaName).getTable(key), databases, statistics);
}
});
}
@@ -116,30 +116,30 @@ public final class ShardingSphereStatisticsScheduleCollector {
.getSchemaData().computeIfAbsent(schemaName, key -> new ShardingSphereSchemaData()).getTableData().put(table.getName().toLowerCase(), optional));
}
- private void compareUpdateAndSendEvent(final ShardingSphereStatistics shardingSphereData, final ShardingSphereStatistics changedShardingSphereData,
+ private void compareUpdateAndSendEvent(final ShardingSphereStatistics statistics, final ShardingSphereStatistics changedStatistics,
final Map<String, ShardingSphereDatabase> databases) {
- changedShardingSphereData.getDatabaseData().forEach((key, value) -> compareUpdateAndSendEventForDatabase(key, shardingSphereData.getDatabaseData().get(key), value, shardingSphereData,
+ changedStatistics.getDatabaseData().forEach((key, value) -> compareUpdateAndSendEventForDatabase(key, statistics.getDatabaseData().get(key), value, statistics,
databases.get(key.toLowerCase())));
}
private void compareUpdateAndSendEventForDatabase(final String databaseName, final ShardingSphereDatabaseData databaseData, final ShardingSphereDatabaseData changedDatabaseData,
- final ShardingSphereStatistics shardingSphereData, final ShardingSphereDatabase database) {
- changedDatabaseData.getSchemaData().forEach((key, value) -> compareUpdateAndSendEventForSchema(databaseName, key, databaseData.getSchemaData().get(key), value, shardingSphereData,
+ final ShardingSphereStatistics statistics, final ShardingSphereDatabase database) {
+ changedDatabaseData.getSchemaData().forEach((key, value) -> compareUpdateAndSendEventForSchema(databaseName, key, databaseData.getSchemaData().get(key), value, statistics,
database.getSchema(key)));
}
private void compareUpdateAndSendEventForSchema(final String databaseName, final String schemaName, final ShardingSphereSchemaData schemaData,
- final ShardingSphereSchemaData changedSchemaData, final ShardingSphereStatistics shardingSphereData, final ShardingSphereSchema schema) {
- changedSchemaData.getTableData().forEach((key, value) -> compareUpdateAndSendEventForTable(databaseName, schemaName, schemaData.getTableData().get(key), value, shardingSphereData,
+ final ShardingSphereSchemaData changedSchemaData, final ShardingSphereStatistics statistics, final ShardingSphereSchema schema) {
+ changedSchemaData.getTableData().forEach((key, value) -> compareUpdateAndSendEventForTable(databaseName, schemaName, schemaData.getTableData().get(key), value, statistics,
schema.getTable(key)));
}
private void compareUpdateAndSendEventForTable(final String databaseName, final String schemaName, final ShardingSphereTableData tableData,
- final ShardingSphereTableData changedTableData, final ShardingSphereStatistics shardingSphereData, final ShardingSphereTable table) {
+ final ShardingSphereTableData changedTableData, final ShardingSphereStatistics statistics, final ShardingSphereTable table) {
if (tableData.equals(changedTableData)) {
return;
}
- shardingSphereData.getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().put(changedTableData.getName().toLowerCase(), changedTableData);
+ statistics.getDatabaseData().get(databaseName).getSchemaData().get(schemaName).getTableData().put(changedTableData.getName().toLowerCase(), changedTableData);
ShardingSphereSchemaDataAlteredEvent event = getShardingSphereSchemaDataAlteredEvent(databaseName, schemaName, tableData, changedTableData, table);
contextManager.getInstanceContext().getEventBusContext().post(event);
}
diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/listener/ShardingSphereDataCollectorTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/listener/ShardingSphereDataCollectorTest.java
index 0ca88a1309f..9147027b600 100644
--- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/listener/ShardingSphereDataCollectorTest.java
+++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/listener/ShardingSphereDataCollectorTest.java
@@ -47,8 +47,8 @@ class ShardingSphereDataCollectorTest {
@Test
void assertCollect() {
ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- ShardingSphereStatistics shardingSphereData = mockShardingSphereData();
- when(contextManager.getMetaDataContexts().getShardingSphereData()).thenReturn(shardingSphereData);
+ ShardingSphereStatistics statistics = mockStatistics();
+ when(contextManager.getMetaDataContexts().getStatistics()).thenReturn(statistics);
ShardingSphereMetaData metaData = mockMetaData();
when(contextManager.getMetaDataContexts().getMetaData()).thenReturn(metaData);
when(contextManager.getMetaDataContexts().getMetaData().getProps()).thenReturn(new ConfigurationProperties(new Properties()));
@@ -56,7 +56,7 @@ class ShardingSphereDataCollectorTest {
verify(contextManager).getInstanceContext();
}
- private ShardingSphereStatistics mockShardingSphereData() {
+ private ShardingSphereStatistics mockStatistics() {
ShardingSphereStatistics result = new ShardingSphereStatistics();
ShardingSphereDatabaseData shardingSphereDatabaseData = new ShardingSphereDatabaseData();
result.getDatabaseData().put("logic_db", shardingSphereDatabaseData);
diff --git a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerablePushDownTableScanExecutorTest.java b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerablePushDownTableScanExecutorTest.java
index 6525def23d8..fa55e35f9a0 100644
--- a/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerablePushDownTableScanExecutorTest.java
+++ b/kernel/sql-federation/core/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerablePushDownTableScanExecutorTest.java
@@ -48,9 +48,9 @@ class EnumerablePushDownTableScanExecutorTest {
TableScanExecutorContext executorContext = Mockito.mock(TableScanExecutorContext.class);
when(executorContext.getDatabaseName()).thenReturn("db");
when(executorContext.getSchemaName()).thenReturn("pg_catalog");
- ShardingSphereStatistics shardingSphereData = mock(ShardingSphereStatistics.class, RETURNS_DEEP_STUBS);
+ ShardingSphereStatistics statistics = mock(ShardingSphereStatistics.class, RETURNS_DEEP_STUBS);
ShardingSphereDatabaseData databaseData = mock(ShardingSphereDatabaseData.class, RETURNS_DEEP_STUBS);
- when(shardingSphereData.getDatabaseData().get("db")).thenReturn(databaseData);
+ when(statistics.getDatabaseData().get("db")).thenReturn(databaseData);
ShardingSphereSchemaData schemaData = mock(ShardingSphereSchemaData.class, RETURNS_DEEP_STUBS);
when(databaseData.getSchemaData().get("pg_catalog")).thenReturn(schemaData);
ShardingSphereTableData tableData = mock(ShardingSphereTableData.class);
@@ -58,7 +58,7 @@ class EnumerablePushDownTableScanExecutorTest {
when(schemaData.getTableData().get("test")).thenReturn(tableData);
ShardingSphereTable shardingSphereTable = mock(ShardingSphereTable.class);
when(shardingSphereTable.getName()).thenReturn("test");
- Enumerable<Object[]> enumerable = new EnumerablePushDownTableScanExecutor(null, null, null, optimizerContext, null, executorContext, shardingSphereData)
+ Enumerable<Object[]> enumerable = new EnumerablePushDownTableScanExecutor(null, null, null, optimizerContext, null, executorContext, statistics)
.execute(shardingSphereTable, mock(EnumerablePushDownTableScanExecutorContext.class));
try (Enumerator<Object[]> actual = enumerable.enumerator()) {
actual.moveNext();
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 173ea8f2b26..e9e8bebfa84 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -320,7 +320,7 @@ public final class ContextManager implements AutoCloseable {
MetaDataContexts reloadMetaDataContexts = createMetaDataContexts(databaseName, false, switchingResource, null);
reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getSchemas().forEach((schemaName, schema) -> reloadMetaDataContexts.getPersistService().getDatabaseMetaDataService()
.persist(reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getName(), schemaName, schema));
- Optional.ofNullable(reloadMetaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName))
+ Optional.ofNullable(reloadMetaDataContexts.getStatistics().getDatabaseData().get(databaseName))
.ifPresent(optional -> optional.getSchemaData().forEach((schemaName, schemaData) -> reloadMetaDataContexts.getPersistService().getShardingSphereDataPersistService()
.persist(databaseName, schemaName, schemaData, metaDataContexts.get().getMetaData().getDatabases())));
alterSchemaMetaData(databaseName, reloadMetaDataContexts.getMetaData().getDatabase(databaseName), metaDataContexts.get().getMetaData().getDatabase(databaseName));
@@ -405,7 +405,7 @@ public final class ContextManager implements AutoCloseable {
MetaDataContexts reloadMetaDataContexts = createMetaDataContexts(databaseName, false, switchingResource, null);
reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getSchemas().forEach((schemaName, schema) -> reloadMetaDataContexts.getPersistService().getDatabaseMetaDataService()
.persist(reloadMetaDataContexts.getMetaData().getDatabase(databaseName).getName(), schemaName, schema));
- Optional.ofNullable(reloadMetaDataContexts.getShardingSphereData().getDatabaseData().get(databaseName))
+ Optional.ofNullable(reloadMetaDataContexts.getStatistics().getDatabaseData().get(databaseName))
.ifPresent(optional -> optional.getSchemaData().forEach((schemaName, schemaData) -> reloadMetaDataContexts.getPersistService().getShardingSphereDataPersistService()
.persist(databaseName, schemaName, schemaData, metaDataContexts.get().getMetaData().getDatabases())));
alterSchemaMetaData(databaseName, reloadMetaDataContexts.getMetaData().getDatabase(databaseName), metaDataContexts.get().getMetaData().getDatabase(databaseName));
@@ -741,10 +741,10 @@ public final class ContextManager implements AutoCloseable {
* @param databaseName database name
*/
public synchronized void addShardingSphereDatabaseData(final String databaseName) {
- if (metaDataContexts.get().getShardingSphereData().containsDatabase(databaseName)) {
+ if (metaDataContexts.get().getStatistics().containsDatabase(databaseName)) {
return;
}
- metaDataContexts.get().getShardingSphereData().putDatabase(databaseName, new ShardingSphereDatabaseData());
+ metaDataContexts.get().getStatistics().putDatabase(databaseName, new ShardingSphereDatabaseData());
}
/**
@@ -753,10 +753,10 @@ public final class ContextManager implements AutoCloseable {
* @param databaseName database name
*/
public synchronized void dropShardingSphereDatabaseData(final String databaseName) {
- if (!metaDataContexts.get().getShardingSphereData().containsDatabase(databaseName)) {
+ if (!metaDataContexts.get().getStatistics().containsDatabase(databaseName)) {
return;
}
- metaDataContexts.get().getShardingSphereData().dropDatabase(databaseName);
+ metaDataContexts.get().getStatistics().dropDatabase(databaseName);
}
/**
@@ -766,10 +766,10 @@ public final class ContextManager implements AutoCloseable {
* @param schemaName schema name
*/
public synchronized void addShardingSphereSchemaData(final String databaseName, final String schemaName) {
- if (metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).containsSchema(schemaName)) {
+ if (metaDataContexts.get().getStatistics().getDatabase(databaseName).containsSchema(schemaName)) {
return;
}
- metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).putSchema(schemaName, new ShardingSphereSchemaData());
+ metaDataContexts.get().getStatistics().getDatabase(databaseName).putSchema(schemaName, new ShardingSphereSchemaData());
}
/**
@@ -779,7 +779,7 @@ public final class ContextManager implements AutoCloseable {
* @param schemaName schema name
*/
public synchronized void dropShardingSphereSchemaData(final String databaseName, final String schemaName) {
- ShardingSphereDatabaseData databaseData = metaDataContexts.get().getShardingSphereData().getDatabase(databaseName);
+ ShardingSphereDatabaseData databaseData = metaDataContexts.get().getStatistics().getDatabase(databaseName);
if (null == databaseData || !databaseData.containsSchema(schemaName)) {
return;
}
@@ -794,13 +794,13 @@ public final class ContextManager implements AutoCloseable {
* @param tableName table name
*/
public synchronized void addShardingSphereTableData(final String databaseName, final String schemaName, final String tableName) {
- if (!metaDataContexts.get().getShardingSphereData().containsDatabase(databaseName) || !metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).containsSchema(schemaName)) {
+ if (!metaDataContexts.get().getStatistics().containsDatabase(databaseName) || !metaDataContexts.get().getStatistics().getDatabase(databaseName).containsSchema(schemaName)) {
return;
}
- if (metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).getSchema(schemaName).containsTable(tableName)) {
+ if (metaDataContexts.get().getStatistics().getDatabase(databaseName).getSchema(schemaName).containsTable(tableName)) {
return;
}
- metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).getSchema(schemaName).putTable(tableName, new ShardingSphereTableData(tableName));
+ metaDataContexts.get().getStatistics().getDatabase(databaseName).getSchema(schemaName).putTable(tableName, new ShardingSphereTableData(tableName));
}
/**
@@ -811,10 +811,10 @@ public final class ContextManager implements AutoCloseable {
* @param tableName table name
*/
public synchronized void dropShardingSphereTableData(final String databaseName, final String schemaName, final String tableName) {
- if (!metaDataContexts.get().getShardingSphereData().containsDatabase(databaseName) || !metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).containsSchema(schemaName)) {
+ if (!metaDataContexts.get().getStatistics().containsDatabase(databaseName) || !metaDataContexts.get().getStatistics().getDatabase(databaseName).containsSchema(schemaName)) {
return;
}
- metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).getSchema(schemaName).removeTable(tableName);
+ metaDataContexts.get().getStatistics().getDatabase(databaseName).getSchema(schemaName).removeTable(tableName);
}
/**
@@ -826,15 +826,15 @@ public final class ContextManager implements AutoCloseable {
* @param yamlRowData yaml row data
*/
public synchronized void alterShardingSphereRowData(final String databaseName, final String schemaName, final String tableName, final YamlShardingSphereRowData yamlRowData) {
- if (!metaDataContexts.get().getShardingSphereData().containsDatabase(databaseName) || !metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).containsSchema(schemaName)
- || !metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).getSchema(schemaName).containsTable(tableName)) {
+ if (!metaDataContexts.get().getStatistics().containsDatabase(databaseName) || !metaDataContexts.get().getStatistics().getDatabase(databaseName).containsSchema(schemaName)
+ || !metaDataContexts.get().getStatistics().getDatabase(databaseName).getSchema(schemaName).containsTable(tableName)) {
return;
}
if (!metaDataContexts.get().getMetaData().containsDatabase(databaseName) || !metaDataContexts.get().getMetaData().getDatabase(databaseName).containsSchema(schemaName)
|| !metaDataContexts.get().getMetaData().getDatabase(databaseName).getSchema(schemaName).containsTable(tableName)) {
return;
}
- ShardingSphereTableData tableData = metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).getSchema(schemaName).getTable(tableName);
+ ShardingSphereTableData tableData = metaDataContexts.get().getStatistics().getDatabase(databaseName).getSchema(schemaName).getTable(tableName);
List<ShardingSphereColumn> columns = new ArrayList<>(metaDataContexts.get().getMetaData().getDatabase(databaseName).getSchema(schemaName).getTable(tableName).getColumnValues());
tableData.getRows().add(new YamlShardingSphereRowDataSwapper(columns).swapToObject(yamlRowData));
}
@@ -848,11 +848,11 @@ public final class ContextManager implements AutoCloseable {
* @param uniqueKey row uniqueKey
*/
public synchronized void deleteShardingSphereRowData(final String databaseName, final String schemaName, final String tableName, final String uniqueKey) {
- if (!metaDataContexts.get().getShardingSphereData().containsDatabase(databaseName) || !metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).containsSchema(schemaName)
- || !metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).getSchema(schemaName).containsTable(tableName)) {
+ if (!metaDataContexts.get().getStatistics().containsDatabase(databaseName) || !metaDataContexts.get().getStatistics().getDatabase(databaseName).containsSchema(schemaName)
+ || !metaDataContexts.get().getStatistics().getDatabase(databaseName).getSchema(schemaName).containsTable(tableName)) {
return;
}
- metaDataContexts.get().getShardingSphereData().getDatabase(databaseName).getSchema(schemaName).getTable(tableName).getRows().removeIf(each -> uniqueKey.equals(each.getUniqueKey()));
+ metaDataContexts.get().getStatistics().getDatabase(databaseName).getSchema(schemaName).getTable(tableName).getRows().removeIf(each -> uniqueKey.equals(each.getUniqueKey()));
}
/**
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
index 115a256e78f..2c72f21d4e1 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContexts.java
@@ -42,15 +42,15 @@ public final class MetaDataContexts implements AutoCloseable {
private final ShardingSphereMetaData metaData;
- private final ShardingSphereStatistics shardingSphereData;
+ private final ShardingSphereStatistics statistics;
public MetaDataContexts(final MetaDataBasedPersistService persistService, final ShardingSphereMetaData metaData) {
this.persistService = persistService;
this.metaData = metaData;
- this.shardingSphereData = initShardingSphereData(metaData);
+ this.statistics = initStatistics(metaData);
}
- private ShardingSphereStatistics initShardingSphereData(final ShardingSphereMetaData metaData) {
+ private ShardingSphereStatistics initStatistics(final ShardingSphereMetaData metaData) {
if (metaData.getDatabases().isEmpty()) {
return new ShardingSphereStatistics();
}
@@ -59,16 +59,16 @@ public final class MetaDataContexts implements AutoCloseable {
.flatMap(protocolType -> TypedSPILoader.findService(ShardingSphereStatisticsBuilder.class, protocolType instanceof SchemaSupportedDatabaseType ? "PostgreSQL" : protocolType.getType())
.map(builder -> builder.build(metaData)))
.orElseGet(ShardingSphereStatistics::new);
- Optional<ShardingSphereStatistics> loadedShardingSphereData = Optional.ofNullable(persistService.getShardingSphereDataPersistService())
+ Optional<ShardingSphereStatistics> loadedStatistics = Optional.ofNullable(persistService.getShardingSphereDataPersistService())
.flatMap(shardingSphereDataPersistService -> shardingSphereDataPersistService.load(metaData));
- loadedShardingSphereData.ifPresent(optional -> useLoadedToReplaceInit(result, optional));
+ loadedStatistics.ifPresent(optional -> useLoadedToReplaceInit(result, optional));
return result;
}
- private void useLoadedToReplaceInit(final ShardingSphereStatistics initShardingSphereData, final ShardingSphereStatistics loadedShardingSphereData) {
- for (Entry<String, ShardingSphereDatabaseData> entry : initShardingSphereData.getDatabaseData().entrySet()) {
- if (loadedShardingSphereData.getDatabaseData().containsKey(entry.getKey())) {
- useLoadedToReplaceInitByDatabaseData(entry.getValue(), loadedShardingSphereData.getDatabaseData().get(entry.getKey()));
+ private void useLoadedToReplaceInit(final ShardingSphereStatistics initStatistics, final ShardingSphereStatistics loadedStatistics) {
+ for (Entry<String, ShardingSphereDatabaseData> entry : initStatistics.getDatabaseData().entrySet()) {
+ if (loadedStatistics.getDatabaseData().containsKey(entry.getKey())) {
+ useLoadedToReplaceInitByDatabaseData(entry.getValue(), loadedStatistics.getDatabaseData().get(entry.getKey()));
}
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
index 51d51bfbc6d..55c5a39e714 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
@@ -150,7 +150,7 @@ public final class MetaDataContextsFactory {
private static void persistMetaData(final MetaDataContexts metaDataContexts) {
metaDataContexts.getMetaData().getDatabases().values().forEach(each -> each.getSchemas()
.forEach((schemaName, schema) -> metaDataContexts.getPersistService().getDatabaseMetaDataService().persist(each.getName(), schemaName, schema)));
- metaDataContexts.getShardingSphereData().getDatabaseData().forEach((databaseName, databaseData) -> databaseData.getSchemaData().forEach((schemaName, schemaData) -> metaDataContexts
+ metaDataContexts.getStatistics().getDatabaseData().forEach((databaseName, databaseData) -> databaseData.getSchemaData().forEach((schemaName, schemaData) -> metaDataContexts
.getPersistService().getShardingSphereDataPersistService().persist(databaseName, schemaName, schemaData, metaDataContexts.getMetaData().getDatabases())));
}
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/NewMetaDataContextsFactory.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/NewMetaDataContextsFactory.java
index 72f9d93c970..976230b57f0 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/NewMetaDataContextsFactory.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/NewMetaDataContextsFactory.java
@@ -152,7 +152,7 @@ public final class NewMetaDataContextsFactory {
private static void persistMetaData(final MetaDataContexts metaDataContexts) {
metaDataContexts.getMetaData().getDatabases().values().forEach(each -> each.getSchemas()
.forEach((schemaName, schema) -> metaDataContexts.getPersistService().getDatabaseMetaDataService().persist(each.getName(), schemaName, schema)));
- metaDataContexts.getShardingSphereData().getDatabaseData().forEach((databaseName, databaseData) -> databaseData.getSchemaData().forEach((schemaName, schemaData) -> metaDataContexts
+ metaDataContexts.getStatistics().getDatabaseData().forEach((databaseName, databaseData) -> databaseData.getSchemaData().forEach((schemaName, schemaData) -> metaDataContexts
.getPersistService().getShardingSphereDataPersistService().persist(databaseName, schemaName, schemaData, metaDataContexts.getMetaData().getDatabases())));
}
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
index 182d508eda0..30d4ccd2c46 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
@@ -104,7 +104,7 @@ public final class ProxySQLExecutor {
String databaseName = databaseConnectionManager.getConnectionSession().getDatabaseName();
String schemaName = queryContext.getSqlStatementContext().getTablesContext().getSchemaName()
.orElseGet(() -> DatabaseTypeEngine.getDefaultSchemaName(queryContext.getSqlStatementContext().getDatabaseType(), databaseName));
- sqlFederationEngine = new SQLFederationEngine(databaseName, schemaName, metaDataContexts.getMetaData(), metaDataContexts.getShardingSphereData(), jdbcExecutor);
+ sqlFederationEngine = new SQLFederationEngine(databaseName, schemaName, metaDataContexts.getMetaData(), metaDataContexts.getStatistics(), jdbcExecutor);
}
/**
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewExecutor.java
index 94a6215ed20..07f9084f0ef 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/PreviewExecutor.java
@@ -102,7 +102,7 @@ public final class PreviewExecutor implements ConnectionSessionRequiredRULExecut
ShardingSpherePreconditions.checkState(database.isComplete(), () -> new RuleNotExistedException(connectionSession.getDatabaseName()));
ConfigurationProperties props = metaDataContexts.getMetaData().getProps();
String schemaName = queryContext.getSqlStatementContext().getTablesContext().getSchemaName().orElseGet(() -> DatabaseTypeEngine.getDefaultSchemaName(database.getProtocolType(), databaseName));
- SQLFederationEngine sqlFederationEngine = new SQLFederationEngine(databaseName, schemaName, metaDataContexts.getMetaData(), metaDataContexts.getShardingSphereData(),
+ SQLFederationEngine sqlFederationEngine = new SQLFederationEngine(databaseName, schemaName, metaDataContexts.getMetaData(), metaDataContexts.getStatistics(),
new JDBCExecutor(BackendExecutorContext.getInstance().getExecutorEngine(), connectionSession.getConnectionContext()));
Collection<ExecutionUnit> executionUnits = isUseFederation(queryContext, metaDataContexts, connectionSession, sqlFederationEngine)
? getFederationExecutionUnits(queryContext, metaDataContexts, connectionSession, sqlFederationEngine)
diff --git a/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutor.java b/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutor.java
index 2125aa36d3f..1beb2817483 100644
--- a/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutor.java
+++ b/proxy/backend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutor.java
@@ -83,7 +83,7 @@ public final class OpenGaussSystemCatalogAdminQueryExecutor implements DatabaseA
public void execute(final ConnectionSession connectionSession) throws SQLException {
MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
JDBCExecutor jdbcExecutor = new JDBCExecutor(BackendExecutorContext.getInstance().getExecutorEngine(), connectionSession.getConnectionContext());
- try (SQLFederationEngine sqlFederationEngine = new SQLFederationEngine(databaseName, PG_CATALOG, metaDataContexts.getMetaData(), metaDataContexts.getShardingSphereData(), jdbcExecutor)) {
+ try (SQLFederationEngine sqlFederationEngine = new SQLFederationEngine(databaseName, PG_CATALOG, metaDataContexts.getMetaData(), metaDataContexts.getStatistics(), jdbcExecutor)) {
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = createDriverExecutionPrepareEngine(metaDataContexts, connectionSession);
SQLFederationExecutorContext context = new SQLFederationExecutorContext(false, new QueryContext(sqlStatementContext, sql, parameters), metaDataContexts.getMetaData());
ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);