Merge branch 'main' into dependabot/cargo/regex-1.10.0

ci/scripts/backfill-test.sh

@@ -30,13 +30,6 @@ git config --global --add safe.directory /risingwave
 
 download_and_prepare_rw "$profile" common
 
-echo "--- e2e, ci-backfill, build"
-cargo make ci-start ci-backfill
-
 ################ TESTS
 
-echo "--- e2e, ci-backfill, run backfill test"
 ./ci/scripts/run-backfill-tests.sh
-
-echo "--- Kill cluster"
-cargo make kill

ci/scripts/run-backfill-tests.sh

@@ -29,15 +29,59 @@ flush() {
   run_sql "FLUSH;"
 }
 
-run_sql_file "$PARENT_PATH"/sql/backfill/create_base_table.sql
+basic() {
+  echo "--- e2e, test_backfill_basic"
+  cargo make ci-start ci-backfill
+  run_sql_file "$PARENT_PATH"/sql/backfill/create_base_table.sql
 
-# Provide snapshot
-run_sql_file "$PARENT_PATH"/sql/backfill/insert.sql
-run_sql_file "$PARENT_PATH"/sql/backfill/insert.sql &
-run_sql_file "$PARENT_PATH"/sql/backfill/create_mv.sql &
+  # Provide snapshot
+  run_sql_file "$PARENT_PATH"/sql/backfill/insert.sql
+  run_sql_file "$PARENT_PATH"/sql/backfill/insert.sql &
+  run_sql_file "$PARENT_PATH"/sql/backfill/create_mv.sql &
 
-wait
+  wait
 
-run_sql_file "$PARENT_PATH"/sql/backfill/select.sql </dev/null
+  run_sql_file "$PARENT_PATH"/sql/backfill/select.sql </dev/null
 
-echo "Backfill tests complete"
+  echo "--- Kill cluster"
+  cargo make kill
+}
+
+# Lots of upstream tombstone, backfill should still proceed.
+test_backfill_tombstone() {
+  echo "--- e2e, test_backfill_tombstone"
+  cargo make ci-start ci-backfill
+  ./risedev psql -c "
+  CREATE TABLE tomb (v1 int)
+  WITH (
+    connector = 'datagen',
+    fields.v1._.kind = 'sequence',
+    datagen.rows.per.second = '10000000'
+  )
+  FORMAT PLAIN
+  ENCODE JSON;
+  "
+
+  sleep 30
+
+  bash -c '
+    set -euo pipefail
+
+    for i in $(seq 1 1000)
+    do
+      ./risedev psql -c "DELETE FROM tomb; FLUSH;"
+      sleep 1
+    done
+  ' 1>deletes.log 2>&1 &
+
+  ./risedev psql -c "CREATE MATERIALIZED VIEW m1 as select * from tomb;"
+  echo "--- Kill cluster"
+  cargo make kill
+}
+
+main() {
+  basic
+  test_backfill_tombstone
+}
+
+main

docker/Dockerfile.hdfs

@@ -44,7 +44,7 @@ ENV JAVA_HOME ${JAVA_HOME_PATH}
 ENV LD_LIBRARY_PATH ${JAVA_HOME_PATH}/lib/server:${LD_LIBRARY_PATH}
 
 RUN cargo fetch && \
-  cargo build -p risingwave_cmd_all --release --features "rw-static-link" && \
+  cargo build -p risingwave_cmd_all --release -p risingwave_object_store --features hdfs-backend --features "rw-static-link"  && \
   mkdir -p /risingwave/bin && \
     mv /risingwave/target/release/risingwave /risingwave/bin/ && \
     mv /risingwave/target/release/risingwave.dwp /risingwave/bin/ && \
@@ -94,5 +94,5 @@ ENV RW_DASHBOARD_UI_PATH /risingwave/ui
 # Set default connector libs path
 ENV CONNECTOR_LIBS_PATH /risingwave/bin/connector-node/libs
 
-ENTRYPOINT [ "/risingwave/hdfs_env.sh" ]
+ENTRYPOINT [ "/risingwave/bin/risingwave" ]
 CMD [ "playground" ]

e2e_test/batch/basic/generate_series.slt.part

@@ -127,3 +127,24 @@ SELECT * FROM generate_series(0.1::numeric, 2.1::numeric, 0.5::numeric)
 1.1
 1.6
 2.1
