Return-Path: <commits-return-27891-archive-asf-public=cust-asf.ponee.io@hive.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id BB6BE200CB7
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri, 26 May 2017 00:59:24 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id BA350160BCA; Thu, 25 May 2017 22:59:24 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 13C51160BD5
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 26 May 2017 00:59:23 +0200 (CEST)
Received: (qmail 48256 invoked by uid 500); 25 May 2017 22:59:23 -0000
Mailing-List: contact commits-help@hive.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hive.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hive.apache.org>
List-Post: <mailto:commits@hive.apache.org>
List-Id: <commits.hive.apache.org>
Reply-To: hive-dev@hive.apache.org
Delivered-To: mailing list commits@hive.apache.org
Received: (qmail 48182 invoked by uid 99); 25 May 2017 22:59:23 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 May 2017 22:59:23 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 1084CE0667; Thu, 25 May 2017 22:59:23 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sershe@apache.org
To: commits@hive.apache.org
Date: Thu, 25 May 2017 22:59:23 -0000
Message-Id: <9df481f7acc94b19ac3fd4f2e5ceb524@git.apache.org>
In-Reply-To: <1a039994db3d43fbb83b60b53998547d@git.apache.org>
References: <1a039994db3d43fbb83b60b53998547d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] hive git commit: HIVE-16755 : LLAP IO: incorrect assert may
 trigger in tests (Sergey Shelukhin, reviewed by Prasanth Jayachandran)
archived-at: Thu, 25 May 2017 22:59:24 -0000

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 <sershe@apache.org>
Authored: Thu May 25 15:58:56 2017 -0700
Committer: sergey <sershe@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));