feat(expr): expression node level non-strict evaluation #12461

BugenZhao · 2023-09-20T09:57:42Z

Signed-off-by: Bugen Zhao i@bugenzhao.comI hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

See #4625 for the background.

Follow-up of #12426, this PR introduces a new NonStrict wrapper that reports the evaluation error and pads with NULL for the inner expression. The wrapper will be attached to every node in the expression tree, unlike the previous eval_infallible function which only handles errors in the root node. This is more reasonable as the optimizer may transform the expression tree arbitrarily after #10812.

As a result, the context for reporting errors will be passed in during the build phase.

Resolves #11586.

Checklist

I have written necessary rustdoc comments
I have added necessary unit tests and integration tests
All checks passed in ./risedev check (or alias, ./risedev c)

Documentation

My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

…apper

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

…apper Signed-off-by: Bugen Zhao <i@bugenzhao.com>

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

…apper Signed-off-by: Bugen Zhao <i@bugenzhao.com>

codecov · 2023-09-25T07:40:05Z

Codecov Report

Merging #12461 (a597f2c) into main (590faea) will decrease coverage by 0.01%.
Report is 6 commits behind head on main.
The diff coverage is 63.38%.

@@            Coverage Diff             @@
##             main   #12461      +/-   ##
==========================================
- Coverage   69.35%   69.35%   -0.01%     
==========================================
  Files        1438     1439       +1     
  Lines      238668   238751      +83     
==========================================
+ Hits       165535   165586      +51     
- Misses      73133    73165      +32

