This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 7c5bab29245 Move TrunkDatabaseType and BranchDatabaseType to core
module (#27267)
7c5bab29245 is described below
commit 7c5bab29245fc509238bc8014b59992b4fe7fc30
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jul 18 14:34:39 2023 +0800
Move TrunkDatabaseType and BranchDatabaseType to core module (#27267)
---
.../org/apache/shardingsphere/infra/database/DatabaseTypeEngine.java | 2 +-
.../org/apache/shardingsphere/infra/spi/DatabaseTypedSPILoader.java | 2 +-
.../shardingsphere/infra/database/core/type}/BranchDatabaseType.java | 4 +++-
.../shardingsphere/infra/database/core/type/DatabaseTypeFactory.java | 1 -
.../shardingsphere/infra/database/core/type}/TrunkDatabaseType.java | 4 +++-
.../infra/database/core/type/dialect/H2DatabaseType.java | 2 +-
.../infra/database/core/type/dialect/MariaDBDatabaseType.java | 2 +-
.../infra/database/core/type/dialect/MySQLDatabaseType.java | 2 +-
.../infra/database/core/type/dialect/OpenGaussDatabaseType.java | 2 +-
.../infra/database/core/type/dialect/OracleDatabaseType.java | 2 +-
.../infra/database/core/type/dialect/PostgreSQLDatabaseType.java | 2 +-
.../infra/database/core/type/dialect/SQL92DatabaseType.java | 2 +-
.../infra/database/core/type/dialect/SQLServerDatabaseType.java | 2 +-
.../database/core/type/fixture/InfraBranchDatabaseTypeFixture.java | 2 +-
.../database/core/type/fixture/InfraTrunkDatabaseTypeFixture.java | 2 +-
.../data/pipeline/common/util/JDBCStreamQueryUtils.java | 2 +-
.../data/pipeline/core/preparer/PipelineJobPreparerUtils.java | 2 +-
.../test/fixture/infra/database/type/MockedDatabaseType.java | 2 +-
18 files changed, 21 insertions(+), 18 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/DatabaseTypeEngine.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/DatabaseTypeEngine.java
index 2b8697ea329..cdb13a6c905 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/database/DatabaseTypeEngine.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/database/DatabaseTypeEngine.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.config.database.DatabaseConfiguration;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.infra.database.spi.BranchDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.datasource.state.DataSourceStateManager;
import
org.apache.shardingsphere.infra.util.exception.external.sql.type.wrapper.SQLWrapperException;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/spi/DatabaseTypedSPILoader.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/spi/DatabaseTypedSPILoader.java
index 776c922f77f..ea15d18f366 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/spi/DatabaseTypedSPILoader.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/spi/DatabaseTypedSPILoader.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.spi;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.database.spi.BranchDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import
org.apache.shardingsphere.infra.util.spi.exception.ServiceProviderNotFoundServerException;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git
a/infra/database/spi/src/main/java/org/apache/shardingsphere/infra/database/spi/BranchDatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/BranchDatabaseType.java
similarity index 89%
rename from
infra/database/spi/src/main/java/org/apache/shardingsphere/infra/database/spi/BranchDatabaseType.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/BranchDatabaseType.java
index 43bca9ec4c6..01929068b95 100644
---
a/infra/database/spi/src/main/java/org/apache/shardingsphere/infra/database/spi/BranchDatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/BranchDatabaseType.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.spi;
+package org.apache.shardingsphere.infra.database.core.type;
+
+import org.apache.shardingsphere.infra.database.spi.DatabaseType;
/**
* Branch database type.
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactory.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactory.java
index 8d037d49a3c..c9ab085ac91 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactory.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeFactory.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.database.core.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.database.spi.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git
a/infra/database/spi/src/main/java/org/apache/shardingsphere/infra/database/spi/TrunkDatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/TrunkDatabaseType.java
similarity index 87%
rename from
infra/database/spi/src/main/java/org/apache/shardingsphere/infra/database/spi/TrunkDatabaseType.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/TrunkDatabaseType.java
index 8039c080e83..0170968fdfb 100644
---
a/infra/database/spi/src/main/java/org/apache/shardingsphere/infra/database/spi/TrunkDatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/TrunkDatabaseType.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.database.spi;
+package org.apache.shardingsphere.infra.database.core.type;
+
+import org.apache.shardingsphere.infra.database.spi.DatabaseType;
/**
* Trunk database type.
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseType.java
index cd7f2795054..762cd5fb4d8 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/H2DatabaseType.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.core.type.dialect;
import
org.apache.shardingsphere.infra.database.core.metadata.dialect.H2DataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.BranchDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseType.java
index 81a12cdc71b..2f5db435a24 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MariaDBDatabaseType.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.core.type.dialect;
import
org.apache.shardingsphere.infra.database.core.metadata.dialect.MariaDBDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.BranchDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseType.java
index 248d4ef6816..840fdb564b6 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/MySQLDatabaseType.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.core.type.dialect;
import
org.apache.shardingsphere.infra.database.core.metadata.dialect.MySQLDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.TrunkDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import java.util.Arrays;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OpenGaussDatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OpenGaussDatabaseType.java
index 87a9fc4c0f9..4bca5ed380d 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OpenGaussDatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OpenGaussDatabaseType.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.core.type.dialect;
import
org.apache.shardingsphere.infra.database.core.metadata.dialect.OpenGaussDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.TrunkDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseType.java
index 5746865c4c7..ef86d8eba02 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/OracleDatabaseType.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.core.type.dialect;
import
org.apache.shardingsphere.infra.database.core.metadata.dialect.OracleDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.TrunkDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import java.sql.Connection;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseType.java
index ffcb7142f1e..1360ffbe700 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/PostgreSQLDatabaseType.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.core.type.dialect;
import
org.apache.shardingsphere.infra.database.core.metadata.dialect.PostgreSQLDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.TrunkDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseType.java
index 5090cfc5638..93282d0efe9 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQL92DatabaseType.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.core.type.dialect;
import
org.apache.shardingsphere.infra.database.core.metadata.dialect.SQL92DataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.TrunkDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import java.util.Collection;
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseType.java
index b0b24697681..c62bfc46cd7 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/dialect/SQLServerDatabaseType.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.core.type.dialect;
import
org.apache.shardingsphere.infra.database.core.metadata.dialect.SQLServerDataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.TrunkDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import java.util.Arrays;
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraBranchDatabaseTypeFixture.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraBranchDatabaseTypeFixture.java
index 0acb76caf28..08c82b15628 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraBranchDatabaseTypeFixture.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraBranchDatabaseTypeFixture.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.database.core.type.fixture;
-import org.apache.shardingsphere.infra.database.spi.BranchDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
diff --git
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraTrunkDatabaseTypeFixture.java
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraTrunkDatabaseTypeFixture.java
index 9fccce860f4..5f6f6732ea2 100644
---
a/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraTrunkDatabaseTypeFixture.java
+++
b/infra/database/core/src/test/java/org/apache/shardingsphere/infra/database/core/type/fixture/InfraTrunkDatabaseTypeFixture.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.database.core.type.fixture;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.TrunkDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import java.util.Collection;
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/util/JDBCStreamQueryUtils.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/util/JDBCStreamQueryUtils.java
index 89813e83038..2f0b58c9b10 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/util/JDBCStreamQueryUtils.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/util/JDBCStreamQueryUtils.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.data.pipeline.common.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.infra.database.spi.BranchDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import
org.apache.shardingsphere.infra.database.core.type.dialect.H2DatabaseType;
import
org.apache.shardingsphere.infra.database.core.type.dialect.MySQLDatabaseType;
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java
index cacefea6a1e..6128df1ed8b 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java
@@ -35,7 +35,7 @@ import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.PrepareT
import
org.apache.shardingsphere.data.pipeline.core.preparer.datasource.DataSourceCheckEngine;
import
org.apache.shardingsphere.data.pipeline.spi.ingest.dumper.IncrementalDumperCreator;
import
org.apache.shardingsphere.data.pipeline.spi.ingest.position.PositionInitializer;
-import org.apache.shardingsphere.infra.database.spi.BranchDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.BranchDatabaseType;
import org.apache.shardingsphere.infra.database.spi.DatabaseType;
import
org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
diff --git
a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/database/type/MockedDatabaseType.java
b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/database/type/MockedDatabaseType.java
index 55651c63b0b..5619afee5cb 100644
---
a/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/database/type/MockedDatabaseType.java
+++
b/test/fixture/infra/src/main/java/org/apache/shardingsphere/test/fixture/infra/database/type/MockedDatabaseType.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.fixture.infra.database.type;
import org.apache.shardingsphere.infra.database.spi.DataSourceMetaData;
-import org.apache.shardingsphere.infra.database.spi.TrunkDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.TrunkDatabaseType;
import org.apache.shardingsphere.sql.parser.sql.common.enums.QuoteCharacter;
import java.util.Collection;
