Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat!: remove tumble function #4367

Closed
wants to merge 2 commits into from
+47 −1,399
Closed

feat!: remove tumble function #4367

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5da30e
feat!: remove `tumble` function
discord9 Jul 15, 2024
2100e5b
chore: forget to rm log file
discord9 Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 107 additions & 0 deletions flow.ans
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
Compiling common-version v0.8.2 (/home/discord9/greptimedb/src/common/version)
Compiling catalog v0.8.2 (/home/discord9/greptimedb/src/catalog)
Compiling common-function v0.8.2 (/home/discord9/greptimedb/src/common/function)
Compiling servers v0.8.2 (/home/discord9/greptimedb/src/servers)
Compiling query v0.8.2 (/home/discord9/greptimedb/src/query)
Compiling cache v0.8.2 (/home/discord9/greptimedb/src/cache)
Compiling client v0.8.2 (/home/discord9/greptimedb/src/client)
Compiling operator v0.8.2 (/home/discord9/greptimedb/src/operator)
Compiling pipeline v0.8.2 (/home/discord9/greptimedb/src/pipeline)
Compiling flow v0.8.2 (/home/discord9/greptimedb/src/flow)
warning: unused variable: `idx`
--> src/flow/src/transform/aggr.rs:338:18
|
338 | for (idx, expr) in group_exprs.iter().enumerate() {
| ^^^ help: if this is intentional, prefix it with an underscore: `_idx`
|
= note: `#[warn(unused_variables)]` on by default

warning: unused variable: `engine`
--> src/flow/src/transform.rs:149:42
|
149 | pub fn register_function_to_query_engine(engine: &Arc<dyn QueryEngine>) {
| ^^^^^^ help: if this is intentional, prefix it with an underscore: `_engine`

warning: `flow` (lib) generated 2 warnings
warning: `flow` (lib test) generated 2 warnings (2 duplicates)
Finished `test` profile [unoptimized + debuginfo] target(s) in 28.25s
Running unittests src/lib.rs (target/debug/deps/flow-42b3e41d9e2a76b2)

running 57 tests
test adapter::parse_expr::test_parse_fixed ... ok
test adapter::parse_expr::test_parse_duration ... ok
test adapter::worker::test::drop_handle ... ok
test compute::render::map::test::test_render_mfp ... ok
test compute::render::reduce::test::test_basic_distinct ... ok
test compute::render::map::test::test_render_mfp_multiple_times ... ok
test compute::render::test::example_source_sink ... ok
test compute::render::test::test_render_constant ... ok
test expr::func::test_get_window_start ... ok
test expr::func::test_num_ops ... ok
test compute::render::test::test_tee_auto_schedule ... ok
test adapter::worker::test::test_simple_get_with_worker_and_handle ... ok
test compute::render::reduce::test::test_basic_reduce_accum ... ok
test compute::render::reduce::test::test_delete_reduce_distinct_accum ... ok
test compute::render::reduce::test::test_composite_reduce_distinct_accum ... ok
test compute::render::reduce::test::test_basic_reduce_distinct_accum ... ok
test expr::linear::test::test_mfp_out_of_order ... ok
test expr::linear::test::manipulation_mfp ... ok
test expr::linear::test::test_mfp_chore ... ok
test expr::linear::test::test_mfp_with_time ... ok
test expr::func::test_binary_func_spec ... ok
test expr::scalar::test::test_extract_bound ... ok
test repr::test::test_row ... ok
test expr::relation::accum::test::test_accum ... ok
test compute::render::map::test::test_render_mfp_with_temporal ... ok
test expr::scalar::test::test_bad_permute ... ok
test expr::linear::test::test_mfp ... ok
test expr::linear::test::test_permute ... ok
test expr::relation::accum::test::test_fail_path_accum ... ok
test repr::test::test_cast_to_internal_ts ... ok
test expr::linear::test::mfp_test_cast_and_filter ... ok
test compute::render::reduce::test::test_avg_eval ... ok
test utils::test::only_save_future_updates ... ok
test utils::test::test_full_arrangement_get_from_first_entry ... ok
test utils::test::test_apply_expired_keys ... ok
test utils::test::test_future_get ... ok
test utils::test::test_get_unaligned ... ok
test utils::test::test_get_by_range ... ok
test utils::test::test_out_of_order_apply_updates ... ok
test utils::test::test_split_off ... ok
test utils::test::test_reduce_expire_keys ... ok
test transform::expr::test::test_func_sig ... ok
test expr::scalar::test::test_df_scalar_function ... ok
test transform::literal::test::test_literal ... ok
test transform::expr::test::test_select_add ... ok
test transform::plan::test::test_select ... ok
test transform::aggr::test::test_sum ... ok
test transform::aggr::test::test_sum_add ... ok
test transform::expr::test::test_binary_func_and_constant_folding ... ok
test transform::expr::test::test_implicitly_cast ... ok
test transform::aggr::test::test_avg ... ok
test transform::aggr::test::test_df_func_expr_tree ... FAILED
test transform::aggr::test::test_df_func_basic ... FAILED
test transform::expr::test::test_cast ... ok
test transform::expr::test::test_where_and ... ok
test transform::aggr::test::test_sum_group_by ... ok
test transform::aggr::test::test_avg_group_by ... ok

failures:

---- transform::aggr::test::test_df_func_expr_tree stdout ----
thread 'transform::aggr::test::test_df_func_expr_tree' panicked at src/flow/src/transform/aggr.rs:622:34:
called `Result::unwrap()` on an `Err` value: 0: Invalid query: column index 3 out of range, expected at most 3 columns, at src/flow/src/expr/linear.rs:159:18

---- transform::aggr::test::test_df_func_basic stdout ----
thread 'transform::aggr::test::test_df_func_basic' panicked at src/flow/src/transform/aggr.rs:500:34:
called `Result::unwrap()` on an `Err` value: 0: Invalid query: column index 3 out of range, expected at most 3 columns, at src/flow/src/expr/linear.rs:159:18
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


failures:
transform::aggr::test::test_df_func_basic
transform::aggr::test::test_df_func_expr_tree

test result: FAILED. 55 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.05s

error: test failed, to rerun pass `-p flow --lib`
164 changes: 0 additions & 164 deletions src/flow/src/compute/render/reduce.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,170 +776,6 @@ mod test {
use crate::expr::{self, AggregateFunc, BinaryFunc, GlobalId, MapFilterProject, UnaryFunc};
use crate::repr::{ColumnType, RelationType};

/// SELECT sum(number) FROM numbers_with_ts GROUP BY tumble(ts, '1 second', '2021-07-01 00:00:00')
/// input table columns: number, ts
/// expected: sum(number), window_start, window_end
#[test]
fn test_tumble_group_by() {
let mut df = Hydroflow::new();
let mut state = DataflowState::default();
let mut ctx = harness_test_ctx(&mut df, &mut state);
const START: i64 = 1625097600000;
let rows = vec![
(1u32, START + 1000),
(2u32, START + 1500),
(3u32, START + 2000),
(1u32, START + 2500),
(2u32, START + 3000),
(3u32, START + 3500),
];
let rows = rows
.into_iter()
.map(|(number, ts)| {
(
Row::new(vec![number.into(), Timestamp::new_millisecond(ts).into()]),
1,
1,
)
})
.collect_vec();

let collection = ctx.render_constant(rows.clone());
ctx.insert_global(GlobalId::User(1), collection);

let aggr_expr = AggregateExpr {
func: AggregateFunc::SumUInt32,
expr: ScalarExpr::Column(0),
distinct: false,
};
let expected = TypedPlan {
schema: RelationType::new(vec![
ColumnType::new(CDT::uint64_datatype(), true), // sum(number)
ColumnType::new(CDT::datetime_datatype(), false), // window start
ColumnType::new(CDT::datetime_datatype(), false), // window end
])
.into_unnamed(),
// TODO(discord9): mfp indirectly ref to key columns
/*
.with_key(vec![1])
.with_time_index(Some(0)),*/
plan: Plan::Mfp {
input: Box::new(
Plan::Reduce {
input: Box::new(
Plan::Get {
id: crate::expr::Id::Global(GlobalId::User(1)),
}
.with_types(
RelationType::new(vec![
ColumnType::new(ConcreteDataType::uint32_datatype(), false),
ColumnType::new(ConcreteDataType::datetime_datatype(), false),
])
.into_unnamed(),
),
),
key_val_plan: KeyValPlan {
key_plan: MapFilterProject::new(2)
.map(vec![
ScalarExpr::Column(1).call_unary(
UnaryFunc::TumbleWindowFloor {
window_size: Interval::from_month_day_nano(
0,
0,
1_000_000_000,
),
start_time: Some(DateTime::new(1625097600000)),
},
),
ScalarExpr::Column(1).call_unary(
UnaryFunc::TumbleWindowCeiling {
window_size: Interval::from_month_day_nano(
0,
0,
1_000_000_000,
),
start_time: Some(DateTime::new(1625097600000)),
},
),
])
.unwrap()
.project(vec![2, 3])
.unwrap()
.into_safe(),
val_plan: MapFilterProject::new(2)
.project(vec![0, 1])
.unwrap()
.into_safe(),
},
reduce_plan: ReducePlan::Accumulable(AccumulablePlan {
full_aggrs: vec![aggr_expr.clone()],
simple_aggrs: vec![AggrWithIndex::new(aggr_expr.clone(), 0, 0)],
distinct_aggrs: vec![],
}),
}
.with_types(
RelationType::new(vec![
ColumnType::new(CDT::datetime_datatype(), false), // window start
ColumnType::new(CDT::datetime_datatype(), false), // window end
ColumnType::new(CDT::uint64_datatype(), true), //sum(number)
])
.with_key(vec![1])
.with_time_index(Some(0))
.into_unnamed(),
),
),
mfp: MapFilterProject::new(3)
.map(vec![
ScalarExpr::Column(2),
ScalarExpr::Column(3),
ScalarExpr::Column(0),
ScalarExpr::Column(1),
])
.unwrap()
.project(vec![4, 5, 6])
.unwrap(),
},
};

let bundle = ctx.render_plan(expected).unwrap();

let output = get_output_handle(&mut ctx, bundle);
drop(ctx);
let expected = BTreeMap::from([(
1,
vec![
(
Row::new(vec![
3u64.into(),
Timestamp::new_millisecond(START + 1000).into(),
Timestamp::new_millisecond(START + 2000).into(),
]),
1,
1,
),
(
Row::new(vec![
4u64.into(),
Timestamp::new_millisecond(START + 2000).into(),
Timestamp::new_millisecond(START + 3000).into(),
]),
1,
1,
),
(
Row::new(vec![
5u64.into(),
Timestamp::new_millisecond(START + 3000).into(),
Timestamp::new_millisecond(START + 4000).into(),
]),
1,
1,
),
],
)]);
run_and_check(&mut state, &mut df, 1..2, expected, output);
}

/// select avg(number) from number;
#[test]
fn test_avg_eval() {
Expand Down
Loading
Loading