----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/24627/ -----------------------------------------------------------
(Updated Aug. 14, 2014, 8:53 p.m.) Review request for hive and Gunther Hagleitner. Changes ------- Fixed test failures. Mostly golden file diffs because of renaming of MergeWork to MergeFileWork. Also previous patch missed TestCliDriver diffs for newly added q file tests. Bugs: HIVE-7704 https://issues.apache.org/jira/browse/HIVE-7704 Repository: hive-git Description ------- Currently tez falls back to MR task for merge file task. It will beneficial to convert the merge file tasks to tez task to make use of the performance gains from tez. Diffs (updated) ----- itests/src/test/resources/testconfiguration.properties b801678 ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java cd017d8 ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java d5de58e ql/src/java/org/apache/hadoop/hive/ql/exec/MoveTask.java a2975cb ql/src/java/org/apache/hadoop/hive/ql/exec/TaskFactory.java 3d74459 ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java 1d6a93a ql/src/java/org/apache/hadoop/hive/ql/exec/mr/ExecMapper.java 4e0fd79 ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DagUtils.java e116426 ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapRecordProcessor.java 8513e33 ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MapTezProcessor.java 31f3bcd ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MergeFileMapRecordProcessor.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/exec/tez/MergeFileTezProcessor.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/exec/tez/OrcMergeFileMapRecordProcessor.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/exec/tez/OrcMergeFileTezProcessor.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/exec/tez/RCFileMergeFileMapRecordProcessor.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/exec/tez/RecordProcessor.java 1577827 ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezProcessor.java c2ba782 ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezTask.java 951e918 ql/src/java/org/apache/hadoop/hive/ql/exec/tez/tools/RCFileMergeFileTezProcessor.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java bf44548 ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileInputFormat.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileMapper.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileOutputFormat.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileTask.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeFileWork.java PRE-CREATION ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeInputFormat.java 4651920 ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeMapper.java beb4f7d ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeOutputFormat.java a3ce699 ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeTask.java c437dd0 ql/src/java/org/apache/hadoop/hive/ql/io/merge/MergeWork.java 9efee3c ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFileMergeMapper.java b36152a ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFileStripeMergeInputFormat.java a6c92fb ql/src/java/org/apache/hadoop/hive/ql/io/orc/Writer.java c391b0e ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java 76b4d03 ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/RCFileBlockMergeInputFormat.java 6809c79 ql/src/java/org/apache/hadoop/hive/ql/io/rcfile/merge/RCFileMergeMapper.java dee6b1c ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java 7129ed8 ql/src/java/org/apache/hadoop/hive/ql/parse/GenTezProcContext.java 8513f99 ql/src/java/org/apache/hadoop/hive/ql/parse/TezCompiler.java d58c59d ql/src/test/queries/clientpositive/orc_merge5.q PRE-CREATION ql/src/test/queries/clientpositive/orc_merge6.q PRE-CREATION ql/src/test/queries/clientpositive/orc_merge7.q PRE-CREATION ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out bb6145c ql/src/test/results/clientpositive/list_bucket_dml_10.q.out e45ab04 ql/src/test/results/clientpositive/list_bucket_dml_4.q.out 9c4ff6b ql/src/test/results/clientpositive/list_bucket_dml_6.q.out d1cde40 ql/src/test/results/clientpositive/list_bucket_dml_7.q.out 19000dc ql/src/test/results/clientpositive/list_bucket_dml_9.q.out 692bc10 ql/src/test/results/clientpositive/merge_dynamic_partition4.q.out 0f57a21 ql/src/test/results/clientpositive/merge_dynamic_partition5.q.out 65f195e ql/src/test/results/clientpositive/orc_createas1.q.out 7e74d49 ql/src/test/results/clientpositive/orc_merge3.q.out 93edc38 ql/src/test/results/clientpositive/orc_merge5.q.out PRE-CREATION ql/src/test/results/clientpositive/orc_merge6.q.out PRE-CREATION ql/src/test/results/clientpositive/orc_merge7.q.out PRE-CREATION ql/src/test/results/clientpositive/rcfile_createas1.q.out 119e0ee ql/src/test/results/clientpositive/rcfile_merge1.q.out e8ed908 ql/src/test/results/clientpositive/rcfile_merge2.q.out 7b06efd ql/src/test/results/clientpositive/rcfile_merge3.q.out 66e4595 ql/src/test/results/clientpositive/tez/orc_merge5.q.out PRE-CREATION ql/src/test/results/clientpositive/tez/orc_merge6.q.out PRE-CREATION ql/src/test/results/clientpositive/tez/orc_merge7.q.out PRE-CREATION ql/src/test/results/clientpositive/union_remove_10.q.out b283fd7 ql/src/test/results/clientpositive/union_remove_11.q.out 1af95c1 ql/src/test/results/clientpositive/union_remove_12.q.out 7d405f4 ql/src/test/results/clientpositive/union_remove_13.q.out 27c67f9 ql/src/test/results/clientpositive/union_remove_14.q.out b949e57 ql/src/test/results/clientpositive/union_remove_16.q.out 722d5d2 ql/src/test/results/clientpositive/union_remove_9.q.out 087b5f7 Diff: https://reviews.apache.org/r/24627/diff/ Testing ------- Thanks, Prasanth_J