Merge remote-tracking branch 'origin/main' into bz/avoid-using-macro-in-parser

Signed-off-by: Bugen Zhao <[email protected]>

Author: BugenZhao

.github/workflows/doc.yml

@@ -14,10 +14,17 @@ jobs:
         run: rustup show
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install -y make build-essential cmake protobuf-compiler curl openssl libssl-dev libsasl2-dev libcurl4-openssl-dev pkg-config postgresql-client tmux lld
+      - name: Run sccache-cache
+        uses: mozilla-actions/[email protected]
+        with:
+          version: "v0.5.2"
       - name: Docs
         run: |
           RUSTDOCFLAGS="--markdown-css rust.css --markdown-no-toc --index-page docs/rustdoc/index.md -Zunstable-options" cargo doc --workspace --no-deps --document-private-items
           cp docs/rustdoc/rust.css target/doc/rust.css
+        env:
+          SCCACHE_GHA_ENABLED: "true"
+          RUSTC_WRAPPER: "sccache"
       - name: Upload artifacts
         uses: actions/upload-pages-artifact@v1
         with:

.github/workflows/license_check.yml

@@ -18,4 +18,4 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Check License Header
-      uses: apache/skywalking-eyes/header@df70871af1a8109c9a5b1dc824faaf65246c5236
+      uses: apache/skywalking-eyes@775fe1ffda59b7e100aa144d0ef8d7beae17f97d

.github/workflows/typo.yml

@@ -10,4 +10,4 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Check spelling of the entire repository
-      uses: crate-ci/typos@v1.13.20
+      uses: crate-ci/typos@v1.14.12

Cargo.lock

@@ -58,6 +58,7 @@ license = "Apache-2.0"
 repository = "https://github.com/risingwavelabs/risingwave"
 
 [workspace.dependencies]
+await-tree = "0.1.1"
 aws-config = { version = "0.51", default-features = false, features = ["rt-tokio", "native-tls"] }
 aws-sdk-kinesis = { version = "0.21", default-features = false, features = ["rt-tokio", "native-tls"] }
 aws-sdk-s3 = { version = "0.21", default-features = false, features = ["rt-tokio","native-tls"] }

Cargo.toml

@@ -14,6 +14,7 @@ extend = [
   { path = "src/tests/compaction_test/Makefile.toml" },
   { path = "src/storage/backup/integration_tests/Makefile.toml" },
   { path = "src/java_binding/make-java-binding.toml" },
+  { path = "src/stream/tests/integration_tests/integration_test.toml" },
 ]
 
 env_files = ["./risedev-components.user.env"]

Makefile.toml

@@ -64,11 +64,7 @@ services:
     environment: {}
     container_name: message_queue
     healthcheck:
-      test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/9092
+      test: curl -f localhost:9644/v1/status/ready
       interval: 1s
       timeout: 5s
       retries: 5

ci/docker-compose.yml

@@ -102,7 +102,7 @@ else
 fi
 
 diff -u ./e2e_test/sink/remote/mysql_expected_result_1.tsv \
-<(mysql --host=mysql --port=3306 -u root -p123456 -s -N -r test -e "SELECT id, v_varchar, v_text, v_integer, v_smallint, v_bigint, v_decimal, v_real, v_double, v_boolean, v_date, v_time, v_timestamp, v_jsonb, TO_BASE64(v_bytea) FROM test.t_remote_1 ORDER BY id")
+<(mysql --host=mysql --port=3306 -u root -p123456 -s -N -r test -e "SELECT id, v_varchar, v_text, v_integer, v_smallint, v_bigint, v_decimal, v_real, v_double, v_boolean, v_date, v_time, v_timestamp, v_timestamptz, v_interval, v_jsonb, TO_BASE64(v_bytea) FROM test.t_remote_1 ORDER BY id")
 if [ $? -eq 0 ]; then
   echo "mysql sink check 1 passed"
 else

ci/scripts/e2e-sink-test.sh

@@ -93,6 +93,7 @@ steps:
           - "twitter-pulsar"
           - "debezium-mongo"
           - "debezium-postgres"
+          - "tidb-cdc-sink"
         format:
           - "json"
           - "protobuf"
@@ -109,3 +110,7 @@ steps:
             testcase: "debezium-postgres"
             format: "protobuf"
           skip: true
+        - with:
+            testcase: "tidb-cdc-sink"
+            format: "protobuf"
+          skip: true

ci/workflows/integration-tests.yml

@@ -192,7 +192,7 @@ steps:
           mount-buildkite-agent: true
           environment:
             - S3_SOURCE_TEST_CONF
