From 54a3eb8312bf4dfe97f9b294a2466785a1a17de6 Mon Sep 17 00:00:00 2001
From: Yin Huai <yhuai@databricks.com>
Date: Wed, 27 Apr 2016 00:30:54 -0700
Subject: [PATCH] [SPARK-14130][SQL] Throw exceptions for ALTER TABLE
ADD/REPLACE/CHANGE COLUMN, ALTER TABLE SET FILEFORMAT, DFS, and transaction
related commands
## What changes were proposed in this pull request?
This PR will make Spark SQL not allow ALTER TABLE ADD/REPLACE/CHANGE COLUMN, ALTER TABLE SET FILEFORMAT, DFS, and transaction related commands.
## How was this patch tested?
Existing tests. For those tests that I put in the blacklist, I am adding the useful parts back to SQLQuerySuite.
Author: Yin Huai <yhuai@databricks.com>
Closes #12714 from yhuai/banNativeCommand.
---
.../spark/sql/catalyst/parser/SqlBase.g4 | 13 +-
.../sql/catalyst/parser/ParserUtils.scala | 4 +
.../spark/sql/execution/SparkSqlParser.scala | 10 +-
.../spark/sql/execution/command/ddl.scala | 28 +-
.../execution/command/DDLCommandSuite.scala | 39 ++
.../execution/HiveCompatibilitySuite.scala | 43 +-
...mat_loc-0-72ba9397f487a914380dc15afaef1058 | 0
...mat_loc-1-30348eedd3afb892ac9d825dd7fdb5d8 | 4 -
...at_loc-10-71631c1e516c81ffdceac80f2d57ce09 | 0
...at_loc-11-fe39b84ddc86b6bf042dc30c1b612321 | 10 -
...at_loc-12-1553ad79b098b737ea8def91134eb0e9 | 0
...at_loc-13-fe39b84ddc86b6bf042dc30c1b612321 | 10 -
...at_loc-14-30348eedd3afb892ac9d825dd7fdb5d8 | 10 -
...at_loc-15-bc83e8a2f8edf84f603109d14440dc83 | 0
...at_loc-16-30348eedd3afb892ac9d825dd7fdb5d8 | 10 -
...at_loc-17-7e411fcfdd8f169c503ed89dc56ee335 | 0
...at_loc-18-30348eedd3afb892ac9d825dd7fdb5d8 | 10 -
...at_loc-19-56cadf0f555e355726dfed1929ad0508 | 0
...mat_loc-2-bc83e8a2f8edf84f603109d14440dc83 | 0
...mat_loc-3-30348eedd3afb892ac9d825dd7fdb5d8 | 4 -
...mat_loc-4-7e411fcfdd8f169c503ed89dc56ee335 | 0
...mat_loc-5-30348eedd3afb892ac9d825dd7fdb5d8 | 4 -
...mat_loc-6-56cadf0f555e355726dfed1929ad0508 | 0
...mat_loc-7-cee355b012efdc3bc7d584268a7025c2 | 0
...mat_loc-8-e4c52934f1ff0024f7f0bbb78d4ae3f8 | 0
...mat_loc-9-fe39b84ddc86b6bf042dc30c1b612321 | 10 -
...archar1-0-5fa6071842a0443346cf6db677a33412 | 0
...archar1-1-be11cb1f18ab19550011417126264fea | 0
...rchar1-10-c1a57b45952193d04b5411c5b6a31139 | 0
...rchar1-11-fa89c704636fa7bd937cf1a975bb2ae6 | 5 -
...rchar1-12-a694df5b2a8f2101f6fd2b936eeb2bfd | 0
...rchar1-13-fa89c704636fa7bd937cf1a975bb2ae6 | 5 -
...rchar1-14-5fa6071842a0443346cf6db677a33412 | 0
...archar1-2-ba9453c6b6a627286691f3930c2b26d0 | 0
...archar1-3-fa89c704636fa7bd937cf1a975bb2ae6 | 5 -
...archar1-4-c9a8643e08d6ed320f82c26e1ffa8b5d | 0
...archar1-5-2756ef8fbe2cfa4609808a3855f50969 | 5 -
...archar1-6-f7d529dc66c022b64e0b287c82f92778 | 0
...archar1-7-818f2ce0a782a1d3cb02fd85bd1d3f9f | 5 -
...varchar1-8-bdde28ebc875c39f9630d95379eee68 | 0
...archar1-9-5e48ee7bcd9439e68aa6dbc850ad8771 | 5 -
...archar2-0-22c4186110b5770deaf7f03cf08326b7 | 0
...archar2-1-ecc82a01a8f681a8a2d44a67a8a3f1cc | 0
...archar2-2-3a20c238eab602ad3d593b1eb3fa6dbb | 0
...archar2-3-fb3191f771e2396d5fc80659a8c68797 | 1 -
...varchar2-4-9a4bf0db2b90d54ea0eeff2ec356fcb | 0
...archar2-5-84e700f9dc6033c1f237fcdb95e31a0c | 1 -
...archar2-6-3250407f20f3766c18f44b8bfae1829d | 0
...archar2-7-50131c0ba7b7a6b65c789a5a8497bada | 1 -
...archar2-8-84e700f9dc6033c1f237fcdb95e31a0c | 1 -
...archar2-9-4c12c4c53d99338796be34e603dc612c | 1 -
.../date_3-0-c26de4559926ddb0127d2dc5ea154774 | 0
.../date_3-1-d9a07d08f5204ae8208fd88c9255d447 | 0
.../date_3-2-a937c6e5a2c655930e0d3f80883ecc16 | 0
.../date_3-3-4cf49e71b636df754871a675f9e4e24 | 0
.../date_3-3-c26f0641e7cec1093273b258e6bf7120 | 0
.../date_3-4-e009f358964f6d1236cfc03283e2b06f | 1 -
.../date_3-5-c26de4559926ddb0127d2dc5ea154774 | 0
...formats-0-12652a5a33548c245772e8d0894af5ad | 0
...formats-1-961f7cb386a6eacd391dcb189cbeddaa | 0
...formats-2-28cd0f9b01baa8627a013339dc9508ce | 0
...formats-3-c6eef43568e8ed96299720d30a6235e1 | 0
..._formats-4-a4890f2b20715c75e05c674d9155a5b | 1 -
...nge_off-0-50131c0ba7b7a6b65c789a5a8497bada | 1 -
...nge_off-1-a071dedef216e84d1cb2f0de6d34fd1a | 1 -
...nge_off-2-ce3797dc14a603cba2a5e58c8612de5b | 1 -
...nge_off-3-f5340880d2be7b0643eb995673e89d11 | 0
...nge_off-4-714ab8c97f4d8993680b91e1ed8f3782 | 0
...nge_off-5-34064fd15c28dba55865cb8f3c5ba68c | 1 -
...nge_off-6-f40a07d7654573e1a8517770eb8529e7 | 0
...on_dirs-0-b454ca2d55b61fd597540dbe38eb51ab | 0
...on_dirs-1-ece80e0bd1236c547da7eceac114e602 | 0
...on_dirs-2-fb7b53f61989f4f645dac4a8f017d6ee | 0
...on_dirs-3-46fe5bb027667f528d7179b239e3427f | 0
...on_dirs-4-26dcd2b2f263b5b417430efcf354663a | 0
...on_dirs-5-2a1bd5ed3955825a9dbb76769f7fe4ea | 1 -
...on_dirs-6-7a9e67189d3d4151f23b12c22bde06b5 | 0
...on_dirs-7-16c31455a193e1cb06a2ede4e9f5d5dd | 0
...on_dirs-8-2a1bd5ed3955825a9dbb76769f7fe4ea | 1 -
...on_dirs-9-40110efef10f6f7b873dcd1d53463101 | 1 -
...on_dirs-0-97b52abf021c81b8364041c1a0bbccf3 | 0
...on_dirs-1-f11a45c42752d06821ccd26d948d51ff | 0
...on_dirs-2-c0b85445b616f93c5e6d090fa35072e7 | 0
...on_dirs-3-10a71bca930d911cc4c2022575b17299 | 1 -
...on_dirs-4-b2ca31dd6cc5c32e33df700786f5b208 | 0
...on_dirs-5-10a71bca930d911cc4c2022575b17299 | 1 -
...on_dirs-6-d1c175a9d042ecd389f2f93fc867591d | 1 -
...mat_mix-0-c6dff7eb0a793f9cd555164d23eda699 | 0
...mat_mix-1-9fa0ea19c0cb6ccef1b4bf9519d8a01b | 0
...mat_mix-2-701660c0ea117b11d12de54dc661bc3e | 0
...mat_mix-3-2b2316f235737a3f9a30fb05a082e132 | 0
...mat_mix-4-fcda187f1366ff93a113cbe670335198 | 0
...mat_mix-5-c2d0da9a0f01736a2163c99fc667f279 | 1 -
...mat_mix-6-4b658b3222b7a09ef41d023215e5b818 | 500 ------------------
.../input3-0-2c80ec90d4d2c9c7446c05651bb76bff | 0
.../input3-1-6ec8e282bd39883a57aecd9e4c8cdf1d | 2 -
...input3-10-10a1a8a97f6417c3da16829f7e519475 | 4 -
...input3-11-9c36cac1372650b703400c60dd29042c | 4 -
...input3-12-a22d09de72e5067a0a94113cdecdaa95 | 0
...input3-13-23bbec31affef0d758bc4a40490e0b9a | 0
...input3-14-efee6816e20fe61595a4a2a991071219 | 4 -
.../input3-2-fa2aceba8cdcb869262e8ad6d431f491 | 0
.../input3-3-1c5990b1aed2be48311810dae3019994 | 3 -
.../input3-4-9c36cac1372650b703400c60dd29042c | 4 -
.../input3-5-f40b7cc4ac38c0121ccab9ef4e7e9fd2 | 0
.../input3-6-ba8c440158c2519353d02471bfb05694 | 0
.../input3-7-1c5990b1aed2be48311810dae3019994 | 4 -
.../input3-8-4dc0fefca4d158fd2ab40551ae9e35be | 0
.../input3-9-5076c1c35053b09173f6acdf1b5e9d6e | 0
...schema1-0-3fc0ef3eda4a7269f205ce0203b56b0c | 0
...schema1-1-3d21fcf667e5b0ef9e2ec0a1d502f915 | 0
...schema1-2-4fcfc1d26e1de1ce3071f1f93c012988 | 8 -
...schema1-3-fdef2e7e9e40868305d21c1b0df019bb | 0
...schema1-4-9b756f83973c37236e72f6927b1c02d7 | 9 -
...schema1-5-52a518a4f7132598998c4f6781fd7634 | 8 -
...format4-0-c854b607353e810be297d3159be30da4 | 0
...format4-1-c561806d8f9ad419dc9b17ae995aab68 | 0
...format4-2-b9f8c3b822051854770f61e5ae5b48b0 | 0
...format4-3-9837451512e92e982f1bd9a12b132e84 | 0
...format4-4-58cfa555b061057f559fc6b9c2f6c631 | 0
...format4-5-ac79def5434bb8a926237d0db8db2e84 | 0
...format5-0-66ee62178e3576fb38cb09800cb610bf | 1 -
...format5-1-c854b607353e810be297d3159be30da4 | 0
...format5-2-6c4f7b115f18953dcc7710fa97287459 | 0
...format5-3-f5f427b174dca478c14eddc371c0025a | 0
...format5-4-da1b1887eb530c7e9d37667b99c9793f | 0
...format5-5-517aaa22478287fa80eef4a19f2cb9ff | 0
...format5-6-a0e23b26ee1777ccc8947fb5eb1e8745 | 2 -
...format5-7-a0eeded14b3d337a74189a5d02c7a5ad | 0
...format5-8-a0e23b26ee1777ccc8947fb5eb1e8745 | 3 -
...format6-0-66ee62178e3576fb38cb09800cb610bf | 1 -
...format6-1-c854b607353e810be297d3159be30da4 | 0
...format6-2-6c4f7b115f18953dcc7710fa97287459 | 0
...format6-3-f5f427b174dca478c14eddc371c0025a | 0
...format6-4-da1b1887eb530c7e9d37667b99c9793f | 0
...format6-5-517aaa22478287fa80eef4a19f2cb9ff | 0
...format6-6-e95296c9f7056b0075007c61d4e5e92f | 1 -
...format6-7-4758d41d052eba37a9acd90c2dbc58f0 | 1 -
...format7-0-66ee62178e3576fb38cb09800cb610bf | 1 -
...format7-1-c854b607353e810be297d3159be30da4 | 0
...format7-2-6c4f7b115f18953dcc7710fa97287459 | 0
...format7-3-f5f427b174dca478c14eddc371c0025a | 0
...format7-4-a34505bd397bb2a66e46408d1dfb6bf2 | 1 -
...format7-5-f2c42f1f32eb3cb300420fb36cbf2362 | 1 -
..._column-0-f7eb4bd6f226be0c13117294be250271 | 0
..._column-1-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-10-7ef160935cece55338bd4d52277b0203 | 0
...column-11-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-12-379d54e3aa66daacff23c75007dfa008 | 0
...column-13-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-14-25bfcf66698b12f82903f72f13fea4e6 | 0
...column-15-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-16-d032f4795c1186255acea241387adf93 | 0
...column-17-9c36cac1372650b703400c60dd29042c | 2 -
...column-18-fe4463a19f61099983f50bb51cfcd335 | 0
...column-19-70b42434913b9d2eb17cd216c4f8039f | 0
..._column-2-b2b2dfa681d01296fdacb4f56fb6db3a | 0
...column-20-f7eb4bd6f226be0c13117294be250271 | 0
...column-21-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-22-b2b2dfa681d01296fdacb4f56fb6db3a | 0
...column-23-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-24-e4bf0dd372b886b2afcca5b2dc089409 | 0
...column-25-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-26-89761e1c7afe3a5b9858f287cb808ccd | 0
...column-27-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-28-59388d1eb6b5dc4e81a434bd59bf2cf4 | 0
...column-29-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
..._column-3-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-30-7ef160935cece55338bd4d52277b0203 | 0
...column-31-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-32-379d54e3aa66daacff23c75007dfa008 | 0
...column-33-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-34-25bfcf66698b12f82903f72f13fea4e6 | 0
...column-35-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
...column-36-d032f4795c1186255acea241387adf93 | 0
...column-37-9c36cac1372650b703400c60dd29042c | 0
..._column-4-e4bf0dd372b886b2afcca5b2dc089409 | 0
..._column-5-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
..._column-6-89761e1c7afe3a5b9858f287cb808ccd | 0
..._column-7-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
..._column-8-59388d1eb6b5dc4e81a434bd59bf2cf4 | 0
..._column-9-6a3bbeb3203ce4df35275dccc4c4e37b | 3 -
.../sql/hive/InsertIntoHiveTableSuite.scala | 47 --
.../sql/hive/execution/SQLQuerySuite.scala | 97 ++++
184 files changed, 194 insertions(+), 819 deletions(-)
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-0-72ba9397f487a914380dc15afaef1058
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-1-30348eedd3afb892ac9d825dd7fdb5d8
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-10-71631c1e516c81ffdceac80f2d57ce09
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-11-fe39b84ddc86b6bf042dc30c1b612321
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-12-1553ad79b098b737ea8def91134eb0e9
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-13-fe39b84ddc86b6bf042dc30c1b612321
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-14-30348eedd3afb892ac9d825dd7fdb5d8
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-15-bc83e8a2f8edf84f603109d14440dc83
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-16-30348eedd3afb892ac9d825dd7fdb5d8
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-17-7e411fcfdd8f169c503ed89dc56ee335
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-18-30348eedd3afb892ac9d825dd7fdb5d8
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-19-56cadf0f555e355726dfed1929ad0508
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-2-bc83e8a2f8edf84f603109d14440dc83
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-3-30348eedd3afb892ac9d825dd7fdb5d8
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-4-7e411fcfdd8f169c503ed89dc56ee335
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-5-30348eedd3afb892ac9d825dd7fdb5d8
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-6-56cadf0f555e355726dfed1929ad0508
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-7-cee355b012efdc3bc7d584268a7025c2
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-8-e4c52934f1ff0024f7f0bbb78d4ae3f8
delete mode 100644 sql/hive/src/test/resources/golden/alter_partition_format_loc-9-fe39b84ddc86b6bf042dc30c1b612321
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-0-5fa6071842a0443346cf6db677a33412
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-1-be11cb1f18ab19550011417126264fea
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-10-c1a57b45952193d04b5411c5b6a31139
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-11-fa89c704636fa7bd937cf1a975bb2ae6
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-12-a694df5b2a8f2101f6fd2b936eeb2bfd
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-13-fa89c704636fa7bd937cf1a975bb2ae6
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-14-5fa6071842a0443346cf6db677a33412
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-2-ba9453c6b6a627286691f3930c2b26d0
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-3-fa89c704636fa7bd937cf1a975bb2ae6
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-4-c9a8643e08d6ed320f82c26e1ffa8b5d
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-5-2756ef8fbe2cfa4609808a3855f50969
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-6-f7d529dc66c022b64e0b287c82f92778
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-7-818f2ce0a782a1d3cb02fd85bd1d3f9f
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-8-bdde28ebc875c39f9630d95379eee68
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar1-9-5e48ee7bcd9439e68aa6dbc850ad8771
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-0-22c4186110b5770deaf7f03cf08326b7
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-1-ecc82a01a8f681a8a2d44a67a8a3f1cc
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-2-3a20c238eab602ad3d593b1eb3fa6dbb
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-3-fb3191f771e2396d5fc80659a8c68797
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-4-9a4bf0db2b90d54ea0eeff2ec356fcb
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-5-84e700f9dc6033c1f237fcdb95e31a0c
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-6-3250407f20f3766c18f44b8bfae1829d
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-7-50131c0ba7b7a6b65c789a5a8497bada
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-8-84e700f9dc6033c1f237fcdb95e31a0c
delete mode 100644 sql/hive/src/test/resources/golden/alter_varchar2-9-4c12c4c53d99338796be34e603dc612c
delete mode 100644 sql/hive/src/test/resources/golden/date_3-0-c26de4559926ddb0127d2dc5ea154774
delete mode 100644 sql/hive/src/test/resources/golden/date_3-1-d9a07d08f5204ae8208fd88c9255d447
delete mode 100644 sql/hive/src/test/resources/golden/date_3-2-a937c6e5a2c655930e0d3f80883ecc16
delete mode 100644 sql/hive/src/test/resources/golden/date_3-3-4cf49e71b636df754871a675f9e4e24
delete mode 100644 sql/hive/src/test/resources/golden/date_3-3-c26f0641e7cec1093273b258e6bf7120
delete mode 100644 sql/hive/src/test/resources/golden/date_3-4-e009f358964f6d1236cfc03283e2b06f
delete mode 100644 sql/hive/src/test/resources/golden/date_3-5-c26de4559926ddb0127d2dc5ea154774
delete mode 100644 sql/hive/src/test/resources/golden/diff_part_input_formats-0-12652a5a33548c245772e8d0894af5ad
delete mode 100644 sql/hive/src/test/resources/golden/diff_part_input_formats-1-961f7cb386a6eacd391dcb189cbeddaa
delete mode 100644 sql/hive/src/test/resources/golden/diff_part_input_formats-2-28cd0f9b01baa8627a013339dc9508ce
delete mode 100644 sql/hive/src/test/resources/golden/diff_part_input_formats-3-c6eef43568e8ed96299720d30a6235e1
delete mode 100644 sql/hive/src/test/resources/golden/diff_part_input_formats-4-a4890f2b20715c75e05c674d9155a5b
delete mode 100644 sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-0-50131c0ba7b7a6b65c789a5a8497bada
delete mode 100644 sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-1-a071dedef216e84d1cb2f0de6d34fd1a
delete mode 100644 sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-2-ce3797dc14a603cba2a5e58c8612de5b
delete mode 100644 sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-3-f5340880d2be7b0643eb995673e89d11
delete mode 100644 sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-4-714ab8c97f4d8993680b91e1ed8f3782
delete mode 100644 sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-5-34064fd15c28dba55865cb8f3c5ba68c
delete mode 100644 sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-6-f40a07d7654573e1a8517770eb8529e7
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-0-b454ca2d55b61fd597540dbe38eb51ab
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-1-ece80e0bd1236c547da7eceac114e602
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-2-fb7b53f61989f4f645dac4a8f017d6ee
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-3-46fe5bb027667f528d7179b239e3427f
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-4-26dcd2b2f263b5b417430efcf354663a
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-5-2a1bd5ed3955825a9dbb76769f7fe4ea
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-6-7a9e67189d3d4151f23b12c22bde06b5
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-7-16c31455a193e1cb06a2ede4e9f5d5dd
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-8-2a1bd5ed3955825a9dbb76769f7fe4ea
delete mode 100644 sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-9-40110efef10f6f7b873dcd1d53463101
delete mode 100644 sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-0-97b52abf021c81b8364041c1a0bbccf3
delete mode 100644 sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-1-f11a45c42752d06821ccd26d948d51ff
delete mode 100644 sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-2-c0b85445b616f93c5e6d090fa35072e7
delete mode 100644 sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-3-10a71bca930d911cc4c2022575b17299
delete mode 100644 sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-4-b2ca31dd6cc5c32e33df700786f5b208
delete mode 100644 sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-5-10a71bca930d911cc4c2022575b17299
delete mode 100644 sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-6-d1c175a9d042ecd389f2f93fc867591d
delete mode 100644 sql/hive/src/test/resources/golden/fileformat_mix-0-c6dff7eb0a793f9cd555164d23eda699
delete mode 100644 sql/hive/src/test/resources/golden/fileformat_mix-1-9fa0ea19c0cb6ccef1b4bf9519d8a01b
delete mode 100644 sql/hive/src/test/resources/golden/fileformat_mix-2-701660c0ea117b11d12de54dc661bc3e
delete mode 100644 sql/hive/src/test/resources/golden/fileformat_mix-3-2b2316f235737a3f9a30fb05a082e132
delete mode 100644 sql/hive/src/test/resources/golden/fileformat_mix-4-fcda187f1366ff93a113cbe670335198
delete mode 100644 sql/hive/src/test/resources/golden/fileformat_mix-5-c2d0da9a0f01736a2163c99fc667f279
delete mode 100644 sql/hive/src/test/resources/golden/fileformat_mix-6-4b658b3222b7a09ef41d023215e5b818
delete mode 100644 sql/hive/src/test/resources/golden/input3-0-2c80ec90d4d2c9c7446c05651bb76bff
delete mode 100644 sql/hive/src/test/resources/golden/input3-1-6ec8e282bd39883a57aecd9e4c8cdf1d
delete mode 100644 sql/hive/src/test/resources/golden/input3-10-10a1a8a97f6417c3da16829f7e519475
delete mode 100644 sql/hive/src/test/resources/golden/input3-11-9c36cac1372650b703400c60dd29042c
delete mode 100644 sql/hive/src/test/resources/golden/input3-12-a22d09de72e5067a0a94113cdecdaa95
delete mode 100644 sql/hive/src/test/resources/golden/input3-13-23bbec31affef0d758bc4a40490e0b9a
delete mode 100644 sql/hive/src/test/resources/golden/input3-14-efee6816e20fe61595a4a2a991071219
delete mode 100644 sql/hive/src/test/resources/golden/input3-2-fa2aceba8cdcb869262e8ad6d431f491
delete mode 100644 sql/hive/src/test/resources/golden/input3-3-1c5990b1aed2be48311810dae3019994
delete mode 100644 sql/hive/src/test/resources/golden/input3-4-9c36cac1372650b703400c60dd29042c
delete mode 100644 sql/hive/src/test/resources/golden/input3-5-f40b7cc4ac38c0121ccab9ef4e7e9fd2
delete mode 100644 sql/hive/src/test/resources/golden/input3-6-ba8c440158c2519353d02471bfb05694
delete mode 100644 sql/hive/src/test/resources/golden/input3-7-1c5990b1aed2be48311810dae3019994
delete mode 100644 sql/hive/src/test/resources/golden/input3-8-4dc0fefca4d158fd2ab40551ae9e35be
delete mode 100644 sql/hive/src/test/resources/golden/input3-9-5076c1c35053b09173f6acdf1b5e9d6e
delete mode 100644 sql/hive/src/test/resources/golden/partition_schema1-0-3fc0ef3eda4a7269f205ce0203b56b0c
delete mode 100644 sql/hive/src/test/resources/golden/partition_schema1-1-3d21fcf667e5b0ef9e2ec0a1d502f915
delete mode 100644 sql/hive/src/test/resources/golden/partition_schema1-2-4fcfc1d26e1de1ce3071f1f93c012988
delete mode 100644 sql/hive/src/test/resources/golden/partition_schema1-3-fdef2e7e9e40868305d21c1b0df019bb
delete mode 100644 sql/hive/src/test/resources/golden/partition_schema1-4-9b756f83973c37236e72f6927b1c02d7
delete mode 100644 sql/hive/src/test/resources/golden/partition_schema1-5-52a518a4f7132598998c4f6781fd7634
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat4-0-c854b607353e810be297d3159be30da4
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat4-1-c561806d8f9ad419dc9b17ae995aab68
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat4-2-b9f8c3b822051854770f61e5ae5b48b0
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat4-3-9837451512e92e982f1bd9a12b132e84
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat4-4-58cfa555b061057f559fc6b9c2f6c631
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat4-5-ac79def5434bb8a926237d0db8db2e84
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat5-0-66ee62178e3576fb38cb09800cb610bf
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat5-1-c854b607353e810be297d3159be30da4
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat5-2-6c4f7b115f18953dcc7710fa97287459
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat5-3-f5f427b174dca478c14eddc371c0025a
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat5-4-da1b1887eb530c7e9d37667b99c9793f
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat5-5-517aaa22478287fa80eef4a19f2cb9ff
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat5-6-a0e23b26ee1777ccc8947fb5eb1e8745
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat5-7-a0eeded14b3d337a74189a5d02c7a5ad
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat5-8-a0e23b26ee1777ccc8947fb5eb1e8745
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat6-0-66ee62178e3576fb38cb09800cb610bf
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat6-1-c854b607353e810be297d3159be30da4
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat6-2-6c4f7b115f18953dcc7710fa97287459
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat6-3-f5f427b174dca478c14eddc371c0025a
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat6-4-da1b1887eb530c7e9d37667b99c9793f
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat6-5-517aaa22478287fa80eef4a19f2cb9ff
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat6-6-e95296c9f7056b0075007c61d4e5e92f
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat6-7-4758d41d052eba37a9acd90c2dbc58f0
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat7-0-66ee62178e3576fb38cb09800cb610bf
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat7-1-c854b607353e810be297d3159be30da4
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat7-2-6c4f7b115f18953dcc7710fa97287459
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat7-3-f5f427b174dca478c14eddc371c0025a
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat7-4-a34505bd397bb2a66e46408d1dfb6bf2
delete mode 100644 sql/hive/src/test/resources/golden/partition_wise_fileformat7-5-f2c42f1f32eb3cb300420fb36cbf2362
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-0-f7eb4bd6f226be0c13117294be250271
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-1-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-10-7ef160935cece55338bd4d52277b0203
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-11-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-12-379d54e3aa66daacff23c75007dfa008
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-13-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-14-25bfcf66698b12f82903f72f13fea4e6
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-15-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-16-d032f4795c1186255acea241387adf93
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-17-9c36cac1372650b703400c60dd29042c
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-18-fe4463a19f61099983f50bb51cfcd335
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-19-70b42434913b9d2eb17cd216c4f8039f
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-2-b2b2dfa681d01296fdacb4f56fb6db3a
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-20-f7eb4bd6f226be0c13117294be250271
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-21-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-22-b2b2dfa681d01296fdacb4f56fb6db3a
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-23-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-24-e4bf0dd372b886b2afcca5b2dc089409
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-25-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-26-89761e1c7afe3a5b9858f287cb808ccd
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-27-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-28-59388d1eb6b5dc4e81a434bd59bf2cf4
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-29-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-3-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-30-7ef160935cece55338bd4d52277b0203
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-31-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-32-379d54e3aa66daacff23c75007dfa008
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-33-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-34-25bfcf66698b12f82903f72f13fea4e6
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-35-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-36-d032f4795c1186255acea241387adf93
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-37-9c36cac1372650b703400c60dd29042c
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-4-e4bf0dd372b886b2afcca5b2dc089409
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-5-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-6-89761e1c7afe3a5b9858f287cb808ccd
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-7-6a3bbeb3203ce4df35275dccc4c4e37b
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-8-59388d1eb6b5dc4e81a434bd59bf2cf4
delete mode 100644 sql/hive/src/test/resources/golden/rename_column-9-6a3bbeb3203ce4df35275dccc4c4e37b
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 9de313ae87..6e04f6eb80 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
@@ -128,14 +128,8 @@ statement
;
hiveNativeCommands
- : DELETE FROM tableIdentifier (WHERE booleanExpression)?
- | TRUNCATE TABLE tableIdentifier partitionSpec?
+ : TRUNCATE TABLE tableIdentifier partitionSpec?
(COLUMNS identifierList)?
- | START TRANSACTION (transactionMode (',' transactionMode)*)?
- | COMMIT WORK?
- | ROLLBACK WORK?
- | SHOW PARTITIONS tableIdentifier partitionSpec?
- | DFS .*?
| (CREATE | ALTER | DROP | SHOW | DESC | DESCRIBE) .*?
;
@@ -179,6 +173,11 @@ unsupportedHiveNativeCommands
| kw1=ALTER kw2=TABLE tableIdentifier kw3=TOUCH
| kw1=ALTER kw2=TABLE tableIdentifier partitionSpec? kw3=COMPACT
| kw1=ALTER kw2=TABLE tableIdentifier partitionSpec? kw3=CONCATENATE
+ | kw1=START kw2=TRANSACTION
+ | kw1=COMMIT
+ | kw1=ROLLBACK
+ | kw1=DFS
+ | kw1=DELETE kw2=FROM
;
createTableHeader
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParserUtils.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParserUtils.scala
index cb9fefec8f..64713cddf4 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParserUtils.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/ParserUtils.scala
@@ -39,6 +39,10 @@ object ParserUtils {
stream.getText(Interval.of(0, stream.size()))
}
+ def parseException(message: String, ctx: ParserRuleContext): ParseException = {
+ new ParseException(s"Operation not allowed: $message", ctx)
+ }
+
/** Get the code that creates the given node. */
def source(ctx: ParserRuleContext): String = {
val stream = ctx.getStart.getInputStream
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala
index e04e130eb6..79fdf9fb22 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlParser.scala
@@ -645,7 +645,7 @@ class SparkSqlAstBuilder(conf: SQLConf) extends AstBuilder {
Option(ctx.partitionSpec).map(visitNonOptionalPartitionSpec),
fileFormat,
genericFormat)(
- command(ctx))
+ parseException("ALTER TABLE SET FILEFORMAT", ctx))
}
/**
@@ -693,7 +693,7 @@ class SparkSqlAstBuilder(conf: SQLConf) extends AstBuilder {
// Note that Restrict and Cascade are mutually exclusive.
ctx.RESTRICT != null,
ctx.CASCADE != null)(
- command(ctx))
+ parseException("ALTER TABLE CHANGE COLUMN", ctx))
}
/**
@@ -713,7 +713,7 @@ class SparkSqlAstBuilder(conf: SQLConf) extends AstBuilder {
// Note that Restrict and Cascade are mutually exclusive.
ctx.RESTRICT != null,
ctx.CASCADE != null)(
- command(ctx))
+ parseException("ALTER TABLE ADD COLUMNS", ctx))
}
/**
@@ -733,7 +733,7 @@ class SparkSqlAstBuilder(conf: SQLConf) extends AstBuilder {
// Note that Restrict and Cascade are mutually exclusive.
ctx.RESTRICT != null,
ctx.CASCADE != null)(
- command(ctx))
+ parseException("ALTER TABLE REPLACE COLUMNS", ctx))
}
/**
@@ -782,7 +782,7 @@ class SparkSqlAstBuilder(conf: SQLConf) extends AstBuilder {
// SET ROLE is the exception to the rule, because we handle this before other SET commands.
"SET ROLE"
}
- throw new ParseException(s"Operation not allowed: $keywords", ctx)
+ throw parseException(keywords, ctx)
}
/**
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala
index 12167ee307..4a9a1603d0 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/ddl.scala
@@ -26,6 +26,7 @@ import org.apache.spark.sql.catalyst.catalog.{CatalogDatabase, CatalogTable}
import org.apache.spark.sql.catalyst.catalog.{CatalogTablePartition, CatalogTableType, SessionCatalog}
import org.apache.spark.sql.catalyst.catalog.ExternalCatalog.TablePartitionSpec
import org.apache.spark.sql.catalyst.expressions.{Attribute, AttributeReference}
+import org.apache.spark.sql.catalyst.parser.ParseException
import org.apache.spark.sql.types._
@@ -34,12 +35,17 @@ import org.apache.spark.sql.types._
// https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DDL
/**
- * A DDL command expected to be parsed and run in an underlying system instead of in Spark.
+ * A DDL command that is not supported right now. Since we have already implemented
+ * the parsing rules for some commands that are not allowed, we use this as the base class
+ * of those commands.
*/
-abstract class NativeDDLCommand(val sql: String) extends RunnableCommand {
+abstract class UnsupportedCommand(exception: ParseException) extends RunnableCommand {
+
+ // Throws the ParseException when we create this command.
+ throw exception
override def run(sparkSession: SparkSession): Seq[Row] = {
- sparkSession.runNativeSql(sql)
+ Seq.empty[Row]
}
override val output: Seq[Attribute] = {
@@ -426,8 +432,8 @@ case class AlterTableSetFileFormat(
tableName: TableIdentifier,
partitionSpec: Option[TablePartitionSpec],
fileFormat: Seq[String],
- genericFormat: Option[String])(sql: String)
- extends NativeDDLCommand(sql) with Logging
+ genericFormat: Option[String])(exception: ParseException)
+ extends UnsupportedCommand(exception) with Logging
/**
* A command that sets the location of a table or a partition.
@@ -488,24 +494,24 @@ case class AlterTableChangeCol(
comment: Option[String],
afterColName: Option[String],
restrict: Boolean,
- cascade: Boolean)(sql: String)
- extends NativeDDLCommand(sql) with Logging
+ cascade: Boolean)(exception: ParseException)
+ extends UnsupportedCommand(exception) with Logging
case class AlterTableAddCol(
tableName: TableIdentifier,
partitionSpec: Option[TablePartitionSpec],
columns: StructType,
restrict: Boolean,
- cascade: Boolean)(sql: String)
- extends NativeDDLCommand(sql) with Logging
+ cascade: Boolean)(exception: ParseException)
+ extends UnsupportedCommand(exception) with Logging
case class AlterTableReplaceCol(
tableName: TableIdentifier,
partitionSpec: Option[TablePartitionSpec],
columns: StructType,
restrict: Boolean,
- cascade: Boolean)(sql: String)
- extends NativeDDLCommand(sql) with Logging
+ cascade: Boolean)(exception: ParseException)
+ extends UnsupportedCommand(exception) with Logging
private[sql] object DDLUtils {
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala
index 9db5ccbbd6..be0f4d78a5 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLCommandSuite.scala
@@ -441,6 +441,7 @@ class DDLCommandSuite extends PlanTest {
assertUnsupported("ALTER TABLE table_name UNARCHIVE PARTITION (dt='2008-08-08', country='us')")
}
+ /*
test("alter table: set file format") {
val sql1 = "ALTER TABLE table_name SET FILEFORMAT INPUTFORMAT 'test' " +
"OUTPUTFORMAT 'test' SERDE 'test'"
@@ -461,6 +462,15 @@ class DDLCommandSuite extends PlanTest {
Some("PARQUET"))(sql2)
comparePlans(parsed1, expected1)
comparePlans(parsed2, expected2)
+ } */
+
+ test("alter table: set file format (not allowed)") {
+ assertUnsupported(
+ "ALTER TABLE table_name SET FILEFORMAT INPUTFORMAT 'test' " +
+ "OUTPUTFORMAT 'test' SERDE 'test'")
+ assertUnsupported(
+ "ALTER TABLE table_name PARTITION (dt='2008-08-08', country='us') " +
+ "SET FILEFORMAT PARQUET")
}
test("alter table: set location") {
@@ -517,6 +527,7 @@ class DDLCommandSuite extends PlanTest {
assertUnsupported("ALTER TABLE table_name SKEWED BY (key) ON (1,5,6) STORED AS DIRECTORIES")
}
+ /*
test("alter table: change column name/type/position/comment") {
val sql1 = "ALTER TABLE table_name CHANGE col_old_name col_new_name INT"
val sql2 =
@@ -566,8 +577,22 @@ class DDLCommandSuite extends PlanTest {
comparePlans(parsed1, expected1)
comparePlans(parsed2, expected2)
comparePlans(parsed3, expected3)
+ } */
+
+ test("alter table: change column name/type/position/comment (not allowed)") {
+ assertUnsupported("ALTER TABLE table_name CHANGE col_old_name col_new_name INT")
+ assertUnsupported(
+ """
+ |ALTER TABLE table_name CHANGE COLUMN col_old_name col_new_name INT
+ |COMMENT 'col_comment' FIRST CASCADE
+ """.stripMargin)
+ assertUnsupported("""
+ |ALTER TABLE table_name CHANGE COLUMN col_old_name col_new_name INT
+ |COMMENT 'col_comment' AFTER column_name RESTRICT
+ """.stripMargin)
}
+ /*
test("alter table: add/replace columns") {
val sql1 =
"""
@@ -603,6 +628,20 @@ class DDLCommandSuite extends PlanTest {
cascade = false)(sql2)
comparePlans(parsed1, expected1)
comparePlans(parsed2, expected2)
+ } */
+
+ test("alter table: add/replace columns (not allowed)") {
+ assertUnsupported(
+ """
+ |ALTER TABLE table_name PARTITION (dt='2008-08-08', country='us')
+ |ADD COLUMNS (new_col1 INT COMMENT 'test_comment', new_col2 LONG
+ |COMMENT 'test_comment2') CASCADE
+ """.stripMargin)
+ assertUnsupported(
+ """
+ |ALTER TABLE table_name REPLACE COLUMNS (new_col1 INT
+ |COMMENT 'test_comment', new_col2 LONG COMMENT 'test_comment2') RESTRICT
+ """.stripMargin)
}
test("show databases") {
diff --git a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala
index 01b24d2f7e..3cf82bc9e0 100644
--- a/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala
+++ b/sql/hive/compatibility/src/test/scala/org/apache/spark/sql/hive/execution/HiveCompatibilitySuite.scala
@@ -454,7 +454,32 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
"touch",
// INPUTDRIVER and OUTPUTDRIVER are not supported
- "inoutdriver"
+ "inoutdriver",
+
+ // We do not support ALTER TABLE ADD COLUMN, ALTER TABLE REPLACE COLUMN,
+ // ALTER TABLE CHANGE COLUMN, and ALTER TABLE SET FILEFORMAT.
+ // We have converted the useful parts of these tests to tests
+ // in org.apache.spark.sql.hive.execution.SQLQuerySuite.
+ "alter_partition_format_loc",
+ "alter_varchar1",
+ "alter_varchar2",
+ "date_3",
+ "diff_part_input_formats",
+ "disallow_incompatible_type_change_off",
+ "fileformat_mix",
+ "input3",
+ "partition_schema1",
+ "partition_wise_fileformat4",
+ "partition_wise_fileformat5",
+ "partition_wise_fileformat6",
+ "partition_wise_fileformat7",
+ "rename_column",
+
+ // We do not support DFS command.
+ // We have converted the useful parts of these tests to tests
+ // in org.apache.spark.sql.hive.execution.SQLQuerySuite.
+ "drop_database_removes_partition_dirs",
+ "drop_table_removes_partition_dirs"
)
/**
@@ -470,12 +495,9 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
"alter2",
"alter3",
"alter5",
- "alter_partition_format_loc",
"alter_partition_with_whitelist",
"alter_rename_partition",
"alter_table_serde",
- "alter_varchar1",
- "alter_varchar2",
"ambiguous_col",
"annotate_stats_join",
"annotate_stats_limit",
@@ -554,7 +576,6 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
"database_properties",
"date_1",
"date_2",
- "date_3",
"date_4",
"date_comparison",
"date_join1",
@@ -565,11 +586,8 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
"default_partition_name",
"delimiter",
"desc_non_existent_tbl",
- "diff_part_input_formats",
"disable_file_format_check",
- "disallow_incompatible_type_change_off",
"distinct_stats",
- "drop_database_removes_partition_dirs",
"drop_function",
"drop_multi_partitions",
"drop_partitions_filter",
@@ -577,14 +595,12 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
"drop_partitions_filter3",
"drop_table",
"drop_table2",
- "drop_table_removes_partition_dirs",
"drop_view",
"dynamic_partition_skip_default",
"escape_clusterby1",
"escape_distributeby1",
"escape_orderby1",
"escape_sortby1",
- "fileformat_mix",
"fileformat_sequencefile",
"fileformat_text",
"filter_join_breaktask",
@@ -665,7 +681,6 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
"input26",
"input28",
"input2_limit",
- "input3",
"input4",
"input40",
"input41",
@@ -834,14 +849,9 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
"part_inherit_tbl_props_with_star",
"partcols1",
"partition_date",
- "partition_schema1",
"partition_serde_format",
"partition_type_check",
"partition_varchar1",
- "partition_wise_fileformat4",
- "partition_wise_fileformat5",
- "partition_wise_fileformat6",
- "partition_wise_fileformat7",
"partition_wise_fileformat9",
"plan_json",
"ppd1",
@@ -883,7 +893,6 @@ class HiveCompatibilitySuite extends HiveQueryFileTest with BeforeAndAfter {
"reduce_deduplicate_exclude_join",
"reduce_deduplicate_extended",
"reducesink_dedup",
- "rename_column",
"router_join_ppr",
"select_as_omitted",
"select_unquote_and",
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-0-72ba9397f487a914380dc15afaef1058 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-0-72ba9397f487a914380dc15afaef1058
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-1-30348eedd3afb892ac9d825dd7fdb5d8 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-1-30348eedd3afb892ac9d825dd7fdb5d8
deleted file mode 100644
index 11487abed2..0000000000
--- a/sql/hive/src/test/resources/golden/alter_partition_format_loc-1-30348eedd3afb892ac9d825dd7fdb5d8
+++ /dev/null
@@ -1,4 +0,0 @@
-key int
-value string
-
-Detailed Table Information Table(tableName:alter_partition_format_test, dbName:default, owner:marmbrus, createTime:1413871688, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:int, comment:null), FieldSchema(name:value, type:string, comment:null)], location:file:/private/var/folders/36/cjkbrr953xg2p_krwrmn8h_r0000gn/T/sparkHiveWarehouse1201055597819413730/alter_partition_format_test, inputFormat:org.apache.hadoop.mapred.TextInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), partitionKeys:[], parameters:{transient_lastDdlTime=1413871688}, viewOriginalText:null, viewExpandedText:null, tableType:MANAGED_TABLE)
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-10-71631c1e516c81ffdceac80f2d57ce09 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-10-71631c1e516c81ffdceac80f2d57ce09
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-11-fe39b84ddc86b6bf042dc30c1b612321 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-11-fe39b84ddc86b6bf042dc30c1b612321
deleted file mode 100644
index 979969dcbf..0000000000
--- a/sql/hive/src/test/resources/golden/alter_partition_format_loc-11-fe39b84ddc86b6bf042dc30c1b612321
+++ /dev/null
@@ -1,10 +0,0 @@
-key int
-value string
-ds string
-
-# Partition Information
-# col_name data_type comment
-
-ds string
-
-Detailed Partition Information Partition(values:[2010], dbName:default, tableName:alter_partition_format_test, createTime:1413871689, lastAccessTime:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:int, comment:null), FieldSchema(name:value, type:string, comment:null), FieldSchema(name:ds, type:string, comment:null)], location:file:/private/var/folders/36/cjkbrr953xg2p_krwrmn8h_r0000gn/T/sparkHiveWarehouse1201055597819413730/alter_partition_format_test/ds=2010, inputFormat:org.apache.hadoop.hive.ql.io.RCFileInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), parameters:{numFiles=0, last_modified_by=marmbrus, last_modified_time=1413871689, transient_lastDdlTime=1413871689, COLUMN_STATS_ACCURATE=false, totalSize=0, numRows=-1, rawDataSize=-1})
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-12-1553ad79b098b737ea8def91134eb0e9 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-12-1553ad79b098b737ea8def91134eb0e9
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-13-fe39b84ddc86b6bf042dc30c1b612321 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-13-fe39b84ddc86b6bf042dc30c1b612321
deleted file mode 100644
index 7e14edcdea..0000000000
--- a/sql/hive/src/test/resources/golden/alter_partition_format_loc-13-fe39b84ddc86b6bf042dc30c1b612321
+++ /dev/null
@@ -1,10 +0,0 @@
-key int
-value string
-ds string
-
-# Partition Information
-# col_name data_type comment
-
-ds string
-
-Detailed Partition Information Partition(values:[2010], dbName:default, tableName:alter_partition_format_test, createTime:1413871689, lastAccessTime:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:int, comment:null), FieldSchema(name:value, type:string, comment:null), FieldSchema(name:ds, type:string, comment:null)], location:file:/test/test/ds=2010, inputFormat:org.apache.hadoop.hive.ql.io.RCFileInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), parameters:{numFiles=0, last_modified_by=marmbrus, last_modified_time=1413871689, transient_lastDdlTime=1413871689, COLUMN_STATS_ACCURATE=false, totalSize=0, numRows=-1, rawDataSize=-1})
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-14-30348eedd3afb892ac9d825dd7fdb5d8 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-14-30348eedd3afb892ac9d825dd7fdb5d8
deleted file mode 100644
index 77a764a814..0000000000
--- a/sql/hive/src/test/resources/golden/alter_partition_format_loc-14-30348eedd3afb892ac9d825dd7fdb5d8
+++ /dev/null
@@ -1,10 +0,0 @@
-key int
-value string
-ds string
-
-# Partition Information
-# col_name data_type comment
-
-ds string
-
-Detailed Table Information Table(tableName:alter_partition_format_test, dbName:default, owner:marmbrus, createTime:1413871689, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:int, comment:null), FieldSchema(name:value, type:string, comment:null), FieldSchema(name:ds, type:string, comment:null)], location:file:/private/var/folders/36/cjkbrr953xg2p_krwrmn8h_r0000gn/T/sparkHiveWarehouse1201055597819413730/alter_partition_format_test, inputFormat:org.apache.hadoop.mapred.TextInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), partitionKeys:[FieldSchema(name:ds, type:string, comment:null)], parameters:{transient_lastDdlTime=1413871689}, viewOriginalText:null, viewExpandedText:null, tableType:MANAGED_TABLE)
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-15-bc83e8a2f8edf84f603109d14440dc83 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-15-bc83e8a2f8edf84f603109d14440dc83
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-16-30348eedd3afb892ac9d825dd7fdb5d8 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-16-30348eedd3afb892ac9d825dd7fdb5d8
deleted file mode 100644
index c8606b1aca..0000000000
--- a/sql/hive/src/test/resources/golden/alter_partition_format_loc-16-30348eedd3afb892ac9d825dd7fdb5d8
+++ /dev/null
@@ -1,10 +0,0 @@
-key int
-value string
-ds string
-
-# Partition Information
-# col_name data_type comment
-
-ds string
-
-Detailed Table Information Table(tableName:alter_partition_format_test, dbName:default, owner:marmbrus, createTime:1413871689, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:int, comment:null), FieldSchema(name:value, type:string, comment:null), FieldSchema(name:ds, type:string, comment:null)], location:file:/private/var/folders/36/cjkbrr953xg2p_krwrmn8h_r0000gn/T/sparkHiveWarehouse1201055597819413730/alter_partition_format_test, inputFormat:org.apache.hadoop.hive.ql.io.RCFileInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), partitionKeys:[FieldSchema(name:ds, type:string, comment:null)], parameters:{last_modified_by=marmbrus, last_modified_time=1413871689, transient_lastDdlTime=1413871689}, viewOriginalText:null, viewExpandedText:null, tableType:MANAGED_TABLE)
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-17-7e411fcfdd8f169c503ed89dc56ee335 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-17-7e411fcfdd8f169c503ed89dc56ee335
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-18-30348eedd3afb892ac9d825dd7fdb5d8 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-18-30348eedd3afb892ac9d825dd7fdb5d8
deleted file mode 100644
index 59922d3b7a..0000000000
--- a/sql/hive/src/test/resources/golden/alter_partition_format_loc-18-30348eedd3afb892ac9d825dd7fdb5d8
+++ /dev/null
@@ -1,10 +0,0 @@
-key int
-value string
-ds string
-
-# Partition Information
-# col_name data_type comment
-
-ds string
-
-Detailed Table Information Table(tableName:alter_partition_format_test, dbName:default, owner:marmbrus, createTime:1413871689, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:int, comment:null), FieldSchema(name:value, type:string, comment:null), FieldSchema(name:ds, type:string, comment:null)], location:file:/test/test/, inputFormat:org.apache.hadoop.hive.ql.io.RCFileInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), partitionKeys:[FieldSchema(name:ds, type:string, comment:null)], parameters:{last_modified_by=marmbrus, last_modified_time=1413871689, transient_lastDdlTime=1413871689}, viewOriginalText:null, viewExpandedText:null, tableType:MANAGED_TABLE)
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-19-56cadf0f555e355726dfed1929ad0508 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-19-56cadf0f555e355726dfed1929ad0508
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-2-bc83e8a2f8edf84f603109d14440dc83 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-2-bc83e8a2f8edf84f603109d14440dc83
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-3-30348eedd3afb892ac9d825dd7fdb5d8 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-3-30348eedd3afb892ac9d825dd7fdb5d8
deleted file mode 100644
index 45ef755539..0000000000
--- a/sql/hive/src/test/resources/golden/alter_partition_format_loc-3-30348eedd3afb892ac9d825dd7fdb5d8
+++ /dev/null
@@ -1,4 +0,0 @@
-key int
-value string
-
-Detailed Table Information Table(tableName:alter_partition_format_test, dbName:default, owner:marmbrus, createTime:1413871688, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:int, comment:null), FieldSchema(name:value, type:string, comment:null)], location:file:/private/var/folders/36/cjkbrr953xg2p_krwrmn8h_r0000gn/T/sparkHiveWarehouse1201055597819413730/alter_partition_format_test, inputFormat:org.apache.hadoop.hive.ql.io.RCFileInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), partitionKeys:[], parameters:{numFiles=0, last_modified_by=marmbrus, last_modified_time=1413871688, transient_lastDdlTime=1413871688, COLUMN_STATS_ACCURATE=false, totalSize=0, numRows=-1, rawDataSize=-1}, viewOriginalText:null, viewExpandedText:null, tableType:MANAGED_TABLE)
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-4-7e411fcfdd8f169c503ed89dc56ee335 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-4-7e411fcfdd8f169c503ed89dc56ee335
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-5-30348eedd3afb892ac9d825dd7fdb5d8 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-5-30348eedd3afb892ac9d825dd7fdb5d8
deleted file mode 100644
index d6804307f3..0000000000
--- a/sql/hive/src/test/resources/golden/alter_partition_format_loc-5-30348eedd3afb892ac9d825dd7fdb5d8
+++ /dev/null
@@ -1,4 +0,0 @@
-key int
-value string
-
-Detailed Table Information Table(tableName:alter_partition_format_test, dbName:default, owner:marmbrus, createTime:1413871688, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:int, comment:null), FieldSchema(name:value, type:string, comment:null)], location:file:/test/test/, inputFormat:org.apache.hadoop.hive.ql.io.RCFileInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.RCFileOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), partitionKeys:[], parameters:{numFiles=0, last_modified_by=marmbrus, last_modified_time=1413871688, transient_lastDdlTime=1413871688, COLUMN_STATS_ACCURATE=false, totalSize=0, numRows=-1, rawDataSize=-1}, viewOriginalText:null, viewExpandedText:null, tableType:MANAGED_TABLE)
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-6-56cadf0f555e355726dfed1929ad0508 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-6-56cadf0f555e355726dfed1929ad0508
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-7-cee355b012efdc3bc7d584268a7025c2 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-7-cee355b012efdc3bc7d584268a7025c2
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-8-e4c52934f1ff0024f7f0bbb78d4ae3f8 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-8-e4c52934f1ff0024f7f0bbb78d4ae3f8
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_partition_format_loc-9-fe39b84ddc86b6bf042dc30c1b612321 b/sql/hive/src/test/resources/golden/alter_partition_format_loc-9-fe39b84ddc86b6bf042dc30c1b612321
deleted file mode 100644
index 77ba51afd2..0000000000
--- a/sql/hive/src/test/resources/golden/alter_partition_format_loc-9-fe39b84ddc86b6bf042dc30c1b612321
+++ /dev/null
@@ -1,10 +0,0 @@
-key int
-value string
-ds string
-
-# Partition Information
-# col_name data_type comment
-
-ds string
-
-Detailed Partition Information Partition(values:[2010], dbName:default, tableName:alter_partition_format_test, createTime:1413871689, lastAccessTime:0, sd:StorageDescriptor(cols:[FieldSchema(name:key, type:int, comment:null), FieldSchema(name:value, type:string, comment:null), FieldSchema(name:ds, type:string, comment:null)], location:file:/private/var/folders/36/cjkbrr953xg2p_krwrmn8h_r0000gn/T/sparkHiveWarehouse1201055597819413730/alter_partition_format_test/ds=2010, inputFormat:org.apache.hadoop.mapred.TextInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), parameters:{transient_lastDdlTime=1413871689})
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-0-5fa6071842a0443346cf6db677a33412 b/sql/hive/src/test/resources/golden/alter_varchar1-0-5fa6071842a0443346cf6db677a33412
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-1-be11cb1f18ab19550011417126264fea b/sql/hive/src/test/resources/golden/alter_varchar1-1-be11cb1f18ab19550011417126264fea
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-10-c1a57b45952193d04b5411c5b6a31139 b/sql/hive/src/test/resources/golden/alter_varchar1-10-c1a57b45952193d04b5411c5b6a31139
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-11-fa89c704636fa7bd937cf1a975bb2ae6 b/sql/hive/src/test/resources/golden/alter_varchar1-11-fa89c704636fa7bd937cf1a975bb2ae6
deleted file mode 100644
index dd347f3e8f..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar1-11-fa89c704636fa7bd937cf1a975bb2ae6
+++ /dev/null
@@ -1,5 +0,0 @@
-0 val_0 NULL NULL
-0 val_0 NULL NULL
-0 val_0 NULL NULL
-2 val_2 NULL NULL
-4 val_4 NULL NULL
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-12-a694df5b2a8f2101f6fd2b936eeb2bfd b/sql/hive/src/test/resources/golden/alter_varchar1-12-a694df5b2a8f2101f6fd2b936eeb2bfd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-13-fa89c704636fa7bd937cf1a975bb2ae6 b/sql/hive/src/test/resources/golden/alter_varchar1-13-fa89c704636fa7bd937cf1a975bb2ae6
deleted file mode 100644
index 12087837ce..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar1-13-fa89c704636fa7bd937cf1a975bb2ae6
+++ /dev/null
@@ -1,5 +0,0 @@
-0 val_0 0 val_0
-0 val_0 0 val_0
-0 val_0 0 val_0
-2 val_2 2 val_2
-4 val_4 4 val_4
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-14-5fa6071842a0443346cf6db677a33412 b/sql/hive/src/test/resources/golden/alter_varchar1-14-5fa6071842a0443346cf6db677a33412
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-2-ba9453c6b6a627286691f3930c2b26d0 b/sql/hive/src/test/resources/golden/alter_varchar1-2-ba9453c6b6a627286691f3930c2b26d0
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-3-fa89c704636fa7bd937cf1a975bb2ae6 b/sql/hive/src/test/resources/golden/alter_varchar1-3-fa89c704636fa7bd937cf1a975bb2ae6
deleted file mode 100644
index 6839c16243..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar1-3-fa89c704636fa7bd937cf1a975bb2ae6
+++ /dev/null
@@ -1,5 +0,0 @@
-0 val_0
-0 val_0
-0 val_0
-2 val_2
-4 val_4
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-4-c9a8643e08d6ed320f82c26e1ffa8b5d b/sql/hive/src/test/resources/golden/alter_varchar1-4-c9a8643e08d6ed320f82c26e1ffa8b5d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-5-2756ef8fbe2cfa4609808a3855f50969 b/sql/hive/src/test/resources/golden/alter_varchar1-5-2756ef8fbe2cfa4609808a3855f50969
deleted file mode 100644
index 6839c16243..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar1-5-2756ef8fbe2cfa4609808a3855f50969
+++ /dev/null
@@ -1,5 +0,0 @@
-0 val_0
-0 val_0
-0 val_0
-2 val_2
-4 val_4
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-6-f7d529dc66c022b64e0b287c82f92778 b/sql/hive/src/test/resources/golden/alter_varchar1-6-f7d529dc66c022b64e0b287c82f92778
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-7-818f2ce0a782a1d3cb02fd85bd1d3f9f b/sql/hive/src/test/resources/golden/alter_varchar1-7-818f2ce0a782a1d3cb02fd85bd1d3f9f
deleted file mode 100644
index 879a6e7bcb..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar1-7-818f2ce0a782a1d3cb02fd85bd1d3f9f
+++ /dev/null
@@ -1,5 +0,0 @@
-0 val
-0 val
-0 val
-2 val
-4 val
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-8-bdde28ebc875c39f9630d95379eee68 b/sql/hive/src/test/resources/golden/alter_varchar1-8-bdde28ebc875c39f9630d95379eee68
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar1-9-5e48ee7bcd9439e68aa6dbc850ad8771 b/sql/hive/src/test/resources/golden/alter_varchar1-9-5e48ee7bcd9439e68aa6dbc850ad8771
deleted file mode 100644
index 6839c16243..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar1-9-5e48ee7bcd9439e68aa6dbc850ad8771
+++ /dev/null
@@ -1,5 +0,0 @@
-0 val_0
-0 val_0
-0 val_0
-2 val_2
-4 val_4
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-0-22c4186110b5770deaf7f03cf08326b7 b/sql/hive/src/test/resources/golden/alter_varchar2-0-22c4186110b5770deaf7f03cf08326b7
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-1-ecc82a01a8f681a8a2d44a67a8a3f1cc b/sql/hive/src/test/resources/golden/alter_varchar2-1-ecc82a01a8f681a8a2d44a67a8a3f1cc
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-2-3a20c238eab602ad3d593b1eb3fa6dbb b/sql/hive/src/test/resources/golden/alter_varchar2-2-3a20c238eab602ad3d593b1eb3fa6dbb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-3-fb3191f771e2396d5fc80659a8c68797 b/sql/hive/src/test/resources/golden/alter_varchar2-3-fb3191f771e2396d5fc80659a8c68797
deleted file mode 100644
index 600b377716..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar2-3-fb3191f771e2396d5fc80659a8c68797
+++ /dev/null
@@ -1 +0,0 @@
-val_238 7
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-4-9a4bf0db2b90d54ea0eeff2ec356fcb b/sql/hive/src/test/resources/golden/alter_varchar2-4-9a4bf0db2b90d54ea0eeff2ec356fcb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-5-84e700f9dc6033c1f237fcdb95e31a0c b/sql/hive/src/test/resources/golden/alter_varchar2-5-84e700f9dc6033c1f237fcdb95e31a0c
deleted file mode 100644
index ad69f390bc..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar2-5-84e700f9dc6033c1f237fcdb95e31a0c
+++ /dev/null
@@ -1 +0,0 @@
-1 val_238 7
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-6-3250407f20f3766c18f44b8bfae1829d b/sql/hive/src/test/resources/golden/alter_varchar2-6-3250407f20f3766c18f44b8bfae1829d
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-7-50131c0ba7b7a6b65c789a5a8497bada b/sql/hive/src/test/resources/golden/alter_varchar2-7-50131c0ba7b7a6b65c789a5a8497bada
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar2-7-50131c0ba7b7a6b65c789a5a8497bada
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-8-84e700f9dc6033c1f237fcdb95e31a0c b/sql/hive/src/test/resources/golden/alter_varchar2-8-84e700f9dc6033c1f237fcdb95e31a0c
deleted file mode 100644
index ad69f390bc..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar2-8-84e700f9dc6033c1f237fcdb95e31a0c
+++ /dev/null
@@ -1 +0,0 @@
-1 val_238 7
diff --git a/sql/hive/src/test/resources/golden/alter_varchar2-9-4c12c4c53d99338796be34e603dc612c b/sql/hive/src/test/resources/golden/alter_varchar2-9-4c12c4c53d99338796be34e603dc612c
deleted file mode 100644
index 1f8ddaec90..0000000000
--- a/sql/hive/src/test/resources/golden/alter_varchar2-9-4c12c4c53d99338796be34e603dc612c
+++ /dev/null
@@ -1 +0,0 @@
-2 238 3
diff --git a/sql/hive/src/test/resources/golden/date_3-0-c26de4559926ddb0127d2dc5ea154774 b/sql/hive/src/test/resources/golden/date_3-0-c26de4559926ddb0127d2dc5ea154774
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/date_3-1-d9a07d08f5204ae8208fd88c9255d447 b/sql/hive/src/test/resources/golden/date_3-1-d9a07d08f5204ae8208fd88c9255d447
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/date_3-2-a937c6e5a2c655930e0d3f80883ecc16 b/sql/hive/src/test/resources/golden/date_3-2-a937c6e5a2c655930e0d3f80883ecc16
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/date_3-3-4cf49e71b636df754871a675f9e4e24 b/sql/hive/src/test/resources/golden/date_3-3-4cf49e71b636df754871a675f9e4e24
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/date_3-3-c26f0641e7cec1093273b258e6bf7120 b/sql/hive/src/test/resources/golden/date_3-3-c26f0641e7cec1093273b258e6bf7120
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/date_3-4-e009f358964f6d1236cfc03283e2b06f b/sql/hive/src/test/resources/golden/date_3-4-e009f358964f6d1236cfc03283e2b06f
deleted file mode 100644
index 66d2220d06..0000000000
--- a/sql/hive/src/test/resources/golden/date_3-4-e009f358964f6d1236cfc03283e2b06f
+++ /dev/null
@@ -1 +0,0 @@
-1 2011-01-01
diff --git a/sql/hive/src/test/resources/golden/date_3-5-c26de4559926ddb0127d2dc5ea154774 b/sql/hive/src/test/resources/golden/date_3-5-c26de4559926ddb0127d2dc5ea154774
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/diff_part_input_formats-0-12652a5a33548c245772e8d0894af5ad b/sql/hive/src/test/resources/golden/diff_part_input_formats-0-12652a5a33548c245772e8d0894af5ad
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/diff_part_input_formats-1-961f7cb386a6eacd391dcb189cbeddaa b/sql/hive/src/test/resources/golden/diff_part_input_formats-1-961f7cb386a6eacd391dcb189cbeddaa
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/diff_part_input_formats-2-28cd0f9b01baa8627a013339dc9508ce b/sql/hive/src/test/resources/golden/diff_part_input_formats-2-28cd0f9b01baa8627a013339dc9508ce
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/diff_part_input_formats-3-c6eef43568e8ed96299720d30a6235e1 b/sql/hive/src/test/resources/golden/diff_part_input_formats-3-c6eef43568e8ed96299720d30a6235e1
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/diff_part_input_formats-4-a4890f2b20715c75e05c674d9155a5b b/sql/hive/src/test/resources/golden/diff_part_input_formats-4-a4890f2b20715c75e05c674d9155a5b
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/diff_part_input_formats-4-a4890f2b20715c75e05c674d9155a5b
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-0-50131c0ba7b7a6b65c789a5a8497bada b/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-0-50131c0ba7b7a6b65c789a5a8497bada
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-0-50131c0ba7b7a6b65c789a5a8497bada
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-1-a071dedef216e84d1cb2f0de6d34fd1a b/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-1-a071dedef216e84d1cb2f0de6d34fd1a
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-1-a071dedef216e84d1cb2f0de6d34fd1a
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-2-ce3797dc14a603cba2a5e58c8612de5b b/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-2-ce3797dc14a603cba2a5e58c8612de5b
deleted file mode 100644
index 60878ffb77..0000000000
--- a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-2-ce3797dc14a603cba2a5e58c8612de5b
+++ /dev/null
@@ -1 +0,0 @@
-238 val_238
diff --git a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-3-f5340880d2be7b0643eb995673e89d11 b/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-3-f5340880d2be7b0643eb995673e89d11
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-4-714ab8c97f4d8993680b91e1ed8f3782 b/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-4-714ab8c97f4d8993680b91e1ed8f3782
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-5-34064fd15c28dba55865cb8f3c5ba68c b/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-5-34064fd15c28dba55865cb8f3c5ba68c
deleted file mode 100644
index 573c4b56de..0000000000
--- a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-5-34064fd15c28dba55865cb8f3c5ba68c
+++ /dev/null
@@ -1 +0,0 @@
-1 {"a1":"b1"} foo1
diff --git a/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-6-f40a07d7654573e1a8517770eb8529e7 b/sql/hive/src/test/resources/golden/disallow_incompatible_type_change_off-6-f40a07d7654573e1a8517770eb8529e7
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-0-b454ca2d55b61fd597540dbe38eb51ab b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-0-b454ca2d55b61fd597540dbe38eb51ab
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-1-ece80e0bd1236c547da7eceac114e602 b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-1-ece80e0bd1236c547da7eceac114e602
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-2-fb7b53f61989f4f645dac4a8f017d6ee b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-2-fb7b53f61989f4f645dac4a8f017d6ee
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-3-46fe5bb027667f528d7179b239e3427f b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-3-46fe5bb027667f528d7179b239e3427f
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-4-26dcd2b2f263b5b417430efcf354663a b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-4-26dcd2b2f263b5b417430efcf354663a
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-5-2a1bd5ed3955825a9dbb76769f7fe4ea b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-5-2a1bd5ed3955825a9dbb76769f7fe4ea
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-5-2a1bd5ed3955825a9dbb76769f7fe4ea
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-6-7a9e67189d3d4151f23b12c22bde06b5 b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-6-7a9e67189d3d4151f23b12c22bde06b5
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-7-16c31455a193e1cb06a2ede4e9f5d5dd b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-7-16c31455a193e1cb06a2ede4e9f5d5dd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-8-2a1bd5ed3955825a9dbb76769f7fe4ea b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-8-2a1bd5ed3955825a9dbb76769f7fe4ea
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-8-2a1bd5ed3955825a9dbb76769f7fe4ea
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-9-40110efef10f6f7b873dcd1d53463101 b/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-9-40110efef10f6f7b873dcd1d53463101
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/drop_database_removes_partition_dirs-9-40110efef10f6f7b873dcd1d53463101
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-0-97b52abf021c81b8364041c1a0bbccf3 b/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-0-97b52abf021c81b8364041c1a0bbccf3
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-1-f11a45c42752d06821ccd26d948d51ff b/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-1-f11a45c42752d06821ccd26d948d51ff
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-2-c0b85445b616f93c5e6d090fa35072e7 b/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-2-c0b85445b616f93c5e6d090fa35072e7
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-3-10a71bca930d911cc4c2022575b17299 b/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-3-10a71bca930d911cc4c2022575b17299
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-3-10a71bca930d911cc4c2022575b17299
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-4-b2ca31dd6cc5c32e33df700786f5b208 b/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-4-b2ca31dd6cc5c32e33df700786f5b208
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-5-10a71bca930d911cc4c2022575b17299 b/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-5-10a71bca930d911cc4c2022575b17299
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-5-10a71bca930d911cc4c2022575b17299
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-6-d1c175a9d042ecd389f2f93fc867591d b/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-6-d1c175a9d042ecd389f2f93fc867591d
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/drop_table_removes_partition_dirs-6-d1c175a9d042ecd389f2f93fc867591d
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/fileformat_mix-0-c6dff7eb0a793f9cd555164d23eda699 b/sql/hive/src/test/resources/golden/fileformat_mix-0-c6dff7eb0a793f9cd555164d23eda699
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/fileformat_mix-1-9fa0ea19c0cb6ccef1b4bf9519d8a01b b/sql/hive/src/test/resources/golden/fileformat_mix-1-9fa0ea19c0cb6ccef1b4bf9519d8a01b
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/fileformat_mix-2-701660c0ea117b11d12de54dc661bc3e b/sql/hive/src/test/resources/golden/fileformat_mix-2-701660c0ea117b11d12de54dc661bc3e
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/fileformat_mix-3-2b2316f235737a3f9a30fb05a082e132 b/sql/hive/src/test/resources/golden/fileformat_mix-3-2b2316f235737a3f9a30fb05a082e132
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/fileformat_mix-4-fcda187f1366ff93a113cbe670335198 b/sql/hive/src/test/resources/golden/fileformat_mix-4-fcda187f1366ff93a113cbe670335198
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/fileformat_mix-5-c2d0da9a0f01736a2163c99fc667f279 b/sql/hive/src/test/resources/golden/fileformat_mix-5-c2d0da9a0f01736a2163c99fc667f279
deleted file mode 100644
index 1b79f38e25..0000000000
--- a/sql/hive/src/test/resources/golden/fileformat_mix-5-c2d0da9a0f01736a2163c99fc667f279
+++ /dev/null
@@ -1 +0,0 @@
-500
diff --git a/sql/hive/src/test/resources/golden/fileformat_mix-6-4b658b3222b7a09ef41d023215e5b818 b/sql/hive/src/test/resources/golden/fileformat_mix-6-4b658b3222b7a09ef41d023215e5b818
deleted file mode 100644
index e34118512c..0000000000
--- a/sql/hive/src/test/resources/golden/fileformat_mix-6-4b658b3222b7a09ef41d023215e5b818
+++ /dev/null
@@ -1,500 +0,0 @@
-238
-86
-311
-27
-165
-409
-255
-278
-98
-484
-265
-193
-401
-150
-273
-224
-369
-66
-128
-213
-146
-406
-429
-374
-152
-469
-145
-495
-37
-327
-281
-277
-209
-15
-82
-403
-166
-417
-430
-252
-292
-219
-287
-153
-193
-338
-446
-459
-394
-237
-482
-174
-413
-494
-207
-199
-466
-208
-174
-399
-396
-247
-417
-489
-162
-377
-397
-309
-365
-266
-439
-342
-367
-325
-167
-195
-475
-17
-113
-155
-203
-339
-0
-455
-128
-311
-316
-57
-302
-205
-149
-438
-345
-129
-170
-20
-489
-157
-378
-221
-92
-111
-47
-72
-4
-280
-35
-427
-277
-208
-356
-399
-169
-382
-498
-125
-386
-437
-469
-192
-286
-187
-176
-54
-459
-51
-138
-103
-239
-213
-216
-430
-278
-176
-289
-221
-65
-318
-332
-311
-275
-137
-241
-83
-333
-180
-284
-12
-230
-181
-67
-260
-404
-384
-489
-353
-373
-272
-138
-217
-84
-348
-466
-58
-8
-411
-230
-208
-348
-24
-463
-431
-179
-172
-42
-129
-158
-119
-496
-0
-322
-197
-468
-393
-454
-100
-298
-199
-191
-418
-96
-26
-165
-327
-230
-205
-120
-131
-51
-404
-43
-436
-156
-469
-468
-308
-95
-196
-288
-481
-457
-98
-282
-197
-187
-318
-318
-409
-470
-137
-369
-316
-169
-413
-85
-77
-0
-490
-87
-364
-179
-118
-134
-395
-282
-138
-238
-419
-15
-118
-72
-90
-307
-19
-435
-10
-277
-273
-306
-224
-309
-389
-327
-242
-369
-392
-272
-331
-401
-242
-452
-177
-226
-5
-497
-402
-396
-317
-395
-58
-35
-336
-95
-11
-168
-34
-229
-233
-143
-472
-322
-498
-160
-195
-42
-321
-430
-119
-489
-458
-78
-76
-41
-223
-492
-149
-449
-218
-228
-138
-453
-30
-209
-64
-468
-76
-74
-342
-69
-230
-33
-368
-103
-296
-113
-216
-367
-344
-167
-274
-219
-239
-485
-116
-223
-256
-263
-70
-487
-480
-401
-288
-191
-5
-244
-438
-128
-467
-432
-202
-316
-229
-469
-463
-280
-2
-35
-283
-331
-235
-80
-44
-193
-321
-335
-104
-466
-366
-175
-403
-483
-53
-105
-257
-406
-409
-190
-406
-401
-114
-258
-90
-203
-262
-348
-424
-12
-396
-201
-217
-164
-431
-454
-478
-298
-125
-431
-164
-424
-187
-382
-5
-70
-397
-480
-291
-24
-351
-255
-104
-70
-163
-438
-119
-414
-200
-491
-237
-439
-360
-248
-479
-305
-417
-199
-444
-120
-429
-169
-443
-323
-325
-277
-230
-478
-178
-468
-310
-317
-333
-493
-460
-207
-249
-265
-480
-83
-136
-353
-172
-214
-462
-233
-406
-133
-175
-189
-454
-375
-401
-421
-407
-384
-256
-26
-134
-67
-384
-379
-18
-462
-492
-100
-298
-9
-341
-498
-146
-458
-362
-186
-285
-348
-167
-18
-273
-183
-281
-344
-97
-469
-315
-84
-28
-37
-448
-152
-348
-307
-194
-414
-477
-222
-126
-90
-169
-403
-400
-200
-97
diff --git a/sql/hive/src/test/resources/golden/input3-0-2c80ec90d4d2c9c7446c05651bb76bff b/sql/hive/src/test/resources/golden/input3-0-2c80ec90d4d2c9c7446c05651bb76bff
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/input3-1-6ec8e282bd39883a57aecd9e4c8cdf1d b/sql/hive/src/test/resources/golden/input3-1-6ec8e282bd39883a57aecd9e4c8cdf1d
deleted file mode 100644
index d3ffb995af..0000000000
--- a/sql/hive/src/test/resources/golden/input3-1-6ec8e282bd39883a57aecd9e4c8cdf1d
+++ /dev/null
@@ -1,2 +0,0 @@
-a int
-b double
diff --git a/sql/hive/src/test/resources/golden/input3-10-10a1a8a97f6417c3da16829f7e519475 b/sql/hive/src/test/resources/golden/input3-10-10a1a8a97f6417c3da16829f7e519475
deleted file mode 100644
index bd673a6c1f..0000000000
--- a/sql/hive/src/test/resources/golden/input3-10-10a1a8a97f6417c3da16829f7e519475
+++ /dev/null
@@ -1,4 +0,0 @@
-a array<int>
-b double
-c map<double,int>
-x double
diff --git a/sql/hive/src/test/resources/golden/input3-11-9c36cac1372650b703400c60dd29042c b/sql/hive/src/test/resources/golden/input3-11-9c36cac1372650b703400c60dd29042c
deleted file mode 100644
index f5b9883df0..0000000000
--- a/sql/hive/src/test/resources/golden/input3-11-9c36cac1372650b703400c60dd29042c
+++ /dev/null
@@ -1,4 +0,0 @@
-src
-srcpart
-test3a
-test3c
diff --git a/sql/hive/src/test/resources/golden/input3-12-a22d09de72e5067a0a94113cdecdaa95 b/sql/hive/src/test/resources/golden/input3-12-a22d09de72e5067a0a94113cdecdaa95
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/input3-13-23bbec31affef0d758bc4a40490e0b9a b/sql/hive/src/test/resources/golden/input3-13-23bbec31affef0d758bc4a40490e0b9a
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/input3-14-efee6816e20fe61595a4a2a991071219 b/sql/hive/src/test/resources/golden/input3-14-efee6816e20fe61595a4a2a991071219
deleted file mode 100644
index ea55abd792..0000000000
--- a/sql/hive/src/test/resources/golden/input3-14-efee6816e20fe61595a4a2a991071219
+++ /dev/null
@@ -1,4 +0,0 @@
-r1 int
-r2 double
-
-Detailed Table Information Table(tableName:test3c, dbName:default, owner:marmbrus, createTime:1413882084, lastAccessTime:0, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:r1, type:int, comment:null), FieldSchema(name:r2, type:double, comment:null)], location:file:/private/var/folders/36/cjkbrr953xg2p_krwrmn8h_r0000gn/T/sparkHiveWarehouse1201055597819413730/test3c, inputFormat:org.apache.hadoop.mapred.TextInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe, parameters:{serialization.format=1}), bucketCols:[], sortCols:[], parameters:{}, skewedInfo:SkewedInfo(skewedColNames:[], skewedColValues:[], skewedColValueLocationMaps:{}), storedAsSubDirectories:false), partitionKeys:[], parameters:{numFiles=0, last_modified_by=marmbrus, last_modified_time=1413882084, transient_lastDdlTime=1413882084, COLUMN_STATS_ACCURATE=false, totalSize=0, numRows=-1, rawDataSize=-1}, viewOriginalText:null, viewExpandedText:null, tableType:MANAGED_TABLE)
diff --git a/sql/hive/src/test/resources/golden/input3-2-fa2aceba8cdcb869262e8ad6d431f491 b/sql/hive/src/test/resources/golden/input3-2-fa2aceba8cdcb869262e8ad6d431f491
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/input3-3-1c5990b1aed2be48311810dae3019994 b/sql/hive/src/test/resources/golden/input3-3-1c5990b1aed2be48311810dae3019994
deleted file mode 100644
index 77eaef91c9..0000000000
--- a/sql/hive/src/test/resources/golden/input3-3-1c5990b1aed2be48311810dae3019994
+++ /dev/null
@@ -1,3 +0,0 @@
-a array<int>
-b double
-c map<double,int>
diff --git a/sql/hive/src/test/resources/golden/input3-4-9c36cac1372650b703400c60dd29042c b/sql/hive/src/test/resources/golden/input3-4-9c36cac1372650b703400c60dd29042c
deleted file mode 100644
index b584fd7c6f..0000000000
--- a/sql/hive/src/test/resources/golden/input3-4-9c36cac1372650b703400c60dd29042c
+++ /dev/null
@@ -1,4 +0,0 @@
-src
-srcpart
-test3a
-test3b
diff --git a/sql/hive/src/test/resources/golden/input3-5-f40b7cc4ac38c0121ccab9ef4e7e9fd2 b/sql/hive/src/test/resources/golden/input3-5-f40b7cc4ac38c0121ccab9ef4e7e9fd2
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/input3-6-ba8c440158c2519353d02471bfb05694 b/sql/hive/src/test/resources/golden/input3-6-ba8c440158c2519353d02471bfb05694
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/input3-7-1c5990b1aed2be48311810dae3019994 b/sql/hive/src/test/resources/golden/input3-7-1c5990b1aed2be48311810dae3019994
deleted file mode 100644
index bd673a6c1f..0000000000
--- a/sql/hive/src/test/resources/golden/input3-7-1c5990b1aed2be48311810dae3019994
+++ /dev/null
@@ -1,4 +0,0 @@
-a array<int>
-b double
-c map<double,int>
-x double
diff --git a/sql/hive/src/test/resources/golden/input3-8-4dc0fefca4d158fd2ab40551ae9e35be b/sql/hive/src/test/resources/golden/input3-8-4dc0fefca4d158fd2ab40551ae9e35be
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/input3-9-5076c1c35053b09173f6acdf1b5e9d6e b/sql/hive/src/test/resources/golden/input3-9-5076c1c35053b09173f6acdf1b5e9d6e
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_schema1-0-3fc0ef3eda4a7269f205ce0203b56b0c b/sql/hive/src/test/resources/golden/partition_schema1-0-3fc0ef3eda4a7269f205ce0203b56b0c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_schema1-1-3d21fcf667e5b0ef9e2ec0a1d502f915 b/sql/hive/src/test/resources/golden/partition_schema1-1-3d21fcf667e5b0ef9e2ec0a1d502f915
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_schema1-2-4fcfc1d26e1de1ce3071f1f93c012988 b/sql/hive/src/test/resources/golden/partition_schema1-2-4fcfc1d26e1de1ce3071f1f93c012988
deleted file mode 100644
index c97e50a8a5..0000000000
--- a/sql/hive/src/test/resources/golden/partition_schema1-2-4fcfc1d26e1de1ce3071f1f93c012988
+++ /dev/null
@@ -1,8 +0,0 @@
-key string
-value string
-dt string
-
-# Partition Information
-# col_name data_type comment
-
-dt string
diff --git a/sql/hive/src/test/resources/golden/partition_schema1-3-fdef2e7e9e40868305d21c1b0df019bb b/sql/hive/src/test/resources/golden/partition_schema1-3-fdef2e7e9e40868305d21c1b0df019bb
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_schema1-4-9b756f83973c37236e72f6927b1c02d7 b/sql/hive/src/test/resources/golden/partition_schema1-4-9b756f83973c37236e72f6927b1c02d7
deleted file mode 100644
index 39db984c88..0000000000
--- a/sql/hive/src/test/resources/golden/partition_schema1-4-9b756f83973c37236e72f6927b1c02d7
+++ /dev/null
@@ -1,9 +0,0 @@
-key string
-value string
-x string
-dt string
-
-# Partition Information
-# col_name data_type comment
-
-dt string
diff --git a/sql/hive/src/test/resources/golden/partition_schema1-5-52a518a4f7132598998c4f6781fd7634 b/sql/hive/src/test/resources/golden/partition_schema1-5-52a518a4f7132598998c4f6781fd7634
deleted file mode 100644
index c97e50a8a5..0000000000
--- a/sql/hive/src/test/resources/golden/partition_schema1-5-52a518a4f7132598998c4f6781fd7634
+++ /dev/null
@@ -1,8 +0,0 @@
-key string
-value string
-dt string
-
-# Partition Information
-# col_name data_type comment
-
-dt string
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat4-0-c854b607353e810be297d3159be30da4 b/sql/hive/src/test/resources/golden/partition_wise_fileformat4-0-c854b607353e810be297d3159be30da4
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat4-1-c561806d8f9ad419dc9b17ae995aab68 b/sql/hive/src/test/resources/golden/partition_wise_fileformat4-1-c561806d8f9ad419dc9b17ae995aab68
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat4-2-b9f8c3b822051854770f61e5ae5b48b0 b/sql/hive/src/test/resources/golden/partition_wise_fileformat4-2-b9f8c3b822051854770f61e5ae5b48b0
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat4-3-9837451512e92e982f1bd9a12b132e84 b/sql/hive/src/test/resources/golden/partition_wise_fileformat4-3-9837451512e92e982f1bd9a12b132e84
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat4-4-58cfa555b061057f559fc6b9c2f6c631 b/sql/hive/src/test/resources/golden/partition_wise_fileformat4-4-58cfa555b061057f559fc6b9c2f6c631
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat4-5-ac79def5434bb8a926237d0db8db2e84 b/sql/hive/src/test/resources/golden/partition_wise_fileformat4-5-ac79def5434bb8a926237d0db8db2e84
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-0-66ee62178e3576fb38cb09800cb610bf b/sql/hive/src/test/resources/golden/partition_wise_fileformat5-0-66ee62178e3576fb38cb09800cb610bf
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-0-66ee62178e3576fb38cb09800cb610bf
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-1-c854b607353e810be297d3159be30da4 b/sql/hive/src/test/resources/golden/partition_wise_fileformat5-1-c854b607353e810be297d3159be30da4
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-2-6c4f7b115f18953dcc7710fa97287459 b/sql/hive/src/test/resources/golden/partition_wise_fileformat5-2-6c4f7b115f18953dcc7710fa97287459
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-3-f5f427b174dca478c14eddc371c0025a b/sql/hive/src/test/resources/golden/partition_wise_fileformat5-3-f5f427b174dca478c14eddc371c0025a
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-4-da1b1887eb530c7e9d37667b99c9793f b/sql/hive/src/test/resources/golden/partition_wise_fileformat5-4-da1b1887eb530c7e9d37667b99c9793f
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-5-517aaa22478287fa80eef4a19f2cb9ff b/sql/hive/src/test/resources/golden/partition_wise_fileformat5-5-517aaa22478287fa80eef4a19f2cb9ff
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-6-a0e23b26ee1777ccc8947fb5eb1e8745 b/sql/hive/src/test/resources/golden/partition_wise_fileformat5-6-a0e23b26ee1777ccc8947fb5eb1e8745
deleted file mode 100644
index eb4c6a843c..0000000000
--- a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-6-a0e23b26ee1777ccc8947fb5eb1e8745
+++ /dev/null
@@ -1,2 +0,0 @@
-101 25
-102 25
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-7-a0eeded14b3d337a74189a5d02c7a5ad b/sql/hive/src/test/resources/golden/partition_wise_fileformat5-7-a0eeded14b3d337a74189a5d02c7a5ad
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-8-a0e23b26ee1777ccc8947fb5eb1e8745 b/sql/hive/src/test/resources/golden/partition_wise_fileformat5-8-a0e23b26ee1777ccc8947fb5eb1e8745
deleted file mode 100644
index 95846abf28..0000000000
--- a/sql/hive/src/test/resources/golden/partition_wise_fileformat5-8-a0e23b26ee1777ccc8947fb5eb1e8745
+++ /dev/null
@@ -1,3 +0,0 @@
-101 25
-102 25
-103 25
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-0-66ee62178e3576fb38cb09800cb610bf b/sql/hive/src/test/resources/golden/partition_wise_fileformat6-0-66ee62178e3576fb38cb09800cb610bf
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-0-66ee62178e3576fb38cb09800cb610bf
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-1-c854b607353e810be297d3159be30da4 b/sql/hive/src/test/resources/golden/partition_wise_fileformat6-1-c854b607353e810be297d3159be30da4
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-2-6c4f7b115f18953dcc7710fa97287459 b/sql/hive/src/test/resources/golden/partition_wise_fileformat6-2-6c4f7b115f18953dcc7710fa97287459
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-3-f5f427b174dca478c14eddc371c0025a b/sql/hive/src/test/resources/golden/partition_wise_fileformat6-3-f5f427b174dca478c14eddc371c0025a
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-4-da1b1887eb530c7e9d37667b99c9793f b/sql/hive/src/test/resources/golden/partition_wise_fileformat6-4-da1b1887eb530c7e9d37667b99c9793f
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-5-517aaa22478287fa80eef4a19f2cb9ff b/sql/hive/src/test/resources/golden/partition_wise_fileformat6-5-517aaa22478287fa80eef4a19f2cb9ff
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-6-e95296c9f7056b0075007c61d4e5e92f b/sql/hive/src/test/resources/golden/partition_wise_fileformat6-6-e95296c9f7056b0075007c61d4e5e92f
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-6-e95296c9f7056b0075007c61d4e5e92f
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-7-4758d41d052eba37a9acd90c2dbc58f0 b/sql/hive/src/test/resources/golden/partition_wise_fileformat6-7-4758d41d052eba37a9acd90c2dbc58f0
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/sql/hive/src/test/resources/golden/partition_wise_fileformat6-7-4758d41d052eba37a9acd90c2dbc58f0
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat7-0-66ee62178e3576fb38cb09800cb610bf b/sql/hive/src/test/resources/golden/partition_wise_fileformat7-0-66ee62178e3576fb38cb09800cb610bf
deleted file mode 100644
index 573541ac97..0000000000
--- a/sql/hive/src/test/resources/golden/partition_wise_fileformat7-0-66ee62178e3576fb38cb09800cb610bf
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat7-1-c854b607353e810be297d3159be30da4 b/sql/hive/src/test/resources/golden/partition_wise_fileformat7-1-c854b607353e810be297d3159be30da4
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat7-2-6c4f7b115f18953dcc7710fa97287459 b/sql/hive/src/test/resources/golden/partition_wise_fileformat7-2-6c4f7b115f18953dcc7710fa97287459
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat7-3-f5f427b174dca478c14eddc371c0025a b/sql/hive/src/test/resources/golden/partition_wise_fileformat7-3-f5f427b174dca478c14eddc371c0025a
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat7-4-a34505bd397bb2a66e46408d1dfb6bf2 b/sql/hive/src/test/resources/golden/partition_wise_fileformat7-4-a34505bd397bb2a66e46408d1dfb6bf2
deleted file mode 100644
index 60d3b2f4a4..0000000000
--- a/sql/hive/src/test/resources/golden/partition_wise_fileformat7-4-a34505bd397bb2a66e46408d1dfb6bf2
+++ /dev/null
@@ -1 +0,0 @@
-15
diff --git a/sql/hive/src/test/resources/golden/partition_wise_fileformat7-5-f2c42f1f32eb3cb300420fb36cbf2362 b/sql/hive/src/test/resources/golden/partition_wise_fileformat7-5-f2c42f1f32eb3cb300420fb36cbf2362
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/sql/hive/src/test/resources/golden/partition_wise_fileformat7-5-f2c42f1f32eb3cb300420fb36cbf2362
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/sql/hive/src/test/resources/golden/rename_column-0-f7eb4bd6f226be0c13117294be250271 b/sql/hive/src/test/resources/golden/rename_column-0-f7eb4bd6f226be0c13117294be250271
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-1-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-1-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 017e14d2eb..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-1-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a int
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-10-7ef160935cece55338bd4d52277b0203 b/sql/hive/src/test/resources/golden/rename_column-10-7ef160935cece55338bd4d52277b0203
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-11-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-11-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index a92663b067..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-11-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-b int
-a1 int test comment1
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-12-379d54e3aa66daacff23c75007dfa008 b/sql/hive/src/test/resources/golden/rename_column-12-379d54e3aa66daacff23c75007dfa008
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-13-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-13-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 899341a881..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-13-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a2 int test comment2
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-14-25bfcf66698b12f82903f72f13fea4e6 b/sql/hive/src/test/resources/golden/rename_column-14-25bfcf66698b12f82903f72f13fea4e6
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-15-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-15-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 26b38dcc6d..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-15-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-b int
-a int test comment2
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-16-d032f4795c1186255acea241387adf93 b/sql/hive/src/test/resources/golden/rename_column-16-d032f4795c1186255acea241387adf93
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-17-9c36cac1372650b703400c60dd29042c b/sql/hive/src/test/resources/golden/rename_column-17-9c36cac1372650b703400c60dd29042c
deleted file mode 100644
index 85c1918f46..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-17-9c36cac1372650b703400c60dd29042c
+++ /dev/null
@@ -1,2 +0,0 @@
-src
-srcpart
diff --git a/sql/hive/src/test/resources/golden/rename_column-18-fe4463a19f61099983f50bb51cfcd335 b/sql/hive/src/test/resources/golden/rename_column-18-fe4463a19f61099983f50bb51cfcd335
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-19-70b42434913b9d2eb17cd216c4f8039f b/sql/hive/src/test/resources/golden/rename_column-19-70b42434913b9d2eb17cd216c4f8039f
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-2-b2b2dfa681d01296fdacb4f56fb6db3a b/sql/hive/src/test/resources/golden/rename_column-2-b2b2dfa681d01296fdacb4f56fb6db3a
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-20-f7eb4bd6f226be0c13117294be250271 b/sql/hive/src/test/resources/golden/rename_column-20-f7eb4bd6f226be0c13117294be250271
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-21-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-21-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 017e14d2eb..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-21-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a int
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-22-b2b2dfa681d01296fdacb4f56fb6db3a b/sql/hive/src/test/resources/golden/rename_column-22-b2b2dfa681d01296fdacb4f56fb6db3a
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-23-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-23-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 2fbb615dd5..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-23-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a string
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-24-e4bf0dd372b886b2afcca5b2dc089409 b/sql/hive/src/test/resources/golden/rename_column-24-e4bf0dd372b886b2afcca5b2dc089409
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-25-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-25-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 173fbad7b1..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-25-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a1 int
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-26-89761e1c7afe3a5b9858f287cb808ccd b/sql/hive/src/test/resources/golden/rename_column-26-89761e1c7afe3a5b9858f287cb808ccd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-27-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-27-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index bad9feb96a..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-27-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a2 int
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-28-59388d1eb6b5dc4e81a434bd59bf2cf4 b/sql/hive/src/test/resources/golden/rename_column-28-59388d1eb6b5dc4e81a434bd59bf2cf4
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-29-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-29-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 4f23db53af..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-29-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-b int
-a int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-3-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-3-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 2fbb615dd5..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-3-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a string
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-30-7ef160935cece55338bd4d52277b0203 b/sql/hive/src/test/resources/golden/rename_column-30-7ef160935cece55338bd4d52277b0203
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-31-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-31-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index a92663b067..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-31-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-b int
-a1 int test comment1
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-32-379d54e3aa66daacff23c75007dfa008 b/sql/hive/src/test/resources/golden/rename_column-32-379d54e3aa66daacff23c75007dfa008
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-33-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-33-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 899341a881..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-33-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a2 int test comment2
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-34-25bfcf66698b12f82903f72f13fea4e6 b/sql/hive/src/test/resources/golden/rename_column-34-25bfcf66698b12f82903f72f13fea4e6
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-35-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-35-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 26b38dcc6d..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-35-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-b int
-a int test comment2
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-36-d032f4795c1186255acea241387adf93 b/sql/hive/src/test/resources/golden/rename_column-36-d032f4795c1186255acea241387adf93
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-37-9c36cac1372650b703400c60dd29042c b/sql/hive/src/test/resources/golden/rename_column-37-9c36cac1372650b703400c60dd29042c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-4-e4bf0dd372b886b2afcca5b2dc089409 b/sql/hive/src/test/resources/golden/rename_column-4-e4bf0dd372b886b2afcca5b2dc089409
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-5-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-5-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 173fbad7b1..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-5-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a1 int
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-6-89761e1c7afe3a5b9858f287cb808ccd b/sql/hive/src/test/resources/golden/rename_column-6-89761e1c7afe3a5b9858f287cb808ccd
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-7-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-7-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index bad9feb96a..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-7-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-a2 int
-b int
-c int
diff --git a/sql/hive/src/test/resources/golden/rename_column-8-59388d1eb6b5dc4e81a434bd59bf2cf4 b/sql/hive/src/test/resources/golden/rename_column-8-59388d1eb6b5dc4e81a434bd59bf2cf4
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/sql/hive/src/test/resources/golden/rename_column-9-6a3bbeb3203ce4df35275dccc4c4e37b b/sql/hive/src/test/resources/golden/rename_column-9-6a3bbeb3203ce4df35275dccc4c4e37b
deleted file mode 100644
index 4f23db53af..0000000000
--- a/sql/hive/src/test/resources/golden/rename_column-9-6a3bbeb3203ce4df35275dccc4c4e37b
+++ /dev/null
@@ -1,3 +0,0 @@
-b int
-a int
-c int
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/InsertIntoHiveTableSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/InsertIntoHiveTableSuite.scala
index 4db95636e7..46de4921f6 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/InsertIntoHiveTableSuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/InsertIntoHiveTableSuite.scala
@@ -212,51 +212,4 @@ class InsertIntoHiveTableSuite extends QueryTest with TestHiveSingleton with Bef
sql("DROP TABLE hiveTableWithStructValue")
}
-
- test("SPARK-5498:partition schema does not match table schema") {
- val testData = hiveContext.sparkContext.parallelize(
- (1 to 10).map(i => TestData(i, i.toString))).toDF()
- testData.registerTempTable("testData")
-
- val testDatawithNull = hiveContext.sparkContext.parallelize(
- (1 to 10).map(i => ThreeCloumntable(i, i.toString, null))).toDF()
-
- val tmpDir = Utils.createTempDir()
- sql(
- s"""
- |CREATE TABLE table_with_partition(key int,value string)
- |PARTITIONED by (ds string) location '${tmpDir.toURI.toString}'
- """.stripMargin)
- sql(
- """
- |INSERT OVERWRITE TABLE table_with_partition
- |partition (ds='1') SELECT key,value FROM testData
- """.stripMargin)
-
- // test schema the same between partition and table
- sql("ALTER TABLE table_with_partition CHANGE COLUMN key key BIGINT")
- checkAnswer(sql("select key,value from table_with_partition where ds='1' "),
- testData.collect().toSeq
- )
-
- // test difference type of field
- sql("ALTER TABLE table_with_partition CHANGE COLUMN key key BIGINT")
- checkAnswer(sql("select key,value from table_with_partition where ds='1' "),
- testData.collect().toSeq
- )
-
- // add column to table
- sql("ALTER TABLE table_with_partition ADD COLUMNS(key1 string)")
- checkAnswer(sql("select key,value,key1 from table_with_partition where ds='1' "),
- testDatawithNull.collect().toSeq
- )
-
- // change column name to table
- sql("ALTER TABLE table_with_partition CHANGE COLUMN key keynew BIGINT")
- checkAnswer(sql("select keynew,value from table_with_partition where ds='1' "),
- testData.collect().toSeq
- )
-
- sql("DROP TABLE table_with_partition")
- }
}
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
index 0ecc9807b2..100cb3cef8 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
@@ -19,6 +19,8 @@ package org.apache.spark.sql.hive.execution
import java.sql.{Date, Timestamp}
+import org.apache.hadoop.fs.Path
+
import org.apache.spark.sql._
import org.apache.spark.sql.catalyst.TableIdentifier
import org.apache.spark.sql.catalyst.analysis.{EliminateSubqueryAliases, FunctionRegistry}
@@ -1391,4 +1393,99 @@ class SQLQuerySuite extends QueryTest with SQLTestUtils with TestHiveSingleton {
assert(message == "'path' is not specified")
}
}
+
+ test("derived from Hive query file: drop_database_removes_partition_dirs.q") {
+ // This test verifies that if a partition exists outside a table's current location when the
+ // database is dropped the partition's location is dropped as well.
+ sql("DROP database if exists test_database CASCADE")
+ sql("CREATE DATABASE test_database")
+ val previousCurrentDB = sessionState.catalog.getCurrentDatabase
+ sql("USE test_database")
+ sql("drop table if exists test_table")
+
+ val tempDir = System.getProperty("test.tmp.dir")
+ assert(tempDir != null, "TestHive should set test.tmp.dir.")
+
+ sql(
+ """
+ |CREATE TABLE test_table (key int, value STRING)
+ |PARTITIONED BY (part STRING)
+ |STORED AS RCFILE
+ |LOCATION 'file:${system:test.tmp.dir}/drop_database_removes_partition_dirs_table'
+ """.stripMargin)
+ sql(
+ """
+ |ALTER TABLE test_table ADD PARTITION (part = '1')
+ |LOCATION 'file:${system:test.tmp.dir}/drop_database_removes_partition_dirs_table2/part=1'
+ """.stripMargin)
+ sql(
+ """
+ |INSERT OVERWRITE TABLE test_table PARTITION (part = '1')
+ |SELECT * FROM default.src
+ """.stripMargin)
+ checkAnswer(
+ sql("select part, key, value from test_table"),
+ sql("select '1' as part, key, value from default.src")
+ )
+ val path = new Path(
+ new Path(s"file:$tempDir"),
+ "drop_database_removes_partition_dirs_table2")
+ val fs = path.getFileSystem(sparkContext.hadoopConfiguration)
+ // The partition dir is not empty.
+ assert(fs.listStatus(new Path(path, "part=1")).nonEmpty)
+
+ sql(s"USE $previousCurrentDB")
+ sql("DROP DATABASE test_database CASCADE")
+
+ // This table dir should not exist after we drop the entire database with the mode
+ // of CASCADE. This probably indicates a Hive bug, which returns the wrong table
+ // root location. So, the table's directory still there. We should change the condition
+ // to fs.exists(path) after we handle fs operations.
+ assert(
+ fs.exists(path),
+ "Thank you for making the changes of letting Spark SQL handle filesystem operations " +
+ "for DDL commands. Originally, Hive metastore does not delete the table root directory " +
+ "for this case. Now, please change this condition to !fs.exists(path).")
+ }
+
+ test("derived from Hive query file: drop_table_removes_partition_dirs.q") {
+ // This test verifies that if a partition exists outside the table's current location when the
+ // table is dropped the partition's location is dropped as well.
+ sql("drop table if exists test_table")
+
+ val tempDir = System.getProperty("test.tmp.dir")
+ assert(tempDir != null, "TestHive should set test.tmp.dir.")
+
+ sql(
+ """
+ |CREATE TABLE test_table (key int, value STRING)
+ |PARTITIONED BY (part STRING)
+ |STORED AS RCFILE
+ |LOCATION 'file:${system:test.tmp.dir}/drop_table_removes_partition_dirs_table2'
+ """.stripMargin)
+ sql(
+ """
+ |ALTER TABLE test_table ADD PARTITION (part = '1')
+ |LOCATION 'file:${system:test.tmp.dir}/drop_table_removes_partition_dirs_table2/part=1'
+ """.stripMargin)
+ sql(
+ """
+ |INSERT OVERWRITE TABLE test_table PARTITION (part = '1')
+ |SELECT * FROM default.src
+ """.stripMargin)
+ checkAnswer(
+ sql("select part, key, value from test_table"),
+ sql("select '1' as part, key, value from src")
+ )
+ val path = new Path(new Path(s"file:$tempDir"), "drop_table_removes_partition_dirs_table2")
+ val fs = path.getFileSystem(sparkContext.hadoopConfiguration)
+ // The partition dir is not empty.
+ assert(fs.listStatus(new Path(path, "part=1")).nonEmpty)
+
+ sql("drop table test_table")
+ assert(
+ !fs.exists(path),
+ "Once a managed table has been dropped, " +
+ "dirs of this table should also have been deleted.")
+ }
}
--
GitLab