Skip to content

Spark: Share CACHE TABLE parsing #2714

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
LucaCappelletti94 merged 1 commit into from
Oct 26, 2026
Merged

Spark: Share CACHE TABLE parsing #2714

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
91 changes: 24 additions & 67 deletions src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5755,78 +5755,35 @@ impl<'a> Parser<'a> {

/// Parse a CACHE TABLE statement
pub fn parse_cache_table(&mut self) -> Result<Statement, ParserError> {
let (mut table_flag, mut options, mut has_as, mut query) = (None, vec![], false, None);
if self.parse_keyword(Keyword::TABLE) {
let table_name = self.parse_object_name(false)?;
if self.peek_token_ref().token != Token::EOF {
if let Token::Word(word) = &self.peek_token_ref().token {
if word.keyword == Keyword::OPTIONS {
options = self.parse_options(Keyword::OPTIONS)?
}
};

if self.peek_token_ref().token != Token::EOF {
let (a, q) = self.parse_as_query()?;
has_as = a;
query = Some(q);
}

Ok(Statement::Cache {
table_flag,
table_name,
has_as,
options,
query,
})
} else {
Ok(Statement::Cache {
table_flag,
table_name,
has_as,
options,
query,
})
}
let table_flag = if self.parse_keyword(Keyword::TABLE) {
None
} else {
table_flag = Some(self.parse_object_name(false)?);
if self.parse_keyword(Keyword::TABLE) {
let table_name = self.parse_object_name(false)?;
if self.peek_token_ref().token != Token::EOF {
if let Token::Word(word) = &self.peek_token_ref().token {
if word.keyword == Keyword::OPTIONS {
options = self.parse_options(Keyword::OPTIONS)?
}
};

if self.peek_token_ref().token != Token::EOF {
let (a, q) = self.parse_as_query()?;
has_as = a;
query = Some(q);
}

Ok(Statement::Cache {
table_flag,
table_name,
has_as,
options,
query,
})
} else {
Ok(Statement::Cache {
table_flag,
table_name,
has_as,
options,
query,
})
}
} else {
let flag = self.parse_object_name(false)?;
if !self.parse_keyword(Keyword::TABLE) {
if self.peek_token_ref().token == Token::EOF {
self.prev_token();
}
self.expected_ref("a `TABLE` keyword", self.peek_token_ref())
return self.expected_ref("a `TABLE` keyword", self.peek_token_ref());
}
}
Some(flag)
};

let table_name = self.parse_object_name(false)?;
let options = self.parse_options(Keyword::OPTIONS)?;
let (has_as, query) = if self.peek_token_ref().token == Token::EOF {
(false, None)
} else {
let (has_as, query) = self.parse_as_query()?;
(has_as, Some(query))
};

Ok(Statement::Cache {
table_flag,
table_name,
has_as,
options,
query,
})
}

/// Parse 'AS' before as query,such as `WITH XXX AS SELECT XXX` oer `CACHE TABLE AS SELECT XXX`
Expand Down
25 changes: 25 additions & 0 deletions tests/sqlparser_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22039,3 +22039,28 @@ fn parse_qualified_literal_prefix_requires_adjacent_period() {
dialects.tokenizes_to(sql, vec![token]);
}
}

#[test]
fn parse_cache_table_options_without_flag() {
let dialects = all_dialects();
for (suffix, has_as) in [("", false), (" SELECT 1", false), (" AS SELECT 1", true)] {
let query = if suffix.is_empty() {
None
} else {
Some(dialects.verified_query("SELECT 1").into())
};
assert_eq!(
dialects.verified_stmt(&format!("CACHE TABLE t OPTIONS('k' = 'v'){suffix}")),
Statement::Cache {
table_flag: None,
table_name: ObjectName::from(vec![Ident::new("t")]),
has_as,
options: vec![SqlOption::KeyValue {
key: Ident::with_quote('\'', "k"),
value: Expr::Value(Value::SingleQuotedString("v".into()).with_empty_span()),
}],
query,
}
);
}
}
Loading