Fix dependency issue in POM and bump version to 0.3.1

.github/workflows/benchmark.yml

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

.github/workflows/release.yml

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

.github/workflows/timezone.yml

@@ -59,4 +59,5 @@ jobs:
           find . -type f -name "pom.xml" -exec sed -i -e 's|.*argLine.*timezone=.*||g' '{}' \;
           mvn --batch-mode --update-snapshots \
             -DclickhouseTimezone=${{ matrix.serverTz }} \
+            -DclickhouseVersion=21.3 \
             -Duser.timezone=${{ matrix.clientTz }} verify

.gitignore

@@ -29,6 +29,7 @@ log/
 target/
 
 # Generated files
+.flattened-pom.xml
 **/parser/*CharStream.java
 **/parser/ClickHouseSqlParser.java
 **/parser/ClickHouseSqlParserConstants.java

README.md

@@ -10,7 +10,7 @@ It has support of a minimal subset of features to be usable.
 <dependency>
     <groupId>ru.yandex.clickhouse</groupId>
     <artifactId>clickhouse-jdbc</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
 </dependency>
 ```
 
@@ -24,14 +24,22 @@ additionally, if you have a few instances, you can use `BalancedClickhouseDataSo
 
 **Notice**
 
-If your build tool can not resolve dependency: `com.github.RoaringBitmap:RoaringBitmap`, please add the JitPack repository to your build file:
+To use an up-to-date version of RoaringBitmap, please update your POM with below two changes:
 ```xml
+<!-- 1. add repository -->
 <repositories>
     <repository>
         <id>jitpack.io</id>
         <url>https://jitpack.io</url>
     </repository>
 </repositories>
+
+<!-- 2. add dependency(groupId is different from the one in maven central) -->
+<dependency>
+    <groupId>com.github.RoaringBitmap</groupId>
+    <artifactId>RoaringBitmap</artifactId>
+    <version>0.9.10</version>
+</dependency>
 ```
 
 ### Extended API

clickhouse-benchmark/pom.xml

@@ -8,7 +8,6 @@
         <version>${revision}</version>
     </parent>
 
-    <groupId>${parent.groupId}</groupId>
     <artifactId>clickhouse-benchmark</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>

clickhouse-client/pom.xml

@@ -8,20 +8,90 @@
         <version>${revision}</version>
     </parent>
 
-    <groupId>${parent.groupId}</groupId>
     <artifactId>clickhouse-client</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
 
+    <properties>
+        <javacc-plugin.version>4.1.4</javacc-plugin.version>
+    </properties>
+
     <dependencies>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.lmax</groupId>
