Skip to content

Commit 400de73

Browse files
authored
Merge branch 'main' into dylan/handle_watermark_for_mv_on_mv
2 parents c9e903b + 8fb2d3f commit 400de73

File tree

190 files changed

+4246
-785
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+4246
-785
lines changed

Cargo.lock

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/scripts/deterministic-e2e-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ echo "--- deterministic simulation e2e, ci-3cn-2fe, batch"
3030
seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation ./e2e_test/batch/\*\*/\*.slt 2> $LOGDIR/batch-{}.log && rm $LOGDIR/batch-{}.log'
3131

3232
echo "--- deterministic simulation e2e, ci-3cn-2fe, kafka source"
33-
seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation --kafka-datadir=./scripts/source/test_data ./e2e_test/source/basic/kafka.slt 2> $LOGDIR/source-{}.log && rm $LOGDIR/source-{}.log'
33+
seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation --kafka-datadir=./scripts/source/test_data ./e2e_test/source/basic/kafka\*.slt 2> $LOGDIR/source-{}.log && rm $LOGDIR/source-{}.log'
3434

3535
echo "--- deterministic simulation e2e, ci-3cn-2fe, parallel, streaming"
3636
seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation -j 16 ./e2e_test/streaming/\*\*/\*.slt 2> $LOGDIR/parallel-streaming-{}.log && rm $LOGDIR/parallel-streaming-{}.log'

clippy.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
disallowed-methods = [
2-
{ path = "std::iter::Iterator::zip", reason = "Please use Itertools::zip_eq instead." },
2+
{ path = "std::iter::Iterator::zip", reason = "Please use `zip_eq_fast` if it's available. Otherwise use `zip_eq_debug`" },
3+
{ path = "itertools::Itertools::zip_eq", reason = "Please use `zip_eq_fast` if it's available. Otherwise use `zip_eq_debug`" },
34
{ path = "futures::stream::select_all", reason = "Please use `risingwave_common::util::select_all` instead." },
45
]
56
doc-valid-idents = [

dashboard/proto/gen/ddl_service.ts

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dashboard/proto/gen/expr.ts

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dashboard/proto/gen/hummock.ts

Lines changed: 72 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e_test/batch/functions/pow.slt.part

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
query R
2+
select pow(2.0, 3.0)
3+
----
4+
8
5+
6+
query R
7+
select pow(2.0::decimal, 3.0::decimal)
8+
----
9+
8
10+
11+
query R
12+
select pow(2.0::double, 3.0::double)
13+
----
14+
8
15+
16+
query R
17+
select pow(2.0::smallint, 3.0::smallint)
18+
----
19+
8
20+
21+
query R
22+
select pow(2.0::bigint, 3.0::bigint)
23+
----
24+
8
25+
26+
query R
27+
select pow(2.0, -2);
28+
----
29+
0.25
30+
31+
query R
32+
select pow(2.23, -2.33);
33+
----
34+
0.15432975583772085
35+
36+
query R
37+
select pow(100000, 0);
38+
----
39+
1
40+
41+
query R
42+
select pow(100000, -200000000000000);
43+
----
44+
0
45+
46+
statement error QueryError: Expr error: Numeric out of range
47+
select pow(100000, 200000000000000);
48+
49+
50+
statement error QueryError: Expr error: Numeric out of range
51+
select pow(-100000, 200000000000001);

grafana/risingwave-dashboard.dashboard.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,8 @@ def section_compaction(outer_panels):
558558
"num of compactions from each level to next level",
559559
[
560560
panels.target(
561-
f"sum({metric('storage_level_compact_frequency')}) by (compactor, group, result)",
562-
"{{result}} - group-{{group}} @ {{compactor}}",
561+
f"sum({metric('storage_level_compact_frequency')}) by (compactor, group, task_type, result)",
562+
"{{task_type}} - {{result}} - group-{{group}} @ {{compactor}}",
563563
),
564564
],
565565
),

grafana/risingwave-dashboard.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/ddl_service.proto

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,12 @@ message ReplaceTablePlanResponse {
214214
uint64 version = 2;
215215
}
216216

217-
message JavaGetTableRequest {
217+
message GetTableRequest {
218218
string database_name = 1;
219219
string table_name = 2;
220220
}
221221

222-
message JavaGetTableResponse {
222+
message GetTableResponse {
223223
catalog.Table table = 1;
224224
}
225225

@@ -244,5 +244,5 @@ service DdlService {
244244
rpc CreateFunction(CreateFunctionRequest) returns (CreateFunctionResponse);
245245
rpc DropFunction(DropFunctionRequest) returns (DropFunctionResponse);
246246
rpc ReplaceTablePlan(ReplaceTablePlanRequest) returns (ReplaceTablePlanResponse);
247-
rpc JavaGetTable(JavaGetTableRequest) returns (JavaGetTableResponse);
247+
rpc GetTable(GetTableRequest) returns (GetTableResponse);
248248
}

0 commit comments

Comments
 (0)