[style](jdbc catalog) Tidy the jdbc catalog java file directory (apac…

…he#22691)
xiaokang · Aug 9, 2023 · 34ea99f · 34ea99f
1 parent e85af25
commit 34ea99f
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 18 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/NativeInsertStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/NativeInsertStmt.java
@@ -42,7 +42,7 @@
 import org.apache.doris.common.util.DebugUtil;
 import org.apache.doris.common.util.Util;
 import org.apache.doris.datasource.ExternalCatalog;
-import org.apache.doris.datasource.JdbcExternalCatalog;
+import org.apache.doris.datasource.jdbc.JdbcExternalCatalog;
 import org.apache.doris.mysql.privilege.PrivPredicate;
 import org.apache.doris.planner.DataPartition;
 import org.apache.doris.planner.DataSink;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/JdbcExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/JdbcExternalDatabase.java
@@ -19,7 +19,7 @@
 
 import org.apache.doris.datasource.ExternalCatalog;
 import org.apache.doris.datasource.InitDatabaseLog;
-import org.apache.doris.datasource.JdbcExternalCatalog;
+import org.apache.doris.datasource.jdbc.JdbcExternalCatalog;
 
 public class JdbcExternalDatabase extends ExternalDatabase<JdbcExternalTable> {
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/JdbcExternalTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/JdbcExternalTable.java
@@ -19,7 +19,7 @@
 
 import org.apache.doris.catalog.Column;
 import org.apache.doris.catalog.JdbcTable;
-import org.apache.doris.datasource.JdbcExternalCatalog;
+import org.apache.doris.datasource.jdbc.JdbcExternalCatalog;
 import org.apache.doris.thrift.TTableDescriptor;
 
 import org.apache.logging.log4j.LogManager;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java
@@ -28,6 +28,7 @@
 import org.apache.doris.common.DdlException;
 import org.apache.doris.common.FeConstants;
 import org.apache.doris.datasource.iceberg.IcebergExternalCatalogFactory;
+import org.apache.doris.datasource.jdbc.JdbcExternalCatalog;
 import org.apache.doris.datasource.paimon.PaimonExternalCatalogFactory;
 import org.apache.doris.datasource.test.TestExternalCatalog;
 

diff --git a/...doris/datasource/JdbcExternalCatalog.java → .../datasource/jdbc/JdbcExternalCatalog.java b/...doris/datasource/JdbcExternalCatalog.java → .../datasource/jdbc/JdbcExternalCatalog.java
@@ -15,13 +15,17 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.datasource;
+package org.apache.doris.datasource.jdbc;
 
 import org.apache.doris.catalog.JdbcResource;
 import org.apache.doris.catalog.external.JdbcExternalDatabase;
 import org.apache.doris.common.DdlException;
-import org.apache.doris.external.jdbc.JdbcClient;
-import org.apache.doris.external.jdbc.JdbcClientConfig;
+import org.apache.doris.datasource.CatalogProperty;
+import org.apache.doris.datasource.ExternalCatalog;
+import org.apache.doris.datasource.InitCatalogLog;
+import org.apache.doris.datasource.SessionContext;
+import org.apache.doris.datasource.jdbc.client.JdbcClient;
+import org.apache.doris.datasource.jdbc.client.JdbcClientConfig;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;

diff --git a/...s/external/jdbc/JdbcClickHouseClient.java → ...rce/jdbc/client/JdbcClickHouseClient.java b/...s/external/jdbc/JdbcClickHouseClient.java → ...rce/jdbc/client/JdbcClickHouseClient.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import org.apache.doris.catalog.ArrayType;
 import org.apache.doris.catalog.ScalarType;

diff --git a/...pache/doris/external/jdbc/JdbcClient.java → ...is/datasource/jdbc/client/JdbcClient.java b/...pache/doris/external/jdbc/JdbcClient.java → ...is/datasource/jdbc/client/JdbcClient.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import org.apache.doris.catalog.Column;
 import org.apache.doris.catalog.JdbcResource;

diff --git a/...doris/external/jdbc/JdbcClientConfig.java → ...asource/jdbc/client/JdbcClientConfig.java b/...doris/external/jdbc/JdbcClientConfig.java → ...asource/jdbc/client/JdbcClientConfig.java
@@ -16,7 +16,7 @@
 // under the License.
 
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import java.util.Map;
 

diff --git a/...is/external/jdbc/JdbcClientException.java → ...urce/jdbc/client/JdbcClientException.java b/...is/external/jdbc/JdbcClientException.java → ...urce/jdbc/client/JdbcClientException.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 public class JdbcClientException extends RuntimeException {
     public JdbcClientException(String format, Throwable cause, Object... msg) {

diff --git a/.../doris/external/jdbc/JdbcMySQLClient.java → ...tasource/jdbc/client/JdbcMySQLClient.java b/.../doris/external/jdbc/JdbcMySQLClient.java → ...tasource/jdbc/client/JdbcMySQLClient.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import org.apache.doris.catalog.Column;
 import org.apache.doris.catalog.PrimitiveType;

diff --git a/...is/external/jdbc/JdbcOceanBaseClient.java → ...urce/jdbc/client/JdbcOceanBaseClient.java b/...is/external/jdbc/JdbcOceanBaseClient.java → ...urce/jdbc/client/JdbcOceanBaseClient.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import org.apache.doris.catalog.JdbcResource;
 import org.apache.doris.catalog.Type;

diff --git a/...doris/external/jdbc/JdbcOracleClient.java → ...asource/jdbc/client/JdbcOracleClient.java b/...doris/external/jdbc/JdbcOracleClient.java → ...asource/jdbc/client/JdbcOracleClient.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import org.apache.doris.catalog.ScalarType;
 import org.apache.doris.catalog.Type;

diff --git a/...s/external/jdbc/JdbcPostgreSQLClient.java → ...rce/jdbc/client/JdbcPostgreSQLClient.java b/...s/external/jdbc/JdbcPostgreSQLClient.java → ...rce/jdbc/client/JdbcPostgreSQLClient.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import org.apache.doris.catalog.PrimitiveType;
 import org.apache.doris.catalog.ScalarType;

diff --git a/...is/external/jdbc/JdbcSQLServerClient.java → ...urce/jdbc/client/JdbcSQLServerClient.java b/...is/external/jdbc/JdbcSQLServerClient.java → ...urce/jdbc/client/JdbcSQLServerClient.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import org.apache.doris.catalog.ScalarType;
 import org.apache.doris.catalog.Type;

diff --git a/...oris/external/jdbc/JdbcSapHanaClient.java → ...source/jdbc/client/JdbcSapHanaClient.java b/...oris/external/jdbc/JdbcSapHanaClient.java → ...source/jdbc/client/JdbcSapHanaClient.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import org.apache.doris.catalog.PrimitiveType;
 import org.apache.doris.catalog.ScalarType;

diff --git a/.../doris/external/jdbc/JdbcTrinoClient.java → ...tasource/jdbc/client/JdbcTrinoClient.java b/.../doris/external/jdbc/JdbcTrinoClient.java → ...tasource/jdbc/client/JdbcTrinoClient.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.external.jdbc;
+package org.apache.doris.datasource.jdbc.client;
 
 import org.apache.doris.catalog.ArrayType;
 import org.apache.doris.catalog.PrimitiveType;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java
@@ -58,13 +58,13 @@
 import org.apache.doris.datasource.EsExternalCatalog;
 import org.apache.doris.datasource.HMSExternalCatalog;
 import org.apache.doris.datasource.InternalCatalog;
-import org.apache.doris.datasource.JdbcExternalCatalog;
 import org.apache.doris.datasource.MaxComputeExternalCatalog;
 import org.apache.doris.datasource.iceberg.IcebergDLFExternalCatalog;
 import org.apache.doris.datasource.iceberg.IcebergExternalCatalog;
 import org.apache.doris.datasource.iceberg.IcebergGlueExternalCatalog;
 import org.apache.doris.datasource.iceberg.IcebergHMSExternalCatalog;
 import org.apache.doris.datasource.iceberg.IcebergRestExternalCatalog;
+import org.apache.doris.datasource.jdbc.JdbcExternalCatalog;
 import org.apache.doris.datasource.paimon.PaimonExternalCatalog;
 import org.apache.doris.datasource.paimon.PaimonHMSExternalCatalog;
 import org.apache.doris.load.loadv2.LoadJob.LoadJobStateUpdateInfo;