+
+statement error start value cannot be infinity
+SELECT * FROM generate_series('infinity'::numeric,10::numeric);
+
+statement error stop value cannot be infinity
+SELECT * FROM generate_series(0::numeric,'-infinity'::numeric);
+
+statement error stop value cannot be NaN
+SELECT * FROM generate_series(0::numeric,'nan'::numeric);
+
+statement error start value cannot be infinity
+SELECT * FROM generate_series('infinity'::numeric,10::numeric,0::numeric);
+
+statement error stop value cannot be infinity
+SELECT * FROM generate_series(0::numeric,'-infinity'::numeric,0::numeric);
+
+statement error step value cannot be NaN
+SELECT * FROM generate_series(0::numeric,10::numeric,'nan'::numeric);
+
+statement error start value cannot be infinity
+SELECT * FROM generate_series('-infinity'::numeric,'infinity'::numeric,'nan'::numeric);

e2e_test/batch/basic/range.slt.part

@@ -114,6 +114,27 @@ SELECT * FROM range(0.1::numeric, 2.1::numeric, 0.5::numeric)
 1.1
 1.6
 
+statement error start value cannot be infinity
+SELECT * FROM range('infinity'::numeric,10::numeric);
+
+statement error stop value cannot be infinity
+SELECT * FROM range(0::numeric,'-infinity'::numeric);
+
+statement error stop value cannot be NaN
+SELECT * FROM range(0::numeric,'nan'::numeric);
+
+statement error start value cannot be infinity
+SELECT * FROM range('infinity'::numeric,10::numeric,0::numeric);
+
+statement error stop value cannot be infinity
+SELECT * FROM range(0::numeric,'-infinity'::numeric,0::numeric);
+
+statement error step value cannot be NaN
+SELECT * FROM range(0::numeric,10::numeric,'nan'::numeric);
+
+statement error start value cannot be infinity
+SELECT * FROM range('-infinity'::numeric,'infinity'::numeric,'nan'::numeric);
+
 # test table function with aliases
 query I
 SELECT alias from range(1,2) alias;

e2e_test/batch/basic/table_with_default_columns.slt.part

@@ -72,11 +72,45 @@ select * from t2;
 1 2
 2 2
 
-statement error db error: ERROR: QueryError: Bind error: impure default expr is not supported.
-create table tt (v1 time default now());
+# `now()` as default value
+statement ok
+alter table t2 add column v3 timestamp with time zone default now();
+
+query IT
+select v1, v3 >= date '2021-01-01' as later_than_2021 from t2;
+----
+1 t
+2 t
+
+# `now()` filled for historical data should be the same
+query II
+select max(v1), count(*) from t2 group by v3 order by v3;
+----
+2 2
 
-statement error db error: ERROR: QueryError: Bind error: impure default expr is not supported.
-alter table t2 add column v3 timestamptz default now();
+statement ok
+flush;
+
+statement ok
+insert into t2 values (3);
+
+# Newly inserted record should have a later timestamp
+query II
+select max(v1), count(*) from t2 group by v3 order by v3;
+----
+2 2
+3 1
+
+# Historical data can be correctly updated
+statement ok
+update t2 set v3 = '2000-01-01 00:00:00+00:00' where v1 = 1;
+
+query II
+select max(v1), count(*) from t2 group by v3 order by v3;
+----
+1 1
+2 1
+3 1
 
 statement ok
 drop table t1;

e2e_test/sink/remote/jdbc.check.pg.slt

@@ -39,3 +39,8 @@ select * from biz.t2 order by "aBc";
 ----
 1
 2
+
+query IT
+select * from t1_uuid;
+----
+221 74605c5a-a7bb-4b3b-8742-2a12e9709dea hello world

e2e_test/sink/remote/jdbc.load.slt

@@ -144,6 +144,22 @@ CREATE SINK s_pg_t2 FROM tt2 WITH (
     force_append_only=true
 );
 
+
+statement ok
+create table t1_uuid (v1 int primary key, v2 varchar, v3 varchar);
+
+statement ok
+CREATE SINK s1_uuid FROM t1_uuid WITH (
+    connector='jdbc',
+    jdbc.url='jdbc:postgresql://db:5432/test?user=test&password=connector',
+    table.name='t1_uuid',
+    primary_key='v1',
+    type='upsert'
+);
+
+statement ok
+INSERT INTO t1_uuid values (221, '74605c5a-a7bb-4b3b-8742-2a12e9709dea', 'hello world');
+
 statement ok
 INSERT INTO tt2 VALUES
     (1),

e2e_test/sink/remote/pg_create_table.sql

@@ -53,6 +53,8 @@ CREATE TABLE t_types (
     jsonb_column JSONB
 );
 
+CREATE TABLE t1_uuid (v1 int primary key, v2 uuid, v3 varchar);
+
 CREATE SCHEMA biz;
 CREATE TABLE biz.t_types (
     id BIGINT PRIMARY KEY,