Skip to content

Commit

Permalink
Merge branch 'main' into feat/switch-sim-integration-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
yezizp2012 committed Sep 30, 2024
2 parents 3e05cb6 + f7e5068 commit 6992a39
Show file tree
Hide file tree
Showing 57 changed files with 1,997 additions and 956 deletions.
2 changes: 1 addition & 1 deletion Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -713,7 +713,7 @@ ${TMUX} list-windows -F "#{window_name} #{pane_id}" \
| xargs -I {} ${TMUX} send-keys -t {} C-c
# Stop docker components
containers=$(docker ps -a -q -f name=risedev- 2>/dev/null) || true
containers=$(docker ps -q -f name='risedev|risingwave'- 2>/dev/null) || true
if [[ -n ${containers} ]]; then
echo "Stopping docker components..."
docker stop ${containers}
Expand Down
23 changes: 0 additions & 23 deletions ci/workflows/main-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -591,29 +591,6 @@ steps:
timeout_in_minutes: 25
retry: *auto-retry

# TODO(Kexiang): Enable this test after we have a GCS_SOURCE_TEST_CONF.
# - label: "GCS source on OpenDAL fs engine"
# key: "s3-source-test-for-opendal-fs-engine"
# command: "ci/scripts/s3-source-test-for-opendal-fs-engine.sh -p ci-release -s gcs_source.py"
# if: |
# !(build.pull_request.labels includes "ci/main-cron/run-selected") && build.env("CI_STEPS") == null
# || build.pull_request.labels includes "ci/run-s3-source-tests"
# || build.env("CI_STEPS") =~ /(^|,)s3-source-tests?(,|$$)/
# depends_on: build
# plugins:
# - seek-oss/aws-sm#v2.3.1:
# env:
# S3_SOURCE_TEST_CONF: ci_s3_source_test_aws
# - docker-compose#v5.1.0:
# run: rw-build-env
# config: ci/docker-compose.yml
# mount-buildkite-agent: true
# environment:
# - S3_SOURCE_TEST_CONF
# - ./ci/plugins/upload-failure-logs
# timeout_in_minutes: 20
# retry: *auto-retry

- label: "pulsar source check"
key: "pulsar-source-tests"
command: "ci/scripts/pulsar-source-test.sh -p ci-release"
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 docker/dashboards/risingwave-user-dashboard.json

Large diffs are not rendered by default.

92 changes: 92 additions & 0 deletions e2e_test/ddl/max_parallelism.slt
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
statement ok
create view table_parallelism as select t.name, tf.parallelism, tf.max_parallelism from rw_tables t, rw_table_fragments tf where t.id = tf.table_id;

#### BEGIN

# Default max_parallelism should be 256.

statement ok
set streaming_max_parallelism to default;

statement ok
set streaming_parallelism to default;

statement ok
create table t;

query TT
select parallelism, max_parallelism from table_parallelism where name = 't';
----
ADAPTIVE 256

statement ok
drop table t;


# Test customized max_parallelism.

statement ok
set streaming_max_parallelism to 4;

# When the parallelism is specified to a value greater than the max parallelism, return an error.
statement ok
set streaming_parallelism to 6;

statement error specified parallelism 6 should not exceed max parallelism 4
create table t;

# When the parallelism is specified to an valid value, ok.
statement ok
set streaming_parallelism to 4;

statement ok
create table t;

query TT
select parallelism, max_parallelism from table_parallelism where name = 't';
----
FIXED(4) 4

statement ok
drop table t;

# When no parallelism is specified, ok, and the parallelism will be adaptive.

statement ok
set streaming_parallelism to default;

statement ok
create table t;

query TT
select parallelism, max_parallelism from table_parallelism where name = 't';
----
ADAPTIVE 4

# Alter parallelism to a valid value, ok.
statement ok
alter table t set parallelism to 4;

query TT
select parallelism, max_parallelism from table_parallelism where name = 't';
----
FIXED(4) 4

# Alter parallelism to an invalid value, return an error.
statement error specified parallelism 8 should not exceed max parallelism 4
alter table t set parallelism to 8;

statement ok
drop table t;


#### END

statement ok
set streaming_max_parallelism to default;

statement ok
set streaming_parallelism to default;

statement ok
drop view table_parallelism;
130 changes: 0 additions & 130 deletions e2e_test/s3/gcs_source.py

This file was deleted.

Loading

0 comments on commit 6992a39

Please sign in to comment.