Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,9 @@ describe('SQL Generation', () => {
}, {
join_path: 'visitors.visitor_checkins',
includes: ['visitor_checkins_count', 'id_sum']
}, {
join_path: 'visitors.visitor_checkins.cards',
includes: ['max_id']
}]
})

Expand Down Expand Up @@ -618,6 +621,10 @@ describe('SQL Generation', () => {
measures: {
count: {
type: 'count'
},
max_id: {
type: 'max',
sql: 'id'
}
},

Expand Down Expand Up @@ -2289,6 +2296,62 @@ SELECT 1 AS revenue, cast('2024-01-01' AS timestamp) as time UNION ALL
});
});

it('multiplied subquery measures', async () => {
await compiler.compile();

const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
measures: [
'visitor_checkins.id_sum',
'visitor_checkins.revenue_per_checkin',
'visitors.visitor_revenue'
],
dimensions: [
'visitors.source',
'visitor_checkins.source'
],
timeDimensions: [],
timezone: 'America/Los_Angeles'
});

console.log(query.buildSqlAndParams());

return dbRunner.testQuery(query.buildSqlAndParams()).then(res => {
console.log(JSON.stringify(res));
expect(res).toEqual(
[
{
visitors__source: null,
vc__source: null,
vc__id_sum: null,
vc__revenue_per_checkin: null,
visitors__visitor_revenue: null
},
{
visitors__source: 'some',
vc__source: null,
vc__id_sum: '12',
vc__revenue_per_checkin: '75',
visitors__visitor_revenue: '300'
},
{
visitors__source: 'google',
vc__source: null,
vc__id_sum: '6',
vc__revenue_per_checkin: null,
visitors__visitor_revenue: null
},
{
visitors__source: 'some',
vc__source: 'google',
vc__id_sum: '3',
vc__revenue_per_checkin: '100',
visitors__visitor_revenue: '100'
}
]
);
});
});

it('having filter', async () => {
await compiler.compile();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ impl<'a> LogicalNodeProcessor<'a, AggregateMultipliedSubquery>
context,
)?;

if context.dimensions_query {
return Ok(keys_query);
}

let keys_query_alias = format!("keys");

let mut join_builder =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,8 @@ impl<'a> LogicalNodeProcessor<'a, KeysSubQuery> for KeysSubQueryProcessor<'a> {
&references_builder,
&mut context_factory,
)?;
for member in keys_subquery
.schema()
.all_dimensions()
.chain(keys_subquery.primary_keys_dimensions().iter())
{
for member in keys_subquery.schema().all_dimensions() {
let alias = member.alias();
/* self.builder.process_calc_group(
member,
&mut context_factory,
&keys_subquery.filter().all_filters(),
)?; */
references_builder.resolve_references_for_member(
member.clone(),
&None,
Expand All @@ -91,6 +82,18 @@ impl<'a> LogicalNodeProcessor<'a, KeysSubQuery> for KeysSubQueryProcessor<'a> {
select_builder.add_projection_member(member, Some(alias));
}

if !context.dimensions_query {
for member in keys_subquery.primary_keys_dimensions().iter() {
let alias = member.alias();
references_builder.resolve_references_for_member(
member.clone(),
&None,
context_factory.render_references_mut(),
)?;
select_builder.add_projection_member(member, Some(alias));
}
}

select_builder.set_distinct();
select_builder.set_filter(filter);
let res = Rc::new(select_builder.build(query_tools.clone(), context_factory));
Expand Down
15 changes: 15 additions & 0 deletions rust/cubesqlplanner/cubesqlplanner/src/planner/query_properties.rs
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,21 @@ impl QueryProperties {
}
}
}
result.multi_stage_measures = result
.multi_stage_measures
.into_iter()
.unique_by(|itm| itm.full_name())
.collect();
result.regular_measures = result
.regular_measures
.into_iter()
.unique_by(|itm| itm.full_name())
.collect();
result.multiplied_measures = result
.multiplied_measures
.into_iter()
.unique_by(|itm| itm.measure.full_name())
.collect();

Ok(result)
}
Expand Down
Loading