From cb825f0f3f1611b8ef82daf032bc0f184fc9ac88 Mon Sep 17 00:00:00 2001 From: xxchan Date: Fri, 5 Jan 2024 12:08:43 +0800 Subject: [PATCH] test: bump sqllogictest & fix backwards-compat-test/e2e-tests (#14354) --- Makefile.toml | 2 +- .../{delete.slt => delete.slt.part} | 0 .../validate_restart.slt | 8 ++ .../{delete.slt => delete.slt.part} | 0 .../{insert.slt => insert.slt.part} | 0 .../validate_restart.slt | 8 ++ ci/Dockerfile | 4 +- ci/build-ci-image.sh | 2 +- ci/docker-compose.yml | 10 +-- e2e_test/batch/duckdb/all.slt.part | 9 +- e2e_test/batch/local_mode.slt | 1 - e2e_test/extended_mode/type.slt | 2 +- .../batch/rank_func/row_number_old.slt.part | 84 +++++++++++++++++++ .../rank_func/row_number_old.slt.part | 84 +++++++++++++++++++ ...umber_old.part => row_number_old.slt.part} | 0 15 files changed, 197 insertions(+), 17 deletions(-) rename backwards-compat-tests/slt/nexmark-backwards-compat/{delete.slt => delete.slt.part} (100%) rename backwards-compat-tests/slt/tpch-backwards-compat/{delete.slt => delete.slt.part} (100%) rename backwards-compat-tests/slt/tpch-backwards-compat/{insert.slt => insert.slt.part} (100%) create mode 100644 e2e_test/over_window/generated/batch/rank_func/row_number_old.slt.part create mode 100644 e2e_test/over_window/generated/streaming/rank_func/row_number_old.slt.part rename e2e_test/over_window/templates/rank_func/{row_number_old.part => row_number_old.slt.part} (100%) diff --git a/Makefile.toml b/Makefile.toml index 9aec344d74d1f..347f2234e5fda 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -1332,7 +1332,7 @@ echo "All processes has exited." [tasks.slt] category = "RiseDev - SQLLogicTest" -install_crate = { version = "0.18.0", crate_name = "sqllogictest-bin", binary = "sqllogictest", test_arg = [ +install_crate = { version = "0.19.1", crate_name = "sqllogictest-bin", binary = "sqllogictest", test_arg = [ "--help", ], install_command = "binstall" } dependencies = ["check-risedev-env-file"] diff --git a/backwards-compat-tests/slt/nexmark-backwards-compat/delete.slt b/backwards-compat-tests/slt/nexmark-backwards-compat/delete.slt.part similarity index 100% rename from backwards-compat-tests/slt/nexmark-backwards-compat/delete.slt rename to backwards-compat-tests/slt/nexmark-backwards-compat/delete.slt.part diff --git a/backwards-compat-tests/slt/nexmark-backwards-compat/validate_restart.slt b/backwards-compat-tests/slt/nexmark-backwards-compat/validate_restart.slt index 093f88f4fdbbe..7a0aede6e2236 100644 --- a/backwards-compat-tests/slt/nexmark-backwards-compat/validate_restart.slt +++ b/backwards-compat-tests/slt/nexmark-backwards-compat/validate_restart.slt @@ -1,9 +1,17 @@ include ../nexmark/test_mv_result.slt.part include ./delete.slt.part + +statement ok +flush; + include ../nexmark/insert_person.slt.part include ../nexmark/insert_auction.slt.part include ../nexmark/insert_bid.slt.part + +statement ok +flush; + include ../nexmark/test_mv_result.slt.part include ../nexmark/drop_views.slt.part diff --git a/backwards-compat-tests/slt/tpch-backwards-compat/delete.slt b/backwards-compat-tests/slt/tpch-backwards-compat/delete.slt.part similarity index 100% rename from backwards-compat-tests/slt/tpch-backwards-compat/delete.slt rename to backwards-compat-tests/slt/tpch-backwards-compat/delete.slt.part diff --git a/backwards-compat-tests/slt/tpch-backwards-compat/insert.slt b/backwards-compat-tests/slt/tpch-backwards-compat/insert.slt.part similarity index 100% rename from backwards-compat-tests/slt/tpch-backwards-compat/insert.slt rename to backwards-compat-tests/slt/tpch-backwards-compat/insert.slt.part diff --git a/backwards-compat-tests/slt/tpch-backwards-compat/validate_restart.slt b/backwards-compat-tests/slt/tpch-backwards-compat/validate_restart.slt index 7c7334cc222d3..81e00f92f0ca1 100644 --- a/backwards-compat-tests/slt/tpch-backwards-compat/validate_restart.slt +++ b/backwards-compat-tests/slt/tpch-backwards-compat/validate_restart.slt @@ -23,7 +23,15 @@ include ../tpch/q22.slt.part # Test deletes and updates should work as per normal. include ./delete.slt.part + +statement ok +flush; + include ./insert.slt.part + +statement ok +flush; + include ../tpch/q1.slt.part include ../tpch/q2.slt.part include ../tpch/q3.slt.part diff --git a/ci/Dockerfile b/ci/Dockerfile index 427e6d68dc116..810a3289b66a8 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -48,8 +48,8 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash RUN cargo binstall -y --no-symlinks cargo-llvm-cov cargo-nextest cargo-hakari cargo-sort cargo-cache cargo-audit \ cargo-make@0.36.10 \ - sqllogictest-bin@0.18.0 \ - && cargo install sccache \ + sqllogictest-bin@0.19.1 \ + sccache@0.7.4 \ && cargo cache -a \ && rm -rf "/root/.cargo/registry/index" \ && rm -rf "/root/.cargo/registry/cache" \ diff --git a/ci/build-ci-image.sh b/ci/build-ci-image.sh index 93718b1e181be..bbdc5d7bfa9ed 100755 --- a/ci/build-ci-image.sh +++ b/ci/build-ci-image.sh @@ -10,7 +10,7 @@ cat ../rust-toolchain # shellcheck disable=SC2155 # REMEMBER TO ALSO UPDATE ci/docker-compose.yml -export BUILD_ENV_VERSION=v20231226 +export BUILD_ENV_VERSION=v20240104_1 export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}" diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml index e4ba36d5b79a2..0ebb9e77eeb20 100644 --- a/ci/docker-compose.yml +++ b/ci/docker-compose.yml @@ -71,7 +71,7 @@ services: retries: 5 source-test-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231226 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240104_1 depends_on: - mysql - db @@ -81,7 +81,7 @@ services: - ..:/risingwave sink-test-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231226 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240104_1 depends_on: - mysql - db @@ -93,12 +93,12 @@ services: - ..:/risingwave rw-build-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231226 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240104_1 volumes: - ..:/risingwave ci-flamegraph-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231226 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240104_1 # NOTE(kwannoel): This is used in order to permit # syscalls for `nperf` (perf_event_open), # so it can do CPU profiling. @@ -109,7 +109,7 @@ services: - ..:/risingwave regress-test-env: - image: public.ecr.aws/x5u3w5h6/rw-build-env:v20231226 + image: public.ecr.aws/x5u3w5h6/rw-build-env:v20240104_1 depends_on: db: condition: service_healthy diff --git a/e2e_test/batch/duckdb/all.slt.part b/e2e_test/batch/duckdb/all.slt.part index 68adce73dea24..ca5d1b5201c45 100644 --- a/e2e_test/batch/duckdb/all.slt.part +++ b/e2e_test/batch/duckdb/all.slt.part @@ -1,9 +1,6 @@ -include ./aggregate/*.slt.part -include ./aggregate/*/*.slt.part -include ./join/*.slt.part -include ./join/*/*.slt.part -include ./conjunction/*.slt.part -include ./conjunction/*/*.slt.part +include ./aggregate/**/*.slt.part +include ./join/**/*.slt.part +include ./conjunction/**/*.slt.part include ./limit/*.slt.part include ./select/*.slt.part include ./cte/*.slt.part diff --git a/e2e_test/batch/local_mode.slt b/e2e_test/batch/local_mode.slt index 5de337518d433..c3818989443a7 100644 --- a/e2e_test/batch/local_mode.slt +++ b/e2e_test/batch/local_mode.slt @@ -5,7 +5,6 @@ statement ok SET QUERY_MODE TO local; include ./basic/*.slt.part -include ./basic/local/*.slt.part include ./duckdb/all.slt.part include ./order/*.slt.part include ./join/*.slt.part diff --git a/e2e_test/extended_mode/type.slt b/e2e_test/extended_mode/type.slt index 2271ecb51c5c9..b172fcf389abc 100644 --- a/e2e_test/extended_mode/type.slt +++ b/e2e_test/extended_mode/type.slt @@ -21,7 +21,7 @@ SET RW_IMPLICIT_FLUSH TO true; include ../batch/types/boolean.slt.part include ../batch/types/cast.slt.part include ../batch/types/date.slt -include ../batch/types/intercal.slt.part +include ../batch/types/interval.slt.part include ../batch/types/number_arithmetic.slt.part include ../batch/types/temporal_arithmetic.slt.part include ../batch/types/time.slt.part diff --git a/e2e_test/over_window/generated/batch/rank_func/row_number_old.slt.part b/e2e_test/over_window/generated/batch/rank_func/row_number_old.slt.part new file mode 100644 index 0000000000000..24f47a8116451 --- /dev/null +++ b/e2e_test/over_window/generated/batch/rank_func/row_number_old.slt.part @@ -0,0 +1,84 @@ +# This file is generated by `gen.py`. Do not edit it manually! + +statement ok +create table t ( + id int + , p1 int + , p2 int + , time int + , v1 int + , v2 int +); + +statement ok +create view v as +select + * + , row_number() over (partition by p1 order by time, id) as out1 + , row_number() over (partition by p1 order by p2 desc, id) as out2 +from t; + +statement ok +insert into t values + (100001, 100, 200, 1, 701, 805) +, (100002, 100, 200, 2, 700, 806) +, (100003, 100, 208, 2, 723, 807) +, (100004, 103, 200, 2, 702, 808); + +query II +select * from v order by id; +---- +100001 100 200 1 701 805 1 2 +100002 100 200 2 700 806 2 3 +100003 100 208 2 723 807 3 1 +100004 103 200 2 702 808 1 1 + +statement ok +insert into t values + (100005, 100, 200, 3, 717, 810) +, (100006, 105, 204, 5, 703, 828); + +query II +select * from v order by id; +---- +100001 100 200 1 701 805 1 2 +100002 100 200 2 700 806 2 3 +100003 100 208 2 723 807 3 1 +100004 103 200 2 702 808 1 1 +100005 100 200 3 717 810 4 4 +100006 105 204 5 703 828 1 1 + +statement ok +update t set v1 = 799 where id = 100002; -- value change + +statement ok +update t set p2 = 200 where id = 100003; -- partition change + +statement ok +update t set "time" = 1 where id = 100005; -- order change + +query iiiiiii +select * from v order by id; +---- +100001 100 200 1 701 805 1 1 +100002 100 200 2 799 806 3 2 +100003 100 200 2 723 807 4 3 +100004 103 200 2 702 808 1 1 +100005 100 200 1 717 810 2 4 +100006 105 204 5 703 828 1 1 + +statement ok +delete from t where time = 2; + +query iiiiiii +select * from v order by id; +---- +100001 100 200 1 701 805 1 1 +100005 100 200 1 717 810 2 2 +100006 105 204 5 703 828 1 1 + +statement ok +drop view v; + +statement ok +drop table t; diff --git a/e2e_test/over_window/generated/streaming/rank_func/row_number_old.slt.part b/e2e_test/over_window/generated/streaming/rank_func/row_number_old.slt.part new file mode 100644 index 0000000000000..39dec472b5b12 --- /dev/null +++ b/e2e_test/over_window/generated/streaming/rank_func/row_number_old.slt.part @@ -0,0 +1,84 @@ +# This file is generated by `gen.py`. Do not edit it manually! + +statement ok +create table t ( + id int + , p1 int + , p2 int + , time int + , v1 int + , v2 int +); + +statement ok +create materialized view v as +select + * + , row_number() over (partition by p1 order by time, id) as out1 + , row_number() over (partition by p1 order by p2 desc, id) as out2 +from t; + +statement ok +insert into t values + (100001, 100, 200, 1, 701, 805) +, (100002, 100, 200, 2, 700, 806) +, (100003, 100, 208, 2, 723, 807) +, (100004, 103, 200, 2, 702, 808); + +query II +select * from v order by id; +---- +100001 100 200 1 701 805 1 2 +100002 100 200 2 700 806 2 3 +100003 100 208 2 723 807 3 1 +100004 103 200 2 702 808 1 1 + +statement ok +insert into t values + (100005, 100, 200, 3, 717, 810) +, (100006, 105, 204, 5, 703, 828); + +query II +select * from v order by id; +---- +100001 100 200 1 701 805 1 2 +100002 100 200 2 700 806 2 3 +100003 100 208 2 723 807 3 1 +100004 103 200 2 702 808 1 1 +100005 100 200 3 717 810 4 4 +100006 105 204 5 703 828 1 1 + +statement ok +update t set v1 = 799 where id = 100002; -- value change + +statement ok +update t set p2 = 200 where id = 100003; -- partition change + +statement ok +update t set "time" = 1 where id = 100005; -- order change + +query iiiiiii +select * from v order by id; +---- +100001 100 200 1 701 805 1 1 +100002 100 200 2 799 806 3 2 +100003 100 200 2 723 807 4 3 +100004 103 200 2 702 808 1 1 +100005 100 200 1 717 810 2 4 +100006 105 204 5 703 828 1 1 + +statement ok +delete from t where time = 2; + +query iiiiiii +select * from v order by id; +---- +100001 100 200 1 701 805 1 1 +100005 100 200 1 717 810 2 2 +100006 105 204 5 703 828 1 1 + +statement ok +drop materialized view v; + +statement ok +drop table t; diff --git a/e2e_test/over_window/templates/rank_func/row_number_old.part b/e2e_test/over_window/templates/rank_func/row_number_old.slt.part similarity index 100% rename from e2e_test/over_window/templates/rank_func/row_number_old.part rename to e2e_test/over_window/templates/rank_func/row_number_old.slt.part