diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java index 5f43379..2548106 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java @@ -478,9 +478,8 @@ public ETLSplitStrategy(Context context, FileSystem fs, Path dir, List 0) { @@ -561,9 +560,11 @@ public BISplitStrategy(Context context, FileSystem fs, public List getSplits() throws IOException { List 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 String toString() { public SplitStrategy call() throws IOException { final SplitStrategy splitStrategy; AcidUtils.Directory dirInfo = AcidUtils.getAcidState(dir, - context.conf, context.transactionList); + context.conf, context.transactionList, useFileIds); List deltas = AcidUtils.serializeDeltas(dirInfo.getCurrentDirectories()); Path base = dirInfo.getBaseDirectory(); List original = dirInfo.getOriginalFiles(); @@ -845,7 +846,8 @@ OrcSplit createSplit(long offset, long length, 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); } diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java index 1263346..c2c3f19 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSplit.java @@ -147,6 +147,7 @@ public void readFields(DataInput in) throws IOException { if (hasFileId) { fileId = in.readLong(); } + LOG.error("TODO# Got file ID " + fileId + " for " + getPath()); } FileMetaInfo getFileMetaInfo(){