Skip to content

Commit 7dee3b3

Browse files
zhicwuzhicwu
authored
Merge pull request #581 from zhicwu/multi-modules
Multi modules
2 parents 0bc6d8e + ef3b27b commit 7dee3b3

File tree

174 files changed

+772
-952
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+772
-952
lines changed

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ log/
2929
target/
3030

3131
# Generated files
32-
src/main/java/ru/yandex/clickhouse/jdbc/parser/*CharStream.java
33-
src/main/java/ru/yandex/clickhouse/jdbc/parser/ClickHouseSqlParser*.java
34-
src/main/java/ru/yandex/clickhouse/jdbc/parser/Token*.java
35-
src/main/java/ru/yandex/clickhouse/jdbc/parser/ParseException.java
32+
**/parser/*CharStream.java
33+
**/parser/ClickHouseSqlParser*.java
34+
**/parser/Token*.java
35+
**/parser/ParseException.java
3636

3737
# Shell scripts
3838
*.sh

‎clickhouse-benchmark/pom.xml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22
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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>tech.clickhouse</groupId>
5+
<parent>
6+
<groupId>tech.clickhouse</groupId>
7+
<artifactId>clickhouse-java</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
11+
<groupId>${parent.groupId}</groupId>
612
<artifactId>clickhouse-benchmark</artifactId>
713
<version>${revision}</version>
814
<packaging>jar</packaging>
915

1016
<name>clickhouse-benchmark</name>
17+
<description>Benchmarks for ClickHouse clients</description>
1118

1219
<properties>
13-
<revision>0.3.0-SNAPSHOT</revision>
1420
<clickhouse4j-driver.version>1.4.4</clickhouse4j-driver.version>
1521
<native-driver.version>2.5.3</native-driver.version>
1622
<mariadb-driver.version>2.7.2</mariadb-driver.version>
@@ -19,7 +25,6 @@
1925
<testcontainers.version>1.15.2</testcontainers.version>
2026
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2127
<jmh.version>1.27</jmh.version>
22-
<javac.target>1.8</javac.target>
2328
<shade.name>benchmarks</shade.name>
2429
</properties>
2530

@@ -96,7 +101,6 @@
96101
<dependency>
97102
<groupId>org.testcontainers</groupId>
98103
<artifactId>testcontainers</artifactId>
99-
<version>${testcontainers.version}</version>
100104
</dependency>
101105
</dependencies>
102106

@@ -105,17 +109,15 @@
105109
<plugin>
106110
<groupId>org.apache.maven.plugins</groupId>
107111
<artifactId>maven-compiler-plugin</artifactId>
108-
<version>3.8.0</version>
109112
<configuration>
110-
<compilerVersion>${javac.target}</compilerVersion>
111-
<source>${javac.target}</source>
112-
<target>${javac.target}</target>
113+
<compilerVersion>${jdk.version}</compilerVersion>
114+
<source>${jdk.version}</source>
115+
<target>${jdk.version}</target>
113116
</configuration>
114117
</plugin>
115118
<plugin>
116119
<groupId>org.apache.maven.plugins</groupId>
117120
<artifactId>maven-shade-plugin</artifactId>
118-
<version>3.2.1</version>
119121
<executions>
120122
<execution>
121123
<phase>package</phase>

‎clickhouse-client/pom.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>tech.clickhouse</groupId>
7+
<artifactId>clickhouse-java</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
11+
<groupId>${parent.groupId}</groupId>
12+
<artifactId>clickhouse-client</artifactId>
13+
<version>${revision}</version>
14+
<packaging>jar</packaging>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>org.slf4j</groupId>
19+
<artifactId>slf4j-api</artifactId>
20+
</dependency>
21+
</dependencies>
22+
23+
<build>
24+
<plugins>
25+
<plugin>
26+
<groupId>org.apache.maven.plugins</groupId>
27+
<artifactId>maven-compiler-plugin</artifactId>
28+
<configuration>
29+
<source>${jdk.version}</source>
30+
<target>${jdk.version}</target>
31+
<showWarnings>true</showWarnings>
32+
<compilerArgs>
33+
<arg>-Xlint:all</arg>
34+
<arg>-Werror</arg>
35+
</compilerArgs>
36+
</configuration>
37+
</plugin>
38+
</plugins>
39+
</build>
40+
</project>

‎clickhouse-grpc-client/pom.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>tech.clickhouse</groupId>
7+
<artifactId>clickhouse-java</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
11+
<groupId>${parent.groupId}</groupId>
12+
<artifactId>clickhouse-grpc-client</artifactId>
13+
<version>${revision}</version>
14+
<packaging>jar</packaging>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>${parent.groupId}</groupId>
19+
<artifactId>clickhouse-client</artifactId>
20+
<version>${revision}</version>
21+
</dependency>
22+
</dependencies>
23+
24+
<build>
25+
<plugins>
26+
<plugin>
27+
<groupId>org.apache.maven.plugins</groupId>
28+
<artifactId>maven-compiler-plugin</artifactId>
29+
<configuration>
30+
<source>${jdk.version}</source>
31+
<target>${jdk.version}</target>
32+
<showWarnings>true</showWarnings>
33+
<compilerArgs>
34+
<arg>-Xlint:all</arg>
35+
<arg>-Werror</arg>
36+
</compilerArgs>
37+
</configuration>
38+
</plugin>
39+
</plugins>
40+
</build>
41+
</project>

‎clickhouse-http-client/pom.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
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">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>tech.clickhouse</groupId>
7+
<artifactId>clickhouse-java</artifactId>
8+
<version>${revision}</version>
9+
</parent>
10+
11+
<groupId>${parent.groupId}</groupId>
12+
<artifactId>clickhouse-http-client</artifactId>
13+
<version>${revision}</version>
14+
<packaging>jar</packaging>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>${parent.groupId}</groupId>
19+
<artifactId>clickhouse-client</artifactId>
20+
<version>${revision}</version>
21+
</dependency>
22+
</dependencies>
23+
24+
<build>
25+
<plugins>
26+
<plugin>
27+
<groupId>org.apache.maven.plugins</groupId>
28+
<artifactId>maven-compiler-plugin</artifactId>
29+
<configuration>
30+
<source>${jdk.version}</source>
31+
<target>${jdk.version}</target>
32+
<showWarnings>true</showWarnings>
33+
<compilerArgs>
34+
<arg>-Xlint:all</arg>
35+
<arg>-Werror</arg>
36+
</compilerArgs>
37+
</configuration>
38+
</plugin>
39+
</plugins>
40+
</build>
41+
</project>

AUTHORS renamed to clickhouse-jdbc/AUTHORS

File renamed without changes.

docs/datetime.md renamed to clickhouse-jdbc/docs/datetime.md

File renamed without changes.

0 commit comments

Comments
 (0)