Skip to content

[SPARK-6271][SQL] Sort these tokens in alphabetic order to avoid further duplicate in HiveQl #4973

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

Closed
wants to merge 5 commits into from
Closed

[SPARK-6271][SQL] Sort these tokens in alphabetic order to avoid further duplicate in HiveQl #4973

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c3f046f
Merge pull request #1 from apache/master
pzzs Mar 2, 2015
cb1852d
Merge pull request #2 from apache/master
pzzs Mar 5, 2015
c87e8b6
Merge pull request #3 from apache/master
pzzs Mar 10, 2015
c7080b3
Sort these tokens in alphabetic order to avoid further duplicate in H…
pzzs Mar 11, 2015
855fa10
Update HiveQl.scala
pzzs Mar 11, 2015
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
88 changes: 46 additions & 42 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,37 +55,8 @@ private[hive] case object NativePlaceholder extends Command
/** Provides a mapping from HiveQL statements to catalyst logical plans and expression trees. */
private[hive] object HiveQl {
protected val nativeCommands = Seq(
"TOK_DESCFUNCTION",
"TOK_DESCDATABASE",
"TOK_SHOW_CREATETABLE",
"TOK_SHOWCOLUMNS",
"TOK_SHOW_TABLESTATUS",
"TOK_SHOWDATABASES",
"TOK_SHOWFUNCTIONS",
"TOK_SHOWINDEXES",
"TOK_SHOWINDEXES",
"TOK_SHOWPARTITIONS",
"TOK_SHOW_TBLPROPERTIES",

"TOK_LOCKTABLE",
"TOK_SHOWLOCKS",
"TOK_UNLOCKTABLE",

"TOK_SHOW_ROLES",
"TOK_CREATEROLE",
"TOK_DROPROLE",
"TOK_GRANT",
"TOK_GRANT_ROLE",
"TOK_REVOKE",
"TOK_SHOW_GRANT",
"TOK_SHOW_ROLE_GRANT",
"TOK_SHOW_SET_ROLE",

"TOK_CREATEFUNCTION",
"TOK_DROPFUNCTION",

"TOK_ALTERDATABASE_PROPERTIES",
"TOK_ALTERDATABASE_OWNER",
"TOK_ALTERDATABASE_PROPERTIES",
"TOK_ALTERINDEX_PROPERTIES",
"TOK_ALTERINDEX_REBUILD",
"TOK_ALTERTABLE_ADDCOLS",
Expand All @@ -102,28 +73,61 @@ private[hive] object HiveQl {
"TOK_ALTERTABLE_SKEWED",
"TOK_ALTERTABLE_TOUCH",
"TOK_ALTERTABLE_UNARCHIVE",
"TOK_CREATEDATABASE",
"TOK_CREATEFUNCTION",
"TOK_CREATEINDEX",
"TOK_DROPDATABASE",
"TOK_DROPINDEX",
"TOK_DROPTABLE_PROPERTIES",
"TOK_MSCK",

"TOK_ALTERVIEW_ADDPARTS",
"TOK_ALTERVIEW_AS",
"TOK_ALTERVIEW_DROPPARTS",
"TOK_ALTERVIEW_PROPERTIES",
"TOK_ALTERVIEW_RENAME",

"TOK_CREATEDATABASE",
"TOK_CREATEFUNCTION",
"TOK_CREATEINDEX",
"TOK_CREATEROLE",
"TOK_CREATEVIEW",
"TOK_DROPVIEW_PROPERTIES",

"TOK_DESCDATABASE",
"TOK_DESCFUNCTION",

"TOK_DROPDATABASE",
"TOK_DROPFUNCTION",
"TOK_DROPINDEX",
"TOK_DROPROLE",
"TOK_DROPTABLE_PROPERTIES",
"TOK_DROPVIEW",

"TOK_DROPVIEW_PROPERTIES",

"TOK_EXPORT",

"TOK_GRANT",
"TOK_GRANT_ROLE",

"TOK_IMPORT",

"TOK_LOAD",

"TOK_SWITCHDATABASE"

"TOK_LOCKTABLE",

"TOK_MSCK",

"TOK_REVOKE",

"TOK_SHOW_CREATETABLE",
"TOK_SHOW_GRANT",
"TOK_SHOW_ROLE_GRANT",
"TOK_SHOW_ROLES",
"TOK_SHOW_SET_ROLE",
"TOK_SHOW_TABLESTATUS",
"TOK_SHOW_TBLPROPERTIES",
"TOK_SHOWCOLUMNS",
"TOK_SHOWDATABASES",
"TOK_SHOWFUNCTIONS",
"TOK_SHOWINDEXES",
"TOK_SHOWLOCKS",
"TOK_SHOWPARTITIONS",

"TOK_SWITCHDATABASE",

"TOK_UNLOCKTABLE"
)

// Commands that we do not need to explain.
Expand Down