Skip to content

Boxed Query body to save some stack space #540

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 1 commit into from
Jul 16, 2022
Merged

Boxed Query body to save some stack space #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/ast/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub struct Query {
/// WITH (common table expressions, or CTEs)
pub with: Option<With>,
/// SELECT or UNION / EXCEPT / INTERSECT
pub body: SetExpr,
pub body: Box<SetExpr>,
/// ORDER BY
pub order_by: Vec<OrderByExpr>,
/// `LIMIT { <N> | ALL }`
Expand Down
4 changes: 2 additions & 2 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3207,7 +3207,7 @@ impl<'a> Parser<'a> {
};

if !self.parse_keyword(Keyword::INSERT) {
let body = self.parse_query_body(0)?;
let body = Box::new(self.parse_query_body(0)?);

let order_by = if self.parse_keywords(&[Keyword::ORDER, Keyword::BY]) {
self.parse_comma_separated(Parser::parse_order_by_expr)?
Expand Down Expand Up @@ -3259,7 +3259,7 @@ impl<'a> Parser<'a> {

Ok(Query {
with,
body: SetExpr::Insert(insert),
body: Box::new(SetExpr::Insert(insert)),
limit: None,
order_by: vec![],
offset: None,
Expand Down
2 changes: 1 addition & 1 deletion src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ impl TestedDialects {
/// Ensures that `sql` parses as a single [Select], and is not modified
/// after a serialization round-trip.
pub fn verified_only_select(&self, query: &str) -> Select {
match self.verified_query(query).body {
match *self.verified_query(query).body {
SetExpr::Select(s) => *s,
_ => panic!("Expected SetExpr::Select"),
}
Expand Down
12 changes: 6 additions & 6 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ fn parse_insert_values() {
for (index, column) in columns.iter().enumerate() {
assert_eq!(column, &Ident::new(expected_columns[index].clone()));
}
match &source.body {
match &*source.body {
SetExpr::Values(Values(values)) => assert_eq!(values.as_slice(), expected_rows),
_ => unreachable!(),
}
Expand Down Expand Up @@ -3976,7 +3976,7 @@ fn parse_offset() {
assert_eq!(ast.offset, expect);
let ast = verified_query("SELECT foo FROM (SELECT * FROM bar OFFSET 2 ROWS) OFFSET 2 ROWS");
assert_eq!(ast.offset, expect);
match ast.body {
match *ast.body {
SetExpr::Select(s) => match only(s.from).relation {
TableFactor::Derived { subquery, .. } => {
assert_eq!(subquery.offset, expect);
Expand Down Expand Up @@ -4070,7 +4070,7 @@ fn parse_fetch() {
"SELECT foo FROM (SELECT * FROM bar FETCH FIRST 2 ROWS ONLY) FETCH FIRST 2 ROWS ONLY",
);
assert_eq!(ast.fetch, fetch_first_two_rows_only);
match ast.body {
match *ast.body {
SetExpr::Select(s) => match only(s.from).relation {
TableFactor::Derived { subquery, .. } => {
assert_eq!(subquery.fetch, fetch_first_two_rows_only);
Expand All @@ -4088,7 +4088,7 @@ fn parse_fetch() {
})
);
assert_eq!(ast.fetch, fetch_first_two_rows_only);
match ast.body {
match *ast.body {
SetExpr::Select(s) => match only(s.from).relation {
TableFactor::Derived { subquery, .. } => {
assert_eq!(
Expand Down Expand Up @@ -4626,7 +4626,7 @@ fn parse_merge() {
lateral: false,
subquery: Box::new(Query {
with: None,
body: SetExpr::Select(Box::new(Select {
body: Box::new(SetExpr::Select(Box::new(Select {
distinct: false,
top: None,
projection: vec![SelectItem::Wildcard],
Expand All @@ -4648,7 +4648,7 @@ fn parse_merge() {
sort_by: vec![],
having: None,
qualify: None,
})),
}))),
order_by: vec![],
limit: None,
offset: None,
Expand Down
22 changes: 11 additions & 11 deletions tests/sqlparser_mysql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ fn parse_quote_identifiers_2() {
mysql().verified_stmt(sql),
Statement::Query(Box::new(Query {
with: None,
body: SetExpr::Select(Box::new(Select {
body: Box::new(SetExpr::Select(Box::new(Select {
distinct: false,
top: None,
projection: vec![SelectItem::UnnamedExpr(Expr::Identifier(Ident {
Expand All @@ -330,7 +330,7 @@ fn parse_quote_identifiers_2() {
sort_by: vec![],
having: None,
qualify: None
})),
}))),
order_by: vec![],
limit: None,
offset: None,
Expand All @@ -347,7 +347,7 @@ fn parse_quote_identifiers_3() {
mysql().verified_stmt(sql),
Statement::Query(Box::new(Query {
with: None,
body: SetExpr::Select(Box::new(Select {
body: Box::new(SetExpr::Select(Box::new(Select {
distinct: false,
top: None,
projection: vec![SelectItem::UnnamedExpr(Expr::Identifier(Ident {
Expand All @@ -364,7 +364,7 @@ fn parse_quote_identifiers_3() {
sort_by: vec![],
having: None,
qualify: None
})),
}))),
order_by: vec![],
limit: None,
offset: None,
Expand Down Expand Up @@ -392,7 +392,7 @@ fn parse_escaped_string() {
let stmt = mysql().one_statement_parses_to(sql, "");

match stmt {
Statement::Query(query) => match query.body {
Statement::Query(query) => match *query.body {
SetExpr::Select(value) => {
let expr = expr_from_projection(only(&value.projection));
assert_eq!(
Expand Down Expand Up @@ -517,7 +517,7 @@ fn parse_simple_insert() {
assert_eq!(
Box::new(Query {
with: None,
body: SetExpr::Values(Values(vec![
body: Box::new(SetExpr::Values(Values(vec![
vec![
Expr::Value(Value::SingleQuotedString("Test Some Inserts".to_string())),
Expr::Value(Value::Number("1".to_string(), false))
Expand All @@ -530,7 +530,7 @@ fn parse_simple_insert() {
Expr::Value(Value::SingleQuotedString("Test Entry 3".to_string())),
Expr::Value(Value::Number("3".to_string(), false))
]
])),
]))),
order_by: vec![],
limit: None,
offset: None,
Expand Down Expand Up @@ -574,7 +574,7 @@ fn parse_insert_with_on_duplicate_update() {
assert_eq!(
Box::new(Query {
with: None,
body: SetExpr::Values(Values(vec![vec![
body: Box::new(SetExpr::Values(Values(vec![vec![
Expr::Value(Value::SingleQuotedString("accounting_manager".to_string())),
Expr::Value(Value::SingleQuotedString(
"Some description about the group".to_string()
Expand All @@ -583,7 +583,7 @@ fn parse_insert_with_on_duplicate_update() {
Expr::Value(Value::Boolean(true)),
Expr::Value(Value::Boolean(true)),
Expr::Value(Value::Boolean(true)),
]])),
]]))),
order_by: vec![],
limit: None,
offset: None,
Expand Down Expand Up @@ -767,7 +767,7 @@ fn parse_substring_in_select() {
assert_eq!(
Box::new(Query {
with: None,
body: SetExpr::Select(Box::new(Select {
body: Box::new(SetExpr::Select(Box::new(Select {
distinct: true,
top: None,
projection: vec![SelectItem::UnnamedExpr(Expr::Substring {
Expand Down Expand Up @@ -805,7 +805,7 @@ fn parse_substring_in_select() {
sort_by: vec![],
having: None,
qualify: None
})),
}))),
order_by: vec![],
limit: None,
offset: None,
Expand Down
6 changes: 3 additions & 3 deletions tests/sqlparser_postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ fn parse_update_set_from() {
lateral: false,
subquery: Box::new(Query {
with: None,
body: SetExpr::Select(Box::new(Select {
body: Box::new(SetExpr::Select(Box::new(Select {
distinct: false,
top: None,
projection: vec![
Expand All @@ -452,7 +452,7 @@ fn parse_update_set_from() {
sort_by: vec![],
having: None,
qualify: None
})),
}))),
order_by: vec![],
limit: None,
offset: None,
Expand Down Expand Up @@ -1042,7 +1042,7 @@ fn parse_prepare() {
Expr::Identifier("a2".into()),
Expr::Identifier("a3".into()),
]];
match &source.body {
match &*source.body {
SetExpr::Values(Values(values)) => assert_eq!(values.as_slice(), &expected_values),
_ => unreachable!(),
}
Expand Down