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

Implement Unparse GroupingSet Expr --> String Support sql #10555

Merged
merged 2 commits into from
May 20, 2024
Merged

Implement Unparse GroupingSet Expr --> String Support sql #10555

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d6ec1d
Implement groupingset -> expr
xinlifoobar May 16, 2024
d3f4604
fix comments
xinlifoobar May 18, 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
55 changes: 46 additions & 9 deletions datafusion/sql/src/unparser/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// under the License.

use core::fmt;
use std::fmt::Display;
use std::{fmt::Display, vec};

use arrow_array::{Date32Array, Date64Array};
use arrow_schema::DataType;
Expand All @@ -26,7 +26,7 @@ use datafusion_common::{
};
use datafusion_expr::{
expr::{Alias, Exists, InList, ScalarFunction, Sort, WindowFunction},
Between, BinaryExpr, Case, Cast, Expr, Like, Operator, TryCast,
Between, BinaryExpr, Case, Cast, Expr, GroupingSet, Like, Operator, TryCast,
};
use sqlparser::ast::{
self, Expr as AstExpr, Function, FunctionArg, Ident, UnaryOperator,
Expand Down Expand Up @@ -411,9 +411,40 @@ impl Unparser<'_> {
Expr::Wildcard { qualifier: _ } => {
not_impl_err!("Unsupported Expr conversion: {expr:?}")
}
Expr::GroupingSet(_) => {
not_impl_err!("Unsupported Expr conversion: {expr:?}")
}
Expr::GroupingSet(grouping_set) => match grouping_set {
GroupingSet::GroupingSets(grouping_sets) => {
let expr_ast_sets = grouping_sets
.iter()
.map(|set| {
set.iter()
.map(|e| self.expr_to_sql(e))
.collect::<Result<Vec<_>>>()
})
.collect::<Result<Vec<_>>>()?;

Ok(ast::Expr::GroupingSets(expr_ast_sets))
}
GroupingSet::Cube(cube) => {
let expr_ast_sets = cube
.iter()
.map(|e| {
let sql = self.expr_to_sql(e)?;
Ok(vec![sql])
})
.collect::<Result<Vec<_>>>()?;
Ok(ast::Expr::Cube(expr_ast_sets))
}
GroupingSet::Rollup(rollup) => {
let expr_ast_sets: Vec<Vec<AstExpr>> = rollup
.iter()
.map(|e| {
let sql = self.expr_to_sql(e)?;
Ok(vec![sql])
})
.collect::<Result<Vec<_>>>()?;
Ok(ast::Expr::Rollup(expr_ast_sets))
}
},
Expr::Placeholder(p) => {
Ok(ast::Expr::Value(ast::Value::Placeholder(p.id.to_string())))
}
Expand Down Expand Up @@ -870,11 +901,11 @@ mod tests {
use arrow::datatypes::{Field, Schema};
use datafusion_common::TableReference;
use datafusion_expr::{
case, col, exists,
case, col, cube, exists,
expr::{AggregateFunction, AggregateFunctionDefinition},
lit, not, not_exists, out_ref_col, placeholder, table_scan, try_cast, when,
wildcard, ColumnarValue, ScalarUDF, ScalarUDFImpl, Signature, Volatility,
WindowFrame, WindowFunctionDefinition,
grouping_set, lit, not, not_exists, out_ref_col, placeholder, rollup, table_scan,
try_cast, when, wildcard, ColumnarValue, ScalarUDF, ScalarUDFImpl, Signature,
Volatility, WindowFrame, WindowFunctionDefinition,
};

use crate::unparser::dialect::CustomDialect;
Expand Down Expand Up @@ -1163,6 +1194,12 @@ mod tests {
out_ref_col(DataType::Int32, "t.a").gt(lit(1)),
r#"("t"."a" > 1)"#,
),
(
grouping_set(vec![vec![col("a"), col("b")], vec![col("a")]]),
r#"GROUPING SETS (("a", "b"), ("a"))"#,
),
(cube(vec![col("a"), col("b")]), r#"CUBE ("a", "b")"#),
(rollup(vec![col("a"), col("b")]), r#"ROLLUP ("a", "b")"#),
];

for (expr, expected) in tests {
Expand Down