You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by go...@apache.org on 2018/07/13 06:57:43 UTC
hive git commit: HIVE-20041: ResultsCache: Improve logging for
concurrent queries (Laszlo Bodor reviewed by Gopal V)
Repository: hive
Updated Branches:
refs/heads/master 20eb7b516 -> d8306cf68
HIVE-20041: ResultsCache: Improve logging for concurrent queries (Laszlo Bodor reviewed by Gopal V)
Signed-off-by: Gopal V <go...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/d8306cf6
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/d8306cf6
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/d8306cf6
Branch: refs/heads/master
Commit: d8306cf68087ed369178c6f3a343db07ad7b9ca8
Parents: 20eb7b5
Author: Laszlo Bodor <lb...@hortonworks.com>
Authored: Thu Jul 12 23:43:05 2018 -0700
Committer: Gopal V <go...@apache.org>
Committed: Thu Jul 12 23:43:05 2018 -0700
----------------------------------------------------------------------
ql/src/java/org/apache/hadoop/hive/ql/Driver.java | 5 +++--
.../hadoop/hive/ql/cache/results/QueryResultsCache.java | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/d8306cf6/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
index bf4d29c..78922f1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
@@ -2203,10 +2203,11 @@ public class Driver implements IDriver {
if (plan.hasAcidResourcesInQuery()) {
txnWriteIdList = AcidUtils.getValidTxnWriteIdList(conf);
}
+ CacheEntry cacheEntry = cacheUsage.getCacheEntry();
boolean savedToCache = QueryResultsCache.getInstance().setEntryValid(
- cacheUsage.getCacheEntry(),
+ cacheEntry,
plan.getFetchTask().getWork());
- LOG.info("savedToCache: {}", savedToCache);
+ LOG.info("savedToCache: {} ({})", savedToCache, cacheEntry);
if (savedToCache) {
useFetchFromCache(cacheUsage.getCacheEntry());
// setEntryValid() already increments the reader count. Set usedCacheEntry so it gets released.
http://git-wip-us.apache.org/repos/asf/hive/blob/d8306cf6/ql/src/java/org/apache/hadoop/hive/ql/cache/results/QueryResultsCache.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/cache/results/QueryResultsCache.java b/ql/src/java/org/apache/hadoop/hive/ql/cache/results/QueryResultsCache.java
index d29c4da..44f7bf8 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/cache/results/QueryResultsCache.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/cache/results/QueryResultsCache.java
@@ -213,9 +213,9 @@ public final class QueryResultsCache {
}
public String toString() {
- return "CacheEntry query: [" + getQueryInfo().getLookupInfo().getQueryText()
- + "], status: " + status + ", location: " + cachedResultsPath
- + ", size: " + size;
+ return String.format("CacheEntry#%s query: [ %s ], status: %s, location: %s, size: %d",
+ System.identityHashCode(this), getQueryInfo().getLookupInfo().getQueryText(), status,
+ cachedResultsPath, size);
}
public boolean addReader() {
@@ -297,7 +297,7 @@ public final class QueryResultsCache {
* false if the status changes from PENDING to INVALID
*/
public boolean waitForValidStatus() {
- LOG.info("Waiting on pending cacheEntry");
+ LOG.info("Waiting on pending cacheEntry: {}", this);
long timeout = 1000;
long startTime = System.nanoTime();