Merge branch 'main' into wkx-check-may-exist-in-join

risingwavelabs · Feb 21, 2023 · 3cb3842 · 3cb3842
2 parents c8e7795 + c4516de
commit 3cb3842
Show file tree

Hide file tree

Showing 51 changed files with 502 additions and 431 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -22,3 +22,7 @@ labels:
   title: "^test.*"
 - label: "component/doc"
   title: "^doc.*"
+
+- label: "user-facing-changes"
+  negate: true
+  body: 'My PR \*\*DOES NOT\*\* contain user-facing changes'
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -16,14 +16,19 @@ Please explain **IN DETAIL** what the changes are in this PR and why they are ne
 
 -->
 
-## Checklist
+## Checklist For Contributors
 
 - [ ] I have written necessary rustdoc comments
 - [ ] I have added necessary unit tests and integration tests
 - [ ] I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features).
 - [ ] I have demonstrated that backward compatibility is not broken by breaking changes and created issues to track deprecated features to be removed in the future. (Please refer to the issue)
 - [ ] All checks passed in `./risedev check` (or alias, `./risedev c`)
 
+## Checklist For Reviewers
+
+- [ ] I have requested macro/micro-benchmarks as this PR can affect performance substantially, and the results are shown.
+<!-- To manually trigger a benchmark, please check out [Notion](https://www.notion.so/risingwave-labs/Manually-trigger-nexmark-performance-dashboard-test-b784f1eae1cf48889b2645d020b6b7d3). -->
+
 ## Documentation
 
 - [ ] My PR **DOES NOT** contain user-facing changes.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dashboard/proto/gen/stream_plan.ts b/dashboard/proto/gen/stream_plan.ts
diff --git a/dashboard/proto/gen/stream_service.ts b/dashboard/proto/gen/stream_service.ts
diff --git a/e2e_test/batch/catalog/pg_cast.slt.part b/e2e_test/batch/catalog/pg_cast.slt.part
@@ -1,5 +1,5 @@
 query IIIT
-SELECT * FROM pg_catalog.pg_cast
+SELECT * FROM pg_catalog.pg_cast;
 ----
 0 16 23 EXPLICIT
 1 16 1043 ASSIGN
@@ -68,7 +68,14 @@ SELECT * FROM pg_catalog.pg_cast
 64 1184 1114 ASSIGN
 65 1186 1043 ASSIGN
 66 1186 1083 ASSIGN
-67 3802 1043 ASSIGN
+67 3802 16 EXPLICIT
+68 3802 21 EXPLICIT
+69 3802 23 EXPLICIT
+70 3802 20 EXPLICIT
+71 3802 700 EXPLICIT
+72 3802 701 EXPLICIT
+73 3802 1700 EXPLICIT
+74 3802 1043 ASSIGN
 
 query TT rowsort
 SELECT s.typname, t.typname

diff --git a/e2e_test/batch/functions/array_join.slt.part b/e2e_test/batch/functions/array_join.slt.part
@@ -0,0 +1,37 @@
+query T
+select array_join(array[1, 2, 3, NULL, 5], ',')
+----
+1,2,3,5
+
+query T
+select array_join(array[1, 2, 3, NULL, 5], ',', '*')
+----
+1,2,3,*,5
+
+query T
+select array_join(array[null,'foo',null], ',', '*');
+----
+*,foo,*
+
+query T
+select array_join(array['2023-02-20 17:35:25'::timestamp, null,'2023-02-19 13:01:30'::timestamp], ',', '*');
+----
+2023-02-20 17:35:25,*,2023-02-19 13:01:30
+
+query T
+with t as (
+  select array[1,null,2,3] as arr, ',' as d union all
+  select array[4,5,6,null,7] as arr, '|')
+select array_join(arr, d) from t;
+----
+1,2,3
+4|5|6|7
+
+# `array` or `delimiter` are required. Otherwise, returns null.
+query T
+select array_join(array[1,2], NULL);
+----
+NULL
+
+query error polymorphic type
+select array_join(null, ',');
diff --git a/e2e_test/batch/types/jsonb.slt.part b/e2e_test/batch/types/jsonb.slt.part
@@ -33,5 +33,55 @@ null
 true
 NULL
 
+query T
+select 'true'::jsonb::bool;
+----
+t
+
+query I
+select '1'::jsonb::smallint;
+----
+1
+
+query I
+select '1'::jsonb::int;
+----
+1
+
+query I
+select '1'::jsonb::bigint;
+----
+1
+
+query R
+select '2.5'::jsonb::decimal;
+----
+2.5
+
+query R
+select '2.5'::jsonb::real;
+----
+2.5
+
+query R
+select '2.5'::jsonb::double precision;
+----
+2.5
+
+# This would fail after #5576 fixed
+# Because PG rounds differently for `decimal -> int` and `float8 -> int`
+query II
+select '2.5'::jsonb::smallint, '3.5'::jsonb::smallint;
+----
+2 3
+
+statement error cannot cast jsonb null to type boolean
+select 'null'::jsonb::bool;
+
+query T
+select null::jsonb::bool;
+----
+NULL
+
 statement ok
 drop table t;
diff --git a/e2e_test/source/basic/ddl.slt b/e2e_test/source/basic/ddl.slt
@@ -23,6 +23,15 @@ create source s with (
   properties.bootstrap.server = '127.0.0.1:29092'
 ) row format json;
 
+statement ok
+create materialized view mv_1 as select * from s
+
+statement error other relation\(s\) depend on it
+drop source s
+
+statement ok
+drop materialized view mv_1
+
 statement ok
 drop source s
 

diff --git a/proto/stream_plan.proto b/proto/stream_plan.proto
@@ -650,7 +650,7 @@ message StreamFragmentGraph {
   // edges between fragments.
   repeated StreamFragmentEdge edges = 2;
 
-  repeated uint32 dependent_table_ids = 3;
+  repeated uint32 dependent_relation_ids = 3;
   uint32 table_ids_cnt = 4;
   StreamEnvironment env = 5;
   // If none, default parallelism will be applied.

diff --git a/proto/stream_service.proto b/proto/stream_service.proto
@@ -9,16 +9,10 @@ import "stream_plan.proto";
 option java_package = "com.risingwave.proto";
 option optimize_for = SPEED;
 
-message HangingChannel {
-  common.ActorInfo upstream = 1;
-  common.ActorInfo downstream = 2;
-}
-
 // Describe the fragments which will be running on this node
 message UpdateActorsRequest {
   string request_id = 1;
   repeated stream_plan.StreamActor actors = 2;
-  repeated HangingChannel hanging_channels = 3;
 }
 
 message UpdateActorsResponse {

diff --git a/scripts/source/test_data/kafka_1_partition_mv_topic.1 b/scripts/source/test_data/kafka_1_partition_mv_topic.1
@@ -15,6 +15,4 @@
 {"v1":7,"v2":"name0"}
 {"v1":0,"v2":"name9"}
 {"v1":3,"v2":"name2"}
-{"v1":7,"v2":"name5"}
-{"v1":1,"v2":"name7"}
-{"v1":3,"v2":"name9"}
+[{"v1":7,"v2":"name5"},{"v1":1,"v2":"name7"},{"v1":3,"v2":"name9"}]
diff --git a/scripts/source/test_data/kafka_1_partition_topic.1 b/scripts/source/test_data/kafka_1_partition_topic.1
@@ -1,4 +1,3 @@
 {"v1": 1, "v2": "1"}
 {"v1": 2, "v2": "22"}
-{"v1": 3, "v2": "333"}
-{"v1": 4, "v2": "4444"}
+[{"v1": 3, "v2": "333"},{"v1": 4, "v2": "4444"}]
diff --git a/...ource/test_data/kafka_2_partition_topic.1 → ...ource/test_data/kafka_2_partition_topic.2 b/...ource/test_data/kafka_2_partition_topic.1 → ...ource/test_data/kafka_2_partition_topic.2
diff --git a/scripts/source/test_data/kafka_3_partition_topic.3 b/scripts/source/test_data/kafka_3_partition_topic.3
@@ -1,4 +1,3 @@
 {"v1": 1, "v2": "1"}
 {"v1": 2, "v2": "22"}
-{"v1": 3, "v2": "333"}
-{"v1": 4, "v2": "4444"}
+[{"v1": 3, "v2": "333"},{"v1": 4, "v2": "4444"}]
diff --git a/scripts/source/test_data/kafka_4_partition_topic.4 b/scripts/source/test_data/kafka_4_partition_topic.4
@@ -1,4 +1,3 @@
 {"v1": 1, "v2": "1"}
 {"v1": 2, "v2": "22"}
-{"v1": 3, "v2": "333"}
-{"v1": 4, "v2": "4444"}
+[{"v1": 3, "v2": "333"},{"v1": 4, "v2": "4444"}]
diff --git a/scripts/source/test_data/kafka_4_partition_topic_with_100_message.4 b/scripts/source/test_data/kafka_4_partition_topic_with_100_message.4
@@ -94,7 +94,4 @@
 {"v1": 93, "v2": "QE53BJ", "v3": [93, 93, 93], "v4": {"v5": 93, "v6": 94}}
 {"v1": 94, "v2": "9Q7W89", "v3": [94, 94, 94], "v4": {"v5": 94, "v6": 95}}
 {"v1": 95, "v2": "VGDBS1", "v3": [95, 95, 95], "v4": {"v5": 95, "v6": 96}}
-{"v1": 96, "v2": "KK6WEX", "v3": [96, 96, 96], "v4": {"v5": 96, "v6": 97}}
-{"v1": 97, "v2": "XRTK3Y", "v3": [97, 97, 97], "v4": {"v5": 97, "v6": 98}}
-{"v1": 98, "v2": "ZQ2TCL", "v3": [98, 98, 98], "v4": {"v5": 98, "v6": 99}}
-{"v1": 99, "v2": "15UCX7", "v3": [99, 99, 99], "v4": {"v5": 99, "v6": 100}}
+[{"v1": 96, "v2": "KK6WEX", "v3": [96, 96, 96], "v4": {"v5": 96, "v6": 97}},{"v1": 97, "v2": "XRTK3Y", "v3": [97, 97, 97], "v4": {"v5": 97, "v6": 98}},{"v1": 98, "v2": "ZQ2TCL", "v3": [98, 98, 98], "v4": {"v5": 98, "v6": 99}},{"v1": 99, "v2": "15UCX7", "v3": [99, 99, 99], "v4": {"v5": 99, "v6": 100}}]