Skip to content

Commit 31aa722

Browse files
chernserchernser
committed
removed java9 build targets
1 parent fc8d92e commit 31aa722

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
@@ -649,23 +649,6 @@
649649
</compilerArgs>
650650
</configuration>
651651
<executions>
652-
<execution>
653-
<id>java9</id>
654-
<phase>none</phase>
655-
<goals>
656-
<goal>compile</goal>
657-
</goals>
658-
<configuration>
659-
<release>9</release>
660-
<jdkToolchain>
661-
<version>9</version>
662-
</jdkToolchain>
663-
<compileSourceRoots>
664-
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
665-
</compileSourceRoots>
666-
<multiReleaseOutput>true</multiReleaseOutput>
667-
</configuration>
668-
</execution>
669652
<execution>
670653
<id>java11</id>
671654
<phase>none</phase>
@@ -875,29 +858,6 @@
875858
<caffeine.version>2.9.2</caffeine.version>
876859
</properties>
877860
</profile>
878-
<profile>
879-
<id>compile-java9</id>
880-
<activation>
881-
<jdk>[9,)</jdk>
882-
<property>
883-
<name>!j8</name>
884-
</property>
885-
</activation>
886-
<build>
887-
<plugins>
888-
<plugin>
889-
<groupId>org.apache.maven.plugins</groupId>
890-
<artifactId>maven-compiler-plugin</artifactId>
891-
<executions>
892-
<execution>
893-
<id>java9</id>
894-
<phase>compile</phase>
895-
</execution>
896-
</executions>
897-
</plugin>
898-
</plugins>
899-
</build>
900-
</profile>
901861
<profile>
902862
<id>compile-java11</id>
903863
<activation>
@@ -960,9 +920,6 @@
960920
</executions>
961921
<configuration>
962922
<toolchains>
963-
<jdk>
964-
<version>9</version>
965-
</jdk>
966923
<jdk>
967924
<version>11</version>
968925
</jdk>
@@ -976,10 +933,6 @@
976933
<groupId>org.apache.maven.plugins</groupId>
977934
<artifactId>maven-compiler-plugin</artifactId>
978935
<executions>
979-
<execution>
980-
<id>java9</id>
981-
<phase>compile</phase>
982-
</execution>
983936
<execution>
984937
<id>java11</id>
985938
<phase>compile</phase>
@@ -1159,7 +1112,7 @@
11591112
</build>
11601113
</profile>
11611114
<profile>
1162-
<id>build9</id>
1115+
<id>build11</id>
11631116
<activation>
11641117
<property>
11651118
<name>!j8</name>
@@ -1179,9 +1132,6 @@
11791132
</executions>
11801133
<configuration>
11811134
<toolchains>
1182-
<jdk>
1183-
<version>9</version>
1184-
</jdk>
11851135
<jdk>
11861136
<version>11</version>
11871137
</jdk>
@@ -1195,10 +1145,6 @@
11951145
<groupId>org.apache.maven.plugins</groupId>
11961146
<artifactId>maven-compiler-plugin</artifactId>
11971147
<executions>
1198-
<execution>
1199-
<id>java9</id>
1200-
<phase>compile</phase>
1201-
</execution>
12021148
<execution>
12031149
<id>java11</id>
12041150
<phase>compile</phase>

0 commit comments

Comments
 (0)