fixed some more tests

Author: chernser

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcIntegrationTest.java

@@ -105,8 +105,12 @@ public DataSource newDataSource(String url, Properties properties) throws SQLExc
         if (properties == null) {
             properties = new Properties();
         }
-        properties.put("password", getPassword());
-        properties.put("user", "default");
+        if (!properties.containsKey("password")) {
+            properties.put("password", getPassword());
+        }
+        if (!properties.containsKey("user")) {
+            properties.put("user", "default");
+        }
 
         if (isCloud()) {
             url = String.format("jdbc:clickhouse:https://%s/%s", getServerAddress(ClickHouseProtocol.HTTP), ClickHouseServerForTest.getDatabase());

clickhouse-r2dbc/src/test/java/com/clickhouse/r2dbc/spi/test/R2DBCTestKitImplTest.java

@@ -38,7 +38,7 @@ public class R2DBCTestKitImplTest implements TestKit<String> {
 
     private static final String DATABASE = "default";
     private static final String USER = "default";
-    private static final String PASSWORD = "";
+    private static final String PASSWORD = "test_default_password";
 
     private static final String CUSTOM_PROTOCOL_NAME = System.getProperty("protocol", "http").toUpperCase();
     private static final ClickHouseProtocol DEFAULT_PROTOCOL = ClickHouseProtocol

client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java

@@ -25,6 +25,11 @@
 import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.data.ClickHouseFormat;
 import com.clickhouse.data.ClickHouseVersion;
+import com.clickhouse.data.format.BinaryStreamUtils;
+import net.jpountz.lz4.LZ4Compressor;
+import net.jpountz.lz4.LZ4SafeDecompressor;
+import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStream;
+import org.apache.commons.compress.compressors.snappy.SnappyCompressorOutputStream;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.testng.Assert;
@@ -556,8 +561,8 @@ public void testCollectionInsert() throws Exception {
         System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "DEBUG");
     }
 
-    @Test
-    public void testAppCompression() throws Exception {
+    @Test(dataProvider = "testAppCompressionDataProvider", dataProviderClass = InsertTests.class)
+    public void testAppCompression(String algo) throws Exception {
         String tableName = "very_long_table_name_with_uuid_" + UUID.randomUUID().toString().replace('-', '_');
         String tableCreate = "CREATE TABLE \"" + tableName + "\" " +
                 " (name String, " +
@@ -581,17 +586,31 @@ public void testAppCompression() throws Exception {
         byte[][] compressedData = new byte[data.length][];
         for (int i = 0 ; i < data.length; i++) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            GZIPOutputStream gz = new GZIPOutputStream(baos);
-            gz.write(data[i].getBytes(StandardCharsets.UTF_8));
-            gz.finish();
+            if (algo.equalsIgnoreCase("gzip")) {
+                GZIPOutputStream gz = new GZIPOutputStream(baos);
+                gz.write(data[i].getBytes(StandardCharsets.UTF_8));
+                gz.finish();
+            } else if (algo.equalsIgnoreCase("lz4")) {
+                FramedLZ4CompressorOutputStream lz4 = new FramedLZ4CompressorOutputStream(baos);
+                lz4.write(data[i].getBytes(StandardCharsets.UTF_8));
+                lz4.finish();
+            } else if (algo.equalsIgnoreCase("snappy")) {
+                byte bytes[] = data[i].getBytes(StandardCharsets.UTF_8);
+
+                SnappyCompressorOutputStream snappy = new SnappyCompressorOutputStream(baos,bytes.length, 32);
+                snappy.write(bytes);
+                snappy.finish();
+            }
             System.out.println("Compressed size " + baos.size() + ", uncompressed size: " + data[i].length());
             compressedData[i] = baos.toByteArray();
         }
 
         InsertSettings insertSettings = new InsertSettings()
-                .appCompressedData(true, "gzip");
+                .appCompressedData(true, algo);
         try (InsertResponse response = client.insert(tableName, out -> {
             for (byte[] row : compressedData) {
+//                if (algo.)
+                BinaryStreamUtils.writeVarInt(out, row.length);
                 out.write(row);
             }
         }, ClickHouseFormat.JSONEachRow, insertSettings).get()) {
@@ -605,6 +624,15 @@ public void testAppCompression() throws Exception {
         }
     }
 
+    @DataProvider(name = "testAppCompressionDataProvider")
+    public static Object[][] testAppCompressionDataProvider() {
+        return new Object[][] {
+                {"gzip"},
+                {"lz4"},
+                {"snappy"},
+        };
+    }
+
     protected void initTable(String tableName, String createTableSQL) throws Exception {
         client.execute("DROP TABLE IF EXISTS " + tableName).get(EXECUTE_CMD_TIMEOUT, TimeUnit.SECONDS);
         client.execute(createTableSQL).get(EXECUTE_CMD_TIMEOUT, TimeUnit.SECONDS);