Merge pull request #764 from zhicwu/fix-build

zhicwu · web-flow · commit 9e543e806de2 · 2021-11-29T23:50:40.000+08:00
Fix build failure on JDK 8
diff --git a/.github/toolchains.xml b/.github/toolchains.xml
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -62,7 +62,7 @@ jobs:
           mvn --batch-mode --update-snapshots -q -DskipTests install
           cd clickhouse-benchmark
           java -DclickhouseVersion="21.8" -jar target/benchmarks.jar -rf text \
-            -p client=clickhouse-http-jdbc -p type=default Basic
+            -p client=clickhouse-http-jdbc -p client=clickhouse-grpc-jdbc -p type=default Basic
           echo "BENCHMARK_REPORT<<EOF" >> $GITHUB_ENV
           cat jmh-result.text >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,11 +32,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 17]
         # most recent LTS releases as well as latest stable builds
         clickhouse: ["21.3", "21.8", "latest"]
       fail-fast: false
-    name: Build using JDK ${{ matrix.java }} against ClickHouse ${{ matrix.clickhouse }}
+    name: Build against ClickHouse ${{ matrix.clickhouse }}
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
@@ -45,10 +44,34 @@ jobs:
           git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 \
             origin pull/${{ github.event.inputs.pr }}/merge:merged-pr && git checkout merged-pr
         if: github.event.inputs.pr != ''
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+      - name: Install JDK 11
+        uses: AdoptOpenJDK/install-jdk@v1
         with:
-          java-version: ${{ matrix.java }}
+          version: '11'
+          targets: 'JDK11_HOME'
+      - name: Setup Toolchain
+        shell: bash
+        run: |
+          mkdir -p $HOME/.m2 \
+          && cat << EOF > $HOME/.m2/toolchains.xml
+          <?xml version="1.0" encoding="UTF8"?>
+          <toolchains>
+            <toolchain>
+              <type>jdk</type>
+              <provides>
+                <version>11</version>
+              </provides>
+              <configuration>
+                <jdkHome>${{ env.JDK11_HOME }}</jdkHome>
+              </configuration>
+            </toolchain>
+          </toolchains>
+          EOF
+      - name: Install JDK 8 and Maven
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 8
       # Step that does that actual cache save and restore
       - name: Cache maven dependencies
         uses: actions/cache@v2
@@ -59,10 +82,4 @@ jobs:
             ${{ runner.os }}-build-
       - name: Build
         run: |
-          mvn --batch-mode --update-snapshots -DclickhouseVersion=${{ matrix.clickhouse }} verify
-        if: matrix.java == '8'
-      - name: Build in release mode
-        run: |
-          mvn --batch-mode --update-snapshots --global-toolchains .github/toolchains.xml \
-            -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} verify
-        if: matrix.java != '8'
+          mvn --batch-mode --update-snapshots -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} verify
diff --git a/clickhouse-benchmark/src/main/java/com/clickhouse/benchmark/jdbc/DriverState.java b/clickhouse-benchmark/src/main/java/com/clickhouse/benchmark/jdbc/DriverState.java
@@ -56,6 +56,11 @@ public void doSetup(ServerState serverState) throws Exception {
                 s.execute(
                         "create table if not exists system.test_insert(i Nullable(UInt64), s Nullable(String), t Nullable(DateTime))engine=Memory");
             }
