Author: xuefu
Date: Mon Dec 22 22:12:55 2014
New Revision: 1647423
URL: http://svn.apache.org/r1647423
Log:
revert HIVE-9154: Cache pathToPartitionInfo in context aware record reader
(Chao via Xuefu)
Modified:
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java
Modified:
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java
URL:
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java?rev=1647423&r1=1647422&r2=1647423&view=diff
==============================================================================
---
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java
(original)
+++
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java
Mon Dec 22 22:12:55 2014
@@ -29,8 +29,8 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.io.HiveIOExceptionHandlerUtil;
-import org.apache.hadoop.hive.ql.exec.FooterBuffer;
import org.apache.hadoop.hive.ql.exec.Utilities;
+import org.apache.hadoop.hive.ql.exec.FooterBuffer;
import org.apache.hadoop.hive.ql.exec.spark.SparkUtilities;
import org.apache.hadoop.hive.ql.io.IOContext.Comparison;
import org.apache.hadoop.hive.ql.plan.PartitionDesc;
@@ -68,7 +68,6 @@ public abstract class HiveContextAwareRe
private boolean wasUsingSortedSearch = false;
private String genericUDFClassName = null;
private final List<Comparison> stopComparisons = new ArrayList<Comparison>();
- private Map<String, PartitionDesc> pathToPartitionInfo;
protected RecordReader recordReader;
protected JobConf jobConf;
@@ -186,8 +185,6 @@ public abstract class HiveContextAwareRe
IOContext.getMap().put(SparkUtilities.MAP_IO_CONTEXT, iocontext);
}
- pathToPartitionInfo =
- Utilities.getMapWork(jobConf).getPathToPartitionInfo();
initDone = true;
}
@@ -327,6 +324,8 @@ public abstract class HiveContextAwareRe
Path filePath = this.ioCxtRef.getInputPath();
PartitionDesc part = null;
try {
+ Map<String, PartitionDesc> pathToPartitionInfo = Utilities
+ .getMapWork(jobConf).getPathToPartitionInfo();
part = HiveFileFormatUtils
.getPartitionDescFromPathRecursively(pathToPartitionInfo,
filePath, IOPrepareCache.get().getPartitionDescMap());