Merge branch 'main' into yifeng/NamespaceAcl

e2e_test/batch/functions/internal.slt.part

@@ -0,0 +1,17 @@
+statement ok
+SET RW_IMPLICIT_FLUSH TO true;
+
+statement ok
+create table t(v1 varchar, v2 int, v3 int)
+
+statement ok
+select rw_vnode(_row_id) as vnode, _row_id from t;
+
+statement ok
+insert into t values ('aaa', 1, 1), ('bbb', 0, 2), ('ccc', 0, 5), ('ddd', 1, 4)
+
+statement ok
+select rw_vnode(_row_id) as vnode, _row_id from t;
+
+statement ok
+drop table t

e2e_test/streaming/string_agg.slt

@@ -8,18 +8,18 @@ statement ok
 insert into t values ('a', 1, 2), ('b', 4, 6);
 
 statement ok
-create materialized view mv1 as select string_agg(a order by a desc) as res from t;
+create materialized view mv1 as select string_agg(a, ',' order by a desc) as res from t;
 
 statement ok
-create materialized view mv2 as select string_agg(a order by b) as res from t group by c;
+create materialized view mv2 as select string_agg(a, b::varchar order by b) as res from t group by c;
 
 statement ok
 flush;
 
 query T
 select * from mv1;
 ----
-ba
+b,a
 
 query T
 select * from mv2 order by res;
@@ -33,13 +33,13 @@ insert into t values ('c', 2, 2), ('d', 3, 6);
 query T
 select * from mv1;
 ----
-dcba
+d,c,b,a
 
 query T
 select * from mv2 order by res;
 ----
-ac
-db
+a2c
+d4b
 
 statement ok
 drop materialized view mv1;

proto/batch_plan.proto

@@ -196,7 +196,7 @@ message MergeSortExchangeNode {
 message LookupJoinNode {
   plan_common.JoinType join_type = 1;
   expr.ExprNode condition = 2;
-  repeated int32 build_side_key = 3;
+  repeated uint32 build_side_key = 3;
   plan_common.CellBasedTableDesc probe_side_table_desc = 4;
   repeated uint32 probe_side_vnode_mapping = 5;
   repeated int32 probe_side_column_ids = 6;

proto/hummock.proto

@@ -228,11 +228,16 @@ message HummockPinnedSnapshot {
   uint64 minimal_pinned_snapshot = 2;
 }
 
-message GetNewTableIdRequest {}
+message GetNewSstIdsRequest {
+  uint32 number = 1;
+}
 
-message GetNewTableIdResponse {
+message GetNewSstIdsResponse {
   common.Status status = 1;
-  uint64 table_id = 2;
+  // inclusive
+  uint64 start_id = 2;
+  // exclusive
+  uint64 end_id = 3;
 }
 
 message SubscribeCompactTasksRequest {
@@ -283,7 +288,7 @@ service HummockManagerService {
   rpc GetEpoch(GetEpochRequest) returns (GetEpochResponse);
   rpc UnpinSnapshot(UnpinSnapshotRequest) returns (UnpinSnapshotResponse);
   rpc UnpinSnapshotBefore(UnpinSnapshotBeforeRequest) returns (UnpinSnapshotBeforeResponse);
-  rpc GetNewTableId(GetNewTableIdRequest) returns (GetNewTableIdResponse);
+  rpc GetNewSstIds(GetNewSstIdsRequest) returns (GetNewSstIdsResponse);
   rpc SubscribeCompactTasks(SubscribeCompactTasksRequest) returns (stream SubscribeCompactTasksResponse);
   rpc ReportVacuumTask(ReportVacuumTaskRequest) returns (ReportVacuumTaskResponse);
   rpc GetCompactionGroups(GetCompactionGroupsRequest) returns (GetCompactionGroupsResponse);

proto/stream_plan.proto

@@ -256,7 +256,8 @@ message ChainNode {
   uint32 table_id = 1;
   // The schema of input stream, which will be used to build a MergeNode
   repeated plan_common.Field upstream_fields = 2;
-  repeated int32 column_ids = 3;
+  // Which columns from upstream are used in this Chain node.
+  repeated uint32 upstream_column_indices = 3;
   // Generally, the barrier needs to be rearranged during the MV creation process, so that data can
   // be flushed to shared buffer periodically, instead of making the first epoch from batch query extra
   // large. However, in some cases, e.g., shared state, the barrier cannot be rearranged in ChainNode.

risedev.yml

@@ -121,6 +121,23 @@ risedev:
     - use: compute-node
     - use: frontend
 
+  playground-3cn:
+    - use: meta-node
+      enable-dashboard-v2: false
+      unsafe-disable-recovery: true
+      max-idle-secs-to-exit: 1800
+    - use: compute-node
+      port: 5687
+      exporter-port: 1222
+    - use: compute-node
+      port: 5688
+      exporter-port: 1223
+    - use: compute-node
+      port: 5689
+      exporter-port: 1224
+    - use: frontend
+    - use: compactor
+
   docker-playground:
     - use: meta-node
       enable-dashboard-v2: false

src/batch/Cargo.toml

@@ -81,3 +81,4 @@ harness = false
 [[bench]]
 name = "hash_join"
 harness = false
+