Flag	Coverage Δ
rust	`69.35% <63.38%> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
src/expr/core/src/expr/expr_case.rs	`95.68% <100.00%> (+0.09%)`	⬆️
src/expr/core/src/expr/expr_coalesce.rs	`96.00% <100.00%> (+0.09%)`	⬆️
src/expr/core/src/expr/expr_field.rs	`84.68% <100.00%> (+0.42%)`	⬆️
src/expr/core/src/expr/expr_in.rs	`98.46% <100.00%> (+0.02%)`	⬆️
src/expr/core/src/expr/expr_input_ref.rs	`90.69% <100.00%> (+1.50%)`	⬆️
src/expr/core/src/expr/expr_literal.rs	`99.35% <100.00%> (+0.01%)`	⬆️
src/expr/core/src/expr/expr_udf.rs	`0.00% <ø> (ø)`
src/expr/core/src/expr/expr_vnode.rs	`94.73% <100.00%> (+0.23%)`	⬆️
src/expr/core/src/expr/mod.rs	`76.08% <100.00%> (+17.26%)`	⬆️
src/expr/core/src/table_function/user_defined.rs	`0.00% <ø> (ø)`
... and 29 more

... and 5 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

fuyufjh

LGTM

stdrc · 2023-09-26T09:20:59Z

src/expr/src/expr/wrapper/non_strict.rs

+/// A dummy implementation that panics when called.
+impl EvalErrorReport for ! {
+    fn report(&self, _error: ExprError) {
+        unreachable!()
+    }
+}


Could you explain a little bit on this?

#12461 (comment)

stdrc · 2023-09-26T11:13:14Z

src/stream/src/executor/aggregation/mod.rs

+    _ctx: &ActorContextRef,
+    _identity: &str,


What about just removing these arguments? Also elsewhere.

Okay. I'll remove all function parameters but keep the existing ones in the executor body for potential future use. 😄

stdrc · 2023-09-26T11:17:22Z

src/stream/src/executor/watermark_filter.rs

+        let eval_error_report = ActorEvalErrorReport {
+            actor_context: ctx.clone(),
+            identity: info.identity.into(),
+        };


Since we are providing identity and eval_error_report etc in params, what about passing in eval_error_report when new?

I agree that the fields here are somehow redundant. Either LGTM. 🥹

stdrc · 2023-09-26T11:23:52Z

src/expr/src/expr/build.rs

+impl ExprBuilder<!> {
+    /// Create a new builder in strict mode.
+    fn new_strict() -> Self {
+        Self { error_report: None }
+    }
+}


What does impl ExprBuilder<!> mean?

We need to specify the generic type R: EvalErrorReport even if we use None for error_report. However, since the concrete type does not matter in this case, we can simply use the "never type" !.

stdrc · 2023-09-26T11:25:18Z

src/expr/src/expr/build.rs

+    fn build_inner(&self, prost: &ExprNode) -> Result<BoxedExpression> {
+        use PbType as E;
+
+        let build_child = |prost: &'_ ExprNode| self.build(prost);


Interesting

stdrc · 2023-09-26T11:29:16Z

src/expr/src/expr/wrapper/non_strict.rs

+    async fn eval(&self, input: &DataChunk) -> Result<ArrayRef> {
+        Ok(match self.inner.eval(input).await {
+            Ok(array) => array,
+            Err(_e) => self.eval_chunk_infallible_by_row(input).await,
+        })
+    }


So this function tries inner.eval chunk, if failed, eval it row by row again? Is there a better option?

Yes.

Is there a better option?

Maybe. Assuming the evaluation error is rare, the current implementation works fine, so I didn't make any changes in this PR.

…apper Signed-off-by: Bugen Zhao <i@bugenzhao.com>

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

github-actions bot added the type/feature label Sep 20, 2023

BugenZhao force-pushed the bz/non-strict-expr-wrapper branch 2 times, most recently from 1228c9d to 53e13dc Compare September 20, 2023 11:09

Base automatically changed from bz/checked-expr-wrapper to main September 20, 2023 12:06

BugenZhao added 5 commits September 21, 2023 11:47

non strict expr wrapper

8479c9d

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

build non strict

b19e668

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

refactor executors

91869b3

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

refactor with build trait

8676ca2

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

clippy

f6c468b

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

BugenZhao force-pushed the bz/non-strict-expr-wrapper branch from 53e13dc to f6c468b Compare September 21, 2023 03:47

BugenZhao added 3 commits September 21, 2023 12:22

refine docs

96600ff

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

format lines

5402efb

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

add more docs

00a22aa

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

BugenZhao force-pushed the bz/non-strict-expr-wrapper branch from a24495a to 00a22aa Compare September 21, 2023 05:22

BugenZhao added 3 commits September 21, 2023 13:49

add build func non strict

a16c575

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

use build_func_non_strict

351e3cc

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

do not wrap child

f306ce9

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

BugenZhao marked this pull request as ready for review September 21, 2023 06:26

BugenZhao requested a review from a team as a code owner September 21, 2023 06:26

BugenZhao requested review from stdrc, wangrunji0408, xiangjinwu and xxchan September 21, 2023 06:27

BugenZhao added 6 commits September 21, 2023 16:00

Merge remote-tracking branch 'origin/main' into bz/non-strict-expr-wr…

64602ac

…apper

refine e2e tests

1b8cdc3

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

Merge remote-tracking branch 'origin/main' into bz/non-strict-expr-wr…

fca876b

…apper Signed-off-by: Bugen Zhao <i@bugenzhao.com>

fix hakari

d087627

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

fix e2e test

c15446c

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

Merge remote-tracking branch 'origin/main' into bz/non-strict-expr-wr…

e108c19

…apper Signed-off-by: Bugen Zhao <i@bugenzhao.com>

BugenZhao requested a review from fuyufjh September 26, 2023 06:53

fuyufjh approved these changes Sep 26, 2023

View reviewed changes

stdrc reviewed Sep 26, 2023

View reviewed changes

BugenZhao added 4 commits September 27, 2023 13:48

Merge remote-tracking branch 'origin/main' into bz/non-strict-expr-wr…

52300b1

…apper Signed-off-by: Bugen Zhao <i@bugenzhao.com>

minor refactor

03cff53

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

remove needless ctxs

b671946

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

cleanup identities

921eefc

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

BugenZhao enabled auto-merge September 27, 2023 06:30

stdrc approved these changes Sep 27, 2023

View reviewed changes

fix clippy

a597f2c

Signed-off-by: Bugen Zhao <i@bugenzhao.com>

BugenZhao added this pull request to the merge queue Sep 27, 2023

Merged via the queue into main with commit 0126304 Sep 27, 2023
9 of 10 checks passed

BugenZhao deleted the bz/non-strict-expr-wrapper branch September 27, 2023 08:13

BugenZhao mentioned this pull request Oct 18, 2023

refactor(expr): type-safe infallible evaluation #12921

Merged

4 tasks

st1page mentioned this pull request Jul 29, 2024

feat(batch): expression's error handling #17844

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(expr): expression node level non-strict evaluation #12461

feat(expr): expression node level non-strict evaluation #12461

BugenZhao commented Sep 20, 2023 •

edited

Loading

codecov bot commented Sep 25, 2023 •

edited

Loading

fuyufjh left a comment

stdrc Sep 26, 2023

BugenZhao Sep 27, 2023

stdrc Sep 26, 2023

BugenZhao Sep 27, 2023

stdrc Sep 26, 2023

BugenZhao Sep 27, 2023

stdrc Sep 26, 2023 •

edited

Loading

BugenZhao Sep 27, 2023

stdrc Sep 26, 2023

stdrc Sep 26, 2023

BugenZhao Sep 27, 2023

feat(expr): expression node level non-strict evaluation #12461

feat(expr): expression node level non-strict evaluation #12461

Conversation

BugenZhao commented Sep 20, 2023 • edited Loading

What's changed and what's your intention?

Checklist

Documentation

Release note

codecov bot commented Sep 25, 2023 • edited Loading

Codecov Report

fuyufjh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stdrc Sep 26, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BugenZhao commented Sep 20, 2023 •

edited

Loading

codecov bot commented Sep 25, 2023 •

edited

Loading

stdrc Sep 26, 2023 •

edited

Loading