+            <artifactId>disruptor</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>dnsjava</groupId>
+            <artifactId>dnsjava</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.roaringbitmap</groupId>
+            <artifactId>RoaringBitmap</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-jre8</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>com.helger.maven</groupId>
+                <artifactId>ph-javacc-maven-plugin</artifactId>
+                <version>${javacc-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>jjc</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>javacc</goal>
+                        </goals>
+                        <configuration>
+                            <jdkVersion>${jdk.version}</jdkVersion>
+                            <javadocFriendlyComments>true</javadocFriendlyComments>
+                            <packageName>tech.clickhouse.client.parser</packageName>
+                            <sourceDirectory>src/main/javacc</sourceDirectory>
+                            <outputDirectory>src/main/java</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -31,10 +101,32 @@
                     <showWarnings>true</showWarnings>
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
-                        <arg>-Werror</arg>
+                        <!-- arg>-Werror</arg -->
                     </compilerArgs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <environmentVariables>
+                        <TEST_ENV_STRING>env_str</TEST_ENV_STRING>
+                        <TEST_ENV_INTEGER>416</TEST_ENV_INTEGER>
+                        <TEST_ENV_BOOLEAN>false</TEST_ENV_BOOLEAN>
+                    </environmentVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

clickhouse-grpc-client/pom.xml

@@ -8,14 +8,13 @@
         <version>${revision}</version>
     </parent>
 
-    <groupId>${parent.groupId}</groupId>
     <artifactId>clickhouse-grpc-client</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>${parent.groupId}</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>clickhouse-client</artifactId>
             <version>${revision}</version>
         </dependency>

clickhouse-http-client/pom.xml

@@ -8,17 +8,53 @@
         <version>${revision}</version>
     </parent>
 
-    <groupId>${parent.groupId}</groupId>
     <artifactId>clickhouse-http-client</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
 
+    <properties>
+        <httpclient.version>4.5.13</httpclient.version>
+    </properties>
+
     <dependencies>
         <dependency>
-            <groupId>${parent.groupId}</groupId>
+            <groupId>${project.parent.groupId}</groupId>
             <artifactId>clickhouse-client</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>${httpclient.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>clickhouse-client</artifactId>
+            <version>${revision}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -32,10 +68,18 @@
                     <showWarnings>true</showWarnings>
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
-                        <arg>-Werror</arg>
+                        <!-- arg>-Werror</arg -->
                     </compilerArgs>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>

clickhouse-jdbc/pom.xml

@@ -50,6 +50,13 @@
     </properties>
 
     <dependencies>
+        <!--
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>clickhouse-http-client</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -73,8 +80,9 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.RoaringBitmap</groupId>
+            <groupId>org.roaringbitmap</groupId>
             <artifactId>RoaringBitmap</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -202,10 +210,6 @@
                             <pattern>net.jpountz</pattern>
                             <shadedPattern>${shade.base}.jpountz</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>org.roaringbitmap</pattern>
-                            <shadedPattern>${shade.base}.bitmap</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>org.slf4j</pattern>
                             <shadedPattern>${shade.base}.slf4j</shadedPattern>

clickhouse-jdbc/src/main/javacc/ClickHouseSqlParser.jj

@@ -127,7 +127,7 @@ public class ClickHouseSqlParser {
             if (DEBUG) {
                 throw new IllegalArgumentException(e);
             } else {
-                log.warn("Failed to parse the given SQL. If you believe the SQL is valid, please feel free to open an issue on Github with the following SQL and exception attached.\n{}", sql, e);
+                log.warn("{}. If you believe the SQL is valid, please feel free to open an issue on Github with this warning and the following SQL attached.\n{}", e.getMessage(), sql);
             }
         }
 

clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/ClickHouseStatementImplTest.java

@@ -34,6 +34,7 @@
 import ru.yandex.clickhouse.ClickHouseStatement;
 import ru.yandex.clickhouse.settings.ClickHouseProperties;
 import ru.yandex.clickhouse.settings.ClickHouseQueryParam;
+import ru.yandex.clickhouse.util.ClickHouseVersionNumberUtil;
 
 public class ClickHouseStatementImplTest {
 
@@ -126,8 +127,10 @@ public void testSelectUInt64() throws SQLException {
 
     @Test
     public void testExternalData() throws SQLException, UnsupportedEncodingException {
+        String serverVersion = connection.getServerVersion();
         ClickHouseStatement stmt = connection.createStatement();
-        String[] rows = "21.3.3.14".equals(connection.getServerVersion())
+        String[] rows = ClickHouseVersionNumberUtil.getMajorVersion(serverVersion) >= 21
+            && ClickHouseVersionNumberUtil.getMinorVersion(serverVersion) >= 3
             ? new String[] { "1\tGroup\n" }
             : new String[] { "1\tGroup", "1\tGroup\n" };
 

clickhouse-jdbc/src/test/resources/log4j.properties

@@ -1,6 +1,6 @@
-log4j.rootLogger=DEBUG, STDOUT
-log4j.category.ru.yandex.clickhouse=DEBUG
-log4j.logger.org.apache.http=WARN
+log4j.rootLogger=WARN, STDOUT
+#log4j.category.ru.yandex.clickhouse=DEBUG
+#log4j.logger.org.apache.http=DEBUG
 log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
 log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
 log4j.appender.STDOUT.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.sss} [%t] [%-5p] {%c{1}:%L} - %m%n