diff --git a/doc/OLD_README.md b/doc/OLD_README.md
index 7cb7ce384..6e2cb9d6e 100644
--- a/doc/OLD_README.md
+++ b/doc/OLD_README.md
@@ -144,7 +144,6 @@ GLOBAL OPTIONS:
| clickhouse.server.user | ClickHouse username |
| clickhouse.server.password | ClickHouse password |
| clickhouse.server.port | ClickHouse port, For TLS(use the correct port `8443` or `443` |
-| clickhouse.server.database | ClickHouse destination database |
| snapshot.mode | "initial" -> Data that already exists in source database will be replicated. "schema_only" -> Replicate data that is added/modified after the connector is started.\
MySQL: https://debezium.io/documentation/reference/stable/connectors/mysql.html#mysql-property-snapshot-mode \
PostgreSQL: https://debezium.io/documentation/reference/stable/connectors/postgresql.html#postgresql-property-snapshot-mode
MongoDB: initial, never. https://debezium.io/documentation/reference/stable/connectors/mongodb.html |
| connector.class | MySQL -> "io.debezium.connector.mysql.MySqlConnector"
PostgreSQL ->
Mongo ->
|
| offset.storage.file.filename | Offset storage file(This stores the offsets of the source database) MySQL: mysql binlog file and position, gtid set. Make sure this file is durable and its not persisted in temp directories. |
@@ -298,7 +297,6 @@ mvn install -DskipTests=true
| clickhouse.server.url | | ClickHouse Server URL |
| clickhouse.server.user | | ClickHouse Server username |
| clickhouse.server.password | | ClickHouse Server password |
-| clickhouse.server.database | | ClickHouse Database name |
| clickhouse.server.port | 8123 | ClickHouse Server port |
| clickhouse.topic2table.map | No | Map of Kafka topics to table names, :,: This variable will override the default mapping of topics to table names. |
| store.kafka.metadata | false | If set to true, kafka metadata columns will be added to Clickhouse |
diff --git a/doc/configuration.md b/doc/configuration.md
index 21c412b90..53a218ca0 100644
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -12,7 +12,6 @@
| clickhouse.server.user | ClickHouse username |
| clickhouse.server.password | ClickHouse password |
| clickhouse.server.port | ClickHouse port, For TLS(use the correct port `8443` or `443` |
-| clickhouse.server.database | ClickHouse destination database |
| snapshot.mode | "initial" -> Data that already exists in source database will be replicated. "schema_only" -> Replicate data that is added/modified after the connector is started.\
MySQL: https://debezium.io/documentation/reference/stable/connectors/mysql.html#mysql-property-snapshot-mode \
PostgreSQL: https://debezium.io/documentation/reference/stable/connectors/postgresql.html#postgresql-property-snapshot-mode
MongoDB: initial, never. https://debezium.io/documentation/reference/stable/connectors/mongodb.html |
| connector.class | MySQL -> "io.debezium.connector.mysql.MySqlConnector"
PostgreSQL ->
Mongo ->
|
| offset.storage.file.filename | Offset storage file(This stores the offsets of the source database) MySQL: mysql binlog file and position, gtid set. Make sure this file is durable and its not persisted in temp directories. |
diff --git a/doc/configuration_kafka.md b/doc/configuration_kafka.md
index b828d728f..cd44a58e3 100644
--- a/doc/configuration_kafka.md
+++ b/doc/configuration_kafka.md
@@ -22,7 +22,6 @@ for both **Debezium** and **Sink**
| clickhouse.server.url | | ClickHouse Server URL |
| clickhouse.server.user | | ClickHouse Server username |
| clickhouse.server.password | | ClickHouse Server password |
-| clickhouse.server.database | | ClickHouse Database name |
| clickhouse.server.port | 8123 | ClickHouse Server port |
| clickhouse.topic2table.map | No | Map of Kafka topics to table names, :,: This variable will override the default mapping of topics to table names. |
| store.kafka.metadata | false | If set to true, kafka metadata columns will be added to Clickhouse |
diff --git a/doc/sink_configuration.md b/doc/sink_configuration.md
index 2ed93716b..f48d9b8e5 100644
--- a/doc/sink_configuration.md
+++ b/doc/sink_configuration.md
@@ -29,7 +29,6 @@ This is a sample configuration that's used in creating the connector using the K
"clickhouse.server.url": "${CLICKHOUSE_HOST}",
"clickhouse.server.user": "${CLICKHOUSE_USER}",
"clickhouse.server.password": "${CLICKHOUSE_PASSWORD}",
- "clickhouse.server.database": "${CLICKHOUSE_DATABASE}",
"clickhouse.server.port": ${CLICKHOUSE_PORT},
"clickhouse.table.name": "${CLICKHOUSE_TABLE}",
"key.converter": "io.apicurio.registry.utils.converter.AvroConverter",
diff --git a/pom.xml b/pom.xml
index f9aa5c09d..b122cfd0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
17
UTF-8
UTF-8
- 2.4.0
+ 2.5.0.Beta1
5.9.1
3.1.1
UTF-8
diff --git a/sink-connector-lightweight/config.examples/mysql_config.yaml b/sink-connector-lightweight/config.examples/mysql_config.yaml
index 785c712f6..80bbe7621 100644
--- a/sink-connector-lightweight/config.examples/mysql_config.yaml
+++ b/sink-connector-lightweight/config.examples/mysql_config.yaml
@@ -8,7 +8,6 @@ clickhouse.server.url: "localhost"
clickhouse.server.user: "root"
clickhouse.server.password: "root"
clickhouse.server.port: "8123"
-clickhouse.server.database: "test"
database.allowPublicKeyRetrieval: "true"
snapshot.mode: "schema_only"
connector.class: "io.debezium.connector.mysql.MySqlConnector"
diff --git a/sink-connector-lightweight/docker/config.yml b/sink-connector-lightweight/docker/config.yml
index 8c75a77e7..0b722931e 100644
--- a/sink-connector-lightweight/docker/config.yml
+++ b/sink-connector-lightweight/docker/config.yml
@@ -41,9 +41,6 @@ clickhouse.server.password: "root"
# Clickhouse Server Port
clickhouse.server.port: "8123"
-# Clickhouse Server Database
-clickhouse.server.database: "test"
-
# database.allowPublicKeyRetrieval: "true" https://rmoff.net/2019/10/23/debezium-mysql-v8-public-key-retrieval-is-not-allowed/
database.allowPublicKeyRetrieval: "true"
diff --git a/sink-connector-lightweight/docker/config_local.yml b/sink-connector-lightweight/docker/config_local.yml
index 47aed60f4..a3413c50c 100644
--- a/sink-connector-lightweight/docker/config_local.yml
+++ b/sink-connector-lightweight/docker/config_local.yml
@@ -38,9 +38,6 @@ clickhouse.server.password: "root"
# Clickhouse Server Port
clickhouse.server.port: "8123"
-# Clickhouse Server Database
-clickhouse.server.database: "test"
-
# database.allowPublicKeyRetrieval: "true" https://rmoff.net/2019/10/23/debezium-mysql-v8-public-key-retrieval-is-not-allowed/
database.allowPublicKeyRetrieval: "true"
diff --git a/sink-connector-lightweight/docker/config_postgres.yml b/sink-connector-lightweight/docker/config_postgres.yml
index 4453291a5..981763787 100644
--- a/sink-connector-lightweight/docker/config_postgres.yml
+++ b/sink-connector-lightweight/docker/config_postgres.yml
@@ -43,9 +43,6 @@ clickhouse.server.password: "root"
# clickhouse.server.port: Clickhouse Server Port
clickhouse.server.port: "8123"
-# clickhouse.server.database: Clickhouse Server Database
-clickhouse.server.database: "test"
-
# database.allowPublicKeyRetrieval: "true" https://rmoff.net/2019/10/23/debezium-mysql-v8-public-key-retrieval-is-not-allowed/
database.allowPublicKeyRetrieval: "true"
diff --git a/sink-connector-lightweight/helm/sink-connector-lightweight/templates/configmap.yaml b/sink-connector-lightweight/helm/sink-connector-lightweight/templates/configmap.yaml
index d666e7b13..e72d89e06 100644
--- a/sink-connector-lightweight/helm/sink-connector-lightweight/templates/configmap.yaml
+++ b/sink-connector-lightweight/helm/sink-connector-lightweight/templates/configmap.yaml
@@ -18,7 +18,6 @@ data:
clickhouse.server.user: "root"
clickhouse.server.password: "root"
clickhouse.server.port: "8123"
- clickhouse.server.database: "test"
database.allowPublicKeyRetrieval: "true"
snapshot.mode: "initial"
offset.flush.interval.ms: 5000
@@ -71,7 +70,6 @@ data:
clickhouse.server.user: "root"
clickhouse.server.pass: "secretsecret"
clickhouse.server.port: "8123"
- clickhouse.server.database: "default"
database.allowPublicKeyRetrieval: "true"
snapshot.mode: "initial"
offset.flush.interval.ms: "5000"
diff --git a/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/cdc/DebeziumChangeEventCapture.java b/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/cdc/DebeziumChangeEventCapture.java
index 090dd737d..6092965cc 100644
--- a/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/cdc/DebeziumChangeEventCapture.java
+++ b/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/cdc/DebeziumChangeEventCapture.java
@@ -1,6 +1,5 @@
package com.altinity.clickhouse.debezium.embedded.cdc;
-import com.altinity.clickhouse.debezium.embedded.api.DebeziumEmbeddedRestApi;
import com.altinity.clickhouse.debezium.embedded.common.PropertiesHelper;
import com.altinity.clickhouse.debezium.embedded.config.SinkConnectorLightWeightConfig;
import com.altinity.clickhouse.debezium.embedded.ddl.parser.DDLParserService;
@@ -85,35 +84,20 @@ public DebeziumChangeEventCapture() {
singleThreadDebeziumEventExecutor = Executors.newFixedThreadPool(1);
}
- // Function to store the DBwriter instance for a given database.
- private Map dbWriterMap = new HashMap<>();
-
- // Function to retrieve the DBWriter from dbWriterMap for a given database.
- // if it exists or create a new one.
- private BaseDbWriter getDbWriter(String databaseName, ClickHouseSinkConnectorConfig config) {
- if(dbWriterMap.containsKey(databaseName)) {
- return dbWriterMap.get(databaseName);
- } else {
- DBCredentials dbCredentials = parseDBConfiguration(config);
- String jdbcUrl = BaseDbWriter.getConnectionString(dbCredentials.getHostName(), dbCredentials.getPort(),
- databaseName);
- ClickHouseConnection conn = BaseDbWriter.createConnection(jdbcUrl, "Client_1",
- dbCredentials.getUserName(), dbCredentials.getPassword(), config);
- BaseDbWriter writer = new BaseDbWriter(dbCredentials.getHostName(), dbCredentials.getPort(),
- databaseName, dbCredentials.getUserName(),
- dbCredentials.getPassword(), config, conn);
- dbWriterMap.put(databaseName, writer);
- return writer;
- }
- }
+ /**
+ * Function to perform DDL operation on the main thread.
+ * @param DDL DDL to be executed.
+ * @param props
+ * @param sr
+ * @param config
+ */
private void performDDLOperation(String DDL, Properties props, SourceRecord sr, ClickHouseSinkConnectorConfig config) {
String databaseName = "system";
if(sr != null && sr.key() != null) {
if(sr.key() instanceof Struct) {
Struct keyStruct = (Struct) sr.key();
- //System.out.println("Do something");
String recordDbName = (String) keyStruct.get("databaseName");
if(recordDbName != null && recordDbName.isEmpty() == false) {
databaseName = recordDbName;
@@ -132,8 +116,6 @@ private void performDDLOperation(String DDL, Properties props, SourceRecord sr,
databaseName, dbCredentials.getUserName(),
dbCredentials.getPassword(), config, conn);
}
- //BaseDbWriter writer = getDbWriter(databaseName, config);
-
StringBuffer clickHouseQuery = new StringBuffer();
AtomicBoolean isDropOrTruncate = new AtomicBoolean(false);
@@ -148,7 +130,6 @@ private void performDDLOperation(String DDL, Properties props, SourceRecord sr,
log.info("Executed Source DB DDL: " + DDL + " Snapshot:" + isSnapshotDDL(sr));
}
-
long currentTime = System.currentTimeMillis();
boolean ddlProcessingResult = true;
Metrics.updateDdlMetrics(DDL, currentTime, 0, ddlProcessingResult);
@@ -173,7 +154,6 @@ private void performDDLOperation(String DDL, Properties props, SourceRecord sr,
} catch (Exception e) {
log.error("Error running DDL Query: " + e);
ddlProcessingResult = false;
- //throw new RuntimeException(e);
}
try {
@@ -188,7 +168,6 @@ private void performDDLOperation(String DDL, Properties props, SourceRecord sr,
Metrics.updateDdlMetrics(DDL, currentTime, elapsedTime, ddlProcessingResult);
}
-
/**
* Function to process every change event record
* as received from Debezium
@@ -253,8 +232,6 @@ private ClickHouseStruct processEveryChangeRecord(Properties props, ChangeEvent<
}
}
- String value = String.valueOf(record.value());
- //log.debug(String.format("Record %s", value));
} catch (Exception e) {
log.error("Exception processing record", e);
}
@@ -323,7 +300,7 @@ private void createDatabaseForDebeziumStorage(ClickHouseSinkConnectorConfig conf
DBCredentials dbCredentials = parseDBConfiguration(config);
//if (writer == null) {
String jdbcUrl = BaseDbWriter.getConnectionString(dbCredentials.getHostName(), dbCredentials.getPort(),
- dbCredentials.getDatabase());
+ "system");
ClickHouseConnection conn = BaseDbWriter.createConnection(jdbcUrl, "Client_1",dbCredentials.getUserName(), dbCredentials.getPassword(), config);
BaseDbWriter writer = new BaseDbWriter(dbCredentials.getHostName(), dbCredentials.getPort(),
dbCredentials.getDatabase(), dbCredentials.getUserName(),
@@ -532,6 +509,14 @@ public void updateDebeziumStorageStatus(ClickHouseSinkConnectorConfig config, Pr
public int numRetries = 0;
+ /**
+ *
+ * @param props
+ * @param debeziumRecordParserService
+ * @param config
+ * @throws IOException
+ * @throws ClassNotFoundException
+ */
public void setupDebeziumEventCapture(Properties props, DebeziumRecordParserService debeziumRecordParserService,
ClickHouseSinkConnectorConfig config) throws IOException, ClassNotFoundException {
@@ -724,7 +709,6 @@ DBCredentials parseDBConfiguration(ClickHouseSinkConnectorConfig config) {
DBCredentials dbCredentials = new DBCredentials();
dbCredentials.setHostName(config.getString(ClickHouseSinkConnectorConfigVariables.CLICKHOUSE_URL.toString()));
- dbCredentials.setDatabase(config.getString(ClickHouseSinkConnectorConfigVariables.CLICKHOUSE_DATABASE.toString()));
dbCredentials.setPort(config.getInt(ClickHouseSinkConnectorConfigVariables.CLICKHOUSE_PORT.toString()));
dbCredentials.setUserName(config.getString(ClickHouseSinkConnectorConfigVariables.CLICKHOUSE_USER.toString()));
dbCredentials.setPassword(config.getString(ClickHouseSinkConnectorConfigVariables.CLICKHOUSE_PASS.toString()));
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ITCommon.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ITCommon.java
index 9cb7c48db..7683e0c46 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ITCommon.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ITCommon.java
@@ -48,7 +48,6 @@ static public Properties getDebeziumProperties(MySQLContainer mySqlContainer, Cl
defaultProps.setProperty("clickhouse.server.port", String.valueOf(clickHouseContainer.getFirstMappedPort()));
defaultProps.setProperty("clickhouse.server.user", clickHouseContainer.getUsername());
defaultProps.setProperty("clickhouse.server.password", clickHouseContainer.getPassword());
- defaultProps.setProperty("clickhouse.server.database", "employees");
defaultProps.setProperty("offset.storage.jdbc.url", String.format("jdbc:clickhouse://%s:%s",
clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort()));
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/client/SinkConnectorClientRestAPITest.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/client/SinkConnectorClientRestAPITest.java
index 6cddf159d..ef1159e34 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/client/SinkConnectorClientRestAPITest.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/client/SinkConnectorClientRestAPITest.java
@@ -74,7 +74,6 @@ public void testRestClient() throws Exception {
Properties props = ITCommon.getDebeziumProperties(mySqlContainer, clickHouseContainer);
props.setProperty("database.include.list", "datatypes");
- props.setProperty("clickhouse.server.database", "datatypes");
// Override clickhouse server timezone.
ClickHouseDebeziumEmbeddedApplication clickHouseDebeziumEmbeddedApplication = new ClickHouseDebeziumEmbeddedApplication();
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/config/mysql_config.yaml b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/config/mysql_config.yaml
index 89052b819..e06e18979 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/config/mysql_config.yaml
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/config/mysql_config.yaml
@@ -8,7 +8,6 @@ clickhouse.server.url: "localhost"
clickhouse.server.user: "root"
clickhouse.server.password: "root"
clickhouse.server.port: "8123"
-clickhouse.server.database: "test"
database.allowPublicKeyRetrieval: "true"
snapshot.mode: "schema_only"
connector.class: "io.debezium.connector.mysql.MySqlConnector"
\ No newline at end of file
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesIT.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesIT.java
index e73ec7860..56e25866d 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesIT.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesIT.java
@@ -53,7 +53,6 @@ public void testCreateTable() throws Exception {
Properties props = getDebeziumProperties();
props.setProperty("database.include.list", "datatypes");
- props.setProperty("clickhouse.server.database", "datatypes");
engine.set(new DebeziumChangeEventCapture());
engine.get().setup(getDebeziumProperties(), new SourceRecordParserService(),
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesTimeZoneIT.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesTimeZoneIT.java
index ec4c6427c..88ecf5174 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesTimeZoneIT.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/CreateTableDataTypesTimeZoneIT.java
@@ -67,7 +67,6 @@ public void testCreateTable() throws Exception {
Properties props = ITCommon.getDebeziumProperties(mySqlContainer, clickHouseContainer);
props.setProperty("database.include.list", "datatypes");
- props.setProperty("clickhouse.server.database", "datatypes");
engine.set(new DebeziumChangeEventCapture());
engine.get().setup(ITCommon.getDebeziumProperties(mySqlContainer, clickHouseContainer), new SourceRecordParserService(),
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneColumnSchemaOnlyIT.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneColumnSchemaOnlyIT.java
index dee4ac2e7..4a2be04d0 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneColumnSchemaOnlyIT.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneColumnSchemaOnlyIT.java
@@ -82,7 +82,6 @@ protected Properties getDebeziumProperties() throws Exception {
defaultProps.setProperty("clickhouse.server.port", String.valueOf(clickHouseContainer.getFirstMappedPort()));
defaultProps.setProperty("clickhouse.server.user", clickHouseContainer.getUsername());
defaultProps.setProperty("clickhouse.server.password", clickHouseContainer.getPassword());
- defaultProps.setProperty("clickhouse.server.database", "employees");
defaultProps.setProperty("offset.storage.jdbc.url", String.format("jdbc:clickhouse://%s:%s",
clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort()));
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneIT.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneIT.java
index d4213adbb..4f446be7a 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneIT.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneIT.java
@@ -68,7 +68,6 @@ public void testCreateTable() throws Exception {
Properties props = ITCommon.getDebeziumProperties(mySqlContainer, clickHouseContainer);
props.setProperty("database.include.list", "datatypes");
- props.setProperty("clickhouse.server.database", "datatypes");
engine.set(new DebeziumChangeEventCapture());
engine.get().setup(ITCommon.getDebeziumProperties(mySqlContainer, clickHouseContainer), new SourceRecordParserService(),
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneSchemaOnlyIT.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneSchemaOnlyIT.java
index 44b376c22..4c0f5c3bc 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneSchemaOnlyIT.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithTimeZoneSchemaOnlyIT.java
@@ -70,7 +70,6 @@ public void testCreateTable() throws Exception {
Properties props = getDebeziumProperties();
props.setProperty("database.include.list", "datatypes");
- props.setProperty("clickhouse.server.database", "datatypes");
engine.set(new DebeziumChangeEventCapture());
engine.get().setup(getDebeziumProperties(), new SourceRecordParserService(),
@@ -275,7 +274,6 @@ protected Properties getDebeziumProperties() throws Exception {
defaultProps.setProperty("clickhouse.server.port", String.valueOf(clickHouseContainer.getFirstMappedPort()));
defaultProps.setProperty("clickhouse.server.user", clickHouseContainer.getUsername());
defaultProps.setProperty("clickhouse.server.password", clickHouseContainer.getPassword());
- defaultProps.setProperty("clickhouse.server.database", "employees");
defaultProps.setProperty("offset.storage.jdbc.url", String.format("jdbc:clickhouse://%s:%s",
clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort()));
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithUserProvidedDifferentTimeZoneIT.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithUserProvidedDifferentTimeZoneIT.java
index 2d7ebd02e..eaf17181b 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithUserProvidedDifferentTimeZoneIT.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithUserProvidedDifferentTimeZoneIT.java
@@ -290,7 +290,6 @@ protected Properties getDebeziumProperties() throws Exception {
defaultProps.setProperty("clickhouse.server.port", String.valueOf(clickHouseContainer.getFirstMappedPort()));
defaultProps.setProperty("clickhouse.server.user", clickHouseContainer.getUsername());
defaultProps.setProperty("clickhouse.server.password", clickHouseContainer.getPassword());
- defaultProps.setProperty("clickhouse.server.database", "employees");
defaultProps.setProperty("offset.storage.jdbc.url", String.format("jdbc:clickhouse://%s:%s",
clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort()));
diff --git a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithUserProvidedTimeZoneSchemaOnlyIT.java b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithUserProvidedTimeZoneSchemaOnlyIT.java
index 8bca5c3ea..24fe3f2ca 100644
--- a/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithUserProvidedTimeZoneSchemaOnlyIT.java
+++ b/sink-connector-lightweight/src/test/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/DateTimeWithUserProvidedTimeZoneSchemaOnlyIT.java
@@ -72,9 +72,6 @@ public void testCreateTable() throws Exception {
Properties props = getDebeziumProperties();
props.setProperty("database.include.list", "datatypes");
- props.setProperty("clickhouse.server.database", "datatypes");
- // Override clickhouse server timezone.
- // props.setProperty("clickhouse.datetime.timezone", "UTC");
engine.set(new DebeziumChangeEventCapture());
engine.get().setup(getDebeziumProperties(), new SourceRecordParserService(),
@@ -269,7 +266,6 @@ protected Properties getDebeziumProperties() throws Exception {
defaultProps.setProperty("clickhouse.server.port", String.valueOf(clickHouseContainer.getFirstMappedPort()));
defaultProps.setProperty("clickhouse.server.user", clickHouseContainer.getUsername());
defaultProps.setProperty("clickhouse.server.password", clickHouseContainer.getPassword());
- defaultProps.setProperty("clickhouse.server.database", "employees");
defaultProps.setProperty("offset.storage.jdbc.url", String.format("jdbc:clickhouse://%s:%s",
clickHouseContainer.getHost(), clickHouseContainer.getFirstMappedPort()));
diff --git a/sink-connector-lightweight/src/test/resources/config.yml b/sink-connector-lightweight/src/test/resources/config.yml
index 4d99d5aea..e39ce2d93 100644
--- a/sink-connector-lightweight/src/test/resources/config.yml
+++ b/sink-connector-lightweight/src/test/resources/config.yml
@@ -10,7 +10,6 @@ clickhouse.server.url: "clickhouse"
clickhouse.server.user: "default"
clickhouse.server.password: "root"
clickhouse.server.port: "8123"
-clickhouse.server.database: "test"
database.allowPublicKeyRetrieval: "true"
snapshot.mode: "initial"
offset.flush.interval.ms: "5000"
diff --git a/sink-connector-lightweight/src/test/resources/config_postgres.yml b/sink-connector-lightweight/src/test/resources/config_postgres.yml
index fc617e69f..82b8db310 100644
--- a/sink-connector-lightweight/src/test/resources/config_postgres.yml
+++ b/sink-connector-lightweight/src/test/resources/config_postgres.yml
@@ -11,7 +11,6 @@ clickhouse.server.url: "clickhouse"
clickhouse.server.user: "default"
clickhouse.server.password: "root"
clickhouse.server.port: "8123"
-clickhouse.server.database: "public"
database.allowPublicKeyRetrieval: "true"
snapshot.mode: "initial"
offset.flush.interval.ms: "5000"
diff --git a/sink-connector/deploy/helm/altinity-sink-connector/templates/sink-kafkaconnector.yaml b/sink-connector/deploy/helm/altinity-sink-connector/templates/sink-kafkaconnector.yaml
index 58044fc64..6a39c8228 100644
--- a/sink-connector/deploy/helm/altinity-sink-connector/templates/sink-kafkaconnector.yaml
+++ b/sink-connector/deploy/helm/altinity-sink-connector/templates/sink-kafkaconnector.yaml
@@ -15,7 +15,6 @@ spec:
clickhouse.server.url: {{ $.Values.clickhouseSinkConnector.clickhouse.server.url }}
clickhouse.server.user: {{ $.Values.clickhouseSinkConnector.clickhouse.server.user }}
clickhouse.server.password: {{ $.Values.clickhouseSinkConnector.clickhouse.server.password }}
- clickhouse.server.database: {{ $.Values.clickhouseSinkConnector.clickhouse.server.url }}
clickhouse.server.port: {{ $.Values.clickhouseSinkConnector.clickhouse.server.port }}
clickhouse.topic2table.map: "employees:employee"
store.kafka.metadata: "false"
diff --git a/sink-connector/deploy/k8s/sink-connector-apicurio-avro.yaml b/sink-connector/deploy/k8s/sink-connector-apicurio-avro.yaml
index e70f3f1ca..b3a32da93 100644
--- a/sink-connector/deploy/k8s/sink-connector-apicurio-avro.yaml
+++ b/sink-connector/deploy/k8s/sink-connector-apicurio-avro.yaml
@@ -18,7 +18,6 @@ spec:
clickhouse.server.url: "${CLICKHOUSE_HOST}"
clickhouse.server.user: "${CLICKHOUSE_USER}"
clickhouse.server.password: "${CLICKHOUSE_PASSWORD}"
- clickhouse.server.database: "${CLICKHOUSE_DATABASE}"
clickhouse.server.port: "${CLICKHOUSE_PORT}"
clickhouse.table.name: "${CLICKHOUSE_TABLE}"
diff --git a/sink-connector/deploy/k8s/sink-connector-avro.yaml b/sink-connector/deploy/k8s/sink-connector-avro.yaml
index 822eebae6..0f62d9bc9 100644
--- a/sink-connector/deploy/k8s/sink-connector-avro.yaml
+++ b/sink-connector/deploy/k8s/sink-connector-avro.yaml
@@ -18,7 +18,6 @@ spec:
clickhouse.server.url: "${CLICKHOUSE_HOST}"
clickhouse.server.user: "${CLICKHOUSE_USER}"
clickhouse.server.password: "${CLICKHOUSE_PASSWORD}"
- clickhouse.server.database: "${CLICKHOUSE_DATABASE}"
clickhouse.server.port: "${CLICKHOUSE_PORT}"
clickhouse.table.name: "${CLICKHOUSE_TABLE}"
diff --git a/sink-connector/deploy/k8s/sink-connector-json.yaml b/sink-connector/deploy/k8s/sink-connector-json.yaml
index 30cdcecfc..8e8f17e96 100644
--- a/sink-connector/deploy/k8s/sink-connector-json.yaml
+++ b/sink-connector/deploy/k8s/sink-connector-json.yaml
@@ -19,7 +19,6 @@ spec:
clickhouse.server.url: "${CLICKHOUSE_HOST}"
clickhouse.server.user: "${CLICKHOUSE_USER}"
clickhouse.server.password: "${CLICKHOUSE_PASSWORD}"
- clickhouse.server.database: "${CLICKHOUSE_DATABASE}"
clickhouse.server.port: "${CLICKHOUSE_PORT}"
clickhouse.table.name: "${CLICKHOUSE_TABLE}"
key.converter: "io.apicurio.registry.utils.converter.AvroConverter"
diff --git a/sink-connector/deploy/sink-connector-setup-database.sh b/sink-connector/deploy/sink-connector-setup-database.sh
index 53c881e3f..43c46337b 100755
--- a/sink-connector/deploy/sink-connector-setup-database.sh
+++ b/sink-connector/deploy/sink-connector-setup-database.sh
@@ -32,7 +32,6 @@ if [[ $1 == "apicurio" ]]; then
"clickhouse.server.url": "${CLICKHOUSE_HOST}",
"clickhouse.server.user": "${CLICKHOUSE_USER}",
"clickhouse.server.password": "${CLICKHOUSE_PASSWORD}",
- "clickhouse.server.database": "${CLICKHOUSE_DATABASE}",
"clickhouse.server.port": ${CLICKHOUSE_PORT},
# "clickhouse.table.name": "${CLICKHOUSE_TABLE}",
"key.converter": "io.apicurio.registry.utils.converter.AvroConverter",
@@ -80,7 +79,6 @@ else
"clickhouse.server.url": "${CLICKHOUSE_HOST}",
"clickhouse.server.user": "${CLICKHOUSE_USER}",
"clickhouse.server.password": "${CLICKHOUSE_PASSWORD}",
- "clickhouse.server.database": "${CLICKHOUSE_DATABASE}",
"clickhouse.server.port": ${CLICKHOUSE_PORT},
"clickhouse.table.name": "${CLICKHOUSE_TABLE}",
"key.converter": "io.confluent.connect.avro.AvroConverter",
diff --git a/sink-connector/deploy/sink-connector-setup-schema-registry.sh b/sink-connector/deploy/sink-connector-setup-schema-registry.sh
index 1d168dc6c..ad92eea9f 100755
--- a/sink-connector/deploy/sink-connector-setup-schema-registry.sh
+++ b/sink-connector/deploy/sink-connector-setup-schema-registry.sh
@@ -43,7 +43,6 @@ if [[ $2 == "apicurio" ]]; then
"clickhouse.server.url": "${CLICKHOUSE_HOST}",
"clickhouse.server.user": "${CLICKHOUSE_USER}",
"clickhouse.server.password": "${CLICKHOUSE_PASSWORD}",
- "clickhouse.server.database": "${CLICKHOUSE_DATABASE}",
"clickhouse.server.port": ${CLICKHOUSE_PORT},
"clickhouse.table.name": "${CLICKHOUSE_TABLE}",
"key.converter": "io.apicurio.registry.utils.converter.AvroConverter",
@@ -90,7 +89,6 @@ else
"clickhouse.server.url": "${CLICKHOUSE_HOST}",
"clickhouse.server.user": "${CLICKHOUSE_USER}",
"clickhouse.server.password": "${CLICKHOUSE_PASSWORD}",
- "clickhouse.server.database": "${CLICKHOUSE_DATABASE}",
"clickhouse.server.port": ${CLICKHOUSE_PORT},
"clickhouse.table.name": "${CLICKHOUSE_TABLE}",
"key.converter": "io.confluent.connect.avro.AvroConverter",
diff --git a/sink-connector/deploy/sink-connector-setup.sh b/sink-connector/deploy/sink-connector-setup.sh
index b4350be43..5dd0e3c56 100755
--- a/sink-connector/deploy/sink-connector-setup.sh
+++ b/sink-connector/deploy/sink-connector-setup.sh
@@ -28,7 +28,6 @@ cat <