Skip to content

Commit

Permalink
Merge branch 'main' into chore/expose-sql-backend-conn-opts
Browse files Browse the repository at this point in the history
  • Loading branch information
yezizp2012 authored Oct 24, 2024
2 parents ffeb39c + 73a3d97 commit 1ef2c92
Show file tree
Hide file tree
Showing 91 changed files with 1,519 additions and 606 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ e2e_test/iceberg/metastore_db
**/*.sqlite
**/*.sqlite-journal

*.slt.temp
*.slt*.temp

.direnv/

Expand Down
44 changes: 29 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
services:
# TODO: Rename this to `postgres`
db:
image: postgres:15-alpine
environment:
Expand Down
3 changes: 0 additions & 3 deletions ci/scripts/e2e-source-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,6 @@ risedev slt './e2e_test/source_legacy/cdc/cdc.check_new_rows.slt'
# drop relations
risedev slt './e2e_test/source_legacy/cdc/cdc_share_stream_drop.slt'

echo "--- postgres_query tvf test"
risedev slt './e2e_test/source_legacy/tvf/postgres_query.slt'

echo "--- Kill cluster"
risedev ci-kill
export RISINGWAVE_CI=true
Expand Down
7 changes: 4 additions & 3 deletions ci/scripts/notify.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"recovery-test-deterministic": ["runji", "noelkwan"],
"background-ddl-arrangement-backfill-recovery-test-deterministic": ["runji", "noelkwan"],
"background-ddl-recovery-test-deterministic": ["runji", "noelkwan"],
"e2e-iceberg-sink-test": ["zilin"],
"e2e-iceberg-sink-v2-test": ["zilin"],
"e2e-iceberg-sink-test": ["zilin", "xinhao"],
"e2e-iceberg-sink-v2-test": ["zilin", "xinhao"],
"e2e-java-binding-tests": ["yiming"],
"s3-source-check-aws": ["bohan"],
"s3-source-check-aws-json-parser": ["bohan"],
Expand All @@ -55,8 +55,9 @@
"e2e-redis-sink-tests": ["xinhao"],
"e2e-starrocks-sink-tests": ["xinhao"],
"e2e-cassandra-sink-tests": ["xinhao"],
"e2e-clickhouse-sink-tests": ["bohan","xinhao"],
"e2e-clickhouse-sink-tests": ["bohan", "xinhao"],
"e2e-pulsar-sink-tests": ["bohan"],
"e2e-mqtt-sink-tests": ["xinhao"],
"connector-node-integration-test": ["siyuan"],
}

Expand Down
2 changes: 1 addition & 1 deletion ci/workflows/main-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ steps:
config: ci/docker-compose.yml
mount-buildkite-agent: true
- ./ci/plugins/upload-failure-logs
timeout_in_minutes: 25
timeout_in_minutes: 35
retry: *auto-retry

- label: "e2e single-node binary test"
Expand Down
4 changes: 2 additions & 2 deletions ci/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ steps:
mount-buildkite-agent: true
upload-container-logs: always
- ./ci/plugins/upload-failure-logs
timeout_in_minutes: 18
timeout_in_minutes: 20
retry: *auto-retry

- label: "end-to-end sink test"
Expand Down Expand Up @@ -771,7 +771,7 @@ steps:
config: ci/docker-compose.yml
mount-buildkite-agent: true
- ./ci/plugins/upload-failure-logs
timeout_in_minutes: 30
timeout_in_minutes: 40
retry: *auto-retry

- label: "e2e single-node binary test"
Expand Down
2 changes: 1 addition & 1 deletion docker/dashboards/risingwave-dev-dashboard.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Edit `SUMMARY.md` to add new chapters.

```sh
# install tools
> cargo binstall mdbook mdbook-linkcheck mdbook-toc
> cargo install mdbook mdbook-linkcheck mdbook-toc
# start a web server on localhost that you can visit to view the book,
# and it will automatically reload each time you edit a page.
> mdbook serve --open
Expand Down
21 changes: 20 additions & 1 deletion e2e_test/batch/explain.slt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,23 @@ statement ok
drop table t;

statement error Not supported: EXPLAIN CREATE VIEW
explain create view v as select 1;
explain create view v as select 1;

query error
explain (trace, format json) select 1;
----
db error: ERROR: Failed to run the query

Caused by:
Not supported: EXPLAIN (TRACE, JSON FORMAT)
HINT: Only EXPLAIN (LOGICAL | PHYSICAL, JSON FORMAT) is supported.


query error
explain (distsql, format json) select 1;
----
db error: ERROR: Failed to run the query

Caused by:
Not supported: EXPLAIN (TRACE, JSON FORMAT)
HINT: Only EXPLAIN (LOGICAL | PHYSICAL, JSON FORMAT) is supported.
40 changes: 40 additions & 0 deletions e2e_test/ddl/alter_rename.slt
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,43 @@ DROP TABLE t2;

statement ok
DROP TABLE t_as_1;

# BEGIN references in changelog

statement ok
CREATE TABLE a (a0 int);

statement ok
CREATE TABLE b (b0 int);

statement ok
CREATE MATERIALIZED VIEW mv AS
WITH a_log AS changelog FROM a,
b_log AS changelog FROM b
SELECT 'a' AS tbl, * FROM a_log
UNION ALL
SELECT 'b', * FROM b_log;

query T
SELECT definition FROM rw_materialized_views WHERE name = 'mv';
----
CREATE MATERIALIZED VIEW mv AS WITH a_log AS changelog from a, b_log AS changelog from b SELECT 'a' AS tbl, * FROM a_log UNION ALL SELECT 'b', * FROM b_log

statement ok
ALTER TABLE a RENAME TO c;

query T
SELECT definition FROM rw_materialized_views WHERE name = 'mv';
----
CREATE MATERIALIZED VIEW mv AS WITH a_log AS changelog from "c", b_log AS changelog from b SELECT 'a' AS tbl, * FROM a_log UNION ALL SELECT 'b', * FROM b_log

statement ok
DROP MATERIALIZED VIEW mv;

statement ok
DROP TABLE b;

statement ok
DROP TABLE c;

# END references in changelog
40 changes: 40 additions & 0 deletions e2e_test/sink/sink_into_table/snapshot.slt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
statement ok
SET RW_IMPLICIT_FLUSH TO true;

statement ok
create table s (v1 int, v2 int) APPEND ONLY;

statement ok
insert into s values (1, 11);

statement ok
create table t (v1 int, v2 int);

statement ok
create sink s1 into t from s with (type = 'append-only');

statement ok
create sink s2 into t from s with (type = 'append-only', snapshot = 'false');

statement ok
insert into s values (2, 22);


query II rowsort
select * from t;
----
1 11
2 22
2 22

statement ok
drop sink s1;

statement ok
drop sink s2;

statement ok
drop table t;

statement ok
drop table s;
Loading

0 comments on commit 1ef2c92

Please sign in to comment.