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 2009/12/22 20:47:42 UTC
svn commit: r893291 - in /hadoop/hive/trunk: CHANGES.txt
ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java
Author: namit
Date: Tue Dec 22 19:47:42 2009
New Revision: 893291
URL: http://svn.apache.org/viewvc?rev=893291&view=rev
Log:
HIVE-1006 getPartitionDescFromPath failing from CombineHiveInputFormat
(Dave Lerman via namit)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=893291&r1=893290&r2=893291&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Tue Dec 22 19:47:42 2009
@@ -351,6 +351,9 @@
HIVE-1004 Change default memory for Hive client to 256M
(Zheng Shao via namit)
+ HIVE-1006 getPartitionDescFromPath failing from CombineHiveInputFormat
+ (Dave Lerman via namit)
+
Release 0.4.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java?rev=893291&r1=893290&r2=893291&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/CombineHiveInputFormat.java Tue Dec 22 19:47:42 2009
@@ -22,6 +22,8 @@
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@@ -287,6 +289,22 @@
reporter, CombineHiveRecordReader.class);
}
+ protected static partitionDesc getPartitionDescFromPath(
+ Map<String, partitionDesc> pathToPartitionInfo, Path dir) throws IOException {
+ // The format of the keys in pathToPartitionInfo sometimes contains a port
+ // and sometimes doesn't, so we just compare paths.
+ for (Map.Entry<String, partitionDesc> entry : pathToPartitionInfo.entrySet()) {
+ try {
+ if (new URI(entry.getKey()).getPath().equals(dir.toUri().getPath())) {
+ return entry.getValue();
+ }
+ }
+ catch (URISyntaxException e2) {}
+ }
+ throw new IOException("cannot find dir = " + dir.toString()
+ + " in partToPartitionInfo!");
+ }
+
static class CombineFilter implements PathFilter {
private String pString;