You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by pr...@apache.org on 2015/03/10 14:35:09 UTC
[2/3] incubator-lens git commit: LENS-394: Solves unexpected end of
stament in QueryPurger in tests (Jaideep Dhok via prongs)
LENS-394: Solves unexpected end of stament in QueryPurger in tests (Jaideep Dhok via prongs)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/93536b8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/93536b8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/93536b8f
Branch: refs/heads/master
Commit: 93536b8f3f7dd8d9cc8fa13cec655cf40d398fb5
Parents: ce7712c
Author: Jaideep Dhok <jd...@apache.org>
Authored: Tue Mar 10 19:02:50 2015 +0530
Committer: Rajat Khandelwal <pr...@apache.org>
Committed: Tue Mar 10 19:02:50 2015 +0530
----------------------------------------------------------------------
lens-ml-lib/src/test/resources/lens-site.xml | 2 --
.../java/org/apache/lens/server/api/LensConfConstants.java | 2 +-
lens-server/src/main/resources/lensserver-default.xml | 2 +-
lens-server/src/test/resources/lens-site.xml | 7 -------
src/site/apt/admin/config.apt | 8 ++++----
5 files changed, 6 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/93536b8f/lens-ml-lib/src/test/resources/lens-site.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/src/test/resources/lens-site.xml b/lens-ml-lib/src/test/resources/lens-site.xml
index 4fdd79a..e2f86ae 100644
--- a/lens-ml-lib/src/test/resources/lens-site.xml
+++ b/lens-ml-lib/src/test/resources/lens-site.xml
@@ -158,6 +158,4 @@
<value>org.apache.lens.server.MockNonLensService</value>
<description>Implementation class for session service</description>
</property>
-
-
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/93536b8f/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
----------------------------------------------------------------------
diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java b/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
index 0bf78f0..cdc5fd7 100644
--- a/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
+++ b/lens-server-api/src/main/java/org/apache/lens/server/api/LensConfConstants.java
@@ -792,7 +792,7 @@ public final class LensConfConstants {
public static final String SERVER_DB_VALIDATION_QUERY = SERVER_PFX + "db.validation.query";
/** default value of the validation query */
- public static final String DEFAULT_SERVER_DB_VALIDATION_QUERY = "select 1";
+ public static final String DEFAULT_SERVER_DB_VALIDATION_QUERY = "select 1 from INFORMATION_SCHEMA.SYSTEM_USERS";
/**
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/93536b8f/lens-server/src/main/resources/lensserver-default.xml
----------------------------------------------------------------------
diff --git a/lens-server/src/main/resources/lensserver-default.xml b/lens-server/src/main/resources/lensserver-default.xml
index 238d329..57fbbc7 100644
--- a/lens-server/src/main/resources/lensserver-default.xml
+++ b/lens-server/src/main/resources/lensserver-default.xml
@@ -280,7 +280,7 @@
</property>
<property>
<name>lens.server.db.validation.query</name>
- <value>select 1</value>
+ <value>select 1 from INFORMATION_SCHEMA.SYSTEM_USERS</value>
<description>BasicDatasource has a config parameter called validationQuery. This query is run before passing
the Datasource to the application to verify if connection is valid.\
{{{http://commons.apache.org/proper/commons-dbcp/configuration.html}dbcp configuration}} \
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/93536b8f/lens-server/src/test/resources/lens-site.xml
----------------------------------------------------------------------
diff --git a/lens-server/src/test/resources/lens-site.xml b/lens-server/src/test/resources/lens-site.xml
index b20f565..2adf762 100644
--- a/lens-server/src/test/resources/lens-site.xml
+++ b/lens-server/src/test/resources/lens-site.xml
@@ -125,13 +125,6 @@
</property>
<property>
- <name>lens.server.db.validation.query</name>
- <value>select 1 from INFORMATION_SCHEMA.SYSTEM_USERS</value>
- <description>Validation query for hsql
- </description>
- </property>
-
- <property>
<name>lens.server.servicenames</name>
<value>session,query,metastore,scheduler,quota,mocknonlens</value>
</property>
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/93536b8f/src/site/apt/admin/config.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/config.apt b/src/site/apt/admin/config.apt
index 794b748..9e06da3 100644
--- a/src/site/apt/admin/config.apt
+++ b/src/site/apt/admin/config.apt
@@ -56,10 +56,10 @@ Lens server configuration
*--+--+---+--+
|16|lens.server.db.jdbc.user|SA|JDBC User for Finished queries table. Also used for database based user config loaders|
*--+--+---+--+
-|17|lens.server.db.validation.query|select 1|BasicDatasource has a config parameter called validationQuery. This query is run before passing the Datasource to the application to verify if connection is valid.\ |
-| | | |{{{http://commons.apache.org/proper/commons-dbcp/configuration.html}dbcp configuration}} \ |
-| | | |{{{http://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases}validationquery for different databases}} \ |
-| | | | |
+|17|lens.server.db.validation.query|select 1 from INFORMATION_SCHEMA.SYSTEM_USERS|BasicDatasource has a config parameter called validationQuery. This query is run before passing the Datasource to the application to verify if connection is valid.\ |
+| | | |{{{http://commons.apache.org/proper/commons-dbcp/configuration.html}dbcp configuration}} \ |
+| | | |{{{http://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases}validationquery for different databases}} \ |
+| | | | |
*--+--+---+--+
|18|lens.server.domain|company.com|Server domain. This will be used in authentication and Sending emails to users. For the server, the username will be without domain and domain will come through conf.|
*--+--+---+--+