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.

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

Release 2.5.0 #944

Merged
merged 72 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
a5ec2af
Added test to cover RENAME table with database.override.map
subkanthi Oct 9, 2024
d4875b0
Upgrade debezium version to 3.0.0.Final
subkanthi Oct 13, 2024
f563469
Merge branch '2.4.0' of github.com:Altinity/clickhouse-sink-connector…
subkanthi Oct 14, 2024
281113c
Merge branch '2.5.0' of github.com:Altinity/clickhouse-sink-connector…
subkanthi Oct 14, 2024
e605355
Add ddl.retry to ddl tests
subkanthi Oct 14, 2024
92dc346
set ddl.retry to true for aall DDL tests
subkanthi Oct 14, 2024
4cf6638
Restore mongodb integration test
subkanthi Oct 16, 2024
4d7b5b3
Added MongoDB tests
subkanthi Oct 16, 2024
8f0b5da
Merge tag '2.4.0' of github.com:Altinity/clickhouse-sink-connector in…
subkanthi Oct 19, 2024
4864826
Merge branch 'develop' of github.com:Altinity/clickhouse-sink-connect…
subkanthi Oct 19, 2024
b29e5c0
Merge tag '2.4.0' of github.com:Altinity/clickhouse-sink-connector in…
subkanthi Oct 19, 2024
b6bad48
Merge branch 'develop' of github.com:Altinity/clickhouse-sink-connect…
subkanthi Oct 19, 2024
bbe062d
Merge branch '2.5.0' of github.com:Altinity/clickhouse-sink-connector…
subkanthi Oct 19, 2024
f1add2d
Add support for parameterized test to test db override functionality
subkanthi Oct 19, 2024
699ab46
Updated setup signature removed ddlservice dependency
subkanthi Oct 20, 2024
a490017
Fixed rename table for database.override.map
subkanthi Oct 20, 2024
4c91874
Merge tag '2.4.0' of github.com:Altinity/clickhouse-sink-connector in…
subkanthi Oct 20, 2024
a569354
Merge branch '2.4.1' of github.com:Altinity/clickhouse-sink-connector…
subkanthi Oct 20, 2024
2933464
Added assert for DatabaseOverrideIT
subkanthi Oct 20, 2024
6910217
Added Integration test for database override it
subkanthi Oct 20, 2024
25b6192
Fixed database override substitution for create table in RRMT
subkanthi Oct 21, 2024
d18dabc
Fixed DB tests in DatabaseOverrideRRMTIT.java
subkanthi Oct 21, 2024
fb27eab
Reverted back change in DatabaseOverrideIT
subkanthi Oct 22, 2024
57c59fe
Merge pull request #877 from Altinity/database_override_it_rrmt
subkanthi Oct 22, 2024
5bcc85e
Remove references to older configuration
subkanthi Oct 25, 2024
4326568
Cleaned up postgres helm configuration
subkanthi Oct 25, 2024
1890b8e
bring back previously failing test
Selfeer Oct 28, 2024
45e0466
Updated debezium to 3.0.0.Final and kafka connect dependencies to the…
subkanthi Oct 29, 2024
4e24bcb
Remove additional call to get column data types from clickhouse
subkanthi Oct 29, 2024
302c716
Merge branch 'develop' of github.com:Altinity/clickhouse-sink-connect…
subkanthi Oct 29, 2024
6d7fb8f
Updated kafka.clients version to 3.8.0
subkanthi Nov 1, 2024
73aefd0
Merge pull request #889 from Altinity/885-remove-clickhouse-calls-to-…
subkanthi Nov 2, 2024
bc914f8
Added logic to ignore ddl based on regex
subkanthi Nov 2, 2024
30de53a
Added ignore.ddl.regex to config.yml
subkanthi Nov 2, 2024
56dfb44
Replaced String.matches with Pattern to test regex on DDL
subkanthi Nov 4, 2024
7c2cfa5
Added DDLIgnoreRegExIT
subkanthi Nov 5, 2024
6a32e21
Added test to cover alter table rename without table keyword
subkanthi Nov 6, 2024
055222b
Fixed handling of alter table rename without table keyword
subkanthi Nov 6, 2024
3b66801
Added logic to support rename column DDL with database override.
subkanthi Nov 6, 2024
9e4b161
Added logic to create schema history table on connector startup.
subkanthi Nov 11, 2024
862cd65
Add logic to only use ignoreregex when its defined
subkanthi Nov 13, 2024
ae6c568
Updated regex to support multi-line strings
subkanthi Nov 14, 2024
30faf6b
Merge pull request #912 from Altinity/894-renaming-a-column-doesnt-wo…
subkanthi Nov 15, 2024
525821d
Merge pull request #914 from Altinity/906-connector-does-not-create-r…
subkanthi Nov 15, 2024
d34c10a
Merge pull request #909 from Altinity/alter_table_fix
subkanthi Nov 15, 2024
69e22cb
Merge branch 'develop' of github.com:Altinity/clickhouse-sink-connect…
subkanthi Nov 15, 2024
67ccfc3
Merge branch '2.4.1' of github.com:Altinity/clickhouse-sink-connector…
subkanthi Nov 15, 2024
e45a7db
Fix integration tests in 2.4.1 branch
subkanthi Nov 18, 2024
81b5480
Merge pull request #920 from Altinity/2_4_1_fix_integration_tests
subkanthi Nov 18, 2024
b527819
Rolled back debezium and jdbc version
subkanthi Nov 19, 2024
7d6b841
Rolled back debezium and jdbc version
subkanthi Nov 19, 2024
381f092
Rolled back debezium and jdbc version
subkanthi Nov 19, 2024
f30122b
Add updated dependency-reduced-pom
subkanthi Nov 19, 2024
b85f7f5
Add retries for creating debezium storage database
subkanthi Nov 21, 2024
89d78f1
Added DDL test for CREATE TABLE like
subkanthi Nov 21, 2024
b76d122
Added DDL test for CREATE TABLE like
subkanthi Nov 21, 2024
6cfd862
Merge branch '2.4.1' of github.com:Altinity/clickhouse-sink-connector…
subkanthi Nov 22, 2024
0978481
Merge pull request #896 from Altinity/895-ignore-ddl-based-on-regex
subkanthi Nov 22, 2024
c97e528
Merge pull request #929 from Altinity/928-create-table-like-mysql-ddl
subkanthi Nov 22, 2024
0fc083c
Merge pull request #883 from Altinity/384-remove-references-to-older-…
subkanthi Nov 22, 2024
75b2641
Merge pull request #926 from Altinity/925-add-retry-for-creating-debe…
subkanthi Nov 22, 2024
0f702f3
Merge pull request #887 from Altinity/debezium_3.0.0
subkanthi Nov 23, 2024
52dd7c1
Merge branch '2.4.1' of github.com:Altinity/clickhouse-sink-connector…
subkanthi Nov 23, 2024
9d99bbd
Kafka version, upgrade mysql debezium to 3.0.4.Final, set mysql to 8.0
subkanthi Dec 4, 2024
f43e5f3
Removed kube-rbac-proxy references
subkanthi Dec 4, 2024
f12d737
Merge pull request #940 from Altinity/935-warning-action-required-rep…
subkanthi Dec 6, 2024
d2bbd14
Merge pull request #921 from Altinity/mongodb_integration_test
subkanthi Dec 6, 2024
7b8d6b9
Merge pull request #939 from Altinity/930-the-connector-using-debeziu…
subkanthi Dec 6, 2024
3fbc861
Merge branch '2.4.1' of github.com:Altinity/clickhouse-sink-connector…
subkanthi Dec 6, 2024
0074988
Fix compiler error in MongoDB IT
subkanthi Dec 6, 2024
4194458
Merge pull request #876 from Altinity/2.4.1
subkanthi Dec 6, 2024
c1c4bef
update ClickHouse version from 23.3 to 23.8 latest
Selfeer Dec 9, 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
4 changes: 2 additions & 2 deletions .github/workflows/testflows-sink-connector-kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
package:
description: "Package either 'docker://' or 'https://'. Example: 'https://s3.amazonaws.com/clickhouse-builds/23.3/.../package_release/clickhouse-common-static_23.3.1.64_amd64.deb', or 'docker://altinity/clickhouse-server:23.8.8'"
type: string
default: docker://clickhouse/clickhouse-server:23.3
default: docker://clickhouse/clickhouse-server:23.8
output_format:
description: "Testflows output style."
type: string
Expand All @@ -34,7 +34,7 @@ on:
package:
description: "Package either 'docker://' or 'https://'. Example: 'https://s3.amazonaws.com/clickhouse-builds/23.3/.../package_release/clickhouse-common-static_23.3.1.64_amd64.deb', or 'docker://altinity/clickhouse-server:23.8.8'"
type: string
default: docker://clickhouse/clickhouse-server:23.3
default: docker://clickhouse/clickhouse-server:23.8
extra_args:
description: "Specific Suite To Run (Default * to run everything)."
required: false
Expand Down
69 changes: 0 additions & 69 deletions doc/k8s/k8s_minikube_load.md

