You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/06/06 18:35:53 UTC
[26/36] hive git commit: Revert "HIVE-16744 : LLAP index update may
be broken after ORC switch (Sergey Shelukhin,
reviewed by Prasanth Jayachandran)"
Revert "HIVE-16744 : LLAP index update may be broken after ORC switch (Sergey Shelukhin, reviewed by Prasanth Jayachandran)"
This reverts commit 019ad8c822786b1bf195bcf0d4be94eec0449dda.
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/38df8b4b
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/38df8b4b
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/38df8b4b
Branch: refs/heads/hive-14535
Commit: 38df8b4b8c624cb58b563a1eef43e7b417b9ab0a
Parents: 087aafc
Author: sergey <se...@apache.org>
Authored: Fri Jun 2 15:43:24 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Fri Jun 2 15:43:24 2017 -0700
----------------------------------------------------------------------
.../apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java | 2 +-
.../apache/hadoop/hive/llap/io/metadata/OrcStripeMetadata.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/38df8b4b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java
index 7081140..9693826 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java
@@ -394,7 +394,7 @@ public class OrcEncodedDataReader extends CallableWithNdc<Void>
LlapIoImpl.ORC_LOGGER.trace("Updating indexes in stripe {} metadata for includes: {}",
stripeKey.stripeIx, DebugUtils.toString(globalIncludes));
}
- assert isFoundInCache; // If it's not fresh from the cache, indexes should be present.
+ assert isFoundInCache;
counters.incrCounter(LlapIOCounters.METADATA_CACHE_MISS);
ensureMetadataReader();
updateLoadedIndexes(stripeMetadata, stripe, globalIncludes, sargColumns);
http://git-wip-us.apache.org/repos/asf/hive/blob/38df8b4b/llap-server/src/java/org/apache/hadoop/hive/llap/io/metadata/OrcStripeMetadata.java
----------------------------------------------------------------------
diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/io/metadata/OrcStripeMetadata.java b/llap-server/src/java/org/apache/hadoop/hive/llap/io/metadata/OrcStripeMetadata.java
index 96c4cce..1f3f7ea 100644
--- a/llap-server/src/java/org/apache/hadoop/hive/llap/io/metadata/OrcStripeMetadata.java
+++ b/llap-server/src/java/org/apache/hadoop/hive/llap/io/metadata/OrcStripeMetadata.java
@@ -113,7 +113,7 @@ public class OrcStripeMetadata extends LlapCacheableBuffer implements ConsumerSt
public void loadMissingIndexes(DataReader mr, StripeInformation stripe, boolean[] includes,
boolean[] sargColumns) throws IOException {
- // Do not lose the old indexes. Create a super set includes
+ // Do not loose the old indexes. Create a super set includes
OrcProto.RowIndex[] existing = getRowIndexes();
boolean superset[] = new boolean[Math.max(existing.length, includes.length)];
for (int i = 0; i < includes.length; i++) {
@@ -123,7 +123,7 @@ public class OrcStripeMetadata extends LlapCacheableBuffer implements ConsumerSt
superset[i] = superset[i] || (existing[i] != null);
}
// TODO: should we save footer to avoid a read here?
- rowIndex = mr.readRowIndex(stripe, schema, null, true, superset,
+ rowIndex = mr.readRowIndex(stripe, schema, null, true, includes,
rowIndex.getRowGroupIndex(),
sargColumns, writerVersion, rowIndex.getBloomFilterKinds(),
rowIndex.getBloomFilterIndex());