Merge branch 'main' into bw/add-loom-test

.github/pull_request_template.md

@@ -2,7 +2,7 @@ I hereby agree to the terms of the [Singularity Data, Inc. Contributor License A
 
 ## What's changed and what's your intention?
 
-***PLEASE DO NOT LEAVE THIS EMPTY !!!***
+**This section will be used as the commit message. Please do not leave this empty!**
 
 Please explain **IN DETAIL** what the changes are in this PR and why they are needed:
 

.mergify.yml

@@ -1,13 +1,13 @@
 shared:
   - commit_message_template: &commit_message_template |
-      {{title}}
+      {{title}} (#{{number}})
 
       {{body | get_section("## What's changed and what's your intention?")}}
 
       {% for user in approved_reviews_by %}
       Approved-By: {{user}}
       {%- endfor %}
-      {% for commit in commits|unique(false, "email_author") %}
+      {% for commit in commits|unique(false, "email_author") if commit.author != "mergify[bot]" %}
       Co-Authored-By: {{ commit.author }} <{{ commit.email_author }}>
       {%- endfor %}
 

ci/docker-compose.yml

@@ -13,6 +13,7 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
+    command: [ "postgres", "-c", "wal_level=logical" ]
 
   mysql:
     image: mysql:8.0
@@ -64,6 +65,7 @@ services:
     image: public.ecr.aws/x5u3w5h6/rw-build-env:v20221212
     depends_on:
       - mysql
+      - db
     volumes:
       - ..:/risingwave
 

ci/scripts/build-other.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 source ci/scripts/common.env.sh
 
 # Should set a stable version of connector node
-STABLE_VERSION=7d454801e478e86c50a1e94cc139842554a0470d
+STABLE_VERSION=9d2e1331680335661fd3e55ee234532358683201
 
 echo "--- Build Java connector node"
 git clone https://"$GITHUB_TOKEN"@github.com/risingwavelabs/risingwave-connector-node.git

ci/scripts/e2e-source-test.sh

@@ -50,11 +50,17 @@ echo "--- Prepare RiseDev dev cluster"
 cargo make pre-start-dev
 cargo make link-all-in-one-binaries
 
-echo "--- e2e, ci-1cn-1fe, cdc source"
+echo "--- e2e, ci-1cn-1fe, mysql & postgres cdc"
 # install mysql client
 apt-get -y install mysql-client
 # import data to mysql
 mysql --host=mysql --port=3306 -u root -p123456 < ./e2e_test/source/cdc/mysql_cdc.sql
+
+# import data to postgres
+export PGPASSWORD='postgres';
+createdb -h db -U postgres cdc_test
+psql -h db -U postgres -d cdc_test < ./e2e_test/source/cdc/postgres_cdc.sql
+
 # start cdc connector node
 nohup java -jar ./connector-service.jar --port 60061 > .risingwave/log/connector-node.log 2>&1 &
 # start risingwave cluster
@@ -67,18 +73,16 @@ sqllogictest -p 4566 -d dev './e2e_test/source/cdc/cdc.check.slt'
 
 # kill cluster
 cargo make kill
+# insert new rows
+mysql --host=mysql --port=3306 -u root -p123456 < ./e2e_test/source/cdc/mysql_cdc_insert.sql
+psql -h db -U postgres -d cdc_test < ./e2e_test/source/cdc/postgres_cdc_insert.sql
+
 # start cluster w/o clean-data
 cargo make dev ci-1cn-1fe-with-recovery
 echo "wait for recovery finish"
 sleep 10
 echo "check mviews after cluster recovery"
-# check snapshot
-sqllogictest -p 4566 -d dev './e2e_test/source/cdc/cdc.check.slt'
-# insert new rows
-mysql --host=mysql --port=3306 -u root -p123456 < ./e2e_test/source/cdc/mysql_cdc_insert.sql
-# wait cdc ingesting
-sleep 10
-# check new results
+# check results
 sqllogictest -p 4566 -d dev './e2e_test/source/cdc/cdc.check_new_rows.slt'