svn commit: r1671982 - in /hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc: OrcInputFormat.java OrcSplit.java

[pr...@apache.org]

Author: prasanthj
Date: Wed Apr  8 00:21:11 2015
New Revision: 1671982

URL: http://svn.apache.org/r1671982
Log:
HIVE-10248: LLAP: Fix merge conflicts related to HIVE-10067 (Prasanth Jayachandran)

Modified:
    hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
    hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java

Modified: hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java?rev=1671982&r1=1671981&r2=1671982&view=diff
==============================================================================
--- hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java (original)
+++ hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java Wed Apr  8 00:21:11 2015
@@ -478,9 +478,8 @@ public class OrcInputFormat  implements
       this.covered = covered;
     }
 
-    private FileInfo verifyCachedFileInfo(HdfsFileStatusWithId fileId) {
+    private FileInfo verifyCachedFileInfo(FileStatus file) {
       context.numFilesCounter.incrementAndGet();
-      FileStatus file = fileId.getFileStatus();
       FileInfo fileInfo = Context.footerCache.getIfPresent(file.getPath());
       if (fileInfo != null) {
         if (LOG.isDebugEnabled()) {
@@ -517,7 +516,7 @@ public class OrcInputFormat  implements
       for (HdfsFileStatusWithId file : files) {
         FileInfo info = null;
         if (context.cacheStripeDetails) {
-          info = verifyCachedFileInfo(file);
+          info = verifyCachedFileInfo(file.getFileStatus());
         }
         // ignore files of 0 length
         if (file.getFileStatus().getLen() > 0) {
@@ -561,9 +560,11 @@ public class OrcInputFormat  implements
     public List<OrcSplit> getSplits() throws IOException {
       List<OrcSplit> splits = Lists.newArrayList();
       for (HdfsFileStatusWithId child : fileStatuses) {
-        String[] hosts = SHIMS.getLocationsWithOffset(fs, child.getFileStatus()).firstEntry().getValue()
+        String[] hosts = SHIMS.getLocationsWithOffset(fs, child.getFileStatus()).firstEntry()
+            .getValue()
             .getHosts();
-        OrcSplit orcSplit = new OrcSplit(child.getFileStatus().getPath(), null, 0, child.getFileStatus().getLen(), hosts,
+        OrcSplit orcSplit = new OrcSplit(child.getFileStatus().getPath(), child.getFileId(),
+            0, child.getFileStatus().getLen(), hosts,
             null, isOriginal, true, deltas, -1);
         splits.add(orcSplit);
       }
@@ -638,7 +639,7 @@ public class OrcInputFormat  implements
     public SplitStrategy call() throws IOException {
       final SplitStrategy splitStrategy;
       AcidUtils.Directory dirInfo = AcidUtils.getAcidState(dir,
-          context.conf, context.transactionList);
+          context.conf, context.transactionList, useFileIds);
       List<Long> deltas = AcidUtils.serializeDeltas(dirInfo.getCurrentDirectories());
       Path base = dirInfo.getBaseDirectory();
       List<HdfsFileStatusWithId> original = dirInfo.getOriginalFiles();
@@ -845,7 +846,8 @@ public class OrcInputFormat  implements
         hosts = new String[hostList.size()];
         hostList.toArray(hosts);
       }
-      return new OrcSplit(fileWithId.getFileStatus().getPath(), null, offset, length, hosts, fileMetaInfo,
+      return new OrcSplit(fileWithId.getFileStatus().getPath(), fileWithId.getFileId(),
+          offset, length, hosts, fileMetaInfo,
           isOriginal, hasBase, deltas, projColsUncompressedSize);
     }
 

Modified: hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java
URL: http://svn.apache.org/viewvc/hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java?rev=1671982&r1=1671981&r2=1671982&view=diff
==============================================================================
--- hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java (original)
+++ hive/branches/llap/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java Wed Apr  8 00:21:11 2015
@@ -147,6 +147,7 @@ public class OrcSplit extends FileSplit
     if (hasFileId) {
       fileId = in.readLong();
     }
+    LOG.error("TODO# Got file ID " + fileId + " for " + getPath());
   }
 
   FileMetaInfo getFileMetaInfo(){