Merge branch 'main' into feat/switch-sim-integration-tests

risingwavelabs · Sep 29, 2024 · d1a8c5e · d1a8c5e
2 parents 51c79fc + d492843
commit d1a8c5e
Show file tree

Hide file tree

Showing 209 changed files with 2,788 additions and 2,061 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ci/scripts/e2e-sink-test.sh b/ci/scripts/e2e-sink-test.sh
@@ -61,6 +61,7 @@ sqllogictest -p 4566 -d dev './e2e_test/sink/create_sink_as.slt'
 sqllogictest -p 4566 -d dev './e2e_test/sink/blackhole_sink.slt'
 sqllogictest -p 4566 -d dev './e2e_test/sink/remote/types.slt'
 sqllogictest -p 4566 -d dev './e2e_test/sink/sink_into_table/*.slt'
+sqllogictest -p 4566 -d dev './e2e_test/sink/file_sink.slt'
 sleep 1
 
 echo "--- testing remote sinks"

diff --git a/ci/scripts/run-backfill-tests.sh b/ci/scripts/run-backfill-tests.sh
@@ -28,11 +28,11 @@ echo "--- Configuring cluster profiles"
 if [[ -n "${BUILDKITE:-}" ]]; then
   echo "Running in buildkite"
   RUNTIME_CLUSTER_PROFILE='ci-3cn-1fe'
-  MINIO_RATE_LIMIT_CLUSTER_PROFILE='ci-3cn-1fe-with-minio-rate-limit'
+  MINIO_RATE_LIMIT_CLUSTER_PROFILE='ci-backfill-3cn-1fe-with-minio-rate-limit'
 else
   echo "Running locally"
-  RUNTIME_CLUSTER_PROFILE='ci-3cn-1fe-with-monitoring'
-  MINIO_RATE_LIMIT_CLUSTER_PROFILE='ci-3cn-1fe-with-monitoring-and-minio-rate-limit'
+  RUNTIME_CLUSTER_PROFILE='ci-backfill-3cn-1fe-with-monitoring'
+  MINIO_RATE_LIMIT_CLUSTER_PROFILE='ci-backfill-3cn-1fe-with-monitoring-and-minio-rate-limit'
 fi
 export RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
 

diff --git a/docker/dashboards/risingwave-dev-dashboard.json b/docker/dashboards/risingwave-dev-dashboard.json
diff --git a/docker/docker-compose-distributed-etcd.yml b/docker/docker-compose-distributed-etcd.yml
@@ -1,7 +1,7 @@
 ---
 version: "3"
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   compactor-0:
     <<: *image

diff --git a/docker/docker-compose-distributed.yml b/docker/docker-compose-distributed.yml
@@ -1,6 +1,6 @@
 ---
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   compactor-0:
     <<: *image

diff --git a/docker/docker-compose-etcd.yml b/docker/docker-compose-etcd.yml
@@ -1,7 +1,7 @@
 ---
 version: "3"
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   risingwave-standalone:
     <<: *image

diff --git a/docker/docker-compose-with-azblob.yml b/docker/docker-compose-with-azblob.yml
@@ -1,6 +1,6 @@
 ---
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   risingwave-standalone:
     <<: *image

diff --git a/docker/docker-compose-with-gcs.yml b/docker/docker-compose-with-gcs.yml
@@ -1,6 +1,6 @@
 ---
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   risingwave-standalone:
     <<: *image

diff --git a/docker/docker-compose-with-local-fs.yml b/docker/docker-compose-with-local-fs.yml
@@ -1,6 +1,6 @@
 ---
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   risingwave-standalone:
     <<: *image

diff --git a/docker/docker-compose-with-obs.yml b/docker/docker-compose-with-obs.yml
@@ -1,6 +1,6 @@
 ---
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   risingwave-standalone:
     <<: *image

diff --git a/docker/docker-compose-with-oss.yml b/docker/docker-compose-with-oss.yml
@@ -1,6 +1,6 @@
 ---
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   risingwave-standalone:
     <<: *image

