diff --git metastore/scripts/upgrade/derby/018-HIVE-6757.derby.sql metastore/scripts/upgrade/derby/018-HIVE-6757.derby.sql new file mode 100644 index 0000000..9169686 --- /dev/null +++ metastore/scripts/upgrade/derby/018-HIVE-6757.derby.sql @@ -0,0 +1,19 @@ +UPDATE SDS + SET INPUT_FORMAT = 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +WHERE + INPUT_FORMAT= 'parquet.hive.DeprecatedParquetInputFormat' or + INPUT_FORMAT = 'parquet.hive.MapredParquetInputFormat' +; + +UPDATE SDS + SET OUTPUT_FORMAT = 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +WHERE + OUTPUT_FORMAT = 'parquet.hive.DeprecatedParquetOutputFormat' or + OUTPUT_FORMAT = 'parquet.hive.MapredParquetOutputFormat' +; + +UPDATE SERDES + SET SLIB='org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +WHERE + SLIB = 'parquet.hive.serde.ParquetHiveSerDe' +; \ No newline at end of file diff --git metastore/scripts/upgrade/derby/upgrade-0.12.0-to-0.13.0.derby.sql metastore/scripts/upgrade/derby/upgrade-0.12.0-to-0.13.0.derby.sql index 7d09e27..10f2ac6 100644 --- metastore/scripts/upgrade/derby/upgrade-0.12.0-to-0.13.0.derby.sql +++ metastore/scripts/upgrade/derby/upgrade-0.12.0-to-0.13.0.derby.sql @@ -2,5 +2,6 @@ RUN 'hive-txn-schema-0.13.0.derby.sql'; RUN '016-HIVE-6386.derby.sql'; RUN '017-HIVE-6458.derby.sql'; +RUN '018-HIVE-6757.derby.sql'; UPDATE "APP".VERSION SET SCHEMA_VERSION='0.13.0', VERSION_COMMENT='Hive release version 0.13.0' where VER_ID=1; diff --git metastore/scripts/upgrade/mysql/018-HIVE-6757.mysql.sql metastore/scripts/upgrade/mysql/018-HIVE-6757.mysql.sql new file mode 100644 index 0000000..cea717f --- /dev/null +++ metastore/scripts/upgrade/mysql/018-HIVE-6757.mysql.sql @@ -0,0 +1,21 @@ +SELECT '' AS ' '; + +UPDATE SDS + SET INPUT_FORMAT = 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +WHERE + INPUT_FORMAT= 'parquet.hive.DeprecatedParquetInputFormat' or + INPUT_FORMAT = 'parquet.hive.MapredParquetInputFormat' +; + +UPDATE SDS + SET OUTPUT_FORMAT = 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +WHERE + OUTPUT_FORMAT = 'parquet.hive.DeprecatedParquetOutputFormat' or + OUTPUT_FORMAT = 'parquet.hive.MapredParquetOutputFormat' +; + +UPDATE SERDES + SET SLIB='org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +WHERE + SLIB = 'parquet.hive.serde.ParquetHiveSerDe' +; \ No newline at end of file diff --git metastore/scripts/upgrade/mysql/upgrade-0.12.0-to-0.13.0.mysql.sql metastore/scripts/upgrade/mysql/upgrade-0.12.0-to-0.13.0.mysql.sql index 0e428e4..e324bda 100644 --- metastore/scripts/upgrade/mysql/upgrade-0.12.0-to-0.13.0.mysql.sql +++ metastore/scripts/upgrade/mysql/upgrade-0.12.0-to-0.13.0.mysql.sql @@ -3,6 +3,7 @@ SELECT 'Upgrading MetaStore schema from 0.12.0 to 0.13.0' AS ' '; SOURCE 015-HIVE-5700.mysql.sql; SOURCE 016-HIVE-6386.mysql.sql; SOURCE 017-HIVE-6458.mysql.sql; +SOURCE 018-HIVE-6757.mysql.sql; SOURCE hive-txn-schema-0.13.0.mysql.sql; UPDATE VERSION SET SCHEMA_VERSION='0.13.0', VERSION_COMMENT='Hive release version 0.13.0' where VER_ID=1; diff --git metastore/scripts/upgrade/oracle/018-HIVE-6757.oracle.sql metastore/scripts/upgrade/oracle/018-HIVE-6757.oracle.sql new file mode 100644 index 0000000..9169686 --- /dev/null +++ metastore/scripts/upgrade/oracle/018-HIVE-6757.oracle.sql @@ -0,0 +1,19 @@ +UPDATE SDS + SET INPUT_FORMAT = 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +WHERE + INPUT_FORMAT= 'parquet.hive.DeprecatedParquetInputFormat' or + INPUT_FORMAT = 'parquet.hive.MapredParquetInputFormat' +; + +UPDATE SDS + SET OUTPUT_FORMAT = 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +WHERE + OUTPUT_FORMAT = 'parquet.hive.DeprecatedParquetOutputFormat' or + OUTPUT_FORMAT = 'parquet.hive.MapredParquetOutputFormat' +; + +UPDATE SERDES + SET SLIB='org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +WHERE + SLIB = 'parquet.hive.serde.ParquetHiveSerDe' +; \ No newline at end of file diff --git metastore/scripts/upgrade/oracle/upgrade-0.12.0-to-0.13.0.oracle.sql metastore/scripts/upgrade/oracle/upgrade-0.12.0-to-0.13.0.oracle.sql index 3a36298..5739768 100644 --- metastore/scripts/upgrade/oracle/upgrade-0.12.0-to-0.13.0.oracle.sql +++ metastore/scripts/upgrade/oracle/upgrade-0.12.0-to-0.13.0.oracle.sql @@ -3,6 +3,7 @@ SELECT 'Upgrading MetaStore schema from 0.12.0 to 0.13.0' AS Status from dual; @015-HIVE-5700.oracle.sql; @016-HIVE-6386.oracle.sql; @017-HIVE-6458.oracle.sql; +@018-HIVE-6757.oracle.sql; @hive-txn-schema-0.13.0.oracle.sql; UPDATE VERSION SET SCHEMA_VERSION='0.13.0', VERSION_COMMENT='Hive release version 0.13.0' where VER_ID=1; diff --git metastore/scripts/upgrade/postgres/018-HIVE-6757.postgres.sql metastore/scripts/upgrade/postgres/018-HIVE-6757.postgres.sql new file mode 100644 index 0000000..2c927f3 --- /dev/null +++ metastore/scripts/upgrade/postgres/018-HIVE-6757.postgres.sql @@ -0,0 +1,21 @@ +SELECT '< HIVE-6757 Remove deprecated parquet classes from outside of org.apache package >'; + +UPDATE SDS + SET INPUT_FORMAT = 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat' +WHERE + INPUT_FORMAT= 'parquet.hive.DeprecatedParquetInputFormat' or + INPUT_FORMAT = 'parquet.hive.MapredParquetInputFormat' +; + +UPDATE SDS + SET OUTPUT_FORMAT = 'org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat' +WHERE + OUTPUT_FORMAT = 'parquet.hive.DeprecatedParquetOutputFormat' or + OUTPUT_FORMAT = 'parquet.hive.MapredParquetOutputFormat' +; + +UPDATE SERDES + SET SLIB='org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe' +WHERE + SLIB = 'parquet.hive.serde.ParquetHiveSerDe' +; \ No newline at end of file diff --git metastore/scripts/upgrade/postgres/upgrade-0.12.0-to-0.13.0.postgres.sql metastore/scripts/upgrade/postgres/upgrade-0.12.0-to-0.13.0.postgres.sql index dcddf77..72c9b40 100644 --- metastore/scripts/upgrade/postgres/upgrade-0.12.0-to-0.13.0.postgres.sql +++ metastore/scripts/upgrade/postgres/upgrade-0.12.0-to-0.13.0.postgres.sql @@ -3,6 +3,7 @@ SELECT 'Upgrading MetaStore schema from 0.12.0 to 0.13.0'; \i 015-HIVE-5700.postgres.sql; \i 016-HIVE-6386.postgres.sql; \i 017-HIVE-6458.postgres.sql; +\i 018-HIVE-6757.postgres.sql; \i hive-txn-schema-0.13.0.postgres.sql; UPDATE "VERSION" SET "SCHEMA_VERSION"='0.13.0', "VERSION_COMMENT"='Hive release version 0.13.0' where "VER_ID"=1; diff --git ql/src/java/parquet/hive/DeprecatedParquetInputFormat.java ql/src/java/parquet/hive/DeprecatedParquetInputFormat.java deleted file mode 100644 index ec0ebc0..0000000 --- ql/src/java/parquet/hive/DeprecatedParquetInputFormat.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package parquet.hive; - -import org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat; -import org.apache.hadoop.io.ArrayWritable; - -import parquet.hadoop.ParquetInputFormat; - -/** - * Deprecated name of the parquet-hive input format. This class exists - * simply to provide backwards compatibility with users who specified - * this name in the Hive metastore. All users should now use - * STORED AS PARQUET - */ -@Deprecated -public class DeprecatedParquetInputFormat extends MapredParquetInputFormat { - - public DeprecatedParquetInputFormat() { - super(); - } - - public DeprecatedParquetInputFormat(final ParquetInputFormat realInputFormat) { - super(realInputFormat); - } -} diff --git ql/src/java/parquet/hive/DeprecatedParquetOutputFormat.java ql/src/java/parquet/hive/DeprecatedParquetOutputFormat.java deleted file mode 100644 index a0bdd75..0000000 --- ql/src/java/parquet/hive/DeprecatedParquetOutputFormat.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package parquet.hive; - -import org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat; -import org.apache.hadoop.io.ArrayWritable; -import org.apache.hadoop.mapreduce.OutputFormat; - -/** - * Deprecated name of the parquet-hive output format. This class exists - * simply to provide backwards compatibility with users who specified - * this name in the Hive metastore. All users should now use - * STORED AS PARQUET - */ -@Deprecated -public class DeprecatedParquetOutputFormat extends MapredParquetOutputFormat { - - public DeprecatedParquetOutputFormat() { - super(); - } - - public DeprecatedParquetOutputFormat(final OutputFormat mapreduceOutputFormat) { - super(mapreduceOutputFormat); - } -} diff --git ql/src/java/parquet/hive/MapredParquetInputFormat.java ql/src/java/parquet/hive/MapredParquetInputFormat.java deleted file mode 100644 index 9b3d453..0000000 --- ql/src/java/parquet/hive/MapredParquetInputFormat.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package parquet.hive; - -import org.apache.hadoop.io.ArrayWritable; - -import parquet.hadoop.ParquetInputFormat; - -/** - * Deprecated name of the parquet-hive input format. This class exists - * simply to provide backwards compatibility with users who specified - * this name in the Hive metastore. All users should now use - * STORED AS PARQUET - */ -@Deprecated -public class MapredParquetInputFormat extends org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat { - - public MapredParquetInputFormat() { - super(); - } - - public MapredParquetInputFormat(final ParquetInputFormat realInputFormat) { - super(realInputFormat); - } -} diff --git ql/src/java/parquet/hive/MapredParquetOutputFormat.java ql/src/java/parquet/hive/MapredParquetOutputFormat.java deleted file mode 100644 index dc6ea3e..0000000 --- ql/src/java/parquet/hive/MapredParquetOutputFormat.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package parquet.hive; - -import org.apache.hadoop.io.ArrayWritable; -import org.apache.hadoop.mapreduce.OutputFormat; - -/** - * Deprecated name of the parquet-hive output format. This class exists - * simply to provide backwards compatibility with users who specified - * this name in the Hive metastore. All users should now use - * STORED AS PARQUET - */ -@Deprecated -public class MapredParquetOutputFormat extends org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat { - - public MapredParquetOutputFormat () { - super(); - } - - public MapredParquetOutputFormat(final OutputFormat mapreduceOutputFormat) { - super(mapreduceOutputFormat); - } -} diff --git ql/src/java/parquet/hive/serde/ParquetHiveSerDe.java ql/src/java/parquet/hive/serde/ParquetHiveSerDe.java deleted file mode 100644 index a1dcaa4..0000000 --- ql/src/java/parquet/hive/serde/ParquetHiveSerDe.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package parquet.hive.serde; - -/** - * Deprecated name of the parquet-hive output format. This class exists - * simply to provide backwards compatibility with users who specified - * this name in the Hive metastore. All users should now use - * STORED AS PARQUET - */ -@Deprecated -public class ParquetHiveSerDe extends org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe { - -}