This is an automated email from the ASF dual-hosted git repository.
zykkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 50dd318183 [style](jdbc catalog) Tidy the jdbc catalog java file
directory (#22691)
50dd318183 is described below
commit 50dd318183f64c6b983e335e25eccd5e2563e0f3
Author: zy-kkk <zhongy...@gmail.com>
AuthorDate: Tue Aug 8 18:21:21 2023 +0800
[style](jdbc catalog) Tidy the jdbc catalog java file directory (#22691)
---
.../main/java/org/apache/doris/analysis/NativeInsertStmt.java | 2 +-
.../apache/doris/catalog/external/JdbcExternalDatabase.java | 2 +-
.../org/apache/doris/catalog/external/JdbcExternalTable.java | 2 +-
.../main/java/org/apache/doris/datasource/CatalogFactory.java | 1 +
.../doris/datasource/{ => jdbc}/JdbcExternalCatalog.java | 10 +++++++---
.../jdbc => datasource/jdbc/client}/JdbcClickHouseClient.java | 2 +-
.../{external/jdbc => datasource/jdbc/client}/JdbcClient.java | 2 +-
.../jdbc => datasource/jdbc/client}/JdbcClientConfig.java | 2 +-
.../jdbc => datasource/jdbc/client}/JdbcClientException.java | 2 +-
.../jdbc => datasource/jdbc/client}/JdbcMySQLClient.java | 2 +-
.../jdbc => datasource/jdbc/client}/JdbcOceanBaseClient.java | 2 +-
.../jdbc => datasource/jdbc/client}/JdbcOracleClient.java | 2 +-
.../jdbc => datasource/jdbc/client}/JdbcPostgreSQLClient.java | 2 +-
.../jdbc => datasource/jdbc/client}/JdbcSQLServerClient.java | 2 +-
.../jdbc => datasource/jdbc/client}/JdbcSapHanaClient.java | 2 +-
.../jdbc => datasource/jdbc/client}/JdbcTrinoClient.java | 2 +-
.../src/main/java/org/apache/doris/persist/gson/GsonUtils.java | 2 +-
17 files changed, 23 insertions(+), 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
index adf12e0ddf..78facc30be 100644
--- 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.UserException;
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
index ce3b3726a9..2d86745553 100644
---
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 @@ package org.apache.doris.catalog.external;
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
index 1f1fd8dcb0..5db69ac8f0 100644
---
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 @@ package org.apache.doris.catalog.external;
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
index e3d409b3d7..5aa75daaad 100644
--- 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.catalog.Resource;
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/fe/fe-core/src/main/java/org/apache/doris/datasource/JdbcExternalCatalog.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
similarity index 94%
rename from
fe/fe-core/src/main/java/org/apache/doris/datasource/JdbcExternalCatalog.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalog.java
index 583cceddd6..28897ca05c 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/datasource/JdbcExternalCatalog.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClickHouseClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClickHouseClient.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClickHouseClient.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClickHouseClient.java
index b759e190d7..292dea760e 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClickHouseClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
similarity index 99%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClient.java
index 4abe061d57..1d3361549d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClientConfig.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClientConfig.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClientConfig.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClientConfig.java
index 787943b5f7..5c24e0298d 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClientConfig.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClientException.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClientException.java
similarity index 95%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClientException.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcClientException.java
index 1298a0df8f..f9c1e53c2a 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClientException.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcMySQLClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
similarity index 99%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcMySQLClient.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
index efbfcfd70c..a09077ac49 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcMySQLClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcOceanBaseClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOceanBaseClient.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcOceanBaseClient.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOceanBaseClient.java
index 70a594f855..14d5d5f184 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcOceanBaseClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcOracleClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOracleClient.java
similarity index 99%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcOracleClient.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcOracleClient.java
index 2dd11fe2a7..ae697b87be 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcOracleClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcPostgreSQLClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcPostgreSQLClient.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcPostgreSQLClient.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcPostgreSQLClient.java
index 763d66226e..9b0bd05d22 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcPostgreSQLClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcSQLServerClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcSQLServerClient.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcSQLServerClient.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcSQLServerClient.java
index 3d79cc6a9e..0f4b287698 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcSQLServerClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcSapHanaClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcSapHanaClient.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcSapHanaClient.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcSapHanaClient.java
index 07f7c2c53f..4e29bba7d7 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcSapHanaClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcTrinoClient.java
b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcTrinoClient.java
similarity index 98%
rename from
fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcTrinoClient.java
rename to
fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcTrinoClient.java
index cf3495709a..e577086e4a 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcTrinoClient.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/datasource/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
index 7024bf4216..892ffbeca5 100644
--- 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
@@ -63,13 +63,13 @@ import org.apache.doris.datasource.CatalogIf;
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
