Skip to content

Commit 36b8823

Browse files
PaultagorasPaultagoras
authored
Merge pull request #1777 from ClickHouse/fix_turn_off_java9
Remove Java9 Targets
2 parents b9a451b + 31aa722 commit 36b8823

File tree

6 files changed

+150
-55
lines changed

6 files changed

+150
-55
lines changed

‎clickhouse-client/src/main/java11/module-info.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**
2+
* Declares com.clickhouse.client module.
3+
*/
4+
module com.clickhouse.client {
5+
exports com.clickhouse.client;
6+
exports com.clickhouse.client.config;
7+
8+
requires static org.dnsjava;
9+
10+
requires transitive com.clickhouse.data;
11+
12+
uses com.clickhouse.client.ClickHouseClient;
13+
uses com.clickhouse.client.ClickHouseDnsResolver;
14+
uses com.clickhouse.client.ClickHouseSslContextProvider;
15+
}

‎clickhouse-data/src/main/java11/com/clickhouse/data/ByteUtils.java‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
package com.clickhouse.data;
2+
3+
import java.lang.invoke.MethodHandles;
4+
import java.lang.invoke.VarHandle;
5+
import java.nio.ByteOrder;
6+
import java.util.Arrays;
7+
8+
public final class ByteUtils {
9+
public boolean equals(byte[] a, int aFromIndex, int aToIndex, byte[] b, int bFromIndex, int bToIndex) {
10+
return Arrays.equals(a, aFromIndex, aToIndex, b, bFromIndex, bToIndex);
11+
}
12+
13+
public byte getInt8(byte[] bytes, int offset) {
14+
return (byte) byteHandle.get(bytes, offset);
15+
}
16+
17+
public void setInt8(byte[] bytes, int offset, byte value) {
18+
byteHandle.set(bytes, offset, value);
19+
}
20+
21+
public short getInt16(byte[] bytes, int offset) {
22+
return (short) shortHandle.get(bytes, offset);
23+
}
24+
25+
public void setInt16(byte[] bytes, int offset, short value) {
26+
shortHandle.set(bytes, offset, value);
27+
}
28+
29+
public int getInt32(byte[] bytes, int offset) {
30+
return (int) intHandle.get(bytes, offset);
31+
}
32+
33+
public void setInt32(byte[] bytes, int offset, int value) {
34+
intHandle.set(bytes, offset, value);
35+
}
36+
37+
public long getInt64(byte[] bytes, int offset) {
38+
return (long) longHandle.get(bytes, offset);
39+
}
40+
41+
public void setInt64(byte[] bytes, int offset, long value) {
42+
longHandle.set(bytes, offset, value);
43+
}
44+
45+
public float getFloat32(byte[] bytes, int offset) {
46+
return (float) floatHandle.get(bytes, offset);
47+
}
48+
49+
public void setFloat32(byte[] bytes, int offset, float value) {
50+
floatHandle.set(bytes, offset, value);
51+
}
52+
53+
public double getFloat64(byte[] bytes, int offset) {
54+
return (double) doubleHandle.get(bytes, offset);
55+
}
56+
57+
public void setFloat64(byte[] bytes, int offset, double value) {
58+
doubleHandle.set(bytes, offset, value);
59+
}
60+
61+
private final VarHandle byteHandle;
62+
private final VarHandle shortHandle;
63+
private final VarHandle intHandle;
64+
private final VarHandle longHandle;
65+
private final VarHandle floatHandle;
66+
private final VarHandle doubleHandle;
67+
68+
ByteUtils(ByteOrder byteOrder) {
69+
byteHandle = MethodHandles.arrayElementVarHandle(byte[].class);
70+
shortHandle = MethodHandles.byteArrayViewVarHandle(short[].class, byteOrder);
71+
intHandle = MethodHandles.byteArrayViewVarHandle(int[].class, byteOrder);
72+
longHandle = MethodHandles.byteArrayViewVarHandle(long[].class, byteOrder);
73+
floatHandle = MethodHandles.byteArrayViewVarHandle(float[].class, byteOrder);
74+
doubleHandle = MethodHandles.byteArrayViewVarHandle(double[].class, byteOrder);
75+
}
76+
}

‎clickhouse-data/src/main/java11/module-info.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/**
2+
* Declares com.clickhouse.data module.
3+
*/
4+
module com.clickhouse.data {
5+
exports com.clickhouse.config;
6+
exports com.clickhouse.data;
7+
// exports com.clickhouse.data.cache;
8+
// exports com.clickhouse.data.format;
9+
// exports com.clickhouse.data.mapper;
10+
// exports com.clickhouse.data.stream;
11+
exports com.clickhouse.data.value;
12+
exports com.clickhouse.logging;
13+
14+
requires static java.logging;
15+
requires static com.google.gson;
16+
requires static com.github.benmanes.caffeine;
17+
requires static org.lz4.java;
18+
requires static org.slf4j;
19+
requires static org.roaringbitmap;
20+
21+
uses com.clickhouse.data.ClickHouseDataStreamFactory;
22+
uses com.clickhouse.logging.LoggerFactory;
23+
}

