Merge pull request #350 from youngsofun/fix

ci: fix conflict in table

Author: youngsofun

databend-jdbc/src/test/java/com/databend/jdbc/TestBasicDriver.java

@@ -186,7 +186,7 @@ public void testDefaultSelectNullValue() throws SQLException {
         try (Connection connection = Utils.createConnection();
              Statement statement = connection.createStatement()
          ) {
-            statement.execute("create table test_basic_driver.table_with_null(a int,b varchar default null, c varchar, d varchar)");
+            statement.execute("create or replace table test_basic_driver.table_with_null(a int,b varchar default null, c varchar, d varchar)");
             statement.execute("insert into test_basic_driver.table_with_null(a,b,c,d) values(1,null,'null','NULL')");
             statement.execute("SELECT a,b,c,d from test_basic_driver.table_with_null");
             ResultSet r = statement.getResultSet();
@@ -241,8 +241,8 @@ public void testBasicWithProperties() throws SQLException {
     @Test(groups = {"IT"})
     public void testPrepareStatementQuery() throws SQLException {
         String sql = "SELECT number from numbers(100) where number = ? or number = ?";
-        Connection conn = Utils.createConnection("test_basic_driver");
-        try (PreparedStatement statement = conn.prepareStatement(sql)) {
+        try (Connection conn = Utils.createConnection("test_basic_driver");
+             PreparedStatement statement = conn.prepareStatement(sql)) {
             statement.setInt(1, 1);
             statement.setInt(2, 2);
             ResultSet r = statement.executeQuery();

databend-jdbc/src/test/java/com/databend/jdbc/TestFileTransfer.java

@@ -7,6 +7,7 @@
 import okhttp3.OkHttpClient;
 import org.testng.Assert;
 import org.testng.annotations.BeforeTest;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import java.io.*;
@@ -16,6 +17,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -53,7 +55,7 @@ private String generateRandomCSV(int lines) throws IOException {
             return "";
         }
         String tmpDir = System.getProperty("java.io.tmpdir");
-        String csvPath = tmpDir + "/test.csv";
+        String csvPath = tmpDir + "/" + UUID.randomUUID();
         try (FileWriter writer = new FileWriter(csvPath)) {
             for (int i = 0; i < lines; i++) {
                 int num = (int) (Math.random() * 1000);
@@ -114,6 +116,7 @@ public void testFileTransfer()
             databendConnection.uploadStream(stageName, "jdbc/test/", fileInputStream, "test.csv", f.length(), false);
             downloaded = databendConnection.downloadStream(stageName, "jdbc/test/test.csv", false);
             byte[] arr = streamToByteArray(downloaded);
+            System.out.println("download size = " + arr.length);
             Assert.assertEquals(arr.length, f.length());
         } finally {
             if (downloaded != null) {
@@ -124,14 +127,14 @@ public void testFileTransfer()
 
     @Test(groups = {"IT"})
     public void testFileTransferThroughAPI() throws SQLException, IOException {
-        String filePath = generateRandomCSV(100000);
+        String filePath = generateRandomCSV(10000);
         File f = new File(filePath);
         try (InputStream fileInputStream = Files.newInputStream(f.toPath());
              Connection connection = Utils.createConnectionWithPresignedUrlDisable()) {
             Logger.getLogger(OkHttpClient.class.getName()).setLevel(Level.ALL);
 
 
-            String stageName = "test_stage";
+            String stageName = "test_stage_np";
             DatabendConnection databendConnection = connection.unwrap(DatabendConnection.class);
             PresignContext.createStageIfNotExists(databendConnection, stageName);
             databendConnection.uploadStream(stageName, "jdbc/test/", fileInputStream, "test.csv", f.length(), false);
@@ -165,17 +168,16 @@ public void testCopyInto() throws IOException, SQLException {
         }
     }
 
-    @Test(groups = {"IT"})
-    public void testLoadStreamToTableWithStage() throws SQLException, IOException {
-        testLoadStreamToTableInner("stage");
-    }
-
-    @Test(groups = {"IT"})
-    public void testLoadStreamToTableWithStreaming() throws SQLException, IOException {
-        testLoadStreamToTableInner("streaming");
+    @DataProvider(name = "streamingLoad")
+    private Object[][] provideTestData() {
+        return new Object[][] {
+                {"streaming"},
+                {"stage"}
+        };
     }
 
-    public void testLoadStreamToTableInner(String method) throws IOException, SQLException {
+    @Test(groups = "IT", dataProvider = "streamingLoad")
+    public void testLoadStreamToTable(String method) throws IOException, SQLException {
         if (!Compatibility.driverCapability.streamingLoad) {
             System.out.println("Skip testLoadStreamToTableInner: driver version too low");
             return;
@@ -190,8 +192,9 @@ public void testLoadStreamToTableInner(String method) throws IOException, SQLExc
         try (FileInputStream fileInputStream = new FileInputStream(f);
              Connection connection = Utils.createConnectionWithPresignedUrlDisable();
              Statement statement = connection.createStatement()) {
-            statement.execute("create or replace database test_load");
-            statement.execute("use test_load");
+            String dbName = "test_load_stream_" + method;
+            statement.execute(String.format("create or replace database %s", dbName));
+            statement.execute(String.format("use %s", dbName));
             statement.execute("create or replace table test_load(i int, a Variant, b string)");
             DatabendConnection databendConnection = connection.unwrap(DatabendConnection.class);
             String sql = "insert into test_load from @_databend_load file_format=(type=csv)";

databend-jdbc/src/test/java/com/databend/jdbc/TestPrepareStatement.java

@@ -25,11 +25,12 @@ public class TestPrepareStatement {
     private static final ThreadLocal<String> METHOD_NAME = new ThreadLocal<>();
     private static final ThreadLocal<String> DB_NAME = new ThreadLocal<>();
 
-    @BeforeMethod
+    @BeforeMethod(groups = "IT")
     public void captureMethod(Method method) {
         METHOD_NAME.set(method.getName());
         String dbName = "TestPrepareStatement_" + METHOD_NAME.get();
         DB_NAME.set(dbName.toLowerCase());
+        System.out.println("【DEBUG】DB_NAME = " + METHOD_NAME.get());
     }
 
     Connection getConn() throws SQLException {
@@ -110,7 +111,7 @@ public void TestBatchInsertWithNULL() throws SQLException {
     }
 
     @Test(groups = "UNIT")
-    public void TestConvertSQLWithBatchValues() throws SQLException {
+    public void TestConvertSQLWithBatchValues() {
         List<String[]> batchValues = new ArrayList<>();
         // Add string arrays to batchValues
         String[] values1 = { "1" };

tests/compatibility/testng.xml

@@ -1,4 +1,4 @@
-<suite name="DatabendJdbcTests" verbose="10">
+<suite name="DatabendJdbcTests" verbose="10" parallel="methods">
   <test name="AllTests">
     <groups>
       <run>