You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2017/05/25 22:59:22 UTC
[1/2] hive git commit: HIVE-16755 : LLAP IO: incorrect assert may
trigger in tests (Sergey Shelukhin, reviewed by Prasanth Jayachandran)
Repository: hive
Updated Branches:
refs/heads/branch-2 7959be51a -> 5431fadcf
refs/heads/master 2fa4dc277 -> 4a7bc89f9
HIVE-16755 : LLAP IO: incorrect assert may trigger in tests (Sergey Shelukhin, reviewed by Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/4a7bc89f
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/4a7bc89f
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/4a7bc89f
Branch: refs/heads/master
Commit: 4a7bc89f92244a3079f57e5c0b0fbd86f7fb7ec8
Parents: 2fa4dc2
Author: sergey <se...@apache.org>
Authored: Thu May 25 15:58:56 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Thu May 25 15:58:56 2017 -0700
----------------------------------------------------------------------
.../apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/4a7bc89f/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 03bc3ce..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
@@ -378,7 +378,9 @@ public class OrcEncodedDataReader extends CallableWithNdc<Void>
orcReader.getSchema(), orcReader.getWriterVersion());
counters.incrTimeCounter(LlapIOCounters.HDFS_TIME_NS, startTimeHdfs);
if (hasFileId && metadataCache != null) {
- stripeMetadata = metadataCache.putStripeMetadata(stripeMetadata);
+ OrcStripeMetadata newMetadata = metadataCache.putStripeMetadata(stripeMetadata);
+ isFoundInCache = newMetadata != stripeMetadata; // May be cached concurrently.
+ stripeMetadata = newMetadata;
if (LlapIoImpl.ORC_LOGGER.isTraceEnabled()) {
LlapIoImpl.ORC_LOGGER.trace("Caching stripe {} metadata with includes: {}",
stripeKey.stripeIx, DebugUtils.toString(globalIncludes));
[2/2] hive git commit: HIVE-16755 : LLAP IO: incorrect assert may
trigger in tests (Sergey Shelukhin, reviewed by Prasanth Jayachandran)
Posted by se...@apache.org.
HIVE-16755 : LLAP IO: incorrect assert may trigger in tests (Sergey Shelukhin, reviewed by Prasanth Jayachandran)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/5431fadc
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/5431fadc
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/5431fadc
Branch: refs/heads/branch-2
Commit: 5431fadcf19d355af92fa91194823a137ac82ac3
Parents: 7959be5
Author: sergey <se...@apache.org>
Authored: Thu May 25 15:58:56 2017 -0700
Committer: sergey <se...@apache.org>
Committed: Thu May 25 15:59:09 2017 -0700
----------------------------------------------------------------------
.../apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/5431fadc/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 03bc3ce..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
@@ -378,7 +378,9 @@ public class OrcEncodedDataReader extends CallableWithNdc<Void>
orcReader.getSchema(), orcReader.getWriterVersion());
counters.incrTimeCounter(LlapIOCounters.HDFS_TIME_NS, startTimeHdfs);
if (hasFileId && metadataCache != null) {
- stripeMetadata = metadataCache.putStripeMetadata(stripeMetadata);
+ OrcStripeMetadata newMetadata = metadataCache.putStripeMetadata(stripeMetadata);
+ isFoundInCache = newMetadata != stripeMetadata; // May be cached concurrently.
+ stripeMetadata = newMetadata;
if (LlapIoImpl.ORC_LOGGER.isTraceEnabled()) {
LlapIoImpl.ORC_LOGGER.trace("Caching stripe {} metadata with includes: {}",
stripeKey.stripeIx, DebugUtils.toString(globalIncludes));