This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 55c26fbe247 Rename backendDatabaseType to storageType (#17854)
55c26fbe247 is described below
commit 55c26fbe247bd3fcf34877dadeb406b9c7c7e722
Author: Liang Zhang <[email protected]>
AuthorDate: Sun May 22 13:22:43 2022 +0800
Rename backendDatabaseType to storageType (#17854)
---
.../encrypt/metadata/EncryptSchemaMetaDataBuilder.java | 2 +-
.../sharding/metadata/ShardingSchemaMetaDataBuilder.java | 2 +-
.../infra/database/type/DatabaseTypeEngine.java | 6 +++---
.../infra/metadata/ShardingSphereDatabase.java | 6 +++---
.../metadata/schema/builder/SchemaBuilderMaterials.java | 2 +-
.../infra/metadata/schema/builder/TableMetaDataBuilder.java | 6 +++---
.../infra/metadata/schema/loader/SchemaLoader.java | 7 +++----
.../infra/metadata/schema/util/TableMetaDataUtil.java | 2 +-
.../apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java | 6 +++---
.../infra/rewrite/engine/GenericSQLRewriteEngine.java | 4 ++--
.../infra/rewrite/engine/RouteSQLRewriteEngine.java | 4 ++--
.../metadata/SingleTableSchemaMetaDataBuilder.java | 2 +-
.../shardingsphere/sqltranslator/spi/SQLTranslator.java | 4 ++--
.../shardingsphere/sqltranslator/rule/SQLTranslatorRule.java | 8 ++++----
.../shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java | 4 ++--
.../sqltranslator/natived/NativeSQLTranslator.java | 2 +-
.../mode/metadata/MetaDataContextsBuilder.java | 12 ++++++------
.../distsql/ral/advanced/ParseDistSQLBackendHandler.java | 4 ++--
18 files changed, 41 insertions(+), 42 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptSchemaMetaDataBuilder.java
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptSchemaMetaDataBuilder.java
index ce09dc14d98..ee46fcca6aa 100644
---
a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptSchemaMetaDataBuilder.java
+++
b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/main/java/org/apache/shardingsphere/encrypt/metadata/EncryptSchemaMetaDataBuilder.java
@@ -55,7 +55,7 @@ public final class EncryptSchemaMetaDataBuilder implements
RuleBasedSchemaMetaDa
if (tableMetaDataLoaderMaterials.isEmpty()) {
return Collections.emptyMap();
}
- return SchemaMetaDataLoaderEngine.load(tableMetaDataLoaderMaterials,
materials.getBackendDatabaseType());
+ return SchemaMetaDataLoaderEngine.load(tableMetaDataLoaderMaterials,
materials.getStorageType());
}
@Override
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataBuilder.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataBuilder.java
index b3975bd2c9f..3c1fa12a5b8 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataBuilder.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataBuilder.java
@@ -63,7 +63,7 @@ public final class ShardingSchemaMetaDataBuilder implements
RuleBasedSchemaMetaD
if (tableMetaDataLoaderMaterials.isEmpty()) {
return Collections.emptyMap();
}
- Map<String, SchemaMetaData> result =
SchemaMetaDataLoaderEngine.load(tableMetaDataLoaderMaterials,
materials.getBackendDatabaseType());
+ Map<String, SchemaMetaData> result =
SchemaMetaDataLoaderEngine.load(tableMetaDataLoaderMaterials,
materials.getStorageType());
if (isCheckingMetaData) {
checkMetaData(result, rule);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngine.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngine.java
index b4a6e7b470c..0b7635953e3 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngine.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/database/type/DatabaseTypeEngine.java
@@ -58,12 +58,12 @@ public final class DatabaseTypeEngine {
}
/**
- * Get backend database type.
+ * Get storage type.
*
* @param databaseConfigs database configs
- * @return backend database type
+ * @return storage type
*/
- public static DatabaseType getBackendDatabaseType(final Map<String, ?
extends DatabaseConfiguration> databaseConfigs) {
+ public static DatabaseType getStorageType(final Map<String, ? extends
DatabaseConfiguration> databaseConfigs) {
return getDatabaseType(
databaseConfigs.values().stream().filter(DatabaseTypeEngine::isComplete).findFirst().map(optional
-> optional.getDataSources().values()).orElseGet(Collections::emptyList));
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereDatabase.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereDatabase.java
index 4d4bec715bb..2fe0b2d1edd 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereDatabase.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/ShardingSphereDatabase.java
@@ -66,17 +66,17 @@ public final class ShardingSphereDatabase {
*
* @param name database name
* @param protocolType database protocol type
- * @param backendDatabaseType backend database type
+ * @param storageType storage type
* @param databaseConfig database configuration
* @param props configuration properties
* @return database meta data
* @throws SQLException SQL exception
*/
- public static ShardingSphereDatabase create(final String name, final
DatabaseType protocolType, final DatabaseType backendDatabaseType,
+ public static ShardingSphereDatabase create(final String name, final
DatabaseType protocolType, final DatabaseType storageType,
final DatabaseConfiguration
databaseConfig, final ConfigurationProperties props) throws SQLException {
Collection<ShardingSphereRule> databaseRules =
DatabaseRulesBuilder.build(name, databaseConfig, props);
Map<String, ShardingSphereSchema> schemas = new ConcurrentHashMap<>();
- schemas.putAll(SchemaLoader.load(name, protocolType,
backendDatabaseType, databaseConfig.getDataSources(), databaseRules, props));
+ schemas.putAll(SchemaLoader.load(name, protocolType, storageType,
databaseConfig.getDataSources(), databaseRules, props));
schemas.putAll(SystemSchemaBuilder.build(name, protocolType));
return create(name, protocolType, databaseConfig, databaseRules,
schemas);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilderMaterials.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilderMaterials.java
index 9f3053e29a2..efb9df35a4c 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilderMaterials.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/SchemaBuilderMaterials.java
@@ -36,7 +36,7 @@ public final class SchemaBuilderMaterials {
private final DatabaseType protocolType;
- private final DatabaseType backendDatabaseType;
+ private final DatabaseType storageType;
private final Map<String, DataSource> dataSourceMap;
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/TableMetaDataBuilder.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/TableMetaDataBuilder.java
index 676a199b0d3..2cf9bf42aa2 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/TableMetaDataBuilder.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/TableMetaDataBuilder.java
@@ -104,13 +104,13 @@ public final class TableMetaDataBuilder {
private static Map<String, SchemaMetaData>
getFrontendSchemaMetaDataMap(final Map<String, SchemaMetaData>
schemaMetaDataMap, final SchemaBuilderMaterials materials) {
DatabaseType protocolType = materials.getProtocolType();
- DatabaseType backendDatabaseType = materials.getBackendDatabaseType();
- if (protocolType.equals(backendDatabaseType)) {
+ DatabaseType storageType = materials.getStorageType();
+ if (protocolType.equals(storageType)) {
return schemaMetaDataMap;
}
Map<String, SchemaMetaData> result = new LinkedHashMap<>();
Map<String, TableMetaData> tableMetaDataMap =
Optional.ofNullable(schemaMetaDataMap.get(
-
backendDatabaseType.getDefaultSchema(materials.getDefaultSchemaName()))).map(SchemaMetaData::getTables).orElseGet(Collections::emptyMap);
+
storageType.getDefaultSchema(materials.getDefaultSchemaName()))).map(SchemaMetaData::getTables).orElseGet(Collections::emptyMap);
String frontendSchemaName =
protocolType.getDefaultSchema(materials.getDefaultSchemaName());
result.put(frontendSchemaName, new SchemaMetaData(frontendSchemaName,
tableMetaDataMap));
return result;
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/SchemaLoader.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/SchemaLoader.java
index bad3ad1bbc8..ab58cd2db97 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/SchemaLoader.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/loader/SchemaLoader.java
@@ -45,18 +45,17 @@ public final class SchemaLoader {
*
* @param defaultSchemaName default schema name
* @param protocolType protocol type
- * @param backendDatabaseType backend database type
+ * @param storageType storage type
* @param dataSourceMap data source map
* @param rules rules
* @param props configuration properties
* @return loaded schema
* @throws SQLException SQL exception
*/
- public static Map<String, ShardingSphereSchema> load(final String
defaultSchemaName, final DatabaseType protocolType,
- final DatabaseType
backendDatabaseType, final Map<String, DataSource> dataSourceMap,
+ public static Map<String, ShardingSphereSchema> load(final String
defaultSchemaName, final DatabaseType protocolType, final DatabaseType
storageType, final Map<String, DataSource> dataSourceMap,
final
Collection<ShardingSphereRule> rules, final ConfigurationProperties props)
throws SQLException {
Map<String, SchemaMetaData> schemaMetaDataMap =
TableMetaDataBuilder.load(
- getAllTableNames(rules), new
SchemaBuilderMaterials(protocolType, backendDatabaseType, dataSourceMap, rules,
props, defaultSchemaName));
+ getAllTableNames(rules), new
SchemaBuilderMaterials(protocolType, storageType, dataSourceMap, rules, props,
defaultSchemaName));
if (schemaMetaDataMap.isEmpty()) {
return Collections.singletonMap(defaultSchemaName, new
ShardingSphereSchema());
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/util/TableMetaDataUtil.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/util/TableMetaDataUtil.java
index c64e06a881c..e28ecca563e 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/util/TableMetaDataUtil.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/util/TableMetaDataUtil.java
@@ -52,7 +52,7 @@ public class TableMetaDataUtil {
Map<String, Collection<String>> dataSourceTableGroups = new
LinkedHashMap<>();
DataNodes dataNodes = new DataNodes(materials.getRules());
for (String each : tableNames) {
-
checkDataSourceTypeIncludeInstanceAndSetDatabaseTableMap(materials.getBackendDatabaseType(),
dataNodes, each);
+
checkDataSourceTypeIncludeInstanceAndSetDatabaseTableMap(materials.getStorageType(),
dataNodes, each);
if (checkMetaDataEnable) {
addAllActualTableDataNode(materials, dataSourceTableGroups,
dataNodes, each);
} else {
diff --git
a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
index aa8ad149633..265932d4412 100644
---
a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
+++
b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
@@ -67,10 +67,10 @@ public final class SQLRewriteEntry {
SQLRewriteContext sqlRewriteContext = createSQLRewriteContext(sql,
parameters, sqlStatementContext, routeContext);
SQLTranslatorRule rule =
database.getRuleMetaData().findSingleRule(SQLTranslatorRule.class).orElse(new
SQLTranslatorRule(new SQLTranslatorRuleConfiguration()));
DatabaseType protocolType = database.getProtocolType();
- DatabaseType backendDatabaseType =
database.getResource().getDatabaseType();
+ DatabaseType storageType = database.getResource().getDatabaseType();
return routeContext.getRouteUnits().isEmpty()
- ? new GenericSQLRewriteEngine(rule, protocolType,
backendDatabaseType).rewrite(sqlRewriteContext)
- : new RouteSQLRewriteEngine(rule, protocolType,
backendDatabaseType).rewrite(sqlRewriteContext, routeContext);
+ ? new GenericSQLRewriteEngine(rule, protocolType,
storageType).rewrite(sqlRewriteContext)
+ : new RouteSQLRewriteEngine(rule, protocolType,
storageType).rewrite(sqlRewriteContext, routeContext);
}
private SQLRewriteContext createSQLRewriteContext(final String sql, final
List<Object> parameters, final SQLStatementContext<?> sqlStatementContext,
final RouteContext routeContext) {
diff --git
a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java
b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java
index 14762a91a1c..f0c050c5f3a 100644
---
a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java
+++
b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java
@@ -35,7 +35,7 @@ public final class GenericSQLRewriteEngine {
private final DatabaseType protocolType;
- private final DatabaseType backendDatabaseType;
+ private final DatabaseType storageType;
/**
* Rewrite SQL and parameters.
@@ -45,7 +45,7 @@ public final class GenericSQLRewriteEngine {
*/
public GenericSQLRewriteResult rewrite(final SQLRewriteContext
sqlRewriteContext) {
String sql = translatorRule.translate(
- new DefaultSQLBuilder(sqlRewriteContext).toSQL(),
sqlRewriteContext.getSqlStatementContext().getSqlStatement(), protocolType,
backendDatabaseType);
+ new DefaultSQLBuilder(sqlRewriteContext).toSQL(),
sqlRewriteContext.getSqlStatementContext().getSqlStatement(), protocolType,
storageType);
return new GenericSQLRewriteResult(new SQLRewriteUnit(sql,
sqlRewriteContext.getParameterBuilder().getParameters()));
}
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
index 2ad5f223f0e..599521ae8f8 100644
---
a/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
+++
b/shardingsphere-infra/shardingsphere-infra-rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
@@ -53,7 +53,7 @@ public final class RouteSQLRewriteEngine {
private final DatabaseType protocolType;
- private final DatabaseType backendDatabaseType;
+ private final DatabaseType storageType;
/**
* Rewrite SQL and parameters.
@@ -156,7 +156,7 @@ public final class RouteSQLRewriteEngine {
private Map<RouteUnit, SQLRewriteUnit> translate(final SQLStatement
sqlStatement, final Map<RouteUnit, SQLRewriteUnit> sqlRewriteUnits) {
Map<RouteUnit, SQLRewriteUnit> result = new
LinkedHashMap<>(sqlRewriteUnits.size(), 1);
for (Entry<RouteUnit, SQLRewriteUnit> entry :
sqlRewriteUnits.entrySet()) {
- String sql = translatorRule.translate(entry.getValue().getSql(),
sqlStatement, protocolType, backendDatabaseType);
+ String sql = translatorRule.translate(entry.getValue().getSql(),
sqlStatement, protocolType, storageType);
SQLRewriteUnit sqlRewriteUnit = new SQLRewriteUnit(sql,
entry.getValue().getParameters());
result.put(entry.getKey(), sqlRewriteUnit);
}
diff --git
a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/metadata/SingleTableSchemaMetaDataBuilder.java
b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/metadata/SingleTableSchemaMetaDataBuilder.java
index 890fba00941..5d573dde79a 100644
---
a/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/metadata/SingleTableSchemaMetaDataBuilder.java
+++
b/shardingsphere-kernel/shardingsphere-single-table/shardingsphere-single-table-core/src/main/java/org/apache/shardingsphere/singletable/metadata/SingleTableSchemaMetaDataBuilder.java
@@ -54,7 +54,7 @@ public final class SingleTableSchemaMetaDataBuilder
implements RuleBasedSchemaMe
if (tableMetaDataLoaderMaterials.isEmpty()) {
return Collections.emptyMap();
}
- return SchemaMetaDataLoaderEngine.load(tableMetaDataLoaderMaterials,
materials.getBackendDatabaseType());
+ return SchemaMetaDataLoaderEngine.load(tableMetaDataLoaderMaterials,
materials.getStorageType());
}
@Override
diff --git
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-api/src/main/java/org/apache/shardingsphere/sqltranslator/spi/SQLTranslator.java
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-api/src/main/java/org/apache/shardingsphere/sqltranslator/spi/SQLTranslator.java
index 8c8394af0e1..e53de12e99f 100644
---
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-api/src/main/java/org/apache/shardingsphere/sqltranslator/spi/SQLTranslator.java
+++
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-api/src/main/java/org/apache/shardingsphere/sqltranslator/spi/SQLTranslator.java
@@ -36,9 +36,9 @@ public interface SQLTranslator extends TypedSPI, RequiredSPI {
* @param sql to be translated SQL
* @param sqlStatement to be translated SQL statement
* @param protocolType protocol type
- * @param backendDatabaseType backend database type
+ * @param storageType storage type
* @return translated SQL
* @throws SQLTranslationException SQL translation exception
*/
- String translate(String sql, SQLStatement sqlStatement, DatabaseType
protocolType, DatabaseType backendDatabaseType) throws SQLTranslationException;
+ String translate(String sql, SQLStatement sqlStatement, DatabaseType
protocolType, DatabaseType storageType) throws SQLTranslationException;
}
diff --git
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRule.java
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRule.java
index c84bef0726f..6240e08892b 100644
---
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRule.java
+++
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-core/src/main/java/org/apache/shardingsphere/sqltranslator/rule/SQLTranslatorRule.java
@@ -46,15 +46,15 @@ public final class SQLTranslatorRule implements GlobalRule {
* @param sql to be translated SQL
* @param sqlStatement to be translated SQL statement
* @param protocolType protocol type
- * @param backendDatabaseType backend database type
+ * @param storageType storage type
* @return translated SQL
*/
- public String translate(final String sql, final SQLStatement sqlStatement,
final DatabaseType protocolType, final DatabaseType backendDatabaseType) {
- if (protocolType.equals(backendDatabaseType)) {
+ public String translate(final String sql, final SQLStatement sqlStatement,
final DatabaseType protocolType, final DatabaseType storageType) {
+ if (protocolType.equals(storageType)) {
return sql;
}
try {
- return translator.translate(sql, sqlStatement, protocolType,
backendDatabaseType);
+ return translator.translate(sql, sqlStatement, protocolType,
storageType);
} catch (final SQLTranslationException ex) {
if (useOriginalSQLWhenTranslatingFailed) {
return sql;
diff --git
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-jooq-provider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-jooq-provider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java
index 1a488bbf758..7d08ea9bd32 100644
---
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-jooq-provider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java
+++
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-jooq-provider/src/main/java/org/apache/shardingsphere/sqltranslator/jooq/JooQSQLTranslator.java
@@ -31,10 +31,10 @@ import org.jooq.impl.DSL;
public final class JooQSQLTranslator implements SQLTranslator {
@Override
- public String translate(final String sql, final SQLStatement statement,
final DatabaseType protocolType, final DatabaseType backendDatabaseType) throws
SQLTranslationException {
+ public String translate(final String sql, final SQLStatement statement,
final DatabaseType protocolType, final DatabaseType storageType) throws
SQLTranslationException {
try {
Query query =
DSL.using(JooQDialectRegistry.getSQLDialect(protocolType)).parser().parseQuery(sql);
- return
DSL.using(JooQDialectRegistry.getSQLDialect(backendDatabaseType)).render(query);
+ return
DSL.using(JooQDialectRegistry.getSQLDialect(storageType)).render(query);
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
diff --git
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-native-provider/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-native-provider/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java
index 70a346e2a53..90dd25470bc 100644
---
a/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-native-provider/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java
+++
b/shardingsphere-kernel/shardingsphere-sql-translator/shardingsphere-sql-translator-provider/shardingsphere-sql-translator-native-provider/src/main/java/org/apache/shardingsphere/sqltranslator/natived/NativeSQLTranslator.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.sqltranslator.spi.SQLTranslator;
public final class NativeSQLTranslator implements SQLTranslator {
@Override
- public String translate(final String sql, final SQLStatement statement,
final DatabaseType protocolType, final DatabaseType backendDatabaseType) {
+ public String translate(final String sql, final SQLStatement statement,
final DatabaseType protocolType, final DatabaseType storageType) {
// TODO
return sql;
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
index 391ff7f263c..1af8a80ee8d 100644
---
a/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
+++
b/shardingsphere-mode/shardingsphere-mode-core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsBuilder.java
@@ -56,25 +56,25 @@ public final class MetaDataContextsBuilder {
*/
public MetaDataContexts build(final MetaDataPersistService
metaDataPersistService) throws SQLException {
DatabaseType protocolType =
DatabaseTypeEngine.getProtocolType(databaseConfigMap, props);
- DatabaseType backendDatabaseType =
DatabaseTypeEngine.getBackendDatabaseType(databaseConfigMap);
- Map<String, ShardingSphereDatabase> databaseMap =
getDatabaseMap(protocolType, backendDatabaseType);
+ DatabaseType storageType =
DatabaseTypeEngine.getStorageType(databaseConfigMap);
+ Map<String, ShardingSphereDatabase> databaseMap =
getDatabaseMap(protocolType, storageType);
ShardingSphereRuleMetaData globalMetaData = new
ShardingSphereRuleMetaData(globalRuleConfigs,
GlobalRulesBuilder.buildRules(globalRuleConfigs, databaseMap));
return new MetaDataContexts(metaDataPersistService, databaseMap,
globalMetaData, OptimizerContextFactory.create(databaseMap, globalMetaData),
props);
}
- private Map<String, ShardingSphereDatabase> getDatabaseMap(final
DatabaseType protocolType, final DatabaseType backendDatabaseType) throws
SQLException {
+ private Map<String, ShardingSphereDatabase> getDatabaseMap(final
DatabaseType protocolType, final DatabaseType storageType) throws SQLException {
Map<String, ShardingSphereDatabase> result = new
HashMap<>(databaseConfigMap.size() +
protocolType.getSystemDatabaseSchemaMap().size(), 1);
- result.putAll(getGenericDatabaseMap(protocolType,
backendDatabaseType));
+ result.putAll(getGenericDatabaseMap(protocolType, storageType));
result.putAll(getSystemDatabaseMap(protocolType));
return result;
}
- private Map<String, ShardingSphereDatabase> getGenericDatabaseMap(final
DatabaseType protocolType, final DatabaseType backendDatabaseType) throws
SQLException {
+ private Map<String, ShardingSphereDatabase> getGenericDatabaseMap(final
DatabaseType protocolType, final DatabaseType storageType) throws SQLException {
Map<String, ShardingSphereDatabase> result = new
HashMap<>(databaseConfigMap.size(), 1);
for (Entry<String, DatabaseConfiguration> entry :
databaseConfigMap.entrySet()) {
String databaseName = entry.getKey();
if (!protocolType.getSystemSchemas().contains(databaseName)) {
- result.put(databaseName,
ShardingSphereDatabase.create(databaseName, protocolType, backendDatabaseType,
entry.getValue(), props));
+ result.put(databaseName,
ShardingSphereDatabase.create(databaseName, protocolType, storageType,
entry.getValue(), props));
}
}
return result;
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/ParseDistSQLBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/ParseDistSQLBackendHandler.java
index 15bb0a52626..c8604761365 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/ParseDistSQLBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/advanced/ParseDistSQLBackendHandler.java
@@ -69,14 +69,14 @@ public final class ParseDistSQLBackendHandler extends
QueryableRALBackendHandler
SQLStatement parsedSqlStatement;
try {
parsedSqlStatement = new ShardingSphereSQLParserEngine(
- getBackendDatabaseType(databaseType,
connectionSession).getType(),
sqlParserRule.get().toParserConfiguration()).parse(sqlStatement.getSql(),
false);
+ getStorageType(databaseType, connectionSession).getType(),
sqlParserRule.get().toParserConfiguration()).parse(sqlStatement.getSql(),
false);
} catch (SQLParsingException ex) {
throw new SQLParsingException("You have a syntax error in your
parsed statement");
}
return
Collections.singleton(Arrays.asList(parsedSqlStatement.getClass().getSimpleName(),
new Gson().toJson(parsedSqlStatement)));
}
- private static DatabaseType getBackendDatabaseType(final DatabaseType
defaultDatabaseType, final ConnectionSession connectionSession) {
+ private static DatabaseType getStorageType(final DatabaseType
defaultDatabaseType, final ConnectionSession connectionSession) {
String databaseName = connectionSession.getDatabaseName();
return Strings.isNullOrEmpty(databaseName) ||
!ProxyContext.getInstance().databaseExists(databaseName)
? defaultDatabaseType
