Merge remote-tracking branch 'upstream/dev' into feature-122

liugddx · Jan 29, 2025 · ac85490 · ac85490
2 parents c491638 + 36b3dd2
commit ac85490
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/...n/java/org/apache/seatunnel/connectors/seatunnel/mongodb/source/reader/MongodbReader.java b/...n/java/org/apache/seatunnel/connectors/seatunnel/mongodb/source/reader/MongodbReader.java
@@ -82,6 +82,9 @@ public void close() {
         if (cursor != null) {
             cursor.close();
         }
+        if (clientProvider != null) {
+            clientProvider.close();
+        }
     }
 
     @Override

diff --git a/...ctor-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisCDCSinkIT.java b/...ctor-doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisCDCSinkIT.java
@@ -26,6 +26,7 @@
 import org.apache.seatunnel.e2e.common.junit.DisabledOnContainer;
 import org.apache.seatunnel.e2e.common.junit.TestContainerExtension;
 
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.TestTemplate;
@@ -129,6 +130,13 @@ public void init() {
         initializeJdbcTable();
     }
 
+    @AfterAll
+    public void close() {
+        if (MYSQL_CONTAINER != null) {
+            MYSQL_CONTAINER.close();
+        }
+    }
+
     @TestTemplate
     public void testDorisCDCSink(TestContainer container) throws Exception {
 

diff --git a/...doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisSchemaChangeIT.java b/...doris-e2e/src/test/java/org/apache/seatunnel/e2e/connector/doris/DorisSchemaChangeIT.java
@@ -17,8 +17,6 @@
 
 package org.apache.seatunnel.e2e.connector.doris;
 
-import org.apache.seatunnel.shade.com.google.common.collect.Lists;
-
 import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.MySqlContainer;
 import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.MySqlVersion;
 import org.apache.seatunnel.connectors.seatunnel.cdc.mysql.testutils.UniqueDatabase;
@@ -80,7 +78,9 @@ public class DorisSchemaChangeIT extends AbstractDorisIT {
     private static final String PROJECTION_QUERY =
             "select id,name,description,weight,add_column1,add_column2,add_column3 from %s.%s order by id;";
     private static final MySqlContainer MYSQL_CONTAINER = createMySqlContainer(MySqlVersion.V8_0);
-    private final UniqueDatabase shopDatabase = new UniqueDatabase(MYSQL_CONTAINER, DATABASE);
+    private final UniqueDatabase shopDatabase =
+            new UniqueDatabase(
+                    MYSQL_CONTAINER, DATABASE, MYSQL_USER_NAME, MYSQL_USER_PASSWORD, DATABASE);
 
     @TestContainerExtension
     private final ContainerExtendedFactory extendedFactory =
@@ -107,7 +107,6 @@ private static MySqlContainer createMySqlContainer(MySqlVersion version) {
                         .withLogConsumer(
                                 new Slf4jLogConsumer(
                                         DockerLoggerFactory.getLogger("mysql-docker-image")));
-        mySqlContainer.setPortBindings(Lists.newArrayList(String.format("%s:%s", 3306, 3306)));
         return mySqlContainer;
     }