Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

506 datetime limits were updated in jdbc libraryclickhouse java #508

Merged
merged 5 commits into from
Mar 22, 2024
Merged

506 datetime limits were updated in jdbc libraryclickhouse java #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7dc090
Update clickhouse jdbc library version to 0.6.0
subkanthi Mar 20, 2024
dee4954
Added new http core5 libraries required for clickhouse jdbc
subkanthi Mar 20, 2024
a493a13
Added JDBC shaded jar, fixed integration tests
subkanthi Mar 20, 2024
34e1109
Fixed integration tests for sink-connector after JDBC library update
subkanthi Mar 21, 2024
108a0c5
Changed the signature of getMetaData().getColumns JDBC function call
subkanthi Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions sink-connector-lightweight/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>2.14.0.Final</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<sink-connector-library-version>0.0.7</sink-connector-library-version>
<apache.httpclient.version>5.2.1</apache.httpclient.version>
<sink-connector-library-version>0.0.8</sink-connector-library-version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -330,7 +331,14 @@
<groupId>com.clickhouse</groupId>
<!-- or clickhouse-grpc-client if you prefer gRPC -->
<artifactId>clickhouse-jdbc</artifactId>
<version>0.4.5</version>
<classifier>shaded</classifier>
<version>0.6.0</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...est/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ public void testCreateTable() throws Exception {
ResultSet dateResult = writer.executeQueryWithResultSet("select * from temporal_types_DATE");

while(dateResult.next()) {
Assert.assertTrue(dateResult.getDate("Minimum_Value").toString().equalsIgnoreCase("1925-01-01"));
Assert.assertTrue(dateResult.getDate("Minimum_Value").toString().equalsIgnoreCase("1900-01-01"));
Assert.assertTrue(dateResult.getDate("Mid_Value").toString().equalsIgnoreCase("2022-09-29"));
Assert.assertTrue(dateResult.getDate("Maximum_Value").toString().equalsIgnoreCase("2283-11-11"));
Assert.assertTrue(dateResult.getDate("Maximum_Value").toString().equalsIgnoreCase("2299-12-31"));
}
// Validate temporal_types_DATETIME data.
ResultSet dateTimeResult = writer.executeQueryWithResultSet("select * from temporal_types_DATETIME");
Expand Down
4 changes: 2 additions & 2 deletions .../com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesTimeZoneIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ public void testCreateTable() throws Exception {
System.out.println(dateResult.getTimestamp("Minimum_Value").toString());

Assert.assertTrue(dateResult.getDate("Mid_Value").toString().contains("2022-09-29"));
Assert.assertTrue(dateResult.getDate("Maximum_Value").toString().contains("2283-11-11"));
Assert.assertTrue(dateResult.getDate("Minimum_Value").toString().contains("1925-01-01"));
Assert.assertTrue(dateResult.getDate("Maximum_Value").toString().contains("2299-12-31"));
Assert.assertTrue(dateResult.getDate("Minimum_Value").toString().contains("1900-01-01"));
}
Assert.assertTrue(dateResultValueChecked);

Expand Down
114 changes: 6 additions & 108 deletions sink-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.altinity</groupId>
<artifactId>clickhouse-kafka-sink-connector</artifactId>
<version>0.0.7</version>
<version>0.0.8</version>
<packaging>jar</packaging>
<name>ClickHouse Kafka Sink Connector</name>
<description>Sinks data from Kafka into ClickHouse</description>
Expand Down Expand Up @@ -41,6 +41,7 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<version.testcontainers>1.19.1</version.testcontainers>
<apache.httpclient.version>5.2.1</apache.httpclient.version>
</properties>


Expand Down Expand Up @@ -150,31 +151,13 @@
<configuration>
<forkCount>0</forkCount>
<useSystemClassLoader>false</useSystemClassLoader>
<!-- <excludedGroups>IntegrationTest</excludedGroups> -->
<excludes>
<exclude>**/*IT.java</exclude>
</excludes>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>
<!-- <executions>
<execution>
<id>integration-test</id>
<goals>
<goal>test</goal>
</goals>
<phase>integration-test</phase>
<configuration>
<excludes>
<exclude>none</exclude>
</excludes>
<includes>
<include>**/*IT.java</include>
</includes>
</configuration>
</execution>
</executions> -->
</plugin>

<plugin>
Expand Down Expand Up @@ -213,20 +196,6 @@
</execution>
</executions>
</plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>install</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand All @@ -240,31 +209,6 @@
</execution>
</executions>
</plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<detectJavaApiLink>false</detectJavaApiLink>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin> -->
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<mainClass></mainClass>
<classpathScope>test</classpathScope>
</configuration>
</plugin> -->
</plugins>

<!-- disable default maven deploy plugin since we are using gpg:sign-and-deploy-file -->
Expand Down Expand Up @@ -355,47 +299,7 @@
<artifactId>jackson-databind</artifactId>
<version>2.12.6</version>
</dependency>
<!-- <dependency>
<groupId>io.confluent</groupId>
<artifactId>kafka-schema-registry-client</artifactId>
<version>6.2.0</version>
<exclusions>
<exclusion>
<groupId>io.confluent</groupId>
<artifactId>common-utils</artifactId>
</exclusion>
<exclusion>
<groupId>io.confluent</groupId>
<artifactId>common-config</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.confluent</groupId>
<artifactId>kafka-avro-serializer</artifactId>
<version>5.5.1</version>
<exclusions>
<exclusion>
<groupId>io.confluent</groupId>
<artifactId>common-utils</artifactId>
</exclusion>
</exclusions>
</dependency> -->
<!-- https://mvnrepository.com/artifact/io.confluent/kafka-connect-avro-converter -->
<!-- <dependency>
<groupId>io.confluent</groupId>
<artifactId>kafka-connect-avro-converter</artifactId>
<version>5.5.1</version>
<scope>test</scope>
</dependency> -->

<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-core</artifactId>
Expand All @@ -421,17 +325,11 @@
<artifactId>maven-artifact</artifactId>
<version>3.9.1</version>
</dependency>
<!--JDBC driver for building connection with Clickhouse-->
<!-- <dependency>
<groupId>ru.yandex.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
<version>0.3.2</version>
</dependency> -->
<dependency>
<groupId>com.clickhouse</groupId>
<!-- or clickhouse-grpc-client if you prefer gRPC -->
<artifactId>clickhouse-jdbc</artifactId>
<version>0.4.5</version>
<version>0.6.0</version>
<!-- below is only needed when all you want is a shaded jar -->
<classifier>http</classifier>
<exclusions>
Expand Down Expand Up @@ -474,7 +372,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.0.1-jre</version>
<version>33.0.0-jre</version>
</dependency>

<!--junit for unit test-->
Expand Down Expand Up @@ -551,7 +449,7 @@
<dependency>
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
<version>0.4.5</version>
<version>0.6.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion sink-connector/src/main/java/com/altinity/clickhouse/sink/connector/db/DBMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public Map<String, String> getColumnsDataTypesForTable(String tableName,
return result;
}

ResultSet columns = conn.getMetaData().getColumns(null, database,
ResultSet columns = conn.getMetaData().getColumns(database, null,
tableName, null);
while (columns.next()) {
String columnName = columns.getString("COLUMN_NAME");
Expand Down
4 changes: 0 additions & 4 deletions ...tor/src/test/java/com/altinity/clickhouse/sink/connector/ClickHouseSinkConnectorTest.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...rc/test/java/com/altinity/clickhouse/sink/connector/converters/DebeziumConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public void testDateConverterMaxRange() {

//Date32
java.sql.Date formattedDate32 = DebeziumConverter.DateConverter.convert(date, ClickHouseDataType.Date32);
Assert.assertTrue(formattedDate32.toString().equalsIgnoreCase("2283-11-11"));
Assert.assertTrue(formattedDate32.toString().equalsIgnoreCase("2299-01-01"));

//Date
java.sql.Date formattedDate = DebeziumConverter.DateConverter.convert(date, ClickHouseDataType.Date);
Expand Down Expand Up @@ -218,7 +218,7 @@ public void testZonedTimestampConverter() {

// Test max limit
String formattedTimestamp4 = DebeziumConverter.ZonedTimestampConverter.convert("2338-01-19T03:14:07.99Z", ZoneId.of("UTC"));
Assert.assertTrue(formattedTimestamp4.equalsIgnoreCase("2283-11-11 23:59:59.000000"));
Assert.assertTrue(formattedTimestamp4.equalsIgnoreCase("2299-12-31 23:59:59.000000"));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions sink-connector/src/test/java/com/altinity/clickhouse/sink/connector/db/DbWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void testGetColumnsDataTypesForTable() {
Map<String, String> columnDataTypesMap = writer.getColumnsDataTypesForTable("employees");

Assert.assertTrue(columnDataTypesMap.isEmpty() == false);
Assert.assertTrue(columnDataTypesMap.size() == 20);
Assert.assertTrue(columnDataTypesMap.size() == 44);

String database2 = "employees2";
String jdbcUrl2 = BaseDbWriter.getConnectionString(dbHostName, port, database2);
Expand All @@ -120,7 +120,7 @@ public void testGetColumnsDataTypesForTable() {
Map<String, String> columnDataTypesMap2 = writer2.getColumnsDataTypesForTable("employees");

Assert.assertTrue(columnDataTypesMap2.isEmpty() == false);
Assert.assertTrue(columnDataTypesMap2.size() == 2);
Assert.assertTrue(columnDataTypesMap2.size() ==44);

}

Expand Down
Loading