You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by ra...@apache.org on 2018/06/13 10:50:55 UTC
lens git commit: LENS-1521 : Download url fix in query service.
Repository: lens
Updated Branches:
refs/heads/master 0a128d600 -> 11cc1859f
LENS-1521 : Download url fix in query service.
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/11cc1859
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/11cc1859
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/11cc1859
Branch: refs/heads/master
Commit: 11cc1859f8e6a71ee37a776f203f53bd612f866d
Parents: 0a128d6
Author: Rajitha R <ra...@apache.org>
Authored: Wed Jun 13 16:20:24 2018 +0530
Committer: Rajitha.R <ra...@IM0318-L0.corp.inmobi.com>
Committed: Wed Jun 13 16:20:24 2018 +0530
----------------------------------------------------------------------
.../lens/server/query/QueryExecutionServiceImpl.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/11cc1859/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
index 5e4acdc..d925b79 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/QueryExecutionServiceImpl.java
@@ -1938,10 +1938,11 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
throw new NotFoundException("InMemory Query result purged " + queryHandle);
}
try {
+ Configuration queryConf = conf;
if (ctx != null && ctx.getConf() != null) {
- conf.addResource(ctx.getConf());
+ queryConf.addResource(ctx.getConf());
}
- return new LensPersistentResult(query, conf);
+ return new LensPersistentResult(query, queryConf);
} catch (Exception e) {
throw new LensException(e);
}
@@ -1970,8 +1971,9 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
LensResultSet resultSet = resultSets.get(queryHandle);
if (resultSet == null) {
if (ctx.isPersistent() && ctx.getQueryOutputFormatter() != null) {
- conf.addResource(ctx.getConf());
- resultSets.put(queryHandle, new LensPersistentResult(ctx, conf));
+ Configuration queryConf = conf;
+ queryConf.addResource(ctx.getConf());
+ resultSets.put(queryHandle, new LensPersistentResult(ctx, queryConf));
} else if (ctx.isResultAvailableInDriver() && !ctx.isQueryClosedOnDriver()) {
//InMemory result can not be returned for a closed query
resultSet = getDriverResultset(queryHandle);