diff options
| author | Andrew Or <andrew@databricks.com> | 2016-05-23 11:55:03 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2016-05-23 11:55:03 -0700 |
| commit | 2585d2b322f3b6b85a0a12ddf7dcde957453000d (patch) | |
| tree | 3346618e5e970969f4cc5acfa46787f0c46139c0 /sql/catalyst | |
| parent | 07c36a2f07fcf5da6fb395f830ebbfc10eb27dcc (diff) | |
| download | spark-2585d2b322f3b6b85a0a12ddf7dcde957453000d.tar.gz spark-2585d2b322f3b6b85a0a12ddf7dcde957453000d.tar.bz2 spark-2585d2b322f3b6b85a0a12ddf7dcde957453000d.zip | |
[SPARK-15279][SQL] Catch conflicting SerDe when creating table
## What changes were proposed in this pull request?
The user may do something like:
```
CREATE TABLE my_tab ROW FORMAT SERDE 'anything' STORED AS PARQUET
CREATE TABLE my_tab ROW FORMAT SERDE 'anything' STORED AS ... SERDE 'myserde'
CREATE TABLE my_tab ROW FORMAT DELIMITED ... STORED AS ORC
CREATE TABLE my_tab ROW FORMAT DELIMITED ... STORED AS ... SERDE 'myserde'
```
None of these should be allowed because the SerDe's conflict. As of this patch:
- `ROW FORMAT DELIMITED` is only compatible with `TEXTFILE`
- `ROW FORMAT SERDE` is only compatible with `TEXTFILE`, `RCFILE` and `SEQUENCEFILE`
## How was this patch tested?
New tests in `DDLCommandSuite`.
Author: Andrew Or <andrew@databricks.com>
Closes #13068 from andrewor14/row-format-conflict.
Diffstat (limited to 'sql/catalyst')
| -rw-r--r-- | sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 b/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 index 848c59e3b8..8ea8f76629 100644 --- a/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 +++ b/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 @@ -267,8 +267,8 @@ createFileFormat ; fileFormat - : INPUTFORMAT inFmt=STRING OUTPUTFORMAT outFmt=STRING (SERDE serdeCls=STRING)? #tableFileFormat - | identifier #genericFileFormat + : INPUTFORMAT inFmt=STRING OUTPUTFORMAT outFmt=STRING #tableFileFormat + | identifier #genericFileFormat ; storageHandler |