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/12 11:32:42 UTC
lens git commit: LENS-1520 : Lens build fix.
Repository: lens
Updated Branches:
refs/heads/master 138d11353 -> 0a128d600
LENS-1520 : Lens build fix.
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/0a128d60
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/0a128d60
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/0a128d60
Branch: refs/heads/master
Commit: 0a128d600a6d0e06593c78d813131e9ab2129264
Parents: 138d113
Author: Rajitha R <ra...@apache.org>
Authored: Tue Jun 12 17:02:15 2018 +0530
Committer: Rajitha.R <ra...@IM0318-L0.corp.inmobi.com>
Committed: Tue Jun 12 17:02:15 2018 +0530
----------------------------------------------------------------------
.../org/apache/lens/server/query/LensPersistentResult.java | 7 ++++---
.../apache/lens/server/query/QueryExecutionServiceImpl.java | 4 +++-
src/site/apt/admin/config.apt | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/0a128d60/lens-server/src/main/java/org/apache/lens/server/query/LensPersistentResult.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/LensPersistentResult.java b/lens-server/src/main/java/org/apache/lens/server/query/LensPersistentResult.java
index 91bb701..4aa4578 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/LensPersistentResult.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/LensPersistentResult.java
@@ -75,11 +75,12 @@ public class LensPersistentResult extends PersistentResultSet {
this.fileSize = fileSize;
this.conf = conf;
if (isHttpResultAvailable()) {
- resultUrlSetter = ReflectionUtils.newInstance(this.conf.getClass(LensConfConstants.RESULT_DOWNLOAD_URL_PROVIDER_CLASS,
+ resultUrlSetter = ReflectionUtils.newInstance(this.conf.getClass(
+ LensConfConstants.RESULT_DOWNLOAD_URL_PROVIDER_CLASS,
LensConfConstants.DEFAULT_RESULT_DOWNLOAD_URL_PROVIDER, DownloadResultUrlProvider.class));
this.httpResultUrl = resultUrlSetter.getResultUrl(this.conf, queryHandle.toString());
- log.info("Config : " + this.conf.get(LensConfConstants.RESULT_DOWNLOAD_URL_PROVIDER_CLASS) + " Result url set as : "
- + this.httpResultUrl);
+ log.info("Config : " + this.conf.get(LensConfConstants.RESULT_DOWNLOAD_URL_PROVIDER_CLASS)
+ + " Result url set as : " + this.httpResultUrl);
}
}
http://git-wip-us.apache.org/repos/asf/lens/blob/0a128d60/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 77fce0b..5e4acdc 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,7 +1938,9 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
throw new NotFoundException("InMemory Query result purged " + queryHandle);
}
try {
- conf.addResource(ctx.getConf());
+ if (ctx != null && ctx.getConf() != null) {
+ conf.addResource(ctx.getConf());
+ }
return new LensPersistentResult(query, conf);
} catch (Exception e) {
throw new LensException(e);
http://git-wip-us.apache.org/repos/asf/lens/blob/0a128d60/src/site/apt/admin/config.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/config.apt b/src/site/apt/admin/config.apt
index 9a1572b..b3dff28 100644
--- a/src/site/apt/admin/config.apt
+++ b/src/site/apt/admin/config.apt
@@ -235,9 +235,9 @@ Lens server configuration
*--+--+---+--+
|103|lens.server.session.ws.resource.impl|org.apache.lens.server.session.SessionResource|Implementation class for Session Resource|
*--+--+---+--+
-|104|lens.server.ssl.enabled|false|flag to enable https communication between lens server|
+|104|lens.server.ssl.enabled|false|flag to enable https communication between lens server and client.|
*--+--+---+--+
-|105|lens.server.ssl.file.path|/usr/local/lens/server/certs|local path for cert file if ssl ie enabled.|
+|105|lens.server.ssl.file.path|/tmp/certs|local path for cert file if ssl ie enabled.|
*--+--+---+--+
|106|lens.server.ssl.password|password|password for cert file|
*--+--+---+--+