diff --git a/docker/docker-compose-with-s3.yml b/docker/docker-compose-with-s3.yml
@@ -1,6 +1,6 @@
 ---
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   risingwave-standalone:
     <<: *image

diff --git a/docker/docker-compose-with-sqlite.yml b/docker/docker-compose-with-sqlite.yml
@@ -1,6 +1,6 @@
 ---
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   risingwave-standalone:
     <<: *image

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,6 +1,6 @@
 ---
 x-image: &image
-  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.0}
+  image: ${RW_IMAGE:-risingwavelabs/risingwave:v2.0.1}
 services:
   risingwave-standalone:
     <<: *image

diff --git a/e2e_test/batch/catalog/pg_settings.slt.part b/e2e_test/batch/catalog/pg_settings.slt.part
@@ -58,6 +58,7 @@ user sink_decouple
 user source_rate_limit
 user standard_conforming_strings
 user statement_timeout
+user streaming_max_parallelism
 user streaming_parallelism
 user streaming_use_arrangement_backfill
 user streaming_use_snapshot_backfill

diff --git a/e2e_test/sink/file_sink.slt b/e2e_test/sink/file_sink.slt
@@ -0,0 +1,20 @@
+statement ok
+CREATE TABLE t (v1 int, v2 int);
+
+statement error
+CREATE table s3_4(
+     v1 int,
+     v2 int,
+)
+WITH (
+    connector = 's3',
+    match_pattern = '*.parquet',
+    s3.region_name = 'custom',
+    s3.bucket_name = 'hummock001',
+    s3.credentials.access = 'wrong_access',
+    s3.credentials.secret = 'wrong_secret',
+    s3.endpoint_url = 'http://hummock001.127.0.0.1:9301',
+) FORMAT PLAIN ENCODE PARQUET;
+
+statement ok
+DROP TABLE t;
diff --git a/e2e_test/streaming/on_conflict.slt b/e2e_test/streaming/on_conflict.slt
@@ -2,7 +2,7 @@ statement ok
 SET RW_IMPLICIT_FLUSH TO true;
 
 statement ok
-create table t1 (v1 int, v2 int, v3 int, primary key(v1)) APPEND ONLY on conflict ignore;
+create table t1 (v1 int, v2 int, v3 int, primary key(v1)) APPEND ONLY on conflict do nothing;
 
 statement ok
 insert into t1 values (1,4,2), (2,3,3);
@@ -30,7 +30,7 @@ statement error
 create table t2 (v1 int, v2 int, v3 int, primary key(v1)) APPEND ONLY on conflict overwrite;
 
 statement ok
-create table t2 (v1 int, v2 int, v3 int, primary key(v1)) on conflict overwrite;
+create table t2 (v1 int, v2 int, v3 int, primary key(v1)) on conflict do update full;
 
 statement ok
 insert into t2 values (1,4,2), (2,3,3);

diff --git a/e2e_test/streaming/with_version_column.slt b/e2e_test/streaming/with_version_column.slt
@@ -12,7 +12,7 @@ statement error
 create table t0 (v1 int, v2 int, v3 int, v4 bool, primary key(v1)) on conflict do update if not null with version column v4;
 
 statement error
-create table t0 (v1 int, v2 int, v3 int, v4 int, primary key(v1)) on conflict ignore with version column(v4);
+create table t0 (v1 int, v2 int, v3 int, v4 int, primary key(v1)) on conflict do nothing with version column(v4);
 
 statement ok
 create table t1 (v1 int, v2 int, v3 int, v4 int, primary key(v1)) on conflict do update if not null with version column(v4);
@@ -62,7 +62,7 @@ statement ok
 SET RW_IMPLICIT_FLUSH TO true;
 
 statement ok
-create table t2 (v1 int, v2 int, v3 int, v4 int, primary key(v1)) on conflict overwrite with version column(v4);
+create table t2 (v1 int, v2 int, v3 int, v4 int, primary key(v1)) on conflict do update full with version column(v4);
 
 statement ok
 insert into t2 values (1,null,2, 4), (2,3,null, 1);