Skip to content

Commit

Permalink
Merge branch 'release-2.0' into peng/cherry-pick-19784
Browse files Browse the repository at this point in the history
  • Loading branch information
shanicky authored Dec 20, 2024
2 parents 7af0fe7 + e65c6a5 commit 461e438
Show file tree
Hide file tree
Showing 9 changed files with 221 additions and 290 deletions.
2 changes: 1 addition & 1 deletion ci/scripts/e2e-kafka-sink-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ rpk topic delete test-rw-sink-debezium

# test different encoding
echo "preparing confluent schema registry"
python3 -m pip install --break-system-packages requests confluent-kafka
python3 -m pip install --break-system-packages -r ./e2e_test/requirements.txt

echo "testing protobuf"
sqllogictest -p 4566 -d dev 'e2e_test/sink/kafka/protobuf.slt'
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/e2e-source-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mkdir ./connector-node
tar xf ./risingwave-connector.tar.gz -C ./connector-node

echo "--- Install dependencies"
python3 -m pip install --break-system-packages requests protobuf fastavro confluent_kafka jsonschema
python3 -m pip install --break-system-packages -r ./e2e_test/requirements.txt
apt-get -y install jq

echo "--- e2e, inline test"
Expand Down
15 changes: 15 additions & 0 deletions e2e_test/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-r source/requirements.txt
-r source_inline/requirements.txt
requests
confluent_kafka==2.6.2
# confluent_kafka doesn't list dependencies, so we need to install them manually
# https://github.com/confluentinc/confluent-kafka-python/issues/1712
protobuf==5.28.0
fastavro==1.9.4
httpx==0.27.2
attrs
cachetools
jsonschema
google-auth
google-api-core
google-cloud-kms
Empty file.
81 changes: 0 additions & 81 deletions e2e_test/source_inline/pubsub/prepare-data.rs

This file was deleted.

155 changes: 0 additions & 155 deletions e2e_test/source_inline/pubsub/pubsub.slt

This file was deleted.

2 changes: 2 additions & 0 deletions e2e_test/source_inline/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nats-py==2.9.0
psycopg2-binary==2.9.10
11 changes: 10 additions & 1 deletion e2e_test/sql_migration/prepare.slt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,16 @@ statement ok
create materialized view mv1 as select * from t1;

statement ok
create materialized view mv2 as select * from src;
create schema tmp;

statement ok
create materialized view tmp.mv2 as select * from src;

statement ok
alter materialized view tmp.mv2 set schema public;

statement ok
drop schema tmp;

statement ok
create view v1 as select * from mv1;
Expand Down
Loading

0 comments on commit 461e438

Please sign in to comment.