Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into eric/remove_source_info
Browse files Browse the repository at this point in the history
  • Loading branch information
fuyufjh committed Mar 11, 2024
2 parents 64a2163 + d34d7af commit fa6d630
Show file tree
Hide file tree
Showing 55 changed files with 1,098 additions and 327 deletions.
35 changes: 23 additions & 12 deletions Cargo.lock

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

87 changes: 87 additions & 0 deletions e2e_test/sink/sink_into_table/parallelism.slt
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
statement ok
SET RW_IMPLICIT_FLUSH TO true;

statement ok
SET STREAMING_PARALLELISM TO 2;

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

statement ok
create table m_simple (v1 int primary key, v2 int);

statement ok
SET STREAMING_PARALLELISM TO 3;

statement ok
create sink s_simple_1 into m_simple as select v1, v2 from t_simple;

query I
select distinct parallelism from rw_fragment_parallelism where name in ('t_simple', 'm_simple', 's_simple_1');
----
2

statement ok
insert into t_simple select * from generate_series(1, 100);

statement ok
flush;

query I
select count(*) from m_simple;
----
100

statement ok
drop sink s_simple_1;

statement ok
drop table t_simple;

statement ok
drop table m_simple;

statement ok
SET RW_IMPLICIT_FLUSH TO true;

statement ok
SET STREAMING_PARALLELISM TO 2;

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

statement ok
create table m_simple (v1 int primary key, v2 int);

statement ok
SET STREAMING_PARALLELISM TO 3;

# multi fragment sink
statement ok
create sink s_multi into m_simple as select v1, count(*)::int from t_simple group by v1;

query I
select parallelism from rw_fragment_parallelism where array_position(flags, 'SINK') is not null and name = 's_multi';
----
3

statement ok
insert into t_simple select * from generate_series(1, 100);

statement ok
flush;

query I
select count(*) from m_simple;
----
100

statement ok
drop sink s_multi;

statement ok
drop table t_simple;

statement ok
drop table m_simple;

2 changes: 1 addition & 1 deletion e2e_test/source/cdc/cdc.share_stream.slt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ create source mysql_mytest with (
connector = 'mysql-cdc',
hostname = '${MYSQL_HOST:localhost}',
port = '${MYSQL_TCP_PORT:8306}',
username = 'dbz',
username = 'rwcdc',
password = '${MYSQL_PWD:}',
database.name = 'mytest',
server.id = '5601'
Expand Down
5 changes: 5 additions & 0 deletions e2e_test/source/cdc/mysql_cdc.sql
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ VALUES (1,1,'no'),
CREATE USER 'dbz'@'%' IDENTIFIED BY '123456';
GRANT SELECT, RELOAD, SHOW DATABASES, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'dbz'@'%';

CREATE USER 'rwcdc'@'%' IDENTIFIED BY '123456';
GRANT SELECT, RELOAD, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'rwcdc'@'%';

FLUSH PRIVILEGES;

CREATE TABLE tt3 (v1 int primary key, v2 timestamp);
INSERT INTO tt3 VALUES (1, '2020-07-30 10:08:22');
INSERT INTO tt3 VALUES (2, '2020-07-31 10:09:22');
18 changes: 18 additions & 0 deletions integration_tests/iceberg-source/docker/hive/config.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[risingwave]
db=dev
user=root
host=127.0.0.1
port=4566

[source]
connector = iceberg
catalog.type = hive
catalog.uri = thrift://metastore:9083
warehouse.path = s3://icebergdata/demo
s3.endpoint=http://minio-0:9301
s3.access.key = hummockadmin
s3.secret.key = hummockadmin
s3.region = ap-southeast-1
catalog.name = demo
database.name=s1
table.name=t1
Loading

0 comments on commit fa6d630

Please sign in to comment.