Add repackaged 3rd party libs

.github/workflows/benchmark.yml

@@ -26,7 +26,7 @@ on:
       driver:
         description: "Driver version"
         required: true
-        default: "0.3.1-SNAPSHOT"
+        default: "0.3.2-SNAPSHOT"
       options:
         description: "Benchmark options"
         required: true

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11, 15]
+        java: [8, 11, 17]
         # most recent LTS releases as well as latest stable builds
         clickhouse: ["21.3", "21.8", "latest"]
       fail-fast: false
@@ -59,4 +59,4 @@ jobs:
             ${{ runner.os }}-build-
       - name: Build with Maven
         run: |
-          mvn --batch-mode --update-snapshots -DclickhouseVersion=${{ matrix.clickhouse }} verify
+          mvn --batch-mode --update-snapshots -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} verify

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       version:
         description: "Release version"
         required: true
-        default: "0.3.1-SNAPSHOT"
+        default: "0.3.2-SNAPSHOT"
 
 jobs:
   release:

.gitignore

@@ -1,6 +1,8 @@
-*.class
+# MacOS
+.DS_Store
 
-# Package Files #
+# Java Files
+*.class
 *.jar
 *.war
 *.ear
@@ -30,6 +32,7 @@ target/
 
 # Generated files
 .flattened-pom.xml
+dependency-reduced-pom.xml
 **/parser/*CharStream.java
 **/parser/ClickHouseSqlParser.java
 **/parser/ClickHouseSqlParserConstants.java
@@ -42,3 +45,6 @@ profile.html
 
 # Shell scripts
 *.sh
+
+# test configuration
+**/test/resources/test.properties

third-party-libraries/io.grpc/pom.xml

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.clickhouse</groupId>
+        <artifactId>third-party-libraries</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>io.grpc</artifactId>
+    <version>${grpc.version}</version>
+    <name>Repackaged grpc-java for JPMS support</name>
+    <description>A Java modules compatible re-packaging of grpc-java</description>
+
+    <dependencies>
+        <!--
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        -->
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.gson</groupId>
+                    <artifactId>gson</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty-shaded</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-okhttp</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.opencensus</groupId>
+            <artifactId>opencensus-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.opencensus</groupId>
+            <artifactId>opencensus-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.opencensus</groupId>
+            <artifactId>opencensus-contrib-grpc-metrics</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- create the base JAR removing all of the dummy classes -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>io/grpc/**/*.class</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <!-- create the shaded JAR -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>shade</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <createSourcesJar>false</createSourcesJar>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>module-info.class</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                        <exclude>android/**</exclude>
+                                        <exclude>com/lmax/**</exclude>
+                                        <exclude>google/**</exclude>
+                                        <exclude>io/perfmark/**</exclude>
+                                        <exclude>org/**</exclude>
+                                        <exclude>javax/**</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <!-- artifactSet>
+                                <includes>
+                                    <include>io.grpc:*</include>
+                                    <include>com.google.instrumentation:instrumentation-api</include>
+                                    <include>io.opencensus:opencensus-api</include>
+                                    <include>io.opencensus:opencensus-contrib-grpc-metrics</include>
+                                </includes>
+                            </artifactSet -->
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <configuration>
+                            <overwriteExistingFiles>true</overwriteExistingFiles>
+                            <module>
+                                <moduleInfoFile>src/main/java/module-info.java</moduleInfoFile>
+                            </module>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

third-party-libraries/io.grpc/src/main/java/io/grpc/LoadBalancerProvider.java

@@ -0,0 +1,13 @@
+package io.grpc;
+
+/**
+ * Dummy class as placeholder. It will be removed during package phase.
+ */
+public class LoadBalancerProvider {
+    /**
+     * Default constructor.
+     */
+    public LoadBalancerProvider() {
+        // dummy constructor
+    }
+}

third-party-libraries/io.grpc/src/main/java/io/grpc/ManagedChannelProvider.java

@@ -0,0 +1,13 @@
+package io.grpc;
+
+/**
+ * Dummy class as placeholder. It will be removed during package phase.
+ */
+public class ManagedChannelProvider {
+    /**
+     * Default constructor.
+     */
+    public ManagedChannelProvider() {
+        // dummy constructor
+    }
+}

third-party-libraries/io.grpc/src/main/java/io/grpc/NameResolverProvider.java

@@ -0,0 +1,13 @@
+package io.grpc;
+
+/**
+ * Dummy class as placeholder. It will be removed during package phase.
+ */
+public class NameResolverProvider {
+    /**
+     * Default constructor.
+     */
+    public NameResolverProvider() {
+        // dummy constructor
+    }
+}

third-party-libraries/io.grpc/src/main/java/io/grpc/ServerProvider.java

@@ -0,0 +1,13 @@
+package io.grpc;
+
+/**
+ * Dummy class as placeholder. It will be removed during package phase.
+ */
+public class ServerProvider {
+    /**
+     * Default constructor.
+     */
+    public ServerProvider() {
+        // dummy constructor
+    }
+}

third-party-libraries/io.grpc/src/main/java/module-info.java

@@ -0,0 +1,18 @@
+module io.grpc {
+    exports io.grpc;
+    // exports io.grpc.inprocess;
+    // exports io.grpc.internal;
+    // exports io.grpc.util;
+
+    requires java.logging;
+    requires java.naming;
+    // requires com.google.errorprone.annotations;
+    // requires com.lmax.disruptor;
+    // requires io.perfmark;
+
+    uses io.grpc.ManagedChannelProvider;
+    uses io.grpc.NameResolverProvider;
+    uses io.grpc.ServerProvider;
+    // uses io.grpc.internal.BinaryLogProvider;
+    uses io.grpc.LoadBalancerProvider;
+}

third-party-libraries/org.roaringbitmap/pom.xml

@@ -0,0 +1,88 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.clickhouse</groupId>
+        <artifactId>third-party-libraries</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>org.roaringbitmap</artifactId>
+    <version>${roaring-bitmap.version}</version>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>Repackaged RoaringBitmap for JPMS compatibility</description>
+    <url>https://github.com/ClickHouse/clickhouse-jdbc/tree/master/third-party-libraries/org.roaringbitmap</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.roaringbitmap</groupId>
+            <artifactId>RoaringBitmap</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>org/roaringbitmap/**/*.class</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>shade</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <createSourcesJar>false</createSourcesJar>
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>module-info.class</exclude>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer" />
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-module-infos</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                        <configuration>
+                            <overwriteExistingFiles>true</overwriteExistingFiles>
+                            <module>
+                                <moduleInfoFile>src/main/java/module-info.java</moduleInfoFile>
+                            </module>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

third-party-libraries/org.roaringbitmap/src/main/java/module-info.java

@@ -0,0 +1,5 @@
+module org.roaringbitmap {
+    exports org.roaringbitmap;
+    exports org.roaringbitmap.buffer;
+    exports org.roaringbitmap.longlong;
+}

third-party-libraries/org.roaringbitmap/src/main/java/org/roaringbitmap/DummyClass.java

@@ -0,0 +1,12 @@
+package org.roaringbitmap;
+
+/**
+ * Dummy class as placeholder. It will be removed during package phase.
+ */
+public class DummyClass {
+    /**
+     * Default constructor.
+     */
+    public DummyClass() {
+    }
+}