Merge pull request #92 from Altinity/revert-84-77-add-sakila-employee…

…s-database

Revert "77 add sakila employees database"

.github/workflows/maven.yml

@@ -15,16 +15,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '8'
+          distribution: 'temurin'
           cache: maven
       - name: Build with Maven
         run: mvn -B package --file pom.xml
       - name: Run Unit tests
-        run: mvn test --file pom.xml
+        run: mvn test
       - name: Run java checkstyle
         uses: nikitasavinov/checkstyle-action@0.4.0

deploy/debezium-connector-setup-schema-registry.sh

@@ -14,7 +14,7 @@ PORT="3306"
 USER="root"
 PASSWORD="root"
 # Comma-separated list of regular expressions that match the databases for which to capture changes
-DBS="test,sakila"
+DBS="test"
 # Comma-separated list of regular expressions that match fully-qualified table identifiers of tables
 TABLES="employees"
 
@@ -52,7 +52,7 @@ elif [[ $1 == "mysql_external" ]]; then
   HOST="host.docker.internal"
 else
   echo "MySQL Database"
-  SNAPSHOT_MODE="initial"
+  SNAPSHOT_MODE="schema_only_recovery"
 fi
 
 
@@ -121,7 +121,7 @@ else
           "tasks.max": "1",
           "snapshot.mode": "${SNAPSHOT_MODE}",
           "snapshot.locking.mode": "none",
-          "snapshot.delay.ms": 0,
+          "snapshot.delay.ms": 10000,
           "include.schema.changes":"true",
           "include.schema.comments": "true",
           "database.hostname": "${HOST}",

deploy/k8s/sink-connector-apicurio-avro.yaml

@@ -20,6 +20,7 @@ spec:
     clickhouse.server.pass: "${CLICKHOUSE_PASSWORD}"
     clickhouse.server.database: "${CLICKHOUSE_DATABASE}"
     clickhouse.server.port: "${CLICKHOUSE_PORT}"
+    clickhouse.table.name: "${CLICKHOUSE_TABLE}"
 
     store.kafka.metadata: "true"
     topic.creation.default.partitions: "1"

deploy/k8s/sink-connector-avro.yaml

@@ -20,6 +20,7 @@ spec:
     clickhouse.server.pass: "${CLICKHOUSE_PASSWORD}"
     clickhouse.server.database: "${CLICKHOUSE_DATABASE}"
     clickhouse.server.port: "${CLICKHOUSE_PORT}"
+    clickhouse.table.name: "${CLICKHOUSE_TABLE}"
 
     store.kafka.metadata: "false"
     topic.creation.default.partitions: "6"

deploy/k8s/sink-connector-json.yaml

@@ -21,7 +21,7 @@ spec:
     clickhouse.server.pass: "${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"
     key.converter.apicurio.registry.url: "http://schemaregistry:8080/apis/registry/v2"
     key.converter.apicurio.registry.auto-register: "true"

deploy/sink-connector-setup-schema-registry.sh

@@ -45,6 +45,7 @@ if [[ $2 == "apicurio" ]]; then
         "clickhouse.server.pass": "${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",
         "value.converter": "io.apicurio.registry.utils.converter.AvroConverter",
 
@@ -86,13 +87,14 @@ else
     "config": {
       "connector.class": "com.altinity.clickhouse.sink.connector.ClickHouseSinkConnector",
       "tasks.max": "20",
-      "topics.regex": "SERVER5432.(.*)",
+      "topics": "${TOPICS}",
       "clickhouse.topic2table.map": "${TOPICS_TABLE_MAP}",
       "clickhouse.server.url": "${CLICKHOUSE_HOST}",
       "clickhouse.server.user": "${CLICKHOUSE_USER}",
       "clickhouse.server.pass": "${CLICKHOUSE_PASSWORD}",
       "clickhouse.server.database": "${CLICKHOUSE_DATABASE}",
       "clickhouse.server.port": ${CLICKHOUSE_PORT},
+      "clickhouse.table.name": "${CLICKHOUSE_TABLE}",
       "key.converter": "io.confluent.connect.avro.AvroConverter",
       "value.converter": "io.confluent.connect.avro.AvroConverter",
       "key.converter.schema.registry.url": "http://schemaregistry:8081",

deploy/sink-connector-setup-sysbench.sh

@@ -39,6 +39,7 @@ if [[ $1 == "apicurio" ]]; then
         "clickhouse.server.pass": "${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",
         "value.converter": "io.apicurio.registry.utils.converter.AvroConverter",
 
@@ -87,6 +88,7 @@ else
       "clickhouse.server.pass": "${CLICKHOUSE_PASSWORD}",
       "clickhouse.server.database": "${CLICKHOUSE_DATABASE}",
       "clickhouse.server.port": ${CLICKHOUSE_PORT},
+      "clickhouse.table.name": "${CLICKHOUSE_TABLE}",
       "key.converter": "io.confluent.connect.avro.AvroConverter",
       "value.converter": "io.confluent.connect.avro.AvroConverter",
       "key.converter.schema.registry.url": "http://schemaregistry:8081",

deploy/sink-connector-setup.sh

@@ -30,6 +30,7 @@ cat <<EOF | curl --request POST --url "${CONNECTORS_MANAGEMENT_URL}" --header 'C
     "clickhouse.server.pass": "${CLICKHOUSE_PASSWORD}",
     "clickhouse.server.database": "${CLICKHOUSE_DATABASE}",
     "clickhouse.server.port": ${CLICKHOUSE_PORT},
+    "clickhouse.table.name": "${CLICKHOUSE_TABLE}",
     "key.converter": "org.apache.kafka.connect.json.JsonConverter",
     "value.converter": "org.apache.kafka.connect.json.JsonConverter",
     "store.kafka.metadata": true