Skip to content

Commit 5a207b4

Browse files
committed
upd
1 parent 5f8b1d6 commit 5a207b4

File tree

4 files changed

+16
-156
lines changed

4 files changed

+16
-156
lines changed

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/full_key_aggregate.rs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,16 @@ impl FullKeyAggregateStrategy for KeysFullKeyAggregateStrategy<'_> {
7272
data_queries.push(query);
7373
}
7474
}
75-
ResolvedMultipliedMeasures::PreAggregation(_simple_query) => todo!(),
75+
ResolvedMultipliedMeasures::PreAggregation(pre_agg_query) => {
76+
let keys_query = self
77+
.builder
78+
.process_node(pre_agg_query.as_ref(), &keys_context)?;
79+
keys_queries.push(keys_query);
80+
let query = self
81+
.builder
82+
.process_node(pre_agg_query.as_ref(), &context)?;
83+
data_queries.push(query);
84+
}
7685
}
7786
}
7887
for multi_stage_ref in full_key_aggregate.multi_stage_subquery_refs.iter() {
@@ -217,7 +226,12 @@ impl FullKeyAggregateStrategy for InnerJoinFullKeyAggregateStrategy<'_> {
217226
data_queries.push(query);
218227
}
219228
}
220-
ResolvedMultipliedMeasures::PreAggregation(_simple_query) => todo!(),
229+
ResolvedMultipliedMeasures::PreAggregation(pre_agg_query) => {
230+
let query = self
231+
.builder
232+
.process_node(pre_agg_query.as_ref(), &context)?;
233+
data_queries.push(query);
234+
}
221235
}
222236
}
223237

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@ mod multi_stage_time_series;
1212
mod pre_aggregation;
1313
mod query;
1414
mod resolve_multiplied_measures;
15-
mod resolved_multiplied_measures;

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/resolved_multiplied_measures.rs

Lines changed: 0 additions & 43 deletions
This file was deleted.

rust/cubesqlplanner/cubesqlplanner/src/physical_plan_builder/processors/simple_query.rs

Lines changed: 0 additions & 110 deletions
This file was deleted.

0 commit comments

Comments
 (0)