Skip to content

Fix wrong projection 'optimization' #268

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

Merged
merged 7 commits into from
May 6, 2021
+112 −88
Merged

Fix wrong projection 'optimization' #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
00f0abc
Fix wrong projection 'optimization'
Dandandan May 5, 2021
e472308
Fmt
Dandandan May 5, 2021
d0d547b
test
Dandandan May 5, 2021
4023f5a
Update some more
Dandandan May 5, 2021
411a7a8
Update tests
Dandandan May 5, 2021
8646ccb
Merge remote-tracking branch 'upstream/master' into projection_fix
Dandandan May 5, 2021
89463ea
Fix test
Dandandan May 5, 2021
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
36 changes: 21 additions & 15 deletions datafusion/src/execution/dataframe_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,11 @@ impl DataFrame for DataFrameImpl {

#[cfg(test)]
mod tests {
use std::vec;

use super::*;
use crate::execution::context::ExecutionContext;
use crate::logical_plan::*;
use crate::{assert_batches_sorted_eq, execution::context::ExecutionContext};
use crate::{datasource::csv::CsvReadOptions, physical_plan::ColumnarValue};
use crate::{physical_plan::functions::ScalarFunctionImplementation, test};
use arrow::datatypes::DataType;
Expand Down Expand Up @@ -216,8 +218,8 @@ mod tests {
Ok(())
}

#[test]
fn aggregate() -> Result<()> {
#[tokio::test]
async fn aggregate() -> Result<()> {
// build plan using DataFrame API
let df = test_table()?;
let group_expr = vec![col("c1")];
Expand All @@ -230,18 +232,22 @@ mod tests {
count_distinct(col("c12")),
];

let df = df.aggregate(group_expr, aggr_expr)?;

let plan = df.to_logical_plan();

// build same plan using SQL API
let sql = "SELECT c1, MIN(c12), MAX(c12), AVG(c12), SUM(c12), COUNT(c12), COUNT(DISTINCT c12) \
FROM aggregate_test_100 \
GROUP BY c1";
let sql_plan = create_plan(sql)?;

// the two plans should be identical
assert_same_plan(&plan, &sql_plan);
let df: Vec<RecordBatch> = df.aggregate(group_expr, aggr_expr)?.collect().await?;

assert_batches_sorted_eq!(
vec![
"+----+----------------------+--------------------+---------------------+--------------------+------------+---------------------+",
"| c1 | MIN(c12) | MAX(c12) | AVG(c12) | SUM(c12) | COUNT(c12) | COUNT(DISTINCT c12) |",
"+----+----------------------+--------------------+---------------------+--------------------+------------+---------------------+",
"| a | 0.02182578039211991 | 0.9800193410444061 | 0.48754517466109415 | 10.238448667882977 | 21 | 21 |",
"| b | 0.04893135681998029 | 0.9185813970744787 | 0.41040709263815384 | 7.797734760124923 | 19 | 19 |",
"| c | 0.0494924465469434 | 0.991517828651004 | 0.6600456536439784 | 13.860958726523545 | 21 | 21 |",
"| d | 0.061029375346466685 | 0.9748360509016578 | 0.48855379387549824 | 8.793968289758968 | 18 | 18 |",
"| e | 0.01479305307777301 | 0.9965400387585364 | 0.48600669271341534 | 10.206140546981722 | 21 | 21 |",
"+----+----------------------+--------------------+---------------------+--------------------+------------+---------------------+",
],
&df
);

Ok(())
}
Expand Down
130 changes: 66 additions & 64 deletions datafusion/src/sql/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,26 +652,10 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
}

/// Wrap a plan in a projection
///
/// The projection is applied only when necessary,
/// i.e., when the input fields are different than the
/// projection. Note that if the input fields are the same, but out of
/// order, the projection will be applied.
fn project(&self, input: &LogicalPlan, expr: Vec<Expr>) -> Result<LogicalPlan> {
self.validate_schema_satisfies_exprs(&input.schema(), &expr)?;

let plan = LogicalPlanBuilder::from(input).project(expr)?.build()?;

let project = match input {
LogicalPlan::TableScan { .. } => true,
_ => plan.schema().fields() != input.schema().fields(),
};

if project {
Ok(plan)
} else {
Ok(input.clone())
}
LogicalPlanBuilder::from(input).project(expr)?.build()
}

fn aggregate(
Expand Down Expand Up @@ -1737,10 +1721,11 @@ mod tests {
)
WHERE fn1 = 'X' AND age < 30";

let expected = "Filter: #fn1 Eq Utf8(\"X\") And #age Lt Int64(30)\
\n Projection: #first_name AS fn1, #age\
\n Filter: #age Gt Int64(20)\
\n TableScan: person projection=None";
let expected = "Projection: #fn1, #age\
\n Filter: #fn1 Eq Utf8(\"X\") And #age Lt Int64(30)\
\n Projection: #first_name AS fn1, #age\
\n Filter: #age Gt Int64(20)\
\n TableScan: person projection=None";

quick_test(sql, expected);
}
Expand Down Expand Up @@ -1797,9 +1782,10 @@ mod tests {
let sql = "SELECT MAX(age)
FROM person
HAVING MAX(age) < 30";
let expected = "Filter: #MAX(age) Lt Int64(30)\
\n Aggregate: groupBy=[[]], aggr=[[MAX(#age)]]\
\n TableScan: person projection=None";
let expected = "Projection: #MAX(age)\
\n Filter: #MAX(age) Lt Int64(30)\
\n Aggregate: groupBy=[[]], aggr=[[MAX(#age)]]\
\n TableScan: person projection=None";
quick_test(sql, expected);
}

Expand Down Expand Up @@ -1857,9 +1843,10 @@ mod tests {
FROM person
GROUP BY first_name
HAVING first_name = 'M'";
let expected = "Filter: #first_name Eq Utf8(\"M\")\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n TableScan: person projection=None";
let expected = "Projection: #first_name, #MAX(age)\
\n Filter: #first_name Eq Utf8(\"M\")\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n TableScan: person projection=None";
quick_test(sql, expected);
}

Expand All @@ -1870,10 +1857,11 @@ mod tests {
WHERE id > 5
GROUP BY first_name
HAVING MAX(age) < 100";
let expected = "Filter: #MAX(age) Lt Int64(100)\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n Filter: #id Gt Int64(5)\
\n TableScan: person projection=None";
let expected = "Projection: #first_name, #MAX(age)\
\n Filter: #MAX(age) Lt Int64(100)\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n Filter: #id Gt Int64(5)\
\n TableScan: person projection=None";
quick_test(sql, expected);
}

Expand All @@ -1885,10 +1873,11 @@ mod tests {
WHERE id > 5 AND age > 18
GROUP BY first_name
HAVING MAX(age) < 100";
let expected = "Filter: #MAX(age) Lt Int64(100)\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n Filter: #id Gt Int64(5) And #age Gt Int64(18)\
\n TableScan: person projection=None";
let expected = "Projection: #first_name, #MAX(age)\
\n Filter: #MAX(age) Lt Int64(100)\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n Filter: #id Gt Int64(5) And #age Gt Int64(18)\
\n TableScan: person projection=None";
quick_test(sql, expected);
}

Expand Down Expand Up @@ -1925,9 +1914,10 @@ mod tests {
FROM person
GROUP BY first_name
HAVING MAX(age) > 100";
let expected = "Filter: #MAX(age) Gt Int64(100)\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n TableScan: person projection=None";
let expected = "Projection: #first_name, #MAX(age)\
\n Filter: #MAX(age) Gt Int64(100)\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n TableScan: person projection=None";
quick_test(sql, expected);
}

Expand All @@ -1950,9 +1940,10 @@ mod tests {
FROM person
GROUP BY first_name
HAVING MAX(age) > 100 AND MAX(age) < 200";
let expected = "Filter: #MAX(age) Gt Int64(100) And #MAX(age) Lt Int64(200)\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n TableScan: person projection=None";
let expected = "Projection: #first_name, #MAX(age)\
\n Filter: #MAX(age) Gt Int64(100) And #MAX(age) Lt Int64(200)\
\n Aggregate: groupBy=[[#first_name]], aggr=[[MAX(#age)]]\
\n TableScan: person projection=None";
quick_test(sql, expected);
}

Expand Down Expand Up @@ -2045,32 +2036,36 @@ mod tests {
fn select_wildcard_with_groupby() {
quick_test(
"SELECT * FROM person GROUP BY id, first_name, last_name, age, state, salary, birth_date",
"Aggregate: groupBy=[[#id, #first_name, #last_name, #age, #state, #salary, #birth_date]], aggr=[[]]\
\n TableScan: person projection=None",
"Projection: #id, #first_name, #last_name, #age, #state, #salary, #birth_date\
\n Aggregate: groupBy=[[#id, #first_name, #last_name, #age, #state, #salary, #birth_date]], aggr=[[]]\
\n TableScan: person projection=None",
);
quick_test(
"SELECT * FROM (SELECT first_name, last_name FROM person) GROUP BY first_name, last_name",
"Aggregate: groupBy=[[#first_name, #last_name]], aggr=[[]]\
\n Projection: #first_name, #last_name\
\n TableScan: person projection=None",
"Projection: #first_name, #last_name\
\n Aggregate: groupBy=[[#first_name, #last_name]], aggr=[[]]\
\n Projection: #first_name, #last_name\
\n TableScan: person projection=None",
);
}

#[test]
fn select_simple_aggregate() {
quick_test(
"SELECT MIN(age) FROM person",
"Aggregate: groupBy=[[]], aggr=[[MIN(#age)]]\
\n TableScan: person projection=None",
"Projection: #MIN(age)\
\n Aggregate: groupBy=[[]], aggr=[[MIN(#age)]]\
\n TableScan: person projection=None",
);
}

#[test]
fn test_sum_aggregate() {
quick_test(
"SELECT SUM(age) from person",
"Aggregate: groupBy=[[]], aggr=[[SUM(#age)]]\
\n TableScan: person projection=None",
"Projection: #SUM(age)\
\n Aggregate: groupBy=[[]], aggr=[[SUM(#age)]]\
\n TableScan: person projection=None",
);
}

Expand Down Expand Up @@ -2131,8 +2126,9 @@ mod tests {
fn select_simple_aggregate_with_groupby() {
quick_test(
"SELECT state, MIN(age), MAX(age) FROM person GROUP BY state",
"Aggregate: groupBy=[[#state]], aggr=[[MIN(#age), MAX(#age)]]\
\n TableScan: person projection=None",
"Projection: #state, #MIN(age), #MAX(age)\
\n Aggregate: groupBy=[[#state]], aggr=[[MIN(#age), MAX(#age)]]\
\n TableScan: person projection=None",
);
}

Expand Down Expand Up @@ -2269,8 +2265,9 @@ mod tests {
) {
quick_test(
"SELECT age + 1, MIN(first_name) FROM person GROUP BY age + 1",
"Aggregate: groupBy=[[#age Plus Int64(1)]], aggr=[[MIN(#first_name)]]\
\n TableScan: person projection=None",
"Projection: #age Plus Int64(1), #MIN(first_name)\
\n Aggregate: groupBy=[[#age Plus Int64(1)]], aggr=[[MIN(#first_name)]]\
\n TableScan: person projection=None",
);
quick_test(
"SELECT MIN(first_name), age + 1 FROM person GROUP BY age + 1",
Expand Down Expand Up @@ -2349,8 +2346,9 @@ mod tests {
fn select_aggregate_with_non_column_inner_expression_with_groupby() {
quick_test(
"SELECT state, MIN(age + 1) FROM person GROUP BY state",
"Aggregate: groupBy=[[#state]], aggr=[[MIN(#age Plus Int64(1))]]\
\n TableScan: person projection=None",
"Projection: #state, #MIN(age Plus Int64(1))\
\n Aggregate: groupBy=[[#state]], aggr=[[MIN(#age Plus Int64(1))]]\
\n TableScan: person projection=None",
);
}

Expand All @@ -2366,16 +2364,18 @@ mod tests {
#[test]
fn select_count_one() {
let sql = "SELECT COUNT(1) FROM person";
let expected = "Aggregate: groupBy=[[]], aggr=[[COUNT(UInt8(1))]]\
\n TableScan: person projection=None";
let expected = "Projection: #COUNT(UInt8(1))\
\n Aggregate: groupBy=[[]], aggr=[[COUNT(UInt8(1))]]\
\n TableScan: person projection=None";
quick_test(sql, expected);
}

#[test]
fn select_count_column() {
let sql = "SELECT COUNT(id) FROM person";
let expected = "Aggregate: groupBy=[[]], aggr=[[COUNT(#id)]]\
\n TableScan: person projection=None";
let expected = "Projection: #COUNT(id)\
\n Aggregate: groupBy=[[]], aggr=[[COUNT(#id)]]\
\n TableScan: person projection=None";
quick_test(sql, expected);
}

Expand Down Expand Up @@ -2461,8 +2461,9 @@ mod tests {
#[test]
fn select_group_by() {
let sql = "SELECT state FROM person GROUP BY state";
let expected = "Aggregate: groupBy=[[#state]], aggr=[[]]\
\n TableScan: person projection=None";
let expected = "Projection: #state\
\n Aggregate: groupBy=[[#state]], aggr=[[]]\
\n TableScan: person projection=None";

quick_test(sql, expected);
}
Expand All @@ -2480,8 +2481,9 @@ mod tests {
#[test]
fn select_group_by_count_star() {
let sql = "SELECT state, COUNT(*) FROM person GROUP BY state";
let expected = "Aggregate: groupBy=[[#state]], aggr=[[COUNT(UInt8(1))]]\
\n TableScan: person projection=None";
let expected = "Projection: #state, #COUNT(UInt8(1))\
\n Aggregate: groupBy=[[#state]], aggr=[[COUNT(UInt8(1))]]\
\n TableScan: person projection=None";

quick_test(sql, expected);
}
Expand Down
34 changes: 25 additions & 9 deletions datafusion/tests/sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,18 @@ async fn nyc() -> Result<()> {
let optimized_plan = ctx.optimize(&logical_plan)?;

match &optimized_plan {
LogicalPlan::Aggregate { input, .. } => match input.as_ref() {
LogicalPlan::TableScan {
ref projected_schema,
..
} => {
assert_eq!(2, projected_schema.fields().len());
assert_eq!(projected_schema.field(0).name(), "passenger_count");
assert_eq!(projected_schema.field(1).name(), "fare_amount");
}
LogicalPlan::Projection { input, .. } => match input.as_ref() {
LogicalPlan::Aggregate { input, .. } => match input.as_ref() {
LogicalPlan::TableScan {
ref projected_schema,
..
} => {
assert_eq!(2, projected_schema.fields().len());
assert_eq!(projected_schema.field(0).name(), "passenger_count");
assert_eq!(projected_schema.field(1).name(), "fare_amount");
}
_ => unreachable!(),
},
_ => unreachable!(),
},
_ => unreachable!(false),
Expand Down Expand Up @@ -447,6 +450,19 @@ async fn select_distinct_simple() -> Result<()> {
Ok(())
}

#[tokio::test]
async fn projection_same_fields() -> Result<()> {
let mut ctx = ExecutionContext::new();

let sql = "select (1+1) as a from (select 1 as a);";
let actual = execute(&mut ctx, sql).await;

let expected = vec![vec!["2"]];
assert_eq!(actual, expected);

Ok(())
}

#[tokio::test]
async fn csv_query_group_by_float64() -> Result<()> {
let mut ctx = ExecutionContext::new();
Expand Down