-    timeout_in_minutes: 20
+    timeout_in_minutes: 25
 
   - label: "S3 source check on lyvecloud.seagate.com (json parser)"
     command: "ci/scripts/s3-source-test.sh -p ci-release -s run"
@@ -207,7 +207,7 @@ steps:
           mount-buildkite-agent: true
           environment:
             - S3_SOURCE_TEST_CONF
-    timeout_in_minutes: 20
+    timeout_in_minutes: 25
 
   - label: "S3 source check on AWS (csv parser)"
     command: "ci/scripts/s3-source-test.sh -p ci-release -s run_csv"
@@ -222,7 +222,7 @@ steps:
           mount-buildkite-agent: true
           environment:
             - S3_SOURCE_TEST_CONF
-    timeout_in_minutes: 20
+    timeout_in_minutes: 25
 
   - label: "S3 source on OpenDAL fs engine"
     command: "ci/scripts/s3-source-test-for-opendal-fs-engine.sh -p ci-release -s run"

ci/workflows/main-cron.yml

@@ -29,10 +29,8 @@ services:
     container_name: compactor-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/6660
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/6660; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -66,10 +64,8 @@ services:
     container_name: compute-node-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/5688
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5688; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -112,9 +108,10 @@ services:
     healthcheck:
       test:
         - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/2388
+        - etcdctl
+        - --endpoints=http://localhost:2388
+        - endpoint
+        - health
       interval: 1s
       timeout: 5s
       retries: 5
@@ -147,10 +144,8 @@ services:
     container_name: frontend-node-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/4566
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/4566; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -172,10 +167,8 @@ services:
     container_name: grafana-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/3001
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/3001; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -218,10 +211,8 @@ services:
     container_name: meta-node-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/5690
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5690; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -246,10 +237,8 @@ services:
     container_name: prometheus-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/9500
+        - CMD-SHELL
+        - sh -c 'printf "GET /-/healthy HTTP/1.0\n\n" | nc localhost 9500; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -294,11 +283,7 @@ services:
     environment: {}
     container_name: message_queue
     healthcheck:
-      test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/9092
+      test: curl -f localhost:9644/v1/status/ready
       interval: 1s
       timeout: 5s
       retries: 5

docker/dashboards/risingwave-dev-dashboard.json

@@ -33,10 +33,8 @@ services:
     container_name: compactor-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/6660
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/6660; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -74,10 +72,8 @@ services:
     container_name: compute-node-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/5688
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5688; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -120,9 +116,10 @@ services:
     healthcheck:
       test:
         - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/2388
+        - etcdctl
+        - --endpoints=http://localhost:2388
+        - endpoint
+        - health
       interval: 1s
       timeout: 5s
       retries: 5
@@ -157,10 +154,8 @@ services:
     container_name: frontend-node-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/4566
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/4566; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -182,10 +177,8 @@ services:
     container_name: grafana-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/3001
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/3001; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -231,10 +224,8 @@ services:
     container_name: meta-node-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/5690
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/5690; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -276,10 +267,8 @@ services:
     container_name: minio-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/9301
+        - CMD-SHELL
+        - bash -c 'printf \"GET / HTTP/1.1\n\n\" > /dev/tcp/127.0.0.1/9301; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -304,10 +293,8 @@ services:
     container_name: prometheus-0
     healthcheck:
       test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/9500
+        - CMD-SHELL
+        - sh -c 'printf "GET /-/healthy HTTP/1.0\n\n" | nc localhost 9500; exit $?;'
       interval: 1s
       timeout: 5s
       retries: 5
@@ -352,11 +339,7 @@ services:
     environment: {}
     container_name: message_queue
     healthcheck:
-      test:
-        - CMD
-        - printf
-        - ""
-        - /dev/tcp/127.0.0.1/9092
+      test: curl -f localhost:9644/v1/status/ready
       interval: 1s
       timeout: 5s
       retries: 5

docker/docker-compose-s3-compatible.yml

@@ -258,6 +258,31 @@ select pg_typeof('123');
 ----
 unknown
 
+query T
+select pg_typeof('123'::varchar);
+----
+varchar
+
+query T
+select pg_typeof('123'::int);
+----
+integer
+
+query T
+select pg_typeof(null);
+----
+unknown
+
+query T
+select pg_typeof(null::varchar);
+----
+varchar
+
+query T
+select pg_typeof(null::bool);
+----
+boolean
+
 query T
 select pg_typeof(-9223372036854775808);
 ----