+
+            if (!Constants.REUSE_CONNECTION.equalsIgnoreCase(connection)) {
+                conn.close();
+                conn = null;
+            }
         } catch (SQLException e) {
             e.printStackTrace();
             throw new RuntimeException(e);
@@ -68,6 +73,7 @@ public void doTearDown(ServerState serverState) throws SQLException {
 
         if (conn != null) {
             conn.close();
+            conn = null;
         }
     }
 
diff --git a/clickhouse-client/src/test/java/com/clickhouse/client/data/ClickHousePipedStreamTest.java b/clickhouse-client/src/test/java/com/clickhouse/client/data/ClickHousePipedStreamTest.java
@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
+import java.nio.Buffer;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -23,7 +24,7 @@ public void testRead() throws Exception {
         }
 
         ByteBuffer buf = ByteBuffer.allocate(1).put(new byte[] { (byte) 3 });
-        stream.queue.put((ByteBuffer) buf.rewind());
+        stream.queue.put((ByteBuffer) ((Buffer) buf).rewind());
         Assert.assertEquals(stream.queue.size(), 1);
         try (InputStream in = stream.getInput()) {
             Assert.assertEquals(in.read(), 3);
@@ -34,7 +35,7 @@ public void testRead() throws Exception {
         }
 
         buf = ByteBuffer.allocate(2).put(new byte[] { (byte) 3, (byte) 4 });
-        stream.queue.put((ByteBuffer) buf.rewind());
+        stream.queue.put((ByteBuffer) ((Buffer) buf).rewind());
         Assert.assertEquals(stream.queue.size(), 1);
         try (InputStream in = stream.getInput()) {
             Assert.assertEquals(in.read(), 3);
@@ -52,7 +53,7 @@ public void testRead() throws Exception {
             Assert.assertEquals(in.read(), -1);
         }
 
-        stream.queue.put((ByteBuffer) buf.rewind());
+        stream.queue.put((ByteBuffer) ((Buffer) buf).rewind());
         stream.queue.put(buf);
         stream.queue.put(ClickHousePipedStream.EMPTY);
         Assert.assertEquals(stream.queue.size(), 3);
@@ -90,15 +91,15 @@ public void testReadBytes() throws Exception {
         }
 
         ByteBuffer buf = ByteBuffer.allocate(2).put(new byte[] { (byte) 3, (byte) 4 });
-        stream.queue.put((ByteBuffer) buf.rewind());
+        stream.queue.put((ByteBuffer) ((Buffer) buf).rewind());
         Assert.assertEquals(stream.queue.size(), 1);
         try (InputStream in = stream.getInput()) {
             in.read(bytes);
             Assert.fail("Read should be timed out");
         } catch (IOException e) {
             Assert.assertTrue(e.getMessage().indexOf("Read timed out") == 0);
         }
-        stream.queue.put((ByteBuffer) buf.rewind());
+        stream.queue.put((ByteBuffer) ((Buffer) buf).rewind());
         Assert.assertEquals(stream.queue.size(), 1);
         try (InputStream in = stream.getInput()) {
             Assert.assertEquals(in.read(bytes, 0, 2), 2);
@@ -107,7 +108,7 @@ public void testReadBytes() throws Exception {
         } catch (IOException e) {
             Assert.assertTrue(e.getMessage().indexOf("Read timed out") == 0);
         }
-        stream.queue.put((ByteBuffer) buf.rewind());
+        stream.queue.put((ByteBuffer) ((Buffer) buf).rewind());
         Assert.assertEquals(stream.queue.size(), 1);
         try (InputStream in = stream.getInput()) {
             in.read(bytes, 0, 3);
@@ -117,7 +118,7 @@ public void testReadBytes() throws Exception {
         }
 
         buf = ByteBuffer.allocate(2).put(new byte[] { (byte) 3, (byte) 4 });
-        stream.queue.put((ByteBuffer) buf.rewind());
+        stream.queue.put((ByteBuffer) ((Buffer) buf).rewind());
         stream.queue.put(ClickHousePipedStream.EMPTY);
         Assert.assertEquals(stream.queue.size(), 2);
         try (InputStream in = stream.getInput()) {
diff --git a/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/util/ClickHouseBlockChecksumTest.java b/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/util/ClickHouseBlockChecksumTest.java
@@ -4,50 +4,80 @@
 import org.testng.annotations.Test;
 import ru.yandex.clickhouse.response.ClickHouseLZ4Stream;
 
-import javax.xml.bind.DatatypeConverter;
-
 /**
  * @author Anton Sukhonosenko <a href="mailto:algebraic@yandex-team.ru"></a>
  * @date 08.06.18
  */
 public class ClickHouseBlockChecksumTest {
     private static final int HEADER_SIZE_BYTES = 9;
 
+    private static int hexToBin(char ch) {
+        if ('0' <= ch && ch <= '9') {
+            return ch - '0';
+        }
+        if ('A' <= ch && ch <= 'F') {
+            return ch - 'A' + 10;
+        }
+        if ('a' <= ch && ch <= 'f') {
+            return ch - 'a' + 10;
+        }
+        return -1;
+    }
+
+    private static byte[] parseHexBinary(String s) {
+        final int len = s.length();
+
+        // "111" is not a valid hex encoding.
+        if (len % 2 != 0) {
+            throw new IllegalArgumentException("hexBinary needs to be even-length: " + s);
+        }
+
+        byte[] out = new byte[len / 2];
+
+        for (int i = 0; i < len; i += 2) {
+            int h = hexToBin(s.charAt(i));
+            int l = hexToBin(s.charAt(i + 1));
+            if (h == -1 || l == -1) {
+                throw new IllegalArgumentException("contains illegal character for hexBinary: " + s);
+            }
+
+            out[i / 2] = (byte) (h * 16 + l);
+        }
+
+        return out;
+    }
+
     @Test(groups = "unit")
     public void trickyBlock() {
-        byte[] compressedData = DatatypeConverter.parseHexBinary("1F000100078078000000B4000000");
+        byte[] compressedData = parseHexBinary("1F000100078078000000B4000000");
         int uncompressedSizeBytes = 35;
 
         ClickHouseBlockChecksum checksum = ClickHouseBlockChecksum.calculateForBlock(
-            (byte) ClickHouseLZ4Stream.MAGIC,
-            compressedData.length + HEADER_SIZE_BYTES,
-            uncompressedSizeBytes,
-            compressedData,
-            compressedData.length
-        );
+                (byte) ClickHouseLZ4Stream.MAGIC,
+                compressedData.length + HEADER_SIZE_BYTES,
+                uncompressedSizeBytes,
+                compressedData,
+                compressedData.length);
 
         Assert.assertEquals(
-            new ClickHouseBlockChecksum(-493639813825217902L, -6253550521065361778L),
-            checksum
-        );
+                new ClickHouseBlockChecksum(-493639813825217902L, -6253550521065361778L),
+                checksum);
     }
 
     @Test(groups = "unit")
     public void anotherTrickyBlock() {
-        byte[] compressedData = DatatypeConverter.parseHexBinary("80D9CEF753E3A59B3F");
+        byte[] compressedData = parseHexBinary("80D9CEF753E3A59B3F");
         int uncompressedSizeBytes = 8;
 
         ClickHouseBlockChecksum checksum = ClickHouseBlockChecksum.calculateForBlock(
-            (byte) ClickHouseLZ4Stream.MAGIC,
-            compressedData.length + HEADER_SIZE_BYTES,
-            uncompressedSizeBytes,
-            compressedData,
-            compressedData.length
-        );
+                (byte) ClickHouseLZ4Stream.MAGIC,
+                compressedData.length + HEADER_SIZE_BYTES,
+                uncompressedSizeBytes,
+                compressedData,
+                compressedData.length);
 
         Assert.assertEquals(
-            new ClickHouseBlockChecksum(-7135037831041210418L, -8214889029657590490L),
-            checksum
-        );
+                new ClickHouseBlockChecksum(-7135037831041210418L, -8214889029657590490L),
+                checksum);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,11 @@ public void doSetup(ServerState serverState) throws Exception {`
`56`	`56`	`s.execute(`
`57`	`57`	`"create table if not exists system.test_insert(i Nullable(UInt64), s Nullable(String), t Nullable(DateTime))engine=Memory");`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+ if (!Constants.REUSE_CONNECTION.equalsIgnoreCase(connection)) {`
	`61`	`+ conn.close();`
	`62`	`+ conn = null;`
	`63`	`+ }`
`59`	`64`	`} catch (SQLException e) {`
`60`	`65`	`e.printStackTrace();`
`61`	`66`	`throw new RuntimeException(e);`
`@@ -68,6 +73,7 @@ public void doTearDown(ServerState serverState) throws SQLException {`
`68`	`73`
`69`	`74`	`if (conn != null) {`
`70`	`75`	`conn.close();`
	`76`	`+ conn = null;`
`71`	`77`	`}`
`72`	`78`	`}`
`73`	`79`