Skip to content

Commit 328daf6

Browse files
pzzsmarmbrus
authored andcommitted
[SPARK-6271][SQL] Sort these tokens in alphabetic order to avoid further duplicate in HiveQl
Author: DoingDone9 <799203320@qq.com> Closes apache#4973 from DoingDone9/sort_token and squashes the following commits: 855fa10 [DoingDone9] Update HiveQl.scala c7080b3 [DoingDone9] Sort these tokens in alphabetic order to avoid further duplicate in HiveQl c87e8b6 [DoingDone9] Merge pull request #3 from apache/master cb1852d [DoingDone9] Merge pull request #2 from apache/master c3f046f [DoingDone9] Merge pull request #1 from apache/master
1 parent 73d5775 commit 328daf6

File tree

1 file changed

+46
-42
lines changed
  • sql/hive/src/main/scala/org/apache/spark/sql/hive

1 file changed

+46
-42
lines changed

sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveQl.scala

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -55,37 +55,8 @@ private[hive] case object NativePlaceholder extends Command
5555
/** Provides a mapping from HiveQL statements to catalyst logical plans and expression trees. */
5656
private[hive] object HiveQl {
5757
protected val nativeCommands = Seq(
58-
"TOK_DESCFUNCTION",
59-
"TOK_DESCDATABASE",
60-
"TOK_SHOW_CREATETABLE",
61-
"TOK_SHOWCOLUMNS",
62-
"TOK_SHOW_TABLESTATUS",
63-
"TOK_SHOWDATABASES",
64-
"TOK_SHOWFUNCTIONS",
65-
"TOK_SHOWINDEXES",
66-
"TOK_SHOWINDEXES",
67-
"TOK_SHOWPARTITIONS",
68-
"TOK_SHOW_TBLPROPERTIES",
69-
70-
"TOK_LOCKTABLE",
71-
"TOK_SHOWLOCKS",
72-
"TOK_UNLOCKTABLE",
73-
74-
"TOK_SHOW_ROLES",
75-
"TOK_CREATEROLE",
76-
"TOK_DROPROLE",
77-
"TOK_GRANT",
78-
"TOK_GRANT_ROLE",
79-
"TOK_REVOKE",
80-
"TOK_SHOW_GRANT",
81-
"TOK_SHOW_ROLE_GRANT",
82-
"TOK_SHOW_SET_ROLE",
83-
84-
"TOK_CREATEFUNCTION",
85-
"TOK_DROPFUNCTION",
86-
87-
"TOK_ALTERDATABASE_PROPERTIES",
8858
"TOK_ALTERDATABASE_OWNER",
59+
"TOK_ALTERDATABASE_PROPERTIES",
8960
"TOK_ALTERINDEX_PROPERTIES",
9061
"TOK_ALTERINDEX_REBUILD",
9162
"TOK_ALTERTABLE_ADDCOLS",
@@ -102,28 +73,61 @@ private[hive] object HiveQl {
10273
"TOK_ALTERTABLE_SKEWED",
10374
"TOK_ALTERTABLE_TOUCH",
10475
"TOK_ALTERTABLE_UNARCHIVE",
105-
"TOK_CREATEDATABASE",
106-
"TOK_CREATEFUNCTION",
107-
"TOK_CREATEINDEX",
108-
"TOK_DROPDATABASE",
109-
"TOK_DROPINDEX",
110-
"TOK_DROPTABLE_PROPERTIES",
111-
"TOK_MSCK",
112-
11376
"TOK_ALTERVIEW_ADDPARTS",
11477
"TOK_ALTERVIEW_AS",
11578
"TOK_ALTERVIEW_DROPPARTS",
11679
"TOK_ALTERVIEW_PROPERTIES",
11780
"TOK_ALTERVIEW_RENAME",
81+
82+
"TOK_CREATEDATABASE",
83+
"TOK_CREATEFUNCTION",
84+
"TOK_CREATEINDEX",
85+
"TOK_CREATEROLE",
11886
"TOK_CREATEVIEW",
119-
"TOK_DROPVIEW_PROPERTIES",
87+
88+
"TOK_DESCDATABASE",
89+
"TOK_DESCFUNCTION",
90+
91+
"TOK_DROPDATABASE",
92+
"TOK_DROPFUNCTION",
93+
"TOK_DROPINDEX",
94+
"TOK_DROPROLE",
95+
"TOK_DROPTABLE_PROPERTIES",
12096
"TOK_DROPVIEW",
121-
97+
"TOK_DROPVIEW_PROPERTIES",
98+
12299
"TOK_EXPORT",
100+
101+
"TOK_GRANT",
102+
"TOK_GRANT_ROLE",
103+
123104
"TOK_IMPORT",
105+
124106
"TOK_LOAD",
125-
126-
"TOK_SWITCHDATABASE"
107+
108+
"TOK_LOCKTABLE",
109+
110+
"TOK_MSCK",
111+
112+
"TOK_REVOKE",
113+
114+
"TOK_SHOW_CREATETABLE",
115+
"TOK_SHOW_GRANT",
116+
"TOK_SHOW_ROLE_GRANT",
117+
"TOK_SHOW_ROLES",
118+
"TOK_SHOW_SET_ROLE",
119+
"TOK_SHOW_TABLESTATUS",
120+
"TOK_SHOW_TBLPROPERTIES",
121+
"TOK_SHOWCOLUMNS",
122+
"TOK_SHOWDATABASES",
123+
"TOK_SHOWFUNCTIONS",
124+
"TOK_SHOWINDEXES",
125+
"TOK_SHOWLOCKS",
126+
"TOK_SHOWPARTITIONS",
127+
128+
"TOK_SWITCHDATABASE",
129+
130+
"TOK_UNLOCKTABLE"
127131
)
128132

129133
// Commands that we do not need to explain.

0 commit comments

Comments
 (0)