This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 3a35332050c Move package of AbstractPostgreSQLDDLAdapter (#32505)
3a35332050c is described below
commit 3a35332050cc8f93f90fccedd7e53548dad94aa8
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Aug 14 21:03:47 2024 +0800
Move package of AbstractPostgreSQLDDLAdapter (#32505)
* Add PostgreSQLIngestPositionCreator
* Add PostgreSQLSlotManager
* Add PostgreSQLSlotManager
* Add PostgreSQLSlotManager
* Add PostgreSQLSlotManager
* Add PostgreSQLSlotManager
* Add PostgreSQLSlotManager
* Add PostgreSQLSlotManager
* Refactor AbstractPostgreSQLDDLAdapter
* Move package of AbstractPostgreSQLDDLAdapter
---
.../postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java | 8 ++++----
.../ddlgenerator/AbstractPostgreSQLDDLAdapter.java | 2 +-
.../ddlgenerator/column}/PostgreSQLColumnPropertiesAppender.java | 3 ++-
.../ddlgenerator/column}/PostgreSQLColumnType.java | 7 ++-----
.../constraints}/PostgreSQLConstraintsPropertiesAppender.java | 4 +++-
.../ddlgenerator/index}/PostgreSQLIndexSQLGenerator.java | 3 ++-
.../ddlgenerator/table}/PostgreSQLTablePropertiesLoader.java | 4 +++-
.../ddlgenerator/column}/PostgreSQLColumnTypeTest.java | 2 +-
8 files changed, 18 insertions(+), 15 deletions(-)
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java
index 838d6bf244e..0d8be8b0067 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java
@@ -21,10 +21,10 @@ import
org.apache.shardingsphere.data.pipeline.core.ingest.record.Column;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord;
import
org.apache.shardingsphere.data.pipeline.core.sqlbuilder.segment.PipelineSQLSegmentBuilder;
import
org.apache.shardingsphere.data.pipeline.core.sqlbuilder.dialect.DialectPipelineSQLBuilder;
-import
org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator.PostgreSQLColumnPropertiesAppender;
-import
org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator.PostgreSQLConstraintsPropertiesAppender;
-import
org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator.PostgreSQLIndexSQLGenerator;
-import
org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator.PostgreSQLTablePropertiesLoader;
+import
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.column.PostgreSQLColumnPropertiesAppender;
+import
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.constraints.PostgreSQLConstraintsPropertiesAppender;
+import
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.index.PostgreSQLIndexSQLGenerator;
+import
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.table.PostgreSQLTablePropertiesLoader;
import
org.apache.shardingsphere.data.pipeline.postgresql.util.PostgreSQLPipelineFreemarkerManager;
import javax.sql.DataSource;
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgreSQLDDLAdapter.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/AbstractPostgreSQLDDLAdapter.java
similarity index 98%
rename from
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgreSQLDDLAdapter.java
rename to
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/AbstractPostgreSQLDDLAdapter.java
index de2ae2abc0b..03fda05ad69 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgreSQLDDLAdapter.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/AbstractPostgreSQLDDLAdapter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator;
+package
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator;
import lombok.AccessLevel;
import lombok.Getter;
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/column/PostgreSQLColumnPropertiesAppender.java
similarity index 98%
rename from
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
rename to
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/column/PostgreSQLColumnPropertiesAppender.java
index 4be24d07ca3..b1db98a9e02 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnPropertiesAppender.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/column/PostgreSQLColumnPropertiesAppender.java
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator;
+package
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.column;
import lombok.SneakyThrows;
+import
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.AbstractPostgreSQLDDLAdapter;
import java.sql.Array;
import java.sql.Connection;
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnType.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/column/PostgreSQLColumnType.java
similarity index 90%
rename from
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnType.java
rename to
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/column/PostgreSQLColumnType.java
index c4f0ed34bde..8e6ecc1e908 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnType.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/column/PostgreSQLColumnType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator;
+package
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.column;
import lombok.RequiredArgsConstructor;
@@ -33,7 +33,7 @@ public enum PostgreSQLColumnType {
VARCHAR(new Long[]{1560L, 1561L, 1562L, 1563L, 1042L, 1043L, 1014L,
1015L}),
- UNKNOWN(new Long[]{});
+ UNKNOWN(new Long[]{0L});
private final Long[] values;
@@ -44,9 +44,6 @@ public enum PostgreSQLColumnType {
* @return value of column type
*/
public static PostgreSQLColumnType valueOf(final Long elemoid) {
- if (0L == elemoid) {
- return UNKNOWN;
- }
for (PostgreSQLColumnType each : values()) {
if (Arrays.asList(each.values).contains(elemoid)) {
return each;
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLConstraintsPropertiesAppender.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/constraints/PostgreSQLConstraintsPropertiesAppender.java
similarity index 98%
rename from
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLConstraintsPropertiesAppender.java
rename to
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/constraints/PostgreSQLConstraintsPropertiesAppender.java
index 4a132862790..471f47d2ee9 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLConstraintsPropertiesAppender.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/constraints/PostgreSQLConstraintsPropertiesAppender.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator;
+package
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.constraints;
+
+import
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.AbstractPostgreSQLDDLAdapter;
import java.sql.Connection;
import java.util.Collection;
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLIndexSQLGenerator.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/index/PostgreSQLIndexSQLGenerator.java
similarity index 97%
rename from
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLIndexSQLGenerator.java
rename to
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/index/PostgreSQLIndexSQLGenerator.java
index b5ed3283af4..b53452f03f1 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLIndexSQLGenerator.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/index/PostgreSQLIndexSQLGenerator.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator;
+package
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.index;
+import
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.AbstractPostgreSQLDDLAdapter;
import
org.apache.shardingsphere.data.pipeline.postgresql.util.PostgreSQLPipelineFreemarkerManager;
import org.postgresql.jdbc.PgArray;
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLTablePropertiesLoader.java
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/table/PostgreSQLTablePropertiesLoader.java
similarity index 96%
rename from
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLTablePropertiesLoader.java
rename to
kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/table/PostgreSQLTablePropertiesLoader.java
index 8839100883d..8349acdfba1 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLTablePropertiesLoader.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/table/PostgreSQLTablePropertiesLoader.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator;
+package
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.table;
+
+import
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.AbstractPostgreSQLDDLAdapter;
import java.sql.Connection;
import java.sql.SQLException;
diff --git
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnTypeTest.java
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/column/PostgreSQLColumnTypeTest.java
similarity index 93%
rename from
kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnTypeTest.java
rename to
kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/column/PostgreSQLColumnTypeTest.java
index 1dd355f361e..6ec3348bd46 100644
---
a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgreSQLColumnTypeTest.java
+++
b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/ddlgenerator/column/PostgreSQLColumnTypeTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.postgresql.ddlgenerator;
+package
org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder.ddlgenerator.column;
import org.junit.jupiter.api.Test;
