update case

apache · Sep 11, 2024 · e78a600 · e78a600
1 parent 766b690
commit e78a600
Show file tree

Hide file tree

Showing 23 changed files with 65 additions and 32 deletions.
diff --git a/...doris-connector/src/test/java/org/apache/doris/flink/catalog/DorisCatalogFactoryTest.java b/...doris-connector/src/test/java/org/apache/doris/flink/catalog/DorisCatalogFactoryTest.java
@@ -20,6 +20,7 @@
 import org.apache.flink.table.catalog.Catalog;
 import org.apache.flink.table.factories.FactoryUtil;
 
+import org.apache.doris.flink.table.DorisConfigOptions;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -33,7 +34,7 @@ public class DorisCatalogFactoryTest {
     @Test
     public void testCreateCatalog() {
         final Map<String, String> options = new HashMap<>();
-        options.put("type", "doris");
+        options.put("type", DorisConfigOptions.IDENTIFIER);
         options.put("jdbc-url", "jdbc:mysql://127.0.0.1:9030");
         options.put("fenodes", "127.0.0.1:8030");
         options.put("default-database", "doris_db");

diff --git a/flink-doris-connector/src/test/java/org/apache/doris/flink/catalog/DorisCatalogITCase.java b/flink-doris-connector/src/test/java/org/apache/doris/flink/catalog/DorisCatalogITCase.java
@@ -42,6 +42,7 @@
 import com.google.common.collect.Lists;
 import org.apache.doris.flink.cfg.DorisConnectionOptions;
 import org.apache.doris.flink.container.AbstractITCaseService;
+import org.apache.doris.flink.table.DorisConfigOptions;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -402,7 +403,7 @@ private static CatalogTable createTable() {
                 TABLE_SCHEMA,
                 new HashMap<String, String>() {
                     {
-                        put("connector", "doris");
+                        put("connector", DorisConfigOptions.IDENTIFIER);
                         put("table.properties.replication_num", "1");
                     }
                 },

diff --git a/...oris-connector/src/test/java/org/apache/doris/flink/container/e2e/Doris2DorisE2ECase.java b/...oris-connector/src/test/java/org/apache/doris/flink/container/e2e/Doris2DorisE2ECase.java
@@ -26,6 +26,7 @@
 
 import org.apache.doris.flink.container.AbstractContainerTestBase;
 import org.apache.doris.flink.container.ContainerUtils;
+import org.apache.doris.flink.table.DorisConfigOptions;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -72,7 +73,9 @@ public void testDoris2Doris() throws Exception {
                                 + "c16  ROW<name String, age int>, \n"
                                 + "c17  STRING \n"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'sink.label-prefix' = '"
@@ -109,7 +112,9 @@ public void testDoris2Doris() throws Exception {
                                 + "c16  ROW<name String, age int>, \n"
                                 + "c17  STRING \n"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'sink.label-prefix' = '"
                                 + UUID.randomUUID()

diff --git a/...oris-connector/src/test/java/org/apache/doris/flink/container/e2e/Mysql2DorisE2ECase.java b/...oris-connector/src/test/java/org/apache/doris/flink/container/e2e/Mysql2DorisE2ECase.java
@@ -54,6 +54,8 @@ private List<String> setMysql2DorisDefaultConfig(List<String> argList) {
         argList.add(PASSWORD + "=" + getMySQLPassword());
         argList.add(MYSQL_CONF);
         argList.add(DATABASE_NAME + "=" + DATABASE);
+        // argList.add(MYSQL_CONF);
+        // argList.add("server-time-zone=UTC");
 
         // set doris database
         argList.add(DORIS_DATABASE);

diff --git a/...e/doris/flink/CDCSchemaChangeExample.java → ...flink/example/CDCSchemaChangeExample.java b/...e/doris/flink/CDCSchemaChangeExample.java → ...flink/example/CDCSchemaChangeExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.common.eventtime.WatermarkStrategy;
 import org.apache.flink.cdc.connectors.mysql.source.MySqlSource;

diff --git a/...e/doris/flink/catalog/CatalogExample.java → ...e/doris/flink/example/CatalogExample.java b/...e/doris/flink/catalog/CatalogExample.java → ...e/doris/flink/example/CatalogExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink.catalog;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.common.RuntimeExecutionMode;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;

diff --git a/...s/flink/DorisDateAndTimestampSqlTest.java → ...example/DorisDateAndTimestampSqlTest.java b/...s/flink/DorisDateAndTimestampSqlTest.java → ...example/DorisDateAndTimestampSqlTest.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.table.api.EnvironmentSettings;
 import org.apache.flink.table.api.TableEnvironment;

diff --git a/...flink/DorisIntranetAccessSinkExample.java → ...ample/DorisIntranetAccessSinkExample.java b/...flink/DorisIntranetAccessSinkExample.java → ...ample/DorisIntranetAccessSinkExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.common.RuntimeExecutionMode;
 import org.apache.flink.api.common.functions.MapFunction;

diff --git a/...doris/flink/DorisSinkArraySQLExample.java → ...ink/example/DorisSinkArraySQLExample.java b/...doris/flink/DorisSinkArraySQLExample.java → ...ink/example/DorisSinkArraySQLExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.common.RuntimeExecutionMode;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;

diff --git a/...he/doris/flink/DorisSinkBatchExample.java → .../flink/example/DorisSinkBatchExample.java b/...he/doris/flink/DorisSinkBatchExample.java → .../flink/example/DorisSinkBatchExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.streaming.api.datastream.DataStreamSource;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;

diff --git a/.../apache/doris/flink/DorisSinkExample.java → ...doris/flink/example/DorisSinkExample.java b/.../apache/doris/flink/DorisSinkExample.java → ...doris/flink/example/DorisSinkExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.common.RuntimeExecutionMode;
 import org.apache.flink.api.common.functions.MapFunction;

diff --git a/.../doris/flink/DorisSinkExampleRowData.java → ...link/example/DorisSinkExampleRowData.java b/.../doris/flink/DorisSinkExampleRowData.java → ...link/example/DorisSinkExampleRowData.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.common.RuntimeExecutionMode;
 import org.apache.flink.api.common.functions.FlatMapFunction;

diff --git a/...ris/flink/DorisSinkMultiTableExample.java → ...k/example/DorisSinkMultiTableExample.java b/...ris/flink/DorisSinkMultiTableExample.java → ...k/example/DorisSinkMultiTableExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.streaming.api.functions.source.SourceFunction;

diff --git a/...ache/doris/flink/DorisSinkSQLExample.java → ...is/flink/example/DorisSinkSQLExample.java b/...ache/doris/flink/DorisSinkSQLExample.java → ...is/flink/example/DorisSinkSQLExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.common.RuntimeExecutionMode;
 import org.apache.flink.api.java.tuple.Tuple2;

diff --git a/...ink/DorisSinkStreamMultiTableExample.java → ...ple/DorisSinkStreamMultiTableExample.java b/...ink/DorisSinkStreamMultiTableExample.java → ...ple/DorisSinkStreamMultiTableExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.common.restartstrategy.RestartStrategies;
 import org.apache.flink.api.common.time.Time;

diff --git a/...he/doris/flink/DorisSourceDataStream.java → .../flink/example/DorisSourceDataStream.java b/...he/doris/flink/DorisSourceDataStream.java → .../flink/example/DorisSourceDataStream.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 

diff --git a/...pache/doris/flink/DorisSourceExample.java → ...ris/flink/example/DorisSourceExample.java b/...pache/doris/flink/DorisSourceExample.java → ...ris/flink/example/DorisSourceExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.table.api.Table;

diff --git a/...e/doris/flink/DorisSourceSinkExample.java → ...flink/example/DorisSourceSinkExample.java b/...e/doris/flink/DorisSourceSinkExample.java → ...flink/example/DorisSourceSinkExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.common.RuntimeExecutionMode;
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;

diff --git a/...is/flink/lookup/LookupJoinCdcExample.java → ...s/flink/example/LookupJoinCdcExample.java b/...is/flink/lookup/LookupJoinCdcExample.java → ...s/flink/example/LookupJoinCdcExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink.lookup;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
 import org.apache.flink.table.api.Table;

diff --git a/...doris/flink/lookup/LookupJoinExample.java → ...oris/flink/example/LookupJoinExample.java b/...doris/flink/lookup/LookupJoinExample.java → ...oris/flink/example/LookupJoinExample.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.flink.lookup;
+package org.apache.doris.flink.example;
 
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.streaming.api.datastream.DataStreamSource;

diff --git a/flink-doris-connector/src/test/java/org/apache/doris/flink/sink/DorisSinkITCase.java b/flink-doris-connector/src/test/java/org/apache/doris/flink/sink/DorisSinkITCase.java
@@ -37,6 +37,7 @@
 import org.apache.doris.flink.sink.DorisSink.Builder;
 import org.apache.doris.flink.sink.batch.DorisBatchSink;
 import org.apache.doris.flink.sink.writer.serializer.SimpleStringSerializer;
+import org.apache.doris.flink.table.DorisConfigOptions;
 import org.apache.doris.flink.utils.MockSource;
 import org.junit.Rule;
 import org.junit.Test;
@@ -172,7 +173,9 @@ public void testTableSinkJsonFormat() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'benodes' = '%s',"
                                 + " 'auto-redirect' = 'false',"
@@ -221,7 +224,9 @@ public void testTableBatch() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'username' = '%s',"
@@ -309,7 +314,9 @@ public void testTableGroupCommit() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'username' = '%s',"
@@ -358,7 +365,9 @@ public void testTableGzFormat() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'username' = '%s',"

diff --git a/flink-doris-connector/src/test/java/org/apache/doris/flink/source/DorisSourceITCase.java b/flink-doris-connector/src/test/java/org/apache/doris/flink/source/DorisSourceITCase.java
@@ -36,6 +36,7 @@
 import org.apache.doris.flink.container.ContainerUtils;
 import org.apache.doris.flink.datastream.DorisSourceFunction;
 import org.apache.doris.flink.deserialization.SimpleListDeserializationSchema;
+import org.apache.doris.flink.table.DorisConfigOptions;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -143,7 +144,9 @@ public void testTableSource() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'username' = '%s',"
@@ -191,7 +194,9 @@ public void testTableSourceOldApi() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'source.use-old-api' = 'true',"
@@ -228,7 +233,9 @@ public void testTableSourceAllOptions() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'source.use-old-api' = 'true',"
@@ -274,7 +281,9 @@ public void testTableSourceFilterAndProjectionPushDown() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'username' = '%s',"
@@ -314,7 +323,9 @@ public void testTableSourceFilterWithUnionAll() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'username' = '%s',"
@@ -357,7 +368,9 @@ public void testJobManagerFailoverSource() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'username' = '%s',"
@@ -436,7 +449,9 @@ public void testTaskManagerFailoverSource() throws Exception {
                                 + " name STRING,"
                                 + " age INT"
                                 + ") WITH ("
-                                + " 'connector' = 'doris',"
+                                + " 'connector' = '"
+                                + DorisConfigOptions.IDENTIFIER
+                                + "',"
                                 + " 'fenodes' = '%s',"
                                 + " 'table.identifier' = '%s',"
                                 + " 'username' = '%s',"

diff --git a/...is-connector/src/test/java/org/apache/doris/flink/table/DorisDynamicTableFactoryTest.java b/...is-connector/src/test/java/org/apache/doris/flink/table/DorisDynamicTableFactoryTest.java
@@ -239,7 +239,7 @@ public void testDorisSinkProperties() {
 
     private Map<String, String> getAllOptions() {
         Map<String, String> options = new HashMap<>();
-        options.put("connector", "doris");
+        options.put("connector", DorisConfigOptions.IDENTIFIER);
         options.put("fenodes", "127.0.0.1:8030");
         options.put("benodes", "127.0.0.1:8040");
         options.put("jdbc-url", "jdbc:mysql://127.0.0.1:9030");