You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2010/06/15 22:49:10 UTC
svn commit: r955043 - in /hadoop/hive/trunk: CHANGES.txt
ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
ql/src/test/queries/clientpositive/diff_part_input_formats.q
ql/src/test/results/clientpositive/diff_part_input_formats.q.out
Author: namit
Date: Tue Jun 15 20:49:09 2010
New Revision: 955043
URL: http://svn.apache.org/viewvc?rev=955043&view=rev
Log:
HIVE-1409. Use the tableSpec if partitions is not present
(Paul Yang via namit)
Added:
hadoop/hive/trunk/ql/src/test/queries/clientpositive/diff_part_input_formats.q
hadoop/hive/trunk/ql/src/test/results/clientpositive/diff_part_input_formats.q.out
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=955043&r1=955042&r2=955043&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Tue Jun 15 20:49:09 2010
@@ -505,6 +505,9 @@ Trunk - Unreleased
HIVE-1407. Add hadoop-*-tools.jar to eclipse classpath
(Carl Steinbach via Ning Zhang)
+ HIVE-1409. Use the tableSpec if partitions is not present
+ (Paul Yang via namit)
+
Release 0.5.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java?rev=955043&r1=955042&r2=955043&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java Tue Jun 15 20:49:09 2010
@@ -540,12 +540,7 @@ public final class GenMapRedUtils {
parts.addAll(partsList.getUnknownPartns());
PartitionDesc aliasPartnDesc = null;
try {
- if (parts.isEmpty()) {
- if (!partsList.getDeniedPartns().isEmpty()) {
- aliasPartnDesc = Utilities.getPartitionDesc(partsList
- .getDeniedPartns().iterator().next());
- }
- } else {
+ if (!parts.isEmpty()) {
aliasPartnDesc = Utilities.getPartitionDesc(parts.iterator().next());
}
} catch (HiveException e) {
Added: hadoop/hive/trunk/ql/src/test/queries/clientpositive/diff_part_input_formats.q
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/queries/clientpositive/diff_part_input_formats.q?rev=955043&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/queries/clientpositive/diff_part_input_formats.q (added)
+++ hadoop/hive/trunk/ql/src/test/queries/clientpositive/diff_part_input_formats.q Tue Jun 15 20:49:09 2010
@@ -0,0 +1,9 @@
+-- Tests the case where a table is changed from sequence file to a RC file,
+-- resulting in partitions in both file formats. If no valid partitions are
+-- selected, then it should still use RC file for reading the dummy partition.
+CREATE TABLE part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE;
+ALTER TABLE part_test ADD PARTITION(ds='1');
+ALTER TABLE part_test SET FILEFORMAT RCFILE;
+ALTER TABLE part_test ADD PARTITION(ds='2');
+SELECT count(1) FROM part_test WHERE ds='3';
+DROP TABLE part_test;
Added: hadoop/hive/trunk/ql/src/test/results/clientpositive/diff_part_input_formats.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/diff_part_input_formats.q.out?rev=955043&view=auto
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/diff_part_input_formats.q.out (added)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/diff_part_input_formats.q.out Tue Jun 15 20:49:09 2010
@@ -0,0 +1,39 @@
+PREHOOK: query: -- Tests the case where a table is changed from sequence file to a RC file,
+-- resulting in partitions in both file formats. If no valid partitions are
+-- selected, then it should still use RC file for reading the dummy partition.
+CREATE TABLE part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: -- Tests the case where a table is changed from sequence file to a RC file,
+-- resulting in partitions in both file formats. If no valid partitions are
+-- selected, then it should still use RC file for reading the dummy partition.
+CREATE TABLE part_test (key STRING, value STRING) PARTITIONED BY (ds STRING) STORED AS SEQUENCEFILE
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@part_test
+PREHOOK: query: ALTER TABLE part_test ADD PARTITION(ds='1')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: query: ALTER TABLE part_test ADD PARTITION(ds='1')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: default@part_test@ds=1
+PREHOOK: query: ALTER TABLE part_test SET FILEFORMAT RCFILE
+PREHOOK: type: null
+POSTHOOK: query: ALTER TABLE part_test SET FILEFORMAT RCFILE
+POSTHOOK: type: null
+POSTHOOK: Input: default@part_test
+POSTHOOK: Output: default@part_test
+PREHOOK: query: ALTER TABLE part_test ADD PARTITION(ds='2')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: query: ALTER TABLE part_test ADD PARTITION(ds='2')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: default@part_test@ds=2
+PREHOOK: query: SELECT count(1) FROM part_test WHERE ds='3'
+PREHOOK: type: QUERY
+PREHOOK: Output: file:/data/users/pyang/task/trunk/VENDOR.hive/trunk/build/ql/scratchdir/hive_2010-06-15_10-14-51_112_6812982446306518733/10000
+POSTHOOK: query: SELECT count(1) FROM part_test WHERE ds='3'
+POSTHOOK: type: QUERY
+POSTHOOK: Output: file:/data/users/pyang/task/trunk/VENDOR.hive/trunk/build/ql/scratchdir/hive_2010-06-15_10-14-51_112_6812982446306518733/10000
+0
+PREHOOK: query: DROP TABLE part_test
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE part_test
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@part_test