Updating for incident

ClickHouse · Oct 24, 2024 · a0aad0b · a0aad0b
1 parent 2e0c17e
commit a0aad0b
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 12 deletions.
diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml
@@ -0,0 +1,51 @@
+name: Release
+
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  build_release:
+    name: build_release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Set env
+        run: echo "RELEASE_VERSION=$(cat VERSION)" >> $GITHUB_ENV
+      - name: Test
+        run: |
+          echo $RELEASE_VERSION
+          echo ${{ env.RELEASE_VERSION }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          architecture: x64
+      - name: Setup and execute Gradle 'createConfluentArchive' task
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: createConfluentArchive
+          gradle-version: '7.4.2'
+      - name: release
+        uses: actions/create-release@v1
+        id: create_release
+        with:
+          draft: false
+          prerelease: true
+          release_name: ${{ env.RELEASE_VERSION }}
+          tag_name: ${{ env.RELEASE_VERSION }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+      - name: upload release artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./build/confluent/clickhouse-kafka-connect-${{ env.RELEASE_VERSION }}.zip
+          asset_name: clickhouse-kafka-connect-${{ env.RELEASE_VERSION }}.zip
+          asset_content_type: application/zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.2.4
+* Adjusting underlying client version to 0.7.0
+* Bugfix for UINT handling
+
 # 1.2.3
 * Tweaking schema validation to allow for UINT
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.2.3
+v1.2.4
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -22,6 +22,7 @@ java {
 buildscript {
     repositories {
         mavenCentral()
+        maven{ url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") }
     }
 }
 
@@ -44,10 +45,11 @@ repositories {
     mavenCentral()
     maven("https://packages.confluent.io/maven/")
     maven("https://jitpack.io")
+    maven{ url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") }
 }
 
 extra.apply {
-    set("clickHouseDriverVersion", "0.6.3")
+    set("clickHouseDriverVersion", "0.7.0-SNAPSHOT")
     set("kafkaVersion", "2.7.0")
     set("avroVersion", "1.9.2")
 

diff --git a/src/main/java/com/clickhouse/kafka/connect/sink/db/ClickHouseWriter.java b/src/main/java/com/clickhouse/kafka/connect/sink/db/ClickHouseWriter.java
@@ -29,6 +29,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
@@ -244,16 +245,10 @@ protected boolean validateDataSchema(Table table, Record record, boolean onlyFie
                                 if (colTypeName.equals("TUPLE") && dataTypeName.equals("STRUCT"))
                                     continue;
 
-                                if (colTypeName.equalsIgnoreCase("UINT8") && dataTypeName.equals("INT8"))
-                                    continue;
-
-                                if (colTypeName.equalsIgnoreCase("UINT16") && dataTypeName.equals("INT16"))
-                                    continue;
-
-                                if (colTypeName.equalsIgnoreCase("UINT32") && dataTypeName.equals("INT32"))
-                                    continue;
-
-                                if (colTypeName.equalsIgnoreCase("UINT64") && dataTypeName.equals("INT64"))
+                                if (colTypeName.equalsIgnoreCase("UINT8")
+                                        || colTypeName.equalsIgnoreCase("UINT16")
+                                        || colTypeName.equalsIgnoreCase("UINT32")
+                                        || colTypeName.equalsIgnoreCase("UINT64"))
                                     continue;
 
                                 if (("DECIMAL".equalsIgnoreCase(colTypeName) && objSchema.name().equals("org.apache.kafka.connect.data.Decimal")))