Merge branch 'main' into bz/junior-jackal

.github/dependabot.yml

@@ -60,8 +60,24 @@ updates:
     - dependency-name: "io.debezium:*"
       update-types:
         ["version-update:semver-minor", "version-update:semver-major"]
+    # Don't upgrade protobuf to 4.x now. See https://github.com/grpc/grpc-java/issues/11015
+    - dependency-name: "com.google.protobuf:*"
+      update-types:
+        ["version-update:semver-major"]
+    # Let's do major version updates manually
+    - dependency-name: "*"
+      update-types:
+        ["version-update:semver-major"]
   groups:
     # Group all dependenies together because Java libraries are quite stable
     all:
       patterns:
         - "*"
+
+# Don't touch risingwave-sink-deltalake-test. It's too complicated and it's only for testing
+- package-ecosystem: maven
+  directory: /java/connector-node/risingwave-sink-deltalake-test/
+  schedule:
+    interval: "weekly"
+  ignore:
+    - dependency-name: "*"

Cargo.toml

@@ -80,7 +80,11 @@ license = "Apache-2.0"
 repository = "https://github.com/risingwavelabs/risingwave"
 
 [workspace.dependencies]
-foyer = { version = "0.12.2", features = ["tracing", "nightly"] }
+# foyer = { version = "0.12.2", features = ["tracing", "nightly"] }
+foyer = { git = "https://github.com/mrcroxx/foyer", rev = "99005412eac1bca6aa7c73d750efc9cdb8ae176e", features = [
+    "tracing",
+    "nightly",
+] }
 apache-avro = { git = "https://github.com/risingwavelabs/avro", rev = "25113ba88234a9ae23296e981d8302c290fdaa4b", features = [
     "snappy",
     "zstandard",

ci/workflows/main-cron.yml

@@ -143,7 +143,7 @@ steps:
           files: "*-junit.xml"
           format: "junit"
       - ./ci/plugins/upload-failure-logs
-    timeout_in_minutes: 11
+    timeout_in_minutes: 13
     retry: *auto-retry
 
   - label: "end-to-end test (parallel, in-memory) (release)"
@@ -347,7 +347,7 @@ steps:
 
   - label: "end-to-end test (madsim)"
     key: "e2e-test-deterministic"
-    command: "TEST_NUM=32 timeout 120m ci/scripts/deterministic-e2e-test.sh"
+    command: "TEST_NUM=32 timeout 130m ci/scripts/deterministic-e2e-test.sh"
     if: |
       !(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
       || build.pull_request.labels includes "ci/run-e2e-test-deterministic-simulation"
@@ -364,12 +364,12 @@ steps:
           environment:
             - GITHUB_TOKEN
       - ./ci/plugins/upload-failure-logs
-    timeout_in_minutes: 120
+    timeout_in_minutes: 135
     retry: *auto-retry
 
   - label: "end-to-end test (madsim, random vnode count)"
     key: "e2e-test-deterministic-random-vnode-count"
-    command: "TEST_NUM=32 RW_SIM_RANDOM_VNODE_COUNT=true timeout 120m ci/scripts/deterministic-e2e-test.sh"
+    command: "TEST_NUM=32 RW_SIM_RANDOM_VNODE_COUNT=true timeout 130m ci/scripts/deterministic-e2e-test.sh"
     if: |
       !(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
       || build.pull_request.labels includes "ci/run-e2e-test-deterministic-simulation"
@@ -386,12 +386,12 @@ steps:
           environment:
             - GITHUB_TOKEN
       - ./ci/plugins/upload-failure-logs
-    timeout_in_minutes: 120
+    timeout_in_minutes: 135
     retry: *auto-retry
 
   - label: "recovery test (madsim)"
     key: "recovery-test-deterministic"
-    command: "TEST_NUM=12 KILL_RATE=1.0 BACKGROUND_DDL_RATE=0.0 timeout 65m ci/scripts/deterministic-recovery-test.sh"
+    command: "TEST_NUM=12 KILL_RATE=1.0 BACKGROUND_DDL_RATE=0.0 timeout 70m ci/scripts/deterministic-recovery-test.sh"
     if: |
       !(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
       || build.pull_request.labels includes "ci/run-recovery-test-deterministic-simulation"
@@ -404,7 +404,7 @@ steps:
           mount-buildkite-agent: true
       # Only upload zipped files, otherwise the logs is too much.
       - ./ci/plugins/upload-failure-logs-zipped
-    timeout_in_minutes: 70
+    timeout_in_minutes: 75
     retry: *auto-retry
 
   # Ddl statements will randomly run with background_ddl.

e2e_test/batch/basic/dml_update.slt.part

@@ -99,8 +99,21 @@ update t set (v1, v2) = (select '888.88', 999);
 db error: ERROR: Failed to run the query
 
 Caused by these errors (recent errors listed first):
-  1: cannot cast type "record" to "record"
-  2: cannot cast type "character varying" to "integer" in Assign context
+  1: cannot cast type "record" to "struct<v1 integer, v2 integer>"
+  2: cannot cast to struct field "v1"
+  3: cannot cast type "character varying" to "integer" in Assign context
+
+
+# Multiple assignments, to subquery (with column name) with cast failure.
+statement error
+update t set (v1, v2) = (select '888.88' s1, 999 s2);
+----
+db error: ERROR: Failed to run the query
+
+Caused by these errors (recent errors listed first):
+  1: cannot cast type "struct<s1 character varying, s2 integer>" to "struct<v1 integer, v2 integer>"
+  2: cannot cast struct field "s1" to struct field "v1"
+  3: cannot cast type "character varying" to "integer" in Assign context
 
 
 # Multiple assignments, to subquery with mismatched column count.

e2e_test/source_legacy/cdc/cdc.share_stream.slt

@@ -134,6 +134,33 @@ create table orders_test (
    PRIMARY KEY (order_id)
 ) from mysql_mytest table 'mytest.orders';
 
+statement error
+CREATE TABLE test_my_default_value (
+    id int,
+    name varchar,
+    city varchar DEFAULT 'Beijing',
+    PRIMARY KEY (id)
+) FROM mysql_mytest TABLE 'mytest.test_my_default_value';
+
+statement ok
+CREATE TABLE test_my_default_value (
+    id int,
+    name varchar,
+    city varchar,
+    PRIMARY KEY (id)
+) FROM mysql_mytest TABLE 'mytest.test_my_default_value';
+
+statement ok
+SET RW_IMPLICIT_FLUSH=true;
+
+statement ok
+INSERT INTO test_my_default_value VALUES (2, 'jack');
+
+query II
+select * from test_my_default_value;
+----
+2 jack Shanghai
+
 
 statement ok
 create table kt1 (*) from mysql_source table 'kdb.kt1';
@@ -575,3 +602,22 @@ query II
 select * from upper_orders_shared order by id;
 ----
 1 happy
+
+statement ok
+CREATE TABLE test_pg_default_value (
+    id int,
+    name varchar,
+    city varchar,
+    PRIMARY KEY (id)
+) FROM pg_source TABLE 'public.test_default_value';
+
+statement ok
+SET RW_IMPLICIT_FLUSH=true;
+
+statement ok
+INSERT INTO test_pg_default_value VALUES (1, 'noris');
+
+query II
+select * from test_pg_default_value;
+----
+1 noris Shanghai

e2e_test/source_legacy/cdc/mysql_create.sql

@@ -49,3 +49,10 @@ CREATE TABLE IF NOT EXISTS mysql_all_types(
 
 INSERT INTO mysql_all_types VALUES ( False, 0, null, null, -8388608, -2147483647, 9223372036854775806, -10.0, -9999.999999, -10000.0, 'c', 'd', '', '', '1001-01-01', '-838:59:59.000000', '2000-01-01 00:00:00.000000', null);
 INSERT INTO mysql_all_types VALUES ( True, 1, -128, -32767, -8388608, -2147483647, -9223372036854775807, -10.0, -9999.999999, -10000.0, 'a', 'b', '', '', '1001-01-01', '00:00:00', '1998-01-01 00:00:00.000000', '1970-01-01 00:00:01');
+
+CREATE TABLE test_my_default_value (
+    id int,
+    name varchar(64),
+    city varchar(200) default 'Shanghai',
+    PRIMARY KEY (id)
+);

e2e_test/source_legacy/cdc/postgres_cdc.sql

@@ -149,3 +149,11 @@ INSERT INTO partitioned_timestamp_table (c_int, c_boolean, c_timestamp) VALUES
 
 -- Here we create this publication without `WITH ( publish_via_partition_root = true )` only for tests. Normally, it should be added.
 create publication rw_publication_pubviaroot_false for TABLE partitioned_timestamp_table;
+
+
+CREATE TABLE test_default_value (
+    "id" int,
+    "name" varchar(64),
+    "city" varchar(200) default 'Shanghai',
+    PRIMARY KEY ("id")
+);