Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: bump sqllogictest & fix backwards-compat-test/e2e-tests #14354

Merged
merged 12 commits into from
Jan 5, 2024
Merged

test: bump sqllogictest & fix backwards-compat-test/e2e-tests #14354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8a7e2fa
test: IGNORE
xxchan Jan 4, 2024
65da406
bump sqlloogictest
xxchan Jan 4, 2024
b1305c4
binstall sccache
xxchan Jan 4, 2024
a7b0f27
fix backwards-compat-test
xxchan Jan 4, 2024
67d3b85
fix tpch
xxchan Jan 4, 2024
0152adc
fix over_window
xxchan Jan 4, 2024
a65b52f
try adding another flush ??
xxchan Jan 4, 2024
ff3c396
flush tpch
xxchan Jan 4, 2024
f911389
fix over window
xxchan Jan 4, 2024
736b907
fix
xxchan Jan 4, 2024
e02104a
try adding another flush
xxchan Jan 4, 2024
d32ce31
fix
xxchan Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
0 ...s/slt/nexmark-backwards-compat/delete.slt → .../nexmark-backwards-compat/delete.slt.part
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions backwards-compat-tests/slt/nexmark-backwards-compat/validate_restart.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
include ../nexmark/test_mv_result.slt.part

include ./delete.slt.part

statement ok
flush;
Comment on lines +5 to +6
Copy link
Member Author

@xxchan xxchan Jan 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I don't add this flush, q0,1,2 succeed, but q3 failed. Why? 🤡

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's ordering of DELETE and INSERT, I don't understand why q0,1,2 succeed

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q0,1,2 seem only depend on bid while q3 also depends on auction

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So what does this imply? 🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IDK, just seems to be explainable if bid table is OK but auction table is not ready

Copy link
Member Author

@xxchan xxchan Jan 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can reproduce this locally. It fails sometimes, and person is empty when it fails. bid and auction is fine. 🤡

include ../e2e_test/nexmark/create_tables.slt.part

include ../e2e_test/nexmark/insert_person.slt.part
include ../e2e_test/nexmark/insert_auction.slt.part
include ../e2e_test/nexmark/insert_bid.slt.part

include ../e2e_test/streaming/nexmark/views/q3.slt.part
include ../e2e_test/streaming/nexmark/q3.slt.part

statement ok
DELETE FROM person;

statement ok
DELETE FROM auction;

statement ok
DELETE FROM bid;

include ../e2e_test/nexmark/insert_person.slt.part
include ../e2e_test/nexmark/insert_auction.slt.part
include ../e2e_test/nexmark/insert_bid.slt.part

statement ok
flush;

include ../e2e_test/streaming/nexmark/q3.slt.part

statement ok
drop materialized view nexmark_q3;

include ../e2e_test/nexmark/drop_tables.slt.part

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had thought that when DML query returns, it will take effect, although not immediately visible. But it seems not correct? 🤔

Copy link
Member Author

@xxchan xxchan Jan 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the DML returns, the data is only sent to some internal channels, not handled by the table yet, and there are multiple channels so the order is not known.


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
Expand Down
0 ...ests/slt/tpch-backwards-compat/delete.slt → ...slt/tpch-backwards-compat/delete.slt.part
View file
Open in desktop
File renamed without changes.
0 ...ests/slt/tpch-backwards-compat/insert.slt → ...slt/tpch-backwards-compat/insert.slt.part
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions backwards-compat-tests/slt/tpch-backwards-compat/validate_restart.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
[email protected] \
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" \
Expand Down
2 changes: 1 addition & 1 deletion ci/build-ci-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
10 changes: 5 additions & 5 deletions ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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.
Expand All @@ -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
Expand Down
9 changes: 3 additions & 6 deletions e2e_test/batch/duckdb/all.slt.part
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion e2e_test/batch/local_mode.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e_test/extended_mode/type.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄

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
Expand Down
84 changes: 84 additions & 0 deletions e2e_test/over_window/generated/batch/rank_func/row_number_old.slt.part
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stdrc I just ran gen.py. Is the new file expected?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess that's because you renamed row_number_old.part to row_number_old.slt.part. gen.py only generates for .slt and .slt.part files.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it should be renamed. It's leaved here just for reference.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Original error before my change is this. Can you help fix that?
image

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the way you like

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK sure

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, interesting...Seems I did indeed want it to be included...

Original file line number Diff line number Diff line change
@@ -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;
84 changes: 84 additions & 0 deletions e2e_test/over_window/generated/streaming/rank_func/row_number_old.slt.part
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
0 ...w/templates/rank_func/row_number_old.part → ...mplates/rank_func/row_number_old.slt.part
View file
Open in desktop
File renamed without changes.
Loading