‎clickhouse-jdbc/src/main/java11/module-info.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/**
2+
* Declares com.clickhouse module.
3+
*/
4+
module com.clickhouse.jdbc {
5+
exports com.clickhouse.jdbc;
6+
7+
requires java.sql;
8+
9+
requires transitive com.clickhouse.client;
10+
// requires transitive com.google.gson;
11+
// requires transitive org.lz4.java;
12+
13+
uses com.clickhouse.client.ClickHouseClient;
14+
uses com.clickhouse.client.ClickHouseDnsResolver;
15+
uses com.clickhouse.client.ClickHouseSslContextProvider;
16+
uses com.clickhouse.data.ClickHouseDataStreamFactory;
17+
uses com.clickhouse.logging.LoggerFactory;
18+
}

‎clickhouse-r2dbc/src/main/java11/module-info.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**
2+
* Declares com.clickhouse.r2dbc module.
3+
*/
4+
module com.clickhouse.r2dbc {
5+
exports com.clickhouse.r2dbc;
6+
7+
requires transitive com.clickhouse.client;
8+
requires transitive r2dbc.spi;
9+
requires transitive reactor.core;
10+
requires transitive org.lz4.java;
11+
12+
uses com.clickhouse.client.ClickHouseClient;
13+
uses com.clickhouse.client.ClickHouseDnsResolver;
14+
uses com.clickhouse.client.ClickHouseSslContextProvider;
15+
uses com.clickhouse.data.ClickHouseDataStreamFactory;
16+
uses com.clickhouse.logging.LoggerFactory;
17+
}

‎pom.xml‎

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -662,23 +662,6 @@
662662
</compilerArgs>
663663
</configuration>
664664
<executions>
665-
<execution>
666-
<id>java9</id>
667-
<phase>none</phase>
668-
<goals>
669-
<goal>compile</goal>
670-
</goals>
671-
<configuration>
672-
<release>9</release>
673-
<jdkToolchain>
674-
<version>9</version>
675-
</jdkToolchain>
676-
<compileSourceRoots>
677-
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
678-
</compileSourceRoots>
679-
<multiReleaseOutput>true</multiReleaseOutput>
680-
</configuration>
681-
</execution>
682665
<execution>
683666
<id>java11</id>
684667
<phase>none</phase>
@@ -888,29 +871,6 @@
888871
<caffeine.version>2.9.2</caffeine.version>
889872
</properties>
890873
</profile>
891-
<profile>
892-
<id>compile-java9</id>
893-
<activation>
894-
<jdk>[9,)</jdk>
895-
<property>
896-
<name>!j8</name>
897-
</property>
898-
</activation>
899-
<build>
900-
<plugins>
901-
<plugin>
902-
<groupId>org.apache.maven.plugins</groupId>
903-
<artifactId>maven-compiler-plugin</artifactId>
904-
<executions>
905-
<execution>
906-
<id>java9</id>
907-
<phase>compile</phase>
908-
</execution>
909-
</executions>
910-
</plugin>
911-
</plugins>
912-
</build>
913-
</profile>
914874
<profile>
915875
<id>compile-java11</id>
916876
<activation>
@@ -973,9 +933,6 @@
973933
</executions>
974934
<configuration>
975935
<toolchains>
976-
<jdk>
977-
<version>9</version>
978-
</jdk>
979936
<jdk>
980937
<version>11</version>
981938
</jdk>
@@ -989,10 +946,6 @@
989946
<groupId>org.apache.maven.plugins</groupId>
990947
<artifactId>maven-compiler-plugin</artifactId>
991948
<executions>
992-
<execution>
993-
<id>java9</id>
994-
<phase>compile</phase>
995-
</execution>
996949
<execution>
997950
<id>java11</id>
998951
<phase>compile</phase>
@@ -1172,7 +1125,7 @@
11721125
</build>
11731126
</profile>
11741127
<profile>
1175-
<id>build9</id>
1128+
<id>build11</id>
11761129
<activation>
11771130
<property>
11781131
<name>!j8</name>
@@ -1192,9 +1145,6 @@
11921145
</executions>
11931146
<configuration>
11941147
<toolchains>
1195-
<jdk>
1196-
<version>9</version>
1197-
</jdk>
11981148
<jdk>
11991149
<version>11</version>
12001150
</jdk>
@@ -1208,10 +1158,6 @@
12081158
<groupId>org.apache.maven.plugins</groupId>
12091159
<artifactId>maven-compiler-plugin</artifactId>
12101160
<executions>
1211-
<execution>
1212-
<id>java9</id>
1213-
<phase>compile</phase>
1214-
</execution>
12151161
<execution>
12161162
<id>java11</id>
12171163
<phase>compile</phase>

0 commit comments

Comments
 (0)