From 7dcd1bde52fb0f9ed67a38da454d82b0342e91f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 16:23:03 +0800 Subject: [PATCH 1/2] chore(deps): Bump rust-embed from 8.4.0 to 8.5.0 (#18817) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6951d0257112..0a95ad501581 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12318,9 +12318,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" dependencies = [ "rust-embed-impl", "rust-embed-utils", From 909b7157978ae5c6fe33d08de955cc4987bc455d Mon Sep 17 00:00:00 2001 From: xxchan Date: Mon, 14 Oct 2024 17:35:13 +0800 Subject: [PATCH 2/2] refactor(test): rename non-inline-style `e2e_test/source` to `source_legacy` (#18890) Signed-off-by: xxchan --- ci/scripts/deterministic-e2e-test.sh | 2 +- ci/scripts/deterministic-recovery-test.sh | 2 +- ci/scripts/e2e-sink-test.sh | 4 +-- ci/scripts/e2e-source-test.sh | 34 +++++++++---------- ci/scripts/pulsar-source-test.sh | 4 +-- e2e_test/ddl/throttle.slt | 2 +- e2e_test/{source => source_legacy}/README.md | 0 .../basic/datagen.slt | 0 .../{source => source_legacy}/basic/ddl.slt | 0 .../basic/handling_mode.slt | 0 .../{source => source_legacy}/basic/kafka.slt | 0 .../basic/kafka_batch.slt | 0 .../basic/kinesis.slt | 0 .../nexmark/nexmark_endless_part1.slt.part | 0 .../basic/nosim_kafka.slt | 0 .../basic/old_row_format_syntax/datagen.slt | 0 .../basic/old_row_format_syntax/ddl.slt | 0 .../basic/old_row_format_syntax/kafka.slt | 0 .../old_row_format_syntax/kafka_batch.slt | 2 +- .../basic/temporary_kafka_batch.slt | 0 .../basic/ttl_table_with_con.slt | 2 +- .../cdc/cdc.check.slt | 0 .../cdc/cdc.check_new_rows.slt | 0 .../cdc/cdc.load.slt | 0 .../cdc/cdc.share_stream.slt | 4 +-- .../cdc/cdc.validate.mysql.slt | 0 .../cdc/cdc.validate.postgres.slt | 0 .../cdc/cdc_share_stream_drop.slt | 0 .../cdc/mongodb/mongodb_basic.slt | 0 .../cdc/mysql_cdc.sql | 0 .../cdc/mysql_cdc_insert.sql | 0 .../cdc/mysql_create.sql | 0 .../cdc/mysql_init_data.sql | 0 .../cdc/postgres_cdc.sql | 0 .../cdc/postgres_cdc_insert.sql | 0 .../alter/cdc_backfill_rate_limit.slt | 0 .../cdc_inline/alter/cdc_table_alter.slt | 0 .../cdc_inline/alter/postgres_alter.slt | 0 .../cdc_inline/auto_schema_change_mysql.slt | 0 .../cdc_inline/auto_schema_map_mysql.slt | 0 .../cdc_inline/auto_schema_map_pg.slt | 0 .../cdc_inline/postgres_create_drop.slt | 2 +- .../sql_server_cdc/sql_server_cdc.slt | 4 +-- .../sql_server_cdc/sql_server_cdc_insert.sql | 0 .../sql_server_cdc/sql_server_cdc_prepare.sql | 0 .../nexmark_endless_part1.slt | 0 .../nexmark_endless_part2.slt | 0 .../nexmark_endless_part3.slt | 0 .../nexmark_endless_part4.slt | 0 .../nexmark_endless_part1.slt | 0 .../nexmark_endless_part2.slt | 0 .../nexmark_endless_part3.slt | 0 .../nexmark_endless_part4.slt | 0 .../nexmark_endless_part5.slt | 0 .../nexmark_endless_part6.slt | 0 .../opendal/data/data1.csv | 0 .../opendal/data/data2.csv | 0 .../opendal/posix_fs.slt | 2 +- .../pulsar/astra-streaming.py | 2 +- .../pulsar/pulsar.slt | 0 .../pulsar/streamnative-cloud.py | 2 +- .../tvf/postgres_query.slt | 2 +- 62 files changed, 35 insertions(+), 35 deletions(-) rename e2e_test/{source => source_legacy}/README.md (100%) rename e2e_test/{source => source_legacy}/basic/datagen.slt (100%) rename e2e_test/{source => source_legacy}/basic/ddl.slt (100%) rename e2e_test/{source => source_legacy}/basic/handling_mode.slt (100%) rename e2e_test/{source => source_legacy}/basic/kafka.slt (100%) rename e2e_test/{source => source_legacy}/basic/kafka_batch.slt (100%) rename e2e_test/{source => source_legacy}/basic/kinesis.slt (100%) rename e2e_test/{source => source_legacy}/basic/nexmark/nexmark_endless_part1.slt.part (100%) rename e2e_test/{source => source_legacy}/basic/nosim_kafka.slt (100%) rename e2e_test/{source => source_legacy}/basic/old_row_format_syntax/datagen.slt (100%) rename e2e_test/{source => source_legacy}/basic/old_row_format_syntax/ddl.slt (100%) rename e2e_test/{source => source_legacy}/basic/old_row_format_syntax/kafka.slt (100%) rename e2e_test/{source => source_legacy}/basic/old_row_format_syntax/kafka_batch.slt (99%) rename e2e_test/{source => source_legacy}/basic/temporary_kafka_batch.slt (100%) rename e2e_test/{source => source_legacy}/basic/ttl_table_with_con.slt (97%) rename e2e_test/{source => source_legacy}/cdc/cdc.check.slt (100%) rename e2e_test/{source => source_legacy}/cdc/cdc.check_new_rows.slt (100%) rename e2e_test/{source => source_legacy}/cdc/cdc.load.slt (100%) rename e2e_test/{source => source_legacy}/cdc/cdc.share_stream.slt (98%) rename e2e_test/{source => source_legacy}/cdc/cdc.validate.mysql.slt (100%) rename e2e_test/{source => source_legacy}/cdc/cdc.validate.postgres.slt (100%) rename e2e_test/{source => source_legacy}/cdc/cdc_share_stream_drop.slt (100%) rename e2e_test/{source => source_legacy}/cdc/mongodb/mongodb_basic.slt (100%) rename e2e_test/{source => source_legacy}/cdc/mysql_cdc.sql (100%) rename e2e_test/{source => source_legacy}/cdc/mysql_cdc_insert.sql (100%) rename e2e_test/{source => source_legacy}/cdc/mysql_create.sql (100%) rename e2e_test/{source => source_legacy}/cdc/mysql_init_data.sql (100%) rename e2e_test/{source => source_legacy}/cdc/postgres_cdc.sql (100%) rename e2e_test/{source => source_legacy}/cdc/postgres_cdc_insert.sql (100%) rename e2e_test/{source => source_legacy}/cdc_inline/alter/cdc_backfill_rate_limit.slt (100%) rename e2e_test/{source => source_legacy}/cdc_inline/alter/cdc_table_alter.slt (100%) rename e2e_test/{source => source_legacy}/cdc_inline/alter/postgres_alter.slt (100%) rename e2e_test/{source => source_legacy}/cdc_inline/auto_schema_change_mysql.slt (100%) rename e2e_test/{source => source_legacy}/cdc_inline/auto_schema_map_mysql.slt (100%) rename e2e_test/{source => source_legacy}/cdc_inline/auto_schema_map_pg.slt (100%) rename e2e_test/{source => source_legacy}/cdc_inline/postgres_create_drop.slt (98%) rename e2e_test/{source => source_legacy}/cdc_inline/sql_server_cdc/sql_server_cdc.slt (98%) rename e2e_test/{source => source_legacy}/cdc_inline/sql_server_cdc/sql_server_cdc_insert.sql (100%) rename e2e_test/{source => source_legacy}/cdc_inline/sql_server_cdc/sql_server_cdc_prepare.sql (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_mvs/nexmark_endless_part1.slt (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_mvs/nexmark_endless_part2.slt (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_mvs/nexmark_endless_part3.slt (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_mvs/nexmark_endless_part4.slt (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_sinks/nexmark_endless_part1.slt (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_sinks/nexmark_endless_part2.slt (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_sinks/nexmark_endless_part3.slt (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_sinks/nexmark_endless_part4.slt (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_sinks/nexmark_endless_part5.slt (100%) rename e2e_test/{source => source_legacy}/nexmark_endless_sinks/nexmark_endless_part6.slt (100%) rename e2e_test/{source => source_legacy}/opendal/data/data1.csv (100%) rename e2e_test/{source => source_legacy}/opendal/data/data2.csv (100%) rename e2e_test/{source => source_legacy}/opendal/posix_fs.slt (90%) rename e2e_test/{source => source_legacy}/pulsar/astra-streaming.py (92%) rename e2e_test/{source => source_legacy}/pulsar/pulsar.slt (100%) rename e2e_test/{source => source_legacy}/pulsar/streamnative-cloud.py (94%) rename e2e_test/{source => source_legacy}/tvf/postgres_query.slt (97%) diff --git a/ci/scripts/deterministic-e2e-test.sh b/ci/scripts/deterministic-e2e-test.sh index f93ded7bad4a..e7c7b2131093 100755 --- a/ci/scripts/deterministic-e2e-test.sh +++ b/ci/scripts/deterministic-e2e-test.sh @@ -39,7 +39,7 @@ echo "--- deterministic simulation e2e, ci-3cn-2fe, batch" seq "$TEST_NUM" | parallel './risingwave_simulation ./e2e_test/batch/\*\*/\*.slt 2> $LOGDIR/batch-{}.log && rm $LOGDIR/batch-{}.log' echo "--- deterministic simulation e2e, ci-3cn-2fe, kafka source" -seq "$TEST_NUM" | parallel './risingwave_simulation --kafka-datadir=./scripts/source/test_data ./e2e_test/source/basic/kafka\*.slt 2> $LOGDIR/source-{}.log && rm $LOGDIR/source-{}.log' +seq "$TEST_NUM" | parallel './risingwave_simulation --kafka-datadir=./scripts/source/test_data ./e2e_test/source_legacy/basic/kafka\*.slt 2> $LOGDIR/source-{}.log && rm $LOGDIR/source-{}.log' echo "--- deterministic simulation e2e, ci-3cn-2fe, parallel, streaming" seq "$TEST_NUM" | parallel './risingwave_simulation -j 16 ./e2e_test/streaming/\*\*/\*.slt 2> $LOGDIR/parallel-streaming-{}.log && rm $LOGDIR/parallel-streaming-{}.log' diff --git a/ci/scripts/deterministic-recovery-test.sh b/ci/scripts/deterministic-recovery-test.sh index b38adfb3a83d..62d2250af96e 100755 --- a/ci/scripts/deterministic-recovery-test.sh +++ b/ci/scripts/deterministic-recovery-test.sh @@ -95,4 +95,4 @@ seq "$TEST_NUM" | parallel './risingwave_simulation \ --kill-rate=${KILL_RATE} \ --kafka-datadir=./scripts/source/test_data \ ${EXTRA_ARGS:-} \ -./e2e_test/source/basic/kafka\*.slt 2> $LOGDIR/recovery-source-{}.log && rm $LOGDIR/recovery-source-{}.log' \ No newline at end of file +./e2e_test/source_legacy/basic/kafka\*.slt 2> $LOGDIR/recovery-source-{}.log && rm $LOGDIR/recovery-source-{}.log' diff --git a/ci/scripts/e2e-sink-test.sh b/ci/scripts/e2e-sink-test.sh index 5e4685b2fc67..0a049f828619 100755 --- a/ci/scripts/e2e-sink-test.sh +++ b/ci/scripts/e2e-sink-test.sh @@ -124,8 +124,8 @@ risedev ci-kill echo "--- e2e, ci-1cn-1fe, nexmark endless" RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \ risedev ci-start ci-1cn-1fe -sqllogictest -p 4566 -d dev './e2e_test/source/nexmark_endless_mvs/*.slt' -sqllogictest -p 4566 -d dev './e2e_test/source/nexmark_endless_sinks/*.slt' +sqllogictest -p 4566 -d dev './e2e_test/source_legacy/nexmark_endless_mvs/*.slt' +sqllogictest -p 4566 -d dev './e2e_test/source_legacy/nexmark_endless_sinks/*.slt' echo "--- Kill cluster" risedev ci-kill diff --git a/ci/scripts/e2e-source-test.sh b/ci/scripts/e2e-source-test.sh index f10ee3ebef09..5c53f84c2485 100755 --- a/ci/scripts/e2e-source-test.sh +++ b/ci/scripts/e2e-source-test.sh @@ -51,12 +51,12 @@ cp src/connector/src/test_data/complex-schema.json ./json-complex-schema echo "--- e2e, ci-1cn-1fe, mysql & postgres cdc" # import data to mysql -mysql --host=mysql --port=3306 -u root -p123456 < ./e2e_test/source/cdc/mysql_cdc.sql +mysql --host=mysql --port=3306 -u root -p123456 < ./e2e_test/source_legacy/cdc/mysql_cdc.sql # import data to postgres export PGHOST=db PGPORT=5432 PGUSER=postgres PGPASSWORD=postgres PGDATABASE=cdc_test createdb -psql < ./e2e_test/source/cdc/postgres_cdc.sql +psql < ./e2e_test/source_legacy/cdc/postgres_cdc.sql echo "--- starting risingwave cluster" RUST_LOG="debug,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \ @@ -82,30 +82,30 @@ echo 'db.runCommand({ping: 1})' | mongo mongodb://mongodb:27017 echo '> rs config' echo 'rs.conf()' | mongo mongodb://mongodb:27017 echo '> run test..' -risedev slt './e2e_test/source/cdc/mongodb/**/*.slt' +risedev slt './e2e_test/source_legacy/cdc/mongodb/**/*.slt' echo "--- inline cdc test" export MYSQL_HOST=mysql MYSQL_TCP_PORT=3306 MYSQL_PWD=123456 export SQLCMDSERVER=sqlserver-server SQLCMDUSER=SA SQLCMDPASSWORD="SomeTestOnly@SA" SQLCMDDBNAME=mydb SQLCMDPORT=1433 -risedev slt './e2e_test/source/cdc_inline/**/*.slt' +risedev slt './e2e_test/source_legacy/cdc_inline/**/*.slt' echo "--- opendal source test" -risedev slt './e2e_test/source/opendal/**/*.slt' +risedev slt './e2e_test/source_legacy/opendal/**/*.slt' echo "--- mysql & postgres cdc validate test" -risedev slt './e2e_test/source/cdc/cdc.validate.mysql.slt' -risedev slt './e2e_test/source/cdc/cdc.validate.postgres.slt' +risedev slt './e2e_test/source_legacy/cdc/cdc.validate.mysql.slt' +risedev slt './e2e_test/source_legacy/cdc/cdc.validate.postgres.slt' echo "--- cdc share source test" # cdc share stream test cases export MYSQL_HOST=mysql MYSQL_TCP_PORT=3306 MYSQL_PWD=123456 -risedev slt './e2e_test/source/cdc/cdc.share_stream.slt' +risedev slt './e2e_test/source_legacy/cdc/cdc.share_stream.slt' echo "--- mysql & postgres load and check" -risedev slt './e2e_test/source/cdc/cdc.load.slt' +risedev slt './e2e_test/source_legacy/cdc/cdc.load.slt' # wait for cdc loading sleep 10 -risedev slt './e2e_test/source/cdc/cdc.check.slt' +risedev slt './e2e_test/source_legacy/cdc/cdc.check.slt' # kill cluster risedev kill @@ -121,10 +121,10 @@ mysql --protocol=tcp -u root mytest -e "INSERT INTO products # insert new rows -mysql --host=mysql --port=3306 -u root -p123456 < ./e2e_test/source/cdc/mysql_cdc_insert.sql +mysql --host=mysql --port=3306 -u root -p123456 < ./e2e_test/source_legacy/cdc/mysql_cdc_insert.sql echo "> inserted new rows into mysql" -psql < ./e2e_test/source/cdc/postgres_cdc_insert.sql +psql < ./e2e_test/source_legacy/cdc/postgres_cdc_insert.sql echo "> inserted new rows into postgres" # start cluster w/o clean-data @@ -136,13 +136,13 @@ echo "> wait for cluster recovery finish" sleep 20 echo "> check mviews after cluster recovery" # check results -risedev slt './e2e_test/source/cdc/cdc.check_new_rows.slt' +risedev slt './e2e_test/source_legacy/cdc/cdc.check_new_rows.slt' # drop relations -risedev slt './e2e_test/source/cdc/cdc_share_stream_drop.slt' +risedev slt './e2e_test/source_legacy/cdc/cdc_share_stream_drop.slt' echo "--- postgres_query tvf test" -risedev slt './e2e_test/source/tvf/postgres_query.slt' +risedev slt './e2e_test/source_legacy/tvf/postgres_query.slt' echo "--- Kill cluster" risedev ci-kill @@ -153,8 +153,8 @@ export RUST_MIN_STACK=4194304 RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \ risedev ci-start ci-kafka ./scripts/source/prepare_ci_kafka.sh -risedev slt './e2e_test/source/basic/*.slt' -risedev slt './e2e_test/source/basic/old_row_format_syntax/*.slt' +risedev slt './e2e_test/source_legacy/basic/*.slt' +risedev slt './e2e_test/source_legacy/basic/old_row_format_syntax/*.slt' echo "--- Run CH-benCHmark" risedev slt './e2e_test/ch_benchmark/batch/ch_benchmark.slt' diff --git a/ci/scripts/pulsar-source-test.sh b/ci/scripts/pulsar-source-test.sh index 86d99ed97f7d..dfe8aa28005a 100755 --- a/ci/scripts/pulsar-source-test.sh +++ b/ci/scripts/pulsar-source-test.sh @@ -46,8 +46,8 @@ risedev ci-start ci-1cn-1fe echo "--- Run test" python3 -m pip install --break-system-packages psycopg2-binary -python3 e2e_test/source/pulsar/astra-streaming.py -# python3 e2e_test/source/pulsar/streamnative-cloud.py +python3 e2e_test/source_legacy/pulsar/astra-streaming.py +# python3 e2e_test/source_legacy/pulsar/streamnative-cloud.py echo "--- Kill cluster" risedev ci-kill diff --git a/e2e_test/ddl/throttle.slt b/e2e_test/ddl/throttle.slt index e8a33b0bfb43..65fa126dbd20 100644 --- a/e2e_test/ddl/throttle.slt +++ b/e2e_test/ddl/throttle.slt @@ -1,5 +1,5 @@ # streaming_rate_limit applies to create source, please refer to -# e2e_test/source/basic/kafka.slt. +# e2e_test/source_legacy/basic/kafka.slt. # backfill_rate_limit applies to create sink, please refer to # e2e_test/sink/kafka/create_sink.slt. diff --git a/e2e_test/source/README.md b/e2e_test/source_legacy/README.md similarity index 100% rename from e2e_test/source/README.md rename to e2e_test/source_legacy/README.md diff --git a/e2e_test/source/basic/datagen.slt b/e2e_test/source_legacy/basic/datagen.slt similarity index 100% rename from e2e_test/source/basic/datagen.slt rename to e2e_test/source_legacy/basic/datagen.slt diff --git a/e2e_test/source/basic/ddl.slt b/e2e_test/source_legacy/basic/ddl.slt similarity index 100% rename from e2e_test/source/basic/ddl.slt rename to e2e_test/source_legacy/basic/ddl.slt diff --git a/e2e_test/source/basic/handling_mode.slt b/e2e_test/source_legacy/basic/handling_mode.slt similarity index 100% rename from e2e_test/source/basic/handling_mode.slt rename to e2e_test/source_legacy/basic/handling_mode.slt diff --git a/e2e_test/source/basic/kafka.slt b/e2e_test/source_legacy/basic/kafka.slt similarity index 100% rename from e2e_test/source/basic/kafka.slt rename to e2e_test/source_legacy/basic/kafka.slt diff --git a/e2e_test/source/basic/kafka_batch.slt b/e2e_test/source_legacy/basic/kafka_batch.slt similarity index 100% rename from e2e_test/source/basic/kafka_batch.slt rename to e2e_test/source_legacy/basic/kafka_batch.slt diff --git a/e2e_test/source/basic/kinesis.slt b/e2e_test/source_legacy/basic/kinesis.slt similarity index 100% rename from e2e_test/source/basic/kinesis.slt rename to e2e_test/source_legacy/basic/kinesis.slt diff --git a/e2e_test/source/basic/nexmark/nexmark_endless_part1.slt.part b/e2e_test/source_legacy/basic/nexmark/nexmark_endless_part1.slt.part similarity index 100% rename from e2e_test/source/basic/nexmark/nexmark_endless_part1.slt.part rename to e2e_test/source_legacy/basic/nexmark/nexmark_endless_part1.slt.part diff --git a/e2e_test/source/basic/nosim_kafka.slt b/e2e_test/source_legacy/basic/nosim_kafka.slt similarity index 100% rename from e2e_test/source/basic/nosim_kafka.slt rename to e2e_test/source_legacy/basic/nosim_kafka.slt diff --git a/e2e_test/source/basic/old_row_format_syntax/datagen.slt b/e2e_test/source_legacy/basic/old_row_format_syntax/datagen.slt similarity index 100% rename from e2e_test/source/basic/old_row_format_syntax/datagen.slt rename to e2e_test/source_legacy/basic/old_row_format_syntax/datagen.slt diff --git a/e2e_test/source/basic/old_row_format_syntax/ddl.slt b/e2e_test/source_legacy/basic/old_row_format_syntax/ddl.slt similarity index 100% rename from e2e_test/source/basic/old_row_format_syntax/ddl.slt rename to e2e_test/source_legacy/basic/old_row_format_syntax/ddl.slt diff --git a/e2e_test/source/basic/old_row_format_syntax/kafka.slt b/e2e_test/source_legacy/basic/old_row_format_syntax/kafka.slt similarity index 100% rename from e2e_test/source/basic/old_row_format_syntax/kafka.slt rename to e2e_test/source_legacy/basic/old_row_format_syntax/kafka.slt diff --git a/e2e_test/source/basic/old_row_format_syntax/kafka_batch.slt b/e2e_test/source_legacy/basic/old_row_format_syntax/kafka_batch.slt similarity index 99% rename from e2e_test/source/basic/old_row_format_syntax/kafka_batch.slt rename to e2e_test/source_legacy/basic/old_row_format_syntax/kafka_batch.slt index 44f40b90c08c..ebf63123c5dd 100644 --- a/e2e_test/source/basic/old_row_format_syntax/kafka_batch.slt +++ b/e2e_test/source_legacy/basic/old_row_format_syntax/kafka_batch.slt @@ -201,4 +201,4 @@ statement ok drop table s8 statement ok -drop source s9 \ No newline at end of file +drop source s9 diff --git a/e2e_test/source/basic/temporary_kafka_batch.slt b/e2e_test/source_legacy/basic/temporary_kafka_batch.slt similarity index 100% rename from e2e_test/source/basic/temporary_kafka_batch.slt rename to e2e_test/source_legacy/basic/temporary_kafka_batch.slt diff --git a/e2e_test/source/basic/ttl_table_with_con.slt b/e2e_test/source_legacy/basic/ttl_table_with_con.slt similarity index 97% rename from e2e_test/source/basic/ttl_table_with_con.slt rename to e2e_test/source_legacy/basic/ttl_table_with_con.slt index 6a232bbdee2a..14869634d782 100644 --- a/e2e_test/source/basic/ttl_table_with_con.slt +++ b/e2e_test/source_legacy/basic/ttl_table_with_con.slt @@ -29,4 +29,4 @@ select * from t; ---- statement ok -drop table t; \ No newline at end of file +drop table t; diff --git a/e2e_test/source/cdc/cdc.check.slt b/e2e_test/source_legacy/cdc/cdc.check.slt similarity index 100% rename from e2e_test/source/cdc/cdc.check.slt rename to e2e_test/source_legacy/cdc/cdc.check.slt diff --git a/e2e_test/source/cdc/cdc.check_new_rows.slt b/e2e_test/source_legacy/cdc/cdc.check_new_rows.slt similarity index 100% rename from e2e_test/source/cdc/cdc.check_new_rows.slt rename to e2e_test/source_legacy/cdc/cdc.check_new_rows.slt diff --git a/e2e_test/source/cdc/cdc.load.slt b/e2e_test/source_legacy/cdc/cdc.load.slt similarity index 100% rename from e2e_test/source/cdc/cdc.load.slt rename to e2e_test/source_legacy/cdc/cdc.load.slt diff --git a/e2e_test/source/cdc/cdc.share_stream.slt b/e2e_test/source_legacy/cdc/cdc.share_stream.slt similarity index 98% rename from e2e_test/source/cdc/cdc.share_stream.slt rename to e2e_test/source_legacy/cdc/cdc.share_stream.slt index c8fcfecb5a8b..a2de0a5e8168 100644 --- a/e2e_test/source/cdc/cdc.share_stream.slt +++ b/e2e_test/source_legacy/cdc/cdc.share_stream.slt @@ -5,11 +5,11 @@ system ok mysql --protocol=tcp -u root -e "DROP DATABASE IF EXISTS mytest; CREATE DATABASE mytest;" system ok -mysql --protocol=tcp -u root mytest < e2e_test/source/cdc/mysql_create.sql +mysql --protocol=tcp -u root mytest < e2e_test/source_legacy/cdc/mysql_create.sql # generate data to mysql system ok -mysql --protocol=tcp -u root mytest < e2e_test/source/cdc/mysql_init_data.sql +mysql --protocol=tcp -u root mytest < e2e_test/source_legacy/cdc/mysql_init_data.sql statement ok create secret mysql_pwd with ( diff --git a/e2e_test/source/cdc/cdc.validate.mysql.slt b/e2e_test/source_legacy/cdc/cdc.validate.mysql.slt similarity index 100% rename from e2e_test/source/cdc/cdc.validate.mysql.slt rename to e2e_test/source_legacy/cdc/cdc.validate.mysql.slt diff --git a/e2e_test/source/cdc/cdc.validate.postgres.slt b/e2e_test/source_legacy/cdc/cdc.validate.postgres.slt similarity index 100% rename from e2e_test/source/cdc/cdc.validate.postgres.slt rename to e2e_test/source_legacy/cdc/cdc.validate.postgres.slt diff --git a/e2e_test/source/cdc/cdc_share_stream_drop.slt b/e2e_test/source_legacy/cdc/cdc_share_stream_drop.slt similarity index 100% rename from e2e_test/source/cdc/cdc_share_stream_drop.slt rename to e2e_test/source_legacy/cdc/cdc_share_stream_drop.slt diff --git a/e2e_test/source/cdc/mongodb/mongodb_basic.slt b/e2e_test/source_legacy/cdc/mongodb/mongodb_basic.slt similarity index 100% rename from e2e_test/source/cdc/mongodb/mongodb_basic.slt rename to e2e_test/source_legacy/cdc/mongodb/mongodb_basic.slt diff --git a/e2e_test/source/cdc/mysql_cdc.sql b/e2e_test/source_legacy/cdc/mysql_cdc.sql similarity index 100% rename from e2e_test/source/cdc/mysql_cdc.sql rename to e2e_test/source_legacy/cdc/mysql_cdc.sql diff --git a/e2e_test/source/cdc/mysql_cdc_insert.sql b/e2e_test/source_legacy/cdc/mysql_cdc_insert.sql similarity index 100% rename from e2e_test/source/cdc/mysql_cdc_insert.sql rename to e2e_test/source_legacy/cdc/mysql_cdc_insert.sql diff --git a/e2e_test/source/cdc/mysql_create.sql b/e2e_test/source_legacy/cdc/mysql_create.sql similarity index 100% rename from e2e_test/source/cdc/mysql_create.sql rename to e2e_test/source_legacy/cdc/mysql_create.sql diff --git a/e2e_test/source/cdc/mysql_init_data.sql b/e2e_test/source_legacy/cdc/mysql_init_data.sql similarity index 100% rename from e2e_test/source/cdc/mysql_init_data.sql rename to e2e_test/source_legacy/cdc/mysql_init_data.sql diff --git a/e2e_test/source/cdc/postgres_cdc.sql b/e2e_test/source_legacy/cdc/postgres_cdc.sql similarity index 100% rename from e2e_test/source/cdc/postgres_cdc.sql rename to e2e_test/source_legacy/cdc/postgres_cdc.sql diff --git a/e2e_test/source/cdc/postgres_cdc_insert.sql b/e2e_test/source_legacy/cdc/postgres_cdc_insert.sql similarity index 100% rename from e2e_test/source/cdc/postgres_cdc_insert.sql rename to e2e_test/source_legacy/cdc/postgres_cdc_insert.sql diff --git a/e2e_test/source/cdc_inline/alter/cdc_backfill_rate_limit.slt b/e2e_test/source_legacy/cdc_inline/alter/cdc_backfill_rate_limit.slt similarity index 100% rename from e2e_test/source/cdc_inline/alter/cdc_backfill_rate_limit.slt rename to e2e_test/source_legacy/cdc_inline/alter/cdc_backfill_rate_limit.slt diff --git a/e2e_test/source/cdc_inline/alter/cdc_table_alter.slt b/e2e_test/source_legacy/cdc_inline/alter/cdc_table_alter.slt similarity index 100% rename from e2e_test/source/cdc_inline/alter/cdc_table_alter.slt rename to e2e_test/source_legacy/cdc_inline/alter/cdc_table_alter.slt diff --git a/e2e_test/source/cdc_inline/alter/postgres_alter.slt b/e2e_test/source_legacy/cdc_inline/alter/postgres_alter.slt similarity index 100% rename from e2e_test/source/cdc_inline/alter/postgres_alter.slt rename to e2e_test/source_legacy/cdc_inline/alter/postgres_alter.slt diff --git a/e2e_test/source/cdc_inline/auto_schema_change_mysql.slt b/e2e_test/source_legacy/cdc_inline/auto_schema_change_mysql.slt similarity index 100% rename from e2e_test/source/cdc_inline/auto_schema_change_mysql.slt rename to e2e_test/source_legacy/cdc_inline/auto_schema_change_mysql.slt diff --git a/e2e_test/source/cdc_inline/auto_schema_map_mysql.slt b/e2e_test/source_legacy/cdc_inline/auto_schema_map_mysql.slt similarity index 100% rename from e2e_test/source/cdc_inline/auto_schema_map_mysql.slt rename to e2e_test/source_legacy/cdc_inline/auto_schema_map_mysql.slt diff --git a/e2e_test/source/cdc_inline/auto_schema_map_pg.slt b/e2e_test/source_legacy/cdc_inline/auto_schema_map_pg.slt similarity index 100% rename from e2e_test/source/cdc_inline/auto_schema_map_pg.slt rename to e2e_test/source_legacy/cdc_inline/auto_schema_map_pg.slt diff --git a/e2e_test/source/cdc_inline/postgres_create_drop.slt b/e2e_test/source_legacy/cdc_inline/postgres_create_drop.slt similarity index 98% rename from e2e_test/source/cdc_inline/postgres_create_drop.slt rename to e2e_test/source_legacy/cdc_inline/postgres_create_drop.slt index ad7425bab3df..f23ff824f249 100644 --- a/e2e_test/source/cdc_inline/postgres_create_drop.slt +++ b/e2e_test/source_legacy/cdc_inline/postgres_create_drop.slt @@ -57,4 +57,4 @@ SELECT * FROM tt1; 1 2023-10-23 10:00:00+00:00 statement ok -drop table tt1; \ No newline at end of file +drop table tt1; diff --git a/e2e_test/source/cdc_inline/sql_server_cdc/sql_server_cdc.slt b/e2e_test/source_legacy/cdc_inline/sql_server_cdc/sql_server_cdc.slt similarity index 98% rename from e2e_test/source/cdc_inline/sql_server_cdc/sql_server_cdc.slt rename to e2e_test/source_legacy/cdc_inline/sql_server_cdc/sql_server_cdc.slt index ee78060a814c..75adae3a04d9 100644 --- a/e2e_test/source/cdc_inline/sql_server_cdc/sql_server_cdc.slt +++ b/e2e_test/source_legacy/cdc_inline/sql_server_cdc/sql_server_cdc.slt @@ -9,7 +9,7 @@ system ok sqlcmd -C -d master -Q 'create database UpperDB COLLATE SQL_Latin1_General_CP1_CS_AS;' -b system ok -sqlcmd -C -i e2e_test/source/cdc_inline/sql_server_cdc/sql_server_cdc_prepare.sql -b +sqlcmd -C -i e2e_test/source_legacy/cdc_inline/sql_server_cdc/sql_server_cdc_prepare.sql -b system ok sqlcmd -C -d UpperDB -Q "CREATE SCHEMA UpperSchema;" -b @@ -418,7 +418,7 @@ SELECT id, c_xml from shared_sqlserver_all_data_types order by id; # ------------ add rows stage ------------ system ok -sqlcmd -C -i e2e_test/source/cdc_inline/sql_server_cdc/sql_server_cdc_insert.sql -b +sqlcmd -C -i e2e_test/source_legacy/cdc_inline/sql_server_cdc/sql_server_cdc_insert.sql -b system ok sqlcmd -C -d UpperDB -Q "INSERT INTO UpperSchema.UpperTable VALUES (11, 'Alice');" -b diff --git a/e2e_test/source/cdc_inline/sql_server_cdc/sql_server_cdc_insert.sql b/e2e_test/source_legacy/cdc_inline/sql_server_cdc/sql_server_cdc_insert.sql similarity index 100% rename from e2e_test/source/cdc_inline/sql_server_cdc/sql_server_cdc_insert.sql rename to e2e_test/source_legacy/cdc_inline/sql_server_cdc/sql_server_cdc_insert.sql diff --git a/e2e_test/source/cdc_inline/sql_server_cdc/sql_server_cdc_prepare.sql b/e2e_test/source_legacy/cdc_inline/sql_server_cdc/sql_server_cdc_prepare.sql similarity index 100% rename from e2e_test/source/cdc_inline/sql_server_cdc/sql_server_cdc_prepare.sql rename to e2e_test/source_legacy/cdc_inline/sql_server_cdc/sql_server_cdc_prepare.sql diff --git a/e2e_test/source/nexmark_endless_mvs/nexmark_endless_part1.slt b/e2e_test/source_legacy/nexmark_endless_mvs/nexmark_endless_part1.slt similarity index 100% rename from e2e_test/source/nexmark_endless_mvs/nexmark_endless_part1.slt rename to e2e_test/source_legacy/nexmark_endless_mvs/nexmark_endless_part1.slt diff --git a/e2e_test/source/nexmark_endless_mvs/nexmark_endless_part2.slt b/e2e_test/source_legacy/nexmark_endless_mvs/nexmark_endless_part2.slt similarity index 100% rename from e2e_test/source/nexmark_endless_mvs/nexmark_endless_part2.slt rename to e2e_test/source_legacy/nexmark_endless_mvs/nexmark_endless_part2.slt diff --git a/e2e_test/source/nexmark_endless_mvs/nexmark_endless_part3.slt b/e2e_test/source_legacy/nexmark_endless_mvs/nexmark_endless_part3.slt similarity index 100% rename from e2e_test/source/nexmark_endless_mvs/nexmark_endless_part3.slt rename to e2e_test/source_legacy/nexmark_endless_mvs/nexmark_endless_part3.slt diff --git a/e2e_test/source/nexmark_endless_mvs/nexmark_endless_part4.slt b/e2e_test/source_legacy/nexmark_endless_mvs/nexmark_endless_part4.slt similarity index 100% rename from e2e_test/source/nexmark_endless_mvs/nexmark_endless_part4.slt rename to e2e_test/source_legacy/nexmark_endless_mvs/nexmark_endless_part4.slt diff --git a/e2e_test/source/nexmark_endless_sinks/nexmark_endless_part1.slt b/e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part1.slt similarity index 100% rename from e2e_test/source/nexmark_endless_sinks/nexmark_endless_part1.slt rename to e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part1.slt diff --git a/e2e_test/source/nexmark_endless_sinks/nexmark_endless_part2.slt b/e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part2.slt similarity index 100% rename from e2e_test/source/nexmark_endless_sinks/nexmark_endless_part2.slt rename to e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part2.slt diff --git a/e2e_test/source/nexmark_endless_sinks/nexmark_endless_part3.slt b/e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part3.slt similarity index 100% rename from e2e_test/source/nexmark_endless_sinks/nexmark_endless_part3.slt rename to e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part3.slt diff --git a/e2e_test/source/nexmark_endless_sinks/nexmark_endless_part4.slt b/e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part4.slt similarity index 100% rename from e2e_test/source/nexmark_endless_sinks/nexmark_endless_part4.slt rename to e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part4.slt diff --git a/e2e_test/source/nexmark_endless_sinks/nexmark_endless_part5.slt b/e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part5.slt similarity index 100% rename from e2e_test/source/nexmark_endless_sinks/nexmark_endless_part5.slt rename to e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part5.slt diff --git a/e2e_test/source/nexmark_endless_sinks/nexmark_endless_part6.slt b/e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part6.slt similarity index 100% rename from e2e_test/source/nexmark_endless_sinks/nexmark_endless_part6.slt rename to e2e_test/source_legacy/nexmark_endless_sinks/nexmark_endless_part6.slt diff --git a/e2e_test/source/opendal/data/data1.csv b/e2e_test/source_legacy/opendal/data/data1.csv similarity index 100% rename from e2e_test/source/opendal/data/data1.csv rename to e2e_test/source_legacy/opendal/data/data1.csv diff --git a/e2e_test/source/opendal/data/data2.csv b/e2e_test/source_legacy/opendal/data/data2.csv similarity index 100% rename from e2e_test/source/opendal/data/data2.csv rename to e2e_test/source_legacy/opendal/data/data2.csv diff --git a/e2e_test/source/opendal/posix_fs.slt b/e2e_test/source_legacy/opendal/posix_fs.slt similarity index 90% rename from e2e_test/source/opendal/posix_fs.slt rename to e2e_test/source_legacy/opendal/posix_fs.slt index 8eb1ce665590..88cc57df16cc 100644 --- a/e2e_test/source/opendal/posix_fs.slt +++ b/e2e_test/source_legacy/opendal/posix_fs.slt @@ -10,7 +10,7 @@ CREATE TABLE diamonds ( ) WITH ( connector = 'posix_fs', match_pattern = 'data*.csv', - posix_fs.root = 'e2e_test/source/opendal/data', + posix_fs.root = 'e2e_test/source_legacy/opendal/data', ) FORMAT PLAIN ENCODE CSV ( without_header = 'false', delimiter = ','); sleep 10s diff --git a/e2e_test/source/pulsar/astra-streaming.py b/e2e_test/source_legacy/pulsar/astra-streaming.py similarity index 92% rename from e2e_test/source/pulsar/astra-streaming.py rename to e2e_test/source_legacy/pulsar/astra-streaming.py index b2e653ed5677..97cf9fd83989 100644 --- a/e2e_test/source/pulsar/astra-streaming.py +++ b/e2e_test/source_legacy/pulsar/astra-streaming.py @@ -29,7 +29,7 @@ def do_test(config): # Do test with slt ret = os.system( - "sqllogictest -p 4566 -d dev './e2e_test/source/pulsar/pulsar.slt'") + "sqllogictest -p 4566 -d dev './e2e_test/source_legacy/pulsar/pulsar.slt'") # Clean up cur.execute('drop table t') diff --git a/e2e_test/source/pulsar/pulsar.slt b/e2e_test/source_legacy/pulsar/pulsar.slt similarity index 100% rename from e2e_test/source/pulsar/pulsar.slt rename to e2e_test/source_legacy/pulsar/pulsar.slt diff --git a/e2e_test/source/pulsar/streamnative-cloud.py b/e2e_test/source_legacy/pulsar/streamnative-cloud.py similarity index 94% rename from e2e_test/source/pulsar/streamnative-cloud.py rename to e2e_test/source_legacy/pulsar/streamnative-cloud.py index f4fad0804fd0..0ca4f3e5641e 100644 --- a/e2e_test/source/pulsar/streamnative-cloud.py +++ b/e2e_test/source_legacy/pulsar/streamnative-cloud.py @@ -33,7 +33,7 @@ def do_test(config): # Do test with slt ret = os.system( - "sqllogictest -p 4566 -d dev './e2e_test/source/pulsar/pulsar.slt'") + "sqllogictest -p 4566 -d dev './e2e_test/source_legacy/pulsar/pulsar.slt'") # Clean up cur.execute('drop table t') diff --git a/e2e_test/source/tvf/postgres_query.slt b/e2e_test/source_legacy/tvf/postgres_query.slt similarity index 97% rename from e2e_test/source/tvf/postgres_query.slt rename to e2e_test/source_legacy/tvf/postgres_query.slt index 566ace0409a1..0ce577535b92 100644 --- a/e2e_test/source/tvf/postgres_query.slt +++ b/e2e_test/source_legacy/tvf/postgres_query.slt @@ -37,4 +37,4 @@ select * from postgres_query('db', '5432', 'postgres', 'postgres', 'cdc_test', ' 97 t 1 1 1 1 1 1.0 2021-01-01 00:00:00 2021-01-01 00:00:00 2021-01-01 08:00:00+00:00 text varchar 1 day {} \x01 98 t 1 1 1 1 1 1.0 2021-01-01 00:00:00 2021-01-01 00:00:00 2021-01-01 08:00:00+00:00 text varchar 1 day {} \x01 99 t 1 1 1 1 1 1.0 2021-01-01 00:00:00 2021-01-01 00:00:00 2021-01-01 08:00:00+00:00 text varchar 1 day {} \x01 -100 t 1 1 1 1 1 1.0 2021-01-01 00:00:00 2021-01-01 00:00:00 2021-01-01 08:00:00+00:00 text varchar 1 day {} \x01 \ No newline at end of file +100 t 1 1 1 1 1 1.0 2021-01-01 00:00:00 2021-01-01 00:00:00 2021-01-01 08:00:00+00:00 text varchar 1 day {} \x01