This file was deleted.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<maven.compiler.target>17</maven.compiler.target>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.debezium>2.5.0.Beta1</version.debezium>
<version.debezium>2.7.2.Final</version.debezium>
<version.junit>5.9.1</version.junit>
<version.checkstyle.plugin>3.1.1</version.checkstyle.plugin>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
6 changes: 3 additions & 3 deletions sink-connector-lightweight/config.examples/mysql_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ database.allowPublicKeyRetrieval: "true"
snapshot.mode: "schema_only"
connector.class: "io.debezium.connector.mysql.MySqlConnector"
offset.storage: "io.debezium.storage.jdbc.offset.JdbcOffsetBackingStore"
offset.storage.offset.storage.jdbc.offset.table.name: "replica_source_info"
offset.storage.jdbc.offset.table.name: "replica_source_info"
offset.storage.jdbc.url: "jdbc:clickhouse://localhost:8123"
offset.storage.jdbc.user: "root"
offset.storage.jdbc.password: "root"
offset.storage.offset.storage.jdbc.offset.table.ddl: "CREATE TABLE %s
offset.storage.jdbc.offset.table.ddl: "CREATE TABLE %s
(
`id` String,
`offset_key` String,
Expand All @@ -28,7 +28,7 @@ offset.storage.offset.storage.jdbc.offset.table.ddl: "CREATE TABLE %s
ENGINE = ReplacingMergeTree(_version)
ORDER BY id
SETTINGS index_granularity = 8192"
offset.storage.offset.storage.jdbc.offset.table.delete: "delete from %s where 1=1"
offset.storage.jdbc.offset.table.delete: "delete from %s where 1=1"
schema.history.internal: io.debezium.storage.jdbc.history.JdbcSchemaHistory
schema.history.internal.jdbc.url: "jdbc:clickhouse://localhost:8123"
schema.history.internal.jdbc.user: "root"
Expand Down
53 changes: 47 additions & 6 deletions sink-connector-lightweight/dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-connector-mongodb</artifactId>
<version>2.7.0.Beta2</version>
<version>3.0.0.Final</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -140,6 +140,46 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-testing-testcontainers</artifactId>
<version>3.0.0.Final</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>kafka</artifactId>
<groupId>org.testcontainers</groupId>
</exclusion>
<exclusion>
<artifactId>awaitility</artifactId>
<groupId>org.awaitility</groupId>
</exclusion>
<exclusion>
<artifactId>mssqlserver</artifactId>
<groupId>org.testcontainers</groupId>
</exclusion>
<exclusion>
<artifactId>oracle-xe</artifactId>
<groupId>org.testcontainers</groupId>
</exclusion>
<exclusion>
<artifactId>junit-platform-launcher</artifactId>
<groupId>org.junit.platform</groupId>
</exclusion>
<exclusion>
<artifactId>junit-jupiter</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
<exclusion>
<artifactId>quarkus-test-common</artifactId>
<groupId>io.quarkus</groupId>
</exclusion>
<exclusion>
<artifactId>okhttp</artifactId>
<groupId>com.squareup.okhttp3</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
Expand Down Expand Up @@ -273,14 +313,14 @@
<artifactId>junit-jupiter-params</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
<exclusion>
<artifactId>junit-platform-launcher</artifactId>
<groupId>org.junit.platform</groupId>
</exclusion>
<exclusion>
<artifactId>junit-jupiter-api</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
<exclusion>
<artifactId>junit-platform-launcher</artifactId>
<groupId>org.junit.platform</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -318,6 +358,7 @@
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<version.testcontainers>1.19.1</version.testcontainers>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<version.kafka>3.8.0</version.kafka>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sink-connector-library-version>0.0.9</sink-connector-library-version>
<javalin-version>5.5.0</javalin-version>
Expand All @@ -326,7 +367,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<version.checkstyle.plugin>3.1.1</version.checkstyle.plugin>
<maven.compiler.target>17</maven.compiler.target>
<version.debezium>2.7.0.Beta2</version.debezium>
<version.debezium>3.0.0.Final</version.debezium>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
</properties>
</project>
5 changes: 4 additions & 1 deletion sink-connector-lightweight/docker/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ database.connectionTimeZone: "UTC"

# Configuration to override the clickhouse database name for a given MySQL database name. If this configuration is not
# provided, the MySQL database name will be used as the ClickHouse database name.
#clickhouse.database.override.map: "employees:employees2, products:productsnew
clickhouse.database.override.map: "test:ch_test"

# clickhouse.datetime.timezone: This timezone will override the default timezone of ClickHouse server. Timezone columns will be set to this timezone.
#clickhouse.datetime.timezone: "UTC"
Expand All @@ -147,6 +147,9 @@ database.connectionTimeZone: "UTC"
#disable.ddl: If set to true, the connector will ignore DDL events. The default is false.
#disable.ddl: "false"

#ignore.ddl.regex: If set, the connector will ignore DDL events that match the regex.
ignore.ddl.regex: "(?i)(ANALYZE PARTITION).*"

#disable.drop.truncate: If set to true, the connector will ignore drop and truncate events. The default is false.
#disable.drop.truncate: "false"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ data:
offset.flush.interval.ms: 5000
connector.class: "io.debezium.connector.postgresql.PostgresConnector"
offset.storage: "io.debezium.storage.jdbc.offset.JdbcOffsetBackingStore"
offset.storage.offset.storage.jdbc.offset.table.name: "altinity_sink_connector.replica_source_info"
offset.storage.jdbc.offset.table.name: "altinity_sink_connector.replica_source_info"
offset.storage.jdbc.url: "jdbc:clickhouse://clickhouse:8123/altinity_sink_connector"
offset.storage.jdbc.user: "root"
offset.storage.jdbc.password: "root"
offset.storage.offset.storage.jdbc.offset.table.ddl: "CREATE TABLE if not exists %s
offset.storage.jdbc.offset.table.ddl: "CREATE TABLE if not exists %s
(
`id` String,
`offset_key` String,
Expand All @@ -39,15 +39,7 @@ data:
ENGINE = ReplacingMergeTree(_version)
ORDER BY id
SETTINGS index_granularity = 8192"
offset.storage.offset.storage.jdbc.offset.table.delete: "delete from %s where 1=1"
schema.history.internal: "io.debezium.storage.jdbc.history.JdbcSchemaHistory"
schema.history.internal.jdbc.url: "jdbc:clickhouse://clickhouse:8123/altinity_sink_connector"
schema.history.internal.jdbc.user: "root"
schema.history.internal.jdbc.password: "root"
schema.history.internal.jdbc.schema.history.table.ddl: "CREATE TABLE if not exists %s
(`id` VARCHAR(36) NOT NULL, `history_data` VARCHAR(65000), `history_data_seq` INTEGER, `record_insert_ts` TIMESTAMP NOT NULL, `record_insert_seq` INTEGER NOT NULL) ENGINE=ReplacingMergeTree(record_insert_seq) order by id"

schema.history.internal.jdbc.schema.history.table.name: "altinity_sink_connector.replicate_schema_history"
offset.storage.jdbc.offset.table.delete: "delete from %s where 1=1"
enable.snapshot.ddl: "true"
auto.create.tables: "true"
database.dbname: "public"
Expand Down Expand Up @@ -75,11 +67,11 @@ data:
offset.flush.interval.ms: "5000"
connector.class: "io.debezium.connector.mysql.MySqlConnector"
offset.storage: "io.debezium.storage.jdbc.offset.JdbcOffsetBackingStore"
offset.storage.offset.storage.jdbc.offset.table.name: "altinity_sink_connector.replica_source_info"
offset.storage.jdbc.offset.table.name: "altinity_sink_connector.replica_source_info"
offset.storage.jdbc.url: "jdbc:clickhouse://chi-argocd-demo-0-0:8123/altinity_sink_connector"
offset.storage.jdbc.user: "root"
offset.storage.jdbc.password: "secretsecret"
offset.storage.offset.storage.jdbc.offset.table.ddl: "CREATE TABLE if not exists %s
offset.storage.jdbc.offset.table.ddl: "CREATE TABLE if not exists %s
(
`id` String,
`offset_key` String,
Expand All @@ -91,7 +83,7 @@ data:
ENGINE = ReplacingMergeTree(_version)
ORDER BY id
SETTINGS index_granularity = 8192"
offset.storage.offset.storage.jdbc.offset.table.delete: "delete from %s where 1=1"
offset.storage.jdbc.offset.table.delete: "delete from %s where 1=1"
schema.history.internal: "io.debezium.storage.jdbc.history.JdbcSchemaHistory"
schema.history.internal.jdbc.url: "jdbc:clickhouse://chi-argocd-demo-0-0:8123/altinity_sink_connector"
schema.history.internal.jdbc.user: "root"
Expand Down
20 changes: 14 additions & 6 deletions sink-connector-lightweight/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<maven.compiler.target>17</maven.compiler.target>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.debezium>2.7.2.Final</version.debezium>
<version.debezium>3.0.0.Final</version.debezium>
<version.junit>5.9.1</version.junit>
<version.testcontainers>1.19.1</version.testcontainers>
<version.checkstyle.plugin>3.1.1</version.checkstyle.plugin>
Expand All @@ -24,6 +24,7 @@
<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.9</sink-connector-library-version>
<version.kafka>3.8.0</version.kafka>
<javalin-version>5.5.0</javalin-version>
</properties>
<dependencyManagement>
Expand Down Expand Up @@ -142,6 +143,13 @@
<version>${version.debezium}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/io.debezium/debezium-testing-testcontainers -->
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-testing-testcontainers</artifactId>
<version>${version.debezium}</version>
<scope>test</scope>
</dependency>


<dependency>
Expand Down Expand Up @@ -170,7 +178,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>3.3.1</version>
<version>${version.kafka}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -336,7 +344,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-api</artifactId>
<version>2.8.1</version>
<version>${version.kafka}</version>
<!-- <scope>provided</scope> -->
<exclusions>
<exclusion>
Expand Down Expand Up @@ -414,7 +422,7 @@
<!-- or clickhouse-grpc-client if you prefer gRPC -->
<artifactId>clickhouse-jdbc</artifactId>
<classifier>shaded</classifier>
<version>0.6.0</version>
<version>0.6.5</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down Expand Up @@ -494,13 +502,13 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-json</artifactId>
<version>3.1.0</version>
<version>${version.kafka}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-json</artifactId>
<version>3.1.0</version>
<version>${version.kafka}</version>
<scope>compile</scope>
</dependency>

Expand Down
Loading
Loading