merge dev and fix some conflict

apache · Sep 9, 2022 · 4d37d02 · 4d37d02
1 parent 2fcac6c
commit 4d37d02
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/seatunnel-connectors-v2/connector-jdbc/pom.xml b/seatunnel-connectors-v2/connector-jdbc/pom.xml
@@ -66,7 +66,6 @@
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
             <version>${sqlserver.version}</version>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 

diff --git a/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml b/seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/pom.xml
@@ -67,7 +67,6 @@
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
             <version>${sqlserver.version}</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/...-jdbc-spark-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/jdbc/JdbcSqlserverIT.java b/...-jdbc-spark-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/jdbc/JdbcSqlserverIT.java
@@ -28,7 +28,6 @@
 import org.testcontainers.containers.MSSQLServerContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.lifecycle.Startables;
-import org.testcontainers.shaded.com.google.common.collect.Lists;
 import org.testcontainers.shaded.org.awaitility.Awaitility;
 import org.testcontainers.utility.DockerImageName;
 
@@ -39,7 +38,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.time.Duration;
-import java.util.List;
 import java.util.stream.Stream;
 
 @Slf4j
@@ -59,7 +57,7 @@ public void startSqlServerContainer() throws ClassNotFoundException, SQLExceptio
         Class.forName(mssqlServerContainer.getDriverClassName());
         Awaitility.given().ignoreExceptions()
             .await()
-            .atMost(Duration.ofMinutes(1))
+            .atMost(Duration.ofMinutes(3))
             .untilAsserted(this::initializeJdbcTable);
         batchInsertData();
     }
@@ -126,15 +124,12 @@ public void tesSqlserverSourceAndSink() throws SQLException, IOException, Interr
         Container.ExecResult execResult = executeSeaTunnelSparkJob("/jdbc/jdbc_sqlserver_source_to_sink.conf");
         Assertions.assertEquals(0, execResult.getExitCode());
         // query result
-        String sql = "select * from sink";
+        String sql = "select * from sink minus select * from source;";
         try (Connection connection = DriverManager.getConnection(mssqlServerContainer.getJdbcUrl(), mssqlServerContainer.getUsername(), mssqlServerContainer.getPassword())) {
             Statement statement = connection.createStatement();
             ResultSet resultSet = statement.executeQuery(sql);
-            List<String> result = Lists.newArrayList();
-            while (resultSet.next()) {
-                result.add(resultSet.getString("ids"));
-            }
-            Assertions.assertFalse(result.isEmpty());
+            Assertions.assertTrue(resultSet.next());
+
         }
     }