You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by pu...@apache.org on 2016/10/25 10:24:59 UTC
[01/31] lens git commit: removed beta from lens version
Repository: lens
Updated Branches:
refs/heads/master 547a42f33 -> 53909baa1
removed beta from lens version
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/f330010c
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/f330010c
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/f330010c
Branch: refs/heads/master
Commit: f330010cdf04e8bb2a412123011161ced702011a
Parents: c326de7
Author: Puneet <pu...@inmobi.com>
Authored: Mon Aug 1 16:21:56 2016 +0530
Committer: Puneet <pu...@inmobi.com>
Committed: Mon Aug 1 16:21:56 2016 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 2 +-
contrib/clients/pom.xml | 2 +-
contrib/clients/python/pom.xml | 2 +-
contrib/pom.xml | 2 +-
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-docker/lens-test/Dockerfile | 2 +-
lens-docker/lens-test/lens-bootstrap.sh | 2 +-
lens-driver-es/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-ship-jars/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
lens-ui/pom.xml | 2 +-
pom.xml | 6 +++---
.../server/drivers/hive/hive1/hivedriver-site.xml | 2 +-
26 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index f680560..d9bb0bd 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/contrib/clients/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/clients/pom.xml b/contrib/clients/pom.xml
index 42a7fb0..a683e7c 100644
--- a/contrib/clients/pom.xml
+++ b/contrib/clients/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>lens-contrib</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-contrib-clients</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/contrib/clients/python/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/clients/python/pom.xml b/contrib/clients/python/pom.xml
index 79b198c..e0a99bd 100644
--- a/contrib/clients/python/pom.xml
+++ b/contrib/clients/python/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-contrib-clients</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-python-client</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 0f792ab..4b60205 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 9b5e5f8..2471c6a 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 6f0555c..bc2c7d4 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index d8f7d6c..3f4357f 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index ef432c2..96febab 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 0cf88b0..d506523 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-docker/lens-test/Dockerfile
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/Dockerfile b/lens-docker/lens-test/Dockerfile
index 49222b2..4c59d3d 100644
--- a/lens-docker/lens-test/Dockerfile
+++ b/lens-docker/lens-test/Dockerfile
@@ -24,7 +24,7 @@ RUN mv spark-1.3.0-bin-hadoop2.4 /usr/local
ENV SPARK_HOME /usr/local/spark-1.3.0-bin-hadoop2.4
RUN rm spark-1.3.0-bin-hadoop2.4.tar
-ENV LENS_VERSION 2.6.0-beta-SNAPSHOT
+ENV LENS_VERSION 2.6.0-SNAPSHOT
ENV BASEDIR /opt/lens
ENV LENS_HOME $BASEDIR/lens-dist/target/apache-lens-${LENS_VERSION}-bin/apache-lens-${LENS_VERSION}-bin/server
ENV LENS_CLIENT $BASEDIR/lens-dist/target/apache-lens-${LENS_VERSION}-bin/apache-lens-${LENS_VERSION}-bin/client
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-docker/lens-test/lens-bootstrap.sh
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/lens-bootstrap.sh b/lens-docker/lens-test/lens-bootstrap.sh
index b736ab5..71f1c2c 100644
--- a/lens-docker/lens-test/lens-bootstrap.sh
+++ b/lens-docker/lens-test/lens-bootstrap.sh
@@ -37,7 +37,7 @@ SPARK_YARN_JAR=$SPARK_HOME/lib/spark-assembly-1.3.0-hadoop2.4.0.jar
export SPARK_YARN_JAR
echo "SPARK_YARN_JAR " $SPARK_YARN_JAR
-HIVE_AUX_JARS_PATH=$LENS_ML/lib/lens-ml-lib-2.6.0-beta-SNAPSHOT.jar,$SPARK_YARN_JAR
+HIVE_AUX_JARS_PATH=$LENS_ML/lib/lens-ml-lib-2.6.0-SNAPSHOT.jar,$SPARK_YARN_JAR
export HIVE_AUX_JARS_PATH
echo "HIVE_AUX_JARS_PATH " $HIVE_AUX_JARS_PATH
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-driver-es/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-es/pom.xml b/lens-driver-es/pom.xml
index b00e78b..03b9d5c 100644
--- a/lens-driver-es/pom.xml
+++ b/lens-driver-es/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-es</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 9809953..bcbe395 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index fd1f78f..13e50ae 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 4144213..fc234db 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index d2dd2de..a496fd4 100644
--- a/lens-ml-dist/pom.xml
+++ b/lens-ml-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 152d7c3..a4632ac 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index 5d8ca3e..ec16458 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 07959c8..7154d29 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index b59c249..6056a8f 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 2294b2a..29098d4 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-ship-jars/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ship-jars/pom.xml b/lens-ship-jars/pom.xml
index 651bba8..7bcb27a 100644
--- a/lens-ship-jars/pom.xml
+++ b/lens-ship-jars/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-ship-jars</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 7fcd921..6de1605 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/lens-ui/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ui/pom.xml b/lens-ui/pom.xml
index 6639f97..342b77a 100644
--- a/lens-ui/pom.xml
+++ b/lens-ui/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>lens-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f5a80df..c85dc17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -708,7 +708,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1795,7 +1795,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.0-beta-SNAPSHOT</version>
+ <version>2.6.0-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
http://git-wip-us.apache.org/repos/asf/lens/blob/f330010c/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml b/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml
index b9b6994..eb86933 100644
--- a/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml
+++ b/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml
@@ -52,6 +52,6 @@
</property>
<property>
<name>hive.aux.jars.path</name>
- <value>file:///opt/lens/lens-ml-dist/target/apache-lens-2.6.0-beta-SNAPSHOT-ml/lib/lens-ml-lib-2.6.0-beta-SNAPSHOT.jar,file:///usr/local/spark-1.3.0-bin-hadoop2.4/lib/spark-assembly-1.3.0-hadoop2.4.0.jar</value>
+ <value>file:///opt/lens/lens-ml-dist/target/apache-lens-2.6.0-SNAPSHOT-ml/lib/lens-ml-lib-2.6.0-SNAPSHOT.jar,file:///usr/local/spark-1.3.0-bin-hadoop2.4/lib/spark-assembly-1.3.0-hadoop2.4.0.jar</value>
</property>
</configuration>
[28/31] lens git commit: LENS-1336: lens/contrib/client/python should
not be build in default profile
Posted by pu...@apache.org.
LENS-1336: lens/contrib/client/python should not be build in default profile
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/aeb2d8ea
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/aeb2d8ea
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/aeb2d8ea
Branch: refs/heads/master
Commit: aeb2d8eac7dfef3b143d1b4039197d598b3a9a70
Parents: e4ac153
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Tue Sep 27 14:38:27 2016 +0530
Committer: Rajat Khandelwal <ra...@gmail.com>
Committed: Tue Sep 27 14:45:06 2016 +0530
----------------------------------------------------------------------
contrib/clients/python/README.md | 6 ++
contrib/clients/python/pom.xml | 157 ++++++++++++++++++----------------
2 files changed, 90 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/aeb2d8ea/contrib/clients/python/README.md
----------------------------------------------------------------------
diff --git a/contrib/clients/python/README.md b/contrib/clients/python/README.md
index 93a19c9..0bcc82b 100644
--- a/contrib/clients/python/README.md
+++ b/contrib/clients/python/README.md
@@ -6,6 +6,12 @@ You can install like this:
pip install -e 'git+https://github.com/apache/lens.git#egg=lenspythonclient&subdirectory=contrib/clients/python' # install a python package from a repo subdirectory
+## Local development
+
+ For local development, fork the project, build with profile `py` (`mvn clean install -Ppy`). That should link python client to
+ your PYTHONPATH. After that, all the changes you make in client here are accessible to your other applications that depend
+ the python client. If that fails, going inside python client directory (contrig/clients/python) and running `python setup.py develop` or
+ `python setup.py develop --user` should work.
## Usage
http://git-wip-us.apache.org/repos/asf/lens/blob/aeb2d8ea/contrib/clients/python/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/clients/python/pom.xml b/contrib/clients/python/pom.xml
index f28853e..d4019f4 100644
--- a/contrib/clients/python/pom.xml
+++ b/contrib/clients/python/pom.xml
@@ -32,79 +32,90 @@
<artifactId>lens-python-client</artifactId>
<packaging>pom</packaging>
<description>Lens python clients jar</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <configuration>
- <executable>python</executable>
- <workingDirectory>${basedir}</workingDirectory>
- <environmentVariables>
- <VERSION>${project.version}</VERSION>
- <!--<BUILD_NUMBER>${buildNumber}</BUILD_NUMBER>-->
- <!--<TIMESTAMP>${timestamp}</TIMESTAMP>-->
- </environmentVariables>
- </configuration>
- <executions>
- <execution>
- <id>setuptools clean</id>
- <phase>clean</phase>
- <goals>
- <goal>exec</goal>
- </goals>
+ <profiles>
+ <profile>
+ <id>no.build.by.default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>py</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
<configuration>
- <arguments>
- <argument>setup.py</argument>
- <argument>clean</argument>
- <argument>--all</argument>
- </arguments>
+ <executable>python</executable>
+ <workingDirectory>${basedir}</workingDirectory>
+ <environmentVariables>
+ <VERSION>${project.version}</VERSION>
+ <!--<BUILD_NUMBER>${buildNumber}</BUILD_NUMBER>-->
+ <!--<TIMESTAMP>${timestamp}</TIMESTAMP>-->
+ </environmentVariables>
</configuration>
- </execution>
- <execution>
- <id>setuptools install</id>
- <phase>compile</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <arguments>
- <argument>setup.py</argument>
- <argument>develop</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>setuptools test</id>
- <phase>test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <arguments>
- <argument>setup.py</argument>
- <argument>test</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>setuptools deploy</id>
- <phase>deploy</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <arguments>
- <argument>setup.py</argument>
- <argument>register</argument>
- <argument>sdist</argument>
- <argument>upload</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <executions>
+ <execution>
+ <id>setuptools clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <arguments>
+ <argument>setup.py</argument>
+ <argument>clean</argument>
+ <argument>--all</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>setuptools install</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <arguments>
+ <argument>setup.py</argument>
+ <argument>develop</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>setuptools test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <skip>${maven.test.skip}</skip>
+ <arguments>
+ <argument>setup.py</argument>
+ <argument>test</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>setuptools deploy</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <arguments>
+ <argument>setup.py</argument>
+ <argument>register</argument>
+ <argument>sdist</argument>
+ <argument>upload</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
[18/31] lens git commit: LENS-1314 : Update 2.6 release documentation
Posted by pu...@apache.org.
LENS-1314 : Update 2.6 release documentation
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/03595918
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/03595918
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/03595918
Branch: refs/heads/master
Commit: 03595918430cf9fd3944539a7c8f26b724a3e773
Parents: ca19ead
Author: Puneet Gupta <pu...@apache.org>
Authored: Wed Sep 21 09:57:56 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Wed Sep 21 09:58:46 2016 +0530
----------------------------------------------------------------------
src/site/apt/releases/download.apt | 2 +-
src/site/apt/releases/release-history.apt | 35 ++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/03595918/src/site/apt/releases/download.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/download.apt b/src/site/apt/releases/download.apt
index d0b313f..7e6895d 100644
--- a/src/site/apt/releases/download.apt
+++ b/src/site/apt/releases/download.apt
@@ -20,7 +20,7 @@
Download
The latest release of Apache Lens can be
- {{{http://www.apache.org/dyn/closer.lua/lens/2.5-beta}downloaded from the ASF}}.
+ {{{http://www.apache.org/dyn/closer.lua/lens/2.6}downloaded from the ASF}}.
Older releases may be found {{{http://archive.apache.org/dist/lens}in the archives}}.
Releases prior to graduation may be found {{{http://archive.apache.org/dist/incubator/lens}in the incubator archives}}.
http://git-wip-us.apache.org/repos/asf/lens/blob/03595918/src/site/apt/releases/release-history.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
index 95891be..5ed0af8 100644
--- a/src/site/apt/releases/release-history.apt
+++ b/src/site/apt/releases/release-history.apt
@@ -23,6 +23,8 @@ All Apache Lens releases
*--+--+---+--+--+--+--+
|Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
*--+--+---+--+--+--+--+
+|2.6.0| GA release, Apache Hive 2 support, Query Scheduler, Lens UI enhancements, Python client, Streaming results, New regression module, Weighted Driver selector, Limit number of open sessions, Exponential back off for hive status updates, Single execution for duplicate queries, Auto kill queries on timeout, Convert dimension filter to fact filters for performance improvement, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes| {{{../versions/2.6.0/index.html} 2.6.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333846&styleName=&projectId=12315923} 2.6 release notes}} |{{{http://archive.apache.org/dist/lens/2.6/} Download}} |{{{#a2.6.x_from_2.5.x} 2.6.x-incompatibilities}} | - |
+*--+--+---+--+--+--+--+
|2.5.0-beta| Support for multiple instances of a driver, REST API enhancements, Derived cube validation, Per-queue driver max launched queries constraint, New error codes for Hive and JDBC Driver, Lens CLI improvements, Query result retention policy, UI Enhancements, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes| {{{../versions/2.5.0-beta/index.html} 2.5.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333326&projectId=12315923} 2.5 release notes}} |{{{http://archive.apache.org/dist/lens/2.5-beta/} Download}} |{{{#a2.5.x_from_2.4.x} 2.5.x-incompatibilities}} | - |
*--+--+---+--+--+--+--+
|2.4.0-beta| JDK8 support, new web client, Saved Query and Parameterization, Support flattening of columns selected through bridge-tables(many-to-many relationships), column name mapping for columns in underlying storage tables, Enhancements cube.xsd and jdbc driver, Improvements in Error codes, Doc improvements, bug fixes| {{{../versions/2.4.0-beta/index.html} 2.4.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12333087} 2.4 release notes}} |{{{http://archive.apache.org/dist/lens/2.4-beta/} Download}} |{{{#a2.4.x_from_2.3.x} 2.4.x-incompatibilities}} | - |
@@ -44,6 +46,39 @@ All Apache Lens releases
* Incompatibilities
+** 2.6.x from 2.5.x
+
+ * LENS-919: For older deployments the schema for "finished_queries" table needs to be modified to include "priority"
+
+ * LENS-1212: Saved query service is enabled by default now. "saved_query" table will be created to store information
+ pertaining to saved queries
+
+ * LENS-833: Number of open sessions allowed for each user is capped at 10 by default now
+
+ * LENS-1244: Dropping beta from lens releases. Lens 2.6 will be a GA release
+
+ * LENS-909: Query finish email notification message body will not have query results inline in case of inmemory
+ resultset
+
+ * LENS-1198: Lens 2.6 is compatible with hive 2.1.0 and above
+
+ * LENS-1217: Old lens GUI is removed. For new GUI check
+ http://lens.apache.org/lenshome/install-and-run.html#Starting_Lens_UI
+
+ * LENS-1215: Cluster user was defaulted to operating system user by lens-client module earlier. This logic have been
+ moved to cli. Direct users of lens-client will see a change in behavior due to this modification
+
+ * LENS-1187: For metastore REST end point most of the apis returning APIResult were giving http status 200 even in
+ case of failure. The payload object had a FAILED APIResult, but the status code was 200. After this, the status
+ code comes as 500.
+
+ * LENS-1029: Lens server configuration lens.server.snapshot.interval is changed to
+ lens.server.state.persistence.interval.millis, lens.server.restart.enabled is changed to
+ lens.server.state.persistence.enabled and lens.server.recover.onrestart is removed
+
+ * LENS-1013: postDriverSelection method has been added DriverQueryHook SPI. Implementation providers need to adapt to
+ new interface (if the implementation is not extending org.apache.lens.server.api.driver.NoOpDriverQueryHook)
+
** 2.5.x from 2.4.x
* LENS-817: Metadata class information is no longer persisted in DB due to redundancy. The 'metadataclass' column is
[15/31] lens git commit: LENS-1282: getUpdatedQueryContext() call is
missing from QueryExecutionServiceImpl#executeTimeoutInternal
Posted by pu...@apache.org.
LENS-1282: getUpdatedQueryContext() call is missing from QueryExecutionServiceImpl#executeTimeoutInternal
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/466cee34
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/466cee34
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/466cee34
Branch: refs/heads/master
Commit: 466cee342d9657d8ca2348efbd7393c47ed0d3d0
Parents: 2748cd9
Author: Puneet Gupta <pu...@gmail.com>
Authored: Mon Aug 22 18:20:48 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Aug 23 11:05:09 2016 +0530
----------------------------------------------------------------------
.../apache/lens/server/query/QueryExecutionServiceImpl.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/466cee34/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 84dcecd..896ddbb 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
@@ -2294,9 +2294,15 @@ public class QueryExecutionServiceImpl extends BaseLensService implements QueryE
long totalWaitMillisSoFar = 0;
synchronized (listener) {
while (totalWaitMillisSoFar < totalWaitTime
- && !queryCtx.getStatus().executed() && !queryCtx.getStatus().finished()) {
+ && !listener.querySuccessful
+ && !queryCtx.getStatus().executed()
+ && !queryCtx.getStatus().finished()) {
listener.wait(waitMillisPerCheck);
totalWaitMillisSoFar += waitMillisPerCheck;
+ if (!listener.querySuccessful) {
+ //update ths status in case query is not successful yet
+ queryCtx = getUpdatedQueryContext(sessionHandle, handle);
+ }
}
}
} catch (InterruptedException e) {
[23/31] lens git commit: LENS-1338: Update current-release-line
version to 2.6.1 in all poms and configs
Posted by pu...@apache.org.
LENS-1338: Update current-release-line version to 2.6.1 in all poms and configs
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/8a71940d
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/8a71940d
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/8a71940d
Branch: refs/heads/master
Commit: 8a71940d5a550783f4a8086d1c0b459d8caf0c6b
Parents: 3e64eea
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Sat Sep 24 10:49:50 2016 +0800
Committer: rajub <ra...@lazada.com>
Committed: Sat Sep 24 10:49:50 2016 +0800
----------------------------------------------------------------------
contrib/clients/pom.xml | 2 +-
contrib/clients/python/lens/client/__init__.py | 2 +-
contrib/clients/python/pom.xml | 2 +-
contrib/clients/python/setup.py | 4 ++--
contrib/pom.xml | 2 +-
lens-docker/lens-test/Dockerfile | 2 +-
lens-docker/lens-test/lens-bootstrap.sh | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/8a71940d/contrib/clients/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/clients/pom.xml b/contrib/clients/pom.xml
index a683e7c..8de9ee9 100644
--- a/contrib/clients/pom.xml
+++ b/contrib/clients/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>lens-contrib</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-contrib-clients</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/8a71940d/contrib/clients/python/lens/client/__init__.py
----------------------------------------------------------------------
diff --git a/contrib/clients/python/lens/client/__init__.py b/contrib/clients/python/lens/client/__init__.py
index d59c5e9..2d57326 100644
--- a/contrib/clients/python/lens/client/__init__.py
+++ b/contrib/clients/python/lens/client/__init__.py
@@ -17,4 +17,4 @@
from .main import LensClient
__all__ = ['LensClient']
-__version__ = "2.6.0"
\ No newline at end of file
+__version__ = "2.6.1"
http://git-wip-us.apache.org/repos/asf/lens/blob/8a71940d/contrib/clients/python/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/clients/python/pom.xml b/contrib/clients/python/pom.xml
index e0a99bd..f28853e 100644
--- a/contrib/clients/python/pom.xml
+++ b/contrib/clients/python/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>lens-contrib-clients</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-python-client</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/8a71940d/contrib/clients/python/setup.py
----------------------------------------------------------------------
diff --git a/contrib/clients/python/setup.py b/contrib/clients/python/setup.py
index 2d58c74..113205d 100644
--- a/contrib/clients/python/setup.py
+++ b/contrib/clients/python/setup.py
@@ -50,7 +50,7 @@ class Tox(TestCommand):
setup(
name='lens-client',
- version="2.6.0",
+ version="2.6.1",
url='http://github.com/apache/lens/',
license='Apache Software License',
author='Apache',
@@ -79,4 +79,4 @@ setup(
extras_require={
'testing': ['pytest'],
}
-)
\ No newline at end of file
+)
http://git-wip-us.apache.org/repos/asf/lens/blob/8a71940d/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 4b60205..104f63b 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/8a71940d/lens-docker/lens-test/Dockerfile
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/Dockerfile b/lens-docker/lens-test/Dockerfile
index 4c59d3d..f52bad1 100644
--- a/lens-docker/lens-test/Dockerfile
+++ b/lens-docker/lens-test/Dockerfile
@@ -24,7 +24,7 @@ RUN mv spark-1.3.0-bin-hadoop2.4 /usr/local
ENV SPARK_HOME /usr/local/spark-1.3.0-bin-hadoop2.4
RUN rm spark-1.3.0-bin-hadoop2.4.tar
-ENV LENS_VERSION 2.6.0-SNAPSHOT
+ENV LENS_VERSION 2.6.1
ENV BASEDIR /opt/lens
ENV LENS_HOME $BASEDIR/lens-dist/target/apache-lens-${LENS_VERSION}-bin/apache-lens-${LENS_VERSION}-bin/server
ENV LENS_CLIENT $BASEDIR/lens-dist/target/apache-lens-${LENS_VERSION}-bin/apache-lens-${LENS_VERSION}-bin/client
http://git-wip-us.apache.org/repos/asf/lens/blob/8a71940d/lens-docker/lens-test/lens-bootstrap.sh
----------------------------------------------------------------------
diff --git a/lens-docker/lens-test/lens-bootstrap.sh b/lens-docker/lens-test/lens-bootstrap.sh
index 71f1c2c..f65021f 100644
--- a/lens-docker/lens-test/lens-bootstrap.sh
+++ b/lens-docker/lens-test/lens-bootstrap.sh
@@ -37,7 +37,7 @@ SPARK_YARN_JAR=$SPARK_HOME/lib/spark-assembly-1.3.0-hadoop2.4.0.jar
export SPARK_YARN_JAR
echo "SPARK_YARN_JAR " $SPARK_YARN_JAR
-HIVE_AUX_JARS_PATH=$LENS_ML/lib/lens-ml-lib-2.6.0-SNAPSHOT.jar,$SPARK_YARN_JAR
+HIVE_AUX_JARS_PATH=$LENS_ML/lib/lens-ml-lib-2.6.1.jar,$SPARK_YARN_JAR
export HIVE_AUX_JARS_PATH
echo "HIVE_AUX_JARS_PATH " $HIVE_AUX_JARS_PATH
[09/31] lens git commit: LENS-1272 : Check-style fixes after LENS-1265
Posted by pu...@apache.org.
LENS-1272 : Check-style fixes after LENS-1265
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/d37e8499
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/d37e8499
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/d37e8499
Branch: refs/heads/master
Commit: d37e84994042622b7e68a5c564d3cb31fed5c45f
Parents: ebf018f
Author: Lavkesh Lahngir <la...@linux.com>
Authored: Wed Aug 10 19:21:43 2016 +0530
Committer: Archana H <ar...@apache.org>
Committed: Wed Aug 17 13:40:49 2016 +0530
----------------------------------------------------------------------
.../main/java/org/apache/lens/server/scheduler/SchedulerDAO.java | 3 ++-
.../org/apache/lens/server/scheduler/SchedulerServiceImpl.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/d37e8499/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java
index 6a4c77b..966a64e 100644
--- a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java
+++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java
@@ -665,7 +665,8 @@ public class SchedulerDAO {
"CREATE TABLE IF NOT EXISTS " + JOB_INSTANCE_RUN_TABLE + "( " + COLUMN_ID + " VARCHAR(255) NOT NULL, "
+ COLUMN_RUN_ID + " INT NOT NULL, " + COLUMN_SESSION_HANDLE + " VARCHAR(255), " + COLUMN_START_TIME
+ " BIGINT, " + COLUMN_END_TIME + " BIGINT, " + COLUMN_RESULT_PATH + " TEXT, " + COLUMN_QUERY_HANDLE
- + " VARCHAR(255), " + COLUMN_STATUS + " VARCHAR(20), " + " PRIMARY KEY ( " + COLUMN_ID + ", " + COLUMN_RUN_ID
+ + " VARCHAR(255), " + COLUMN_STATUS + " VARCHAR(20), " + " PRIMARY KEY ( " + COLUMN_ID + ", "
+ + COLUMN_RUN_ID
+ ")" + ")";
runner.update(createSQL);
}
http://git-wip-us.apache.org/repos/asf/lens/blob/d37e8499/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java
index 28d7e27..74b337c 100644
--- a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java
@@ -97,8 +97,9 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
private void doesSessionBelongToUser(LensSessionHandle sessionHandle, String user) throws LensException {
LensSessionImpl session = getSession(sessionHandle);
- if (!session.getLoggedInUser().equals(user))
+ if (!session.getLoggedInUser().equals(user)) {
throw new LensException("Logged in user " + session.getLoggedInUser() + " is not same as " + user);
+ }
}
@Override
[03/31] lens git commit: LENS-1250 : Error while initializing saved
query service on server start
Posted by pu...@apache.org.
LENS-1250 : Error while initializing saved query service on server start
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/06c6f47b
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/06c6f47b
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/06c6f47b
Branch: refs/heads/master
Commit: 06c6f47b361421cad53550bae72c7a892af8f516
Parents: 7ae4a54
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Tue Aug 2 15:16:50 2016 +0530
Committer: Archana H <ar...@apache.org>
Committed: Wed Aug 3 18:29:28 2016 +0530
----------------------------------------------------------------------
.../main/java/org/apache/lens/server/query/save/SavedQueryDao.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/06c6f47b/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java b/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java
index 75a8115..8762aff 100644
--- a/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java
+++ b/lens-server/src/main/java/org/apache/lens/server/query/save/SavedQueryDao.java
@@ -282,7 +282,7 @@ public class SavedQueryDao {
+ QUERY_COL_NAME + " longtext,"
+ PARAMS_COL_NAME + " longtext,"
+ CREATED_AT_COL_NAME + " timestamp DEFAULT CURRENT_TIMESTAMP,"
- + UPDATED_AT_COL_NAME + " timestamp DEFAULT CURRENT_TIMESTAMP,"
+ + UPDATED_AT_COL_NAME + " timestamp NOT NULL,"
+ " PRIMARY KEY ("+ ID_COL_NAME +")"
+ ")";
[02/31] lens git commit: LENS-1242: (incremental)JDBCDriver cancel
query is taking huge time
Posted by pu...@apache.org.
LENS-1242: (incremental)JDBCDriver cancel query is taking huge time
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/7ae4a547
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/7ae4a547
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/7ae4a547
Branch: refs/heads/master
Commit: 7ae4a547294e23ec0b61d89679c9137f86709fb2
Parents: f330010
Author: Amareshwari Sriramadasu <am...@gmail.com>
Authored: Mon Aug 1 17:18:21 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Tue Aug 2 09:37:31 2016 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/7ae4a547/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java
index 15a1826..bebb9ae 100644
--- a/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java
+++ b/lens-driver-jdbc/src/main/java/org/apache/lens/driver/jdbc/JDBCDriver.java
@@ -217,7 +217,7 @@ public class JDBCDriver extends AbstractLensDriver {
log.debug("Done resultFuture cancel!");
// queryResult object would be null if query is not yet launched - since we did future.cancel, no other cancel is
// required.
- if (queryResult != null && isStatementCancelSupported) {
+ if (queryResult != null && queryResult.stmt != null && isStatementCancelSupported) {
log.debug("Cancelling query through statement cancel");
try {
queryResult.stmt.cancel();
[04/31] lens git commit: LENS-1254 : Fix
TestLensQueryCommands.showPersistentResultSet failure
Posted by pu...@apache.org.
LENS-1254 : Fix TestLensQueryCommands.showPersistentResultSet failure
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/68e01c2b
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/68e01c2b
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/68e01c2b
Branch: refs/heads/master
Commit: 68e01c2b40b15fc1f14e6071267823d77efd317c
Parents: 06c6f47
Author: Puneet Gupta <pu...@gmail.com>
Authored: Thu Aug 4 10:42:11 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Aug 4 10:46:47 2016 +0530
----------------------------------------------------------------------
.../src/test/java/org/apache/lens/cli/TestLensQueryCommands.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/68e01c2b/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java
----------------------------------------------------------------------
diff --git a/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java b/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java
index ae30e9f..e1b19de 100644
--- a/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java
+++ b/lens-cli/src/test/java/org/apache/lens/cli/TestLensQueryCommands.java
@@ -461,6 +461,7 @@ public class TestLensQueryCommands extends LensCliApplicationTest {
public void showPersistentResultSet(LensQueryCommands qCom) throws Exception {
System.out.println("@@PERSISTENT_RESULT_TEST-------------");
qCom.getClient().setConnectionParam("lens.query.enable.persistent.resultset", "true");
+ qCom.getClient().setConnectionParam("lens.query.prefetch.inmemory.resultset", "false");
String query = "cube select id,name from test_dim";
try {
String result = qCom.executeQuery(query, false, "testQuery3");
[24/31] lens git commit: LENS-1337: Update Release documentation for
lens 2.6.1
Posted by pu...@apache.org.
LENS-1337: Update Release documentation for lens 2.6.1
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/c600c82b
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/c600c82b
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/c600c82b
Branch: refs/heads/master
Commit: c600c82b03d3127b3f1107e2b798e42b1a2acf0e
Parents: 8a71940
Author: Puneet Gupta <pu...@gmail.com>
Authored: Sat Sep 24 10:53:51 2016 +0800
Committer: rajub <ra...@lazada.com>
Committed: Sat Sep 24 10:53:51 2016 +0800
----------------------------------------------------------------------
src/site/apt/releases/release-history.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/c600c82b/src/site/apt/releases/release-history.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
index 5ed0af8..f919ca5 100644
--- a/src/site/apt/releases/release-history.apt
+++ b/src/site/apt/releases/release-history.apt
@@ -23,7 +23,7 @@ All Apache Lens releases
*--+--+---+--+--+--+--+
|Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
*--+--+---+--+--+--+--+
-|2.6.0| GA release, Apache Hive 2 support, Query Scheduler, Lens UI enhancements, Python client, Streaming results, New regression module, Weighted Driver selector, Limit number of open sessions, Exponential back off for hive status updates, Single execution for duplicate queries, Auto kill queries on timeout, Convert dimension filter to fact filters for performance improvement, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes| {{{../versions/2.6.0/index.html} 2.6.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333846&styleName=&projectId=12315923} 2.6 release notes}} |{{{http://archive.apache.org/dist/lens/2.6/} Download}} |{{{#a2.6.x_from_2.5.x} 2.6.x-incompatibilities}} | - |
+|2.6.1| GA release, Apache Hive 2 support, Query Scheduler, Lens UI enhancements, Python client, Streaming results, New regression module, Weighted Driver selector, Limit number of open sessions, Exponential back off for hive status updates, Single execution for duplicate queries, Auto kill queries on timeout, Convert dimension filter to fact filters for performance improvement, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes| {{{../versions/2.6.0/index.html} 2.6.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333846&styleName=&projectId=12315923} 2.6 release notes}} |{{{http://archive.apache.org/dist/lens/2.6/} Download}} |{{{#a2.6.x_from_2.5.x} 2.6.x-incompatibilities}} | - |
*--+--+---+--+--+--+--+
|2.5.0-beta| Support for multiple instances of a driver, REST API enhancements, Derived cube validation, Per-queue driver max launched queries constraint, New error codes for Hive and JDBC Driver, Lens CLI improvements, Query result retention policy, UI Enhancements, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes| {{{../versions/2.5.0-beta/index.html} 2.5.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333326&projectId=12315923} 2.5 release notes}} |{{{http://archive.apache.org/dist/lens/2.5-beta/} Download}} |{{{#a2.5.x_from_2.4.x} 2.5.x-incompatibilities}} | - |
*--+--+---+--+--+--+--+
[26/31] lens git commit: LENS-1337 : Update docs link in
release-history
Posted by pu...@apache.org.
LENS-1337 : Update docs link in release-history
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/7efc6436
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/7efc6436
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/7efc6436
Branch: refs/heads/master
Commit: 7efc6436a2e8fbde77e1c3feb181f6aa2b989d82
Parents: 0f7a1d6
Author: Puneet Gupta <pu...@apache.org>
Authored: Sun Sep 25 07:51:41 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Sun Sep 25 07:52:27 2016 +0530
----------------------------------------------------------------------
src/site/apt/releases/release-history.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/7efc6436/src/site/apt/releases/release-history.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
index f919ca5..7057c74 100644
--- a/src/site/apt/releases/release-history.apt
+++ b/src/site/apt/releases/release-history.apt
@@ -23,7 +23,7 @@ All Apache Lens releases
*--+--+---+--+--+--+--+
|Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
*--+--+---+--+--+--+--+
-|2.6.1| GA release, Apache Hive 2 support, Query Scheduler, Lens UI enhancements, Python client, Streaming results, New regression module, Weighted Driver selector, Limit number of open sessions, Exponential back off for hive status updates, Single execution for duplicate queries, Auto kill queries on timeout, Convert dimension filter to fact filters for performance improvement, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes| {{{../versions/2.6.0/index.html} 2.6.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333846&styleName=&projectId=12315923} 2.6 release notes}} |{{{http://archive.apache.org/dist/lens/2.6/} Download}} |{{{#a2.6.x_from_2.5.x} 2.6.x-incompatibilities}} | - |
+|2.6.1| GA release, Apache Hive 2 support, Query Scheduler, Lens UI enhancements, Python client, Streaming results, New regression module, Weighted Driver selector, Limit number of open sessions, Exponential back off for hive status updates, Single execution for duplicate queries, Auto kill queries on timeout, Convert dimension filter to fact filters for performance improvement, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes| {{{../versions/2.6.1/index.html} 2.6.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333846&styleName=&projectId=12315923} 2.6 release notes}} |{{{http://archive.apache.org/dist/lens/2.6/} Download}} |{{{#a2.6.x_from_2.5.x} 2.6.x-incompatibilities}} | - |
*--+--+---+--+--+--+--+
|2.5.0-beta| Support for multiple instances of a driver, REST API enhancements, Derived cube validation, Per-queue driver max launched queries constraint, New error codes for Hive and JDBC Driver, Lens CLI improvements, Query result retention policy, UI Enhancements, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes| {{{../versions/2.5.0-beta/index.html} 2.5.x docs}} |{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12333326&projectId=12315923} 2.5 release notes}} |{{{http://archive.apache.org/dist/lens/2.5-beta/} Download}} |{{{#a2.5.x_from_2.4.x} 2.5.x-incompatibilities}} | - |
*--+--+---+--+--+--+--+
[29/31] lens git commit: [maven-release-plugin] prepare release
apache-lens-2.6.1
Posted by pu...@apache.org.
[maven-release-plugin] prepare release apache-lens-2.6.1
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/7224d832
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/7224d832
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/7224d832
Branch: refs/heads/master
Commit: 7224d832de56ac7a22a06bb285808cfac33f32f2
Parents: aeb2d8e
Author: Puneet <pu...@inmobi.com>
Authored: Tue Sep 27 16:47:29 2016 +0530
Committer: Puneet <pu...@inmobi.com>
Committed: Tue Sep 27 16:47:29 2016 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +++++-
contrib/clients/pom.xml | 2 +-
contrib/clients/python/pom.xml | 5 ++---
contrib/pom.xml | 2 +-
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-es/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-ship-jars/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
lens-ui/pom.xml | 2 +-
pom.xml | 8 ++++----
23 files changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 6a69eae..8194153 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
<build>
<plugins>
@@ -49,4 +49,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>apache-lens-2.6.1</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/contrib/clients/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/clients/pom.xml b/contrib/clients/pom.xml
index 8de9ee9..79f14eb 100644
--- a/contrib/clients/pom.xml
+++ b/contrib/clients/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>lens-contrib</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-contrib-clients</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/contrib/clients/python/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/clients/python/pom.xml b/contrib/clients/python/pom.xml
index d4019f4..57ed554 100644
--- a/contrib/clients/python/pom.xml
+++ b/contrib/clients/python/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Python Client</name>
<parent>
<artifactId>lens-contrib-clients</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-python-client</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 104f63b..04b4045 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 9706a32..6cd3394 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 197ef1b..2ab54a2 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 3e0d429..7a35692 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 63cbc6c..5f065d3 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 33be92a..3efd258 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-driver-es/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-es/pom.xml b/lens-driver-es/pom.xml
index 6953124..361b963 100644
--- a/lens-driver-es/pom.xml
+++ b/lens-driver-es/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-driver-es</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 8165239..dbff178 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index ce446e2..f3115b7 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 60b9022..ce7246f 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index e448332..7b3fe81 100644
--- a/lens-ml-dist/pom.xml
+++ b/lens-ml-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index d55e664..4a86136 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index ddedeb7..e289dad 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index d475b82..92f0089 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 520c3f9..f066401 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index b68f4a5..391b11b 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-ship-jars/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ship-jars/pom.xml b/lens-ship-jars/pom.xml
index bbc9e1e..12f433f 100644
--- a/lens-ship-jars/pom.xml
+++ b/lens-ship-jars/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-ship-jars</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 56a3728..c2b092e 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/lens-ui/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ui/pom.xml b/lens-ui/pom.xml
index e33c83d..f10f8ed 100644
--- a/lens-ui/pom.xml
+++ b/lens-ui/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</parent>
<artifactId>lens-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/7224d832/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6dfa049..362649e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -376,7 +376,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/lens.git</url>
- <tag>HEAD</tag>
+ <tag>apache-lens-2.6.1</tag>
</scm>
<reporting>
@@ -704,7 +704,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</dependency>
</dependencies>
<executions>
@@ -1804,7 +1804,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.6.1</version>
</dependency>
</dependencies>
<executions>
[20/31] lens git commit: LENS-1331 : Remove protobuf dependency from
lens
Posted by pu...@apache.org.
LENS-1331 : Remove protobuf dependency from lens
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/d89a4ea3
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/d89a4ea3
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/d89a4ea3
Branch: refs/heads/master
Commit: d89a4ea39e1d08e68047a2210b713654001d1620
Parents: 3c6433d
Author: Archana H <ar...@apache.org>
Authored: Wed Sep 21 18:18:19 2016 +0530
Committer: Archana H <ar...@apache.org>
Committed: Wed Sep 21 18:20:16 2016 +0530
----------------------------------------------------------------------
lens-regression/pom.xml | 5 -----
pom.xml | 7 -------
2 files changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/d89a4ea3/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 7154d29..f0d3864 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -101,11 +101,6 @@
<artifactId>hadoop-client</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </dependency>
-
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/lens/blob/d89a4ea3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84ea80c..075f55c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,6 @@
<lombok.maven.plugin.version>1.16.4.1</lombok.maven.plugin.version>
<typesafe.config.version>1.2.1</typesafe.config.version>
<logback.version>1.1.3</logback.version>
- <protobuf.version>2.5.0</protobuf.version>
-
<jackson.asl.version>1.9.13</jackson.asl.version>
<jackson.guava.version>2.3.3</jackson.guava.version>
@@ -884,11 +882,6 @@
<version>${guava.version}</version>
</dependency>
<dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
[13/31] lens git commit: LENS-1281 : Fix license issue with quartz
dependency
Posted by pu...@apache.org.
LENS-1281 : Fix license issue with quartz dependency
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/15cf0b57
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/15cf0b57
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/15cf0b57
Branch: refs/heads/master
Commit: 15cf0b577216d8bd6073391da98fbb5fc0dd01e4
Parents: 8fcc1a1
Author: Ajay Yadava <aj...@apache.org>
Authored: Mon Aug 22 17:21:50 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Aug 22 17:29:08 2016 +0530
----------------------------------------------------------------------
pom.xml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/15cf0b57/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 97cb612..c181a58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -815,6 +815,14 @@
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>${quartz.version}</version>
+ <!-- This version of c3p0 is LGPL and incompatible with Apache License 2.0
+ hence excluding. A compatible version is included in lens as separate dependency -->
+ <exclusions>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
[10/31] lens git commit: LENS-1268: Lens build on dev enviornment is
failing
Posted by pu...@apache.org.
LENS-1268: Lens build on dev enviornment is failing
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/baf4e765
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/baf4e765
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/baf4e765
Branch: refs/heads/master
Commit: baf4e765c6ca0690686762767456514b9240b1a0
Parents: d37e849
Author: Praveen Adlakha <ad...@gmail.com>
Authored: Tue Aug 9 13:19:43 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Wed Aug 17 18:45:04 2016 +0530
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/baf4e765/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c85dc17..97cb612 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1268,6 +1268,10 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.pentaho</groupId>
+ <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
[19/31] lens git commit: LENS-1321: Add License message for
properties files
Posted by pu...@apache.org.
LENS-1321: Add License message for properties files
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/3c6433dc
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/3c6433dc
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/3c6433dc
Branch: refs/heads/master
Commit: 3c6433dc89e8c41054c4965707a7f41e3be86e0a
Parents: 0359591
Author: Puneet Gupta <pu...@gmail.com>
Authored: Wed Sep 21 11:57:27 2016 +0530
Committer: Puneet <pu...@inmobi.com>
Committed: Wed Sep 21 12:21:43 2016 +0530
----------------------------------------------------------------------
lens-ml-lib/data/naive_bayes/ml.properties | 24 +++++++++++++++++++-
.../src/main/resources/queries.properties | 22 ++++++++++++++++--
.../src/main/resources/template.lens.properties | 24 +++++++++++++++++++-
pom.xml | 1 -
4 files changed, 66 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/3c6433dc/lens-ml-lib/data/naive_bayes/ml.properties
----------------------------------------------------------------------
diff --git a/lens-ml-lib/data/naive_bayes/ml.properties b/lens-ml-lib/data/naive_bayes/ml.properties
index 61b156e..c5758f9 100644
--- a/lens-ml-lib/data/naive_bayes/ml.properties
+++ b/lens-ml-lib/data/naive_bayes/ml.properties
@@ -1,7 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+######################
+
algo=spark_naive_bayes
database=default
traintable=naive_bayes_train
testtable=naive_bayes_test
outputtable=naive_bayes_output
features=feature1,feature2,feature3
-labelcolumn=label
\ No newline at end of file
+labelcolumn=label
+
+######################
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lens/blob/3c6433dc/lens-regression/src/main/resources/queries.properties
----------------------------------------------------------------------
diff --git a/lens-regression/src/main/resources/queries.properties b/lens-regression/src/main/resources/queries.properties
index 033c504..af4ca57 100644
--- a/lens-regression/src/main/resources/queries.properties
+++ b/lens-regression/src/main/resources/queries.properties
@@ -1,4 +1,22 @@
-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+######################
HIVE.COST_95=cube select sample_dim_chain.name, measure4 from sample_cube where time_range_in(dt, '2014-06-01', '2014-09-04')
HIVE.COST_60=cube select sample_dim_chain.name, measure4 from sample_cube where time_range_in(dt, '2014-06-01', '2014-07-31')
@@ -23,5 +41,5 @@ JDBC.QUERY2 = cube select product_id from sales where time_range_in(delivery_tim
JDBC.QUERY3 = cube select product_id from sales where time_range_in(delivery_time,'2015-04-12','2015-04-13')
JDBC.QUERY4 = cube select product_id from sales where time_range_in(delivery_time,'2015-04-12','2015-04-13')
-
+######################
http://git-wip-us.apache.org/repos/asf/lens/blob/3c6433dc/lens-regression/src/main/resources/template.lens.properties
----------------------------------------------------------------------
diff --git a/lens-regression/src/main/resources/template.lens.properties b/lens-regression/src/main/resources/template.lens.properties
index de00410..0df127d 100644
--- a/lens-regression/src/main/resources/template.lens.properties
+++ b/lens-regression/src/main/resources/template.lens.properties
@@ -1,3 +1,23 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+######################
+
lens.baseurl=
lens.adminurl=
lens.username=
@@ -6,4 +26,6 @@ lens.server.dir=/usr/local/lens/server/
lens.client.dir=/usr/local/lens/client/
lens.remote.host=
lens.remote.username=
-lens.remote.password=
\ No newline at end of file
+lens.remote.password=
+
+######################
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lens/blob/3c6433dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0a898cd..84ea80c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -655,7 +655,6 @@
<!-- Used on ui -->
<exclude>**/codemirror.min.*</exclude>
<exclude>**/*.js</exclude>
- <exclude>**/*.properties</exclude>
<exclude>**/*.json</exclude>
<!-- python client -->
<exclude>**/.tox/</exclude>
[22/31] lens git commit: [maven-release-plugin] prepare for next
development iteration
Posted by pu...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/3e64eeac
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/3e64eeac
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/3e64eeac
Branch: refs/heads/master
Commit: 3e64eeacea81858d6c6958eebe5b04acc75e3d6a
Parents: 925094f
Author: Puneet <pu...@inmobi.com>
Authored: Thu Sep 22 16:15:45 2016 +0530
Committer: Puneet <pu...@inmobi.com>
Committed: Thu Sep 22 16:15:45 2016 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +-----
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-es/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-ship-jars/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
lens-ui/pom.xml | 2 +-
pom.xml | 8 ++++----
20 files changed, 23 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 207b1b8..6a69eae 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
<build>
<plugins>
@@ -49,8 +49,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>apache-lens-2.6.0</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index db25aef..9706a32 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 39b3a07..197ef1b 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 1ade6e4..3e0d429 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index fbc73c3..63cbc6c 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 1d3a0ef..33be92a 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-driver-es/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-es/pom.xml b/lens-driver-es/pom.xml
index 481e2a9..6953124 100644
--- a/lens-driver-es/pom.xml
+++ b/lens-driver-es/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-es</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index 002ef69..8165239 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index dbf1c234..ce446e2 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index 240a82d..60b9022 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index 4adc777..e448332 100644
--- a/lens-ml-dist/pom.xml
+++ b/lens-ml-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index b7a0486..d55e664 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index a66c850..ddedeb7 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index db0263c..d475b82 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 07a84ca..520c3f9 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index f46c6da..b68f4a5 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-ship-jars/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ship-jars/pom.xml b/lens-ship-jars/pom.xml
index 7e25021..bbc9e1e 100644
--- a/lens-ship-jars/pom.xml
+++ b/lens-ship-jars/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-ship-jars</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index dadb999..56a3728 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/lens-ui/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ui/pom.xml b/lens-ui/pom.xml
index 32482d1..e33c83d 100644
--- a/lens-ui/pom.xml
+++ b/lens-ui/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</parent>
<artifactId>lens-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/3e64eeac/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f9ce799..8733649 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -376,7 +376,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/lens.git</url>
- <tag>apache-lens-2.6.0</tag>
+ <tag>HEAD</tag>
</scm>
<reporting>
@@ -704,7 +704,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1803,7 +1803,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.0</version>
+ <version>2.6.1-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
[11/31] lens git commit: LENS-1278 : Fix too many instances of
UDFClassLoader
Posted by pu...@apache.org.
LENS-1278 : Fix too many instances of UDFClassLoader
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/35aba09a
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/35aba09a
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/35aba09a
Branch: refs/heads/master
Commit: 35aba09ab0288f67634f70ad65ea41ed89322892
Parents: baf4e76
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Fri Aug 19 12:37:02 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Aug 22 10:32:29 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/lens/server/session/LensSessionImpl.java | 4 ++++
.../java/org/apache/lens/server/session/SessionClassLoader.java | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/35aba09a/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java b/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java
index 3003ab7..a6013e7 100644
--- a/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/session/LensSessionImpl.java
@@ -221,6 +221,8 @@ public class LensSessionImpl extends HiveSessionImpl implements AutoCloseable {
}
sessionDbClassLoaders.clear();
}
+ // reset classloader in close
+ Thread.currentThread().setContextClassLoader(LensSessionImpl.class.getClassLoader());
}
public CubeMetastoreClient getCubeMetastoreClient() throws LensException {
@@ -272,6 +274,8 @@ public class LensSessionImpl extends HiveSessionImpl implements AutoCloseable {
setActive();
if (acquireCount.decrementAndGet() == 0) {
super.release(userAccess);
+ // reset classloader in release
+ Thread.currentThread().setContextClassLoader(LensSessionImpl.class.getClassLoader());
}
}
http://git-wip-us.apache.org/repos/asf/lens/blob/35aba09a/lens-server/src/main/java/org/apache/lens/server/session/SessionClassLoader.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/session/SessionClassLoader.java b/lens-server/src/main/java/org/apache/lens/server/session/SessionClassLoader.java
index f5e2068..0230db6 100644
--- a/lens-server/src/main/java/org/apache/lens/server/session/SessionClassLoader.java
+++ b/lens-server/src/main/java/org/apache/lens/server/session/SessionClassLoader.java
@@ -20,7 +20,8 @@ package org.apache.lens.server.session;
import java.io.IOException;
import java.net.URL;
-import java.net.URLClassLoader;
+
+import org.apache.hadoop.hive.ql.exec.UDFClassLoader;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -29,7 +30,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@EqualsAndHashCode(callSuper = false)
-public class SessionClassLoader extends URLClassLoader {
+public class SessionClassLoader extends UDFClassLoader {
@Getter
@Setter
private boolean closed;
[14/31] lens git commit: LENS-1269 : Time range fallback in lens
examples should not give empty results
Posted by pu...@apache.org.
LENS-1269 : Time range fallback in lens examples should not give empty results
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/2748cd9c
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/2748cd9c
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/2748cd9c
Branch: refs/heads/master
Commit: 2748cd9c4fdf23b57c3ebd70c75d8311a6538cde
Parents: 15cf0b5
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Mon Aug 22 17:35:10 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Aug 22 17:35:53 2016 +0530
----------------------------------------------------------------------
lens-examples/src/main/resources/sales-aggr-fact2-local3.data | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/2748cd9c/lens-examples/src/main/resources/sales-aggr-fact2-local3.data
----------------------------------------------------------------------
diff --git a/lens-examples/src/main/resources/sales-aggr-fact2-local3.data b/lens-examples/src/main/resources/sales-aggr-fact2-local3.data
index a0cb704..407b097 100644
--- a/lens-examples/src/main/resources/sales-aggr-fact2-local3.data
+++ b/lens-examples/src/main/resources/sales-aggr-fact2-local3.data
@@ -1,2 +1,2 @@
-2015-04-13 00:00:00,2015-04-13 04:00:00,1,1,1,1,1,1,5,0
-2015-04-13 00:00:00,2015-04-13 04:00:00,2,1,2,2,2,1,8,2
\ No newline at end of file
+2015-04-13 03:00:00,2015-04-13 04:00:00,1,1,1,1,1,1,5,0
+2015-04-13 03:00:00,2015-04-13 04:00:00,2,1,2,2,2,1,8,2
\ No newline at end of file
[08/31] lens git commit: LENS-1265: Scheduler Bug fixes (followup to
LENS-128)
Posted by pu...@apache.org.
LENS-1265: Scheduler Bug fixes (followup to LENS-128)
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/ebf018f9
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/ebf018f9
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/ebf018f9
Branch: refs/heads/master
Commit: ebf018f97621eccd1ca423e1bbfdc036b6b46c2c
Parents: 05533d1
Author: Lavkesh Lahngir <la...@linux.com>
Authored: Wed Aug 10 12:26:29 2016 +0530
Committer: Archana H <ar...@apache.org>
Committed: Wed Aug 17 13:40:43 2016 +0530
----------------------------------------------------------------------
.../lens/api/scheduler/SchedulerJobInfo.java | 6 +-
.../api/scheduler/SchedulerJobInstanceInfo.java | 5 +
.../api/scheduler/SchedulerJobInstanceRun.java | 5 +
.../scheduler/SchedulerJobInstanceState.java | 3 +
.../lens/api/scheduler/SchedulerJobState.java | 3 +
.../src/main/resources/scheduler-job-0.1.xsd | 14 +-
.../server/api/scheduler/SchedulerService.java | 25 ++--
.../lens/server/scheduler/AlarmService.java | 25 ++--
.../lens/server/scheduler/ScheduleResource.java | 34 ++---
.../lens/server/scheduler/SchedulerDAO.java | 10 +-
.../scheduler/SchedulerEventListener.java | 129 +++++++++++--------
.../scheduler/SchedulerQueryEventListener.java | 8 +-
.../server/scheduler/SchedulerServiceImpl.java | 98 ++++++++++----
.../lens/server/scheduler/AlarmServiceTest.java | 5 +-
.../scheduler/TestSchedulerServiceImpl.java | 37 +++---
15 files changed, 256 insertions(+), 151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInfo.java
----------------------------------------------------------------------
diff --git a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInfo.java b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInfo.java
index b19248f..50562f4 100644
--- a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInfo.java
+++ b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInfo.java
@@ -18,14 +18,19 @@
*/
package org.apache.lens.api.scheduler;
+import javax.xml.bind.annotation.XmlRootElement;
+
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* POJO to represent the <code>job</code> table in the database.
*/
@Data
@AllArgsConstructor
+@NoArgsConstructor
+@XmlRootElement
public class SchedulerJobInfo {
/**
@@ -65,5 +70,4 @@ public class SchedulerJobInfo {
* @return last modified time for this job
*/
private long modifiedOn;
-
}
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceInfo.java
----------------------------------------------------------------------
diff --git a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceInfo.java b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceInfo.java
index 52b56ca..9148af1 100644
--- a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceInfo.java
+++ b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceInfo.java
@@ -20,14 +20,19 @@ package org.apache.lens.api.scheduler;
import java.util.List;
+import javax.xml.bind.annotation.XmlRootElement;
+
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* POJO for an instance of SchedulerJob.
*/
@Data
@AllArgsConstructor
+@NoArgsConstructor
+@XmlRootElement
public class SchedulerJobInstanceInfo {
/**
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceRun.java
----------------------------------------------------------------------
diff --git a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceRun.java b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceRun.java
index e6c1571..8532ed0 100644
--- a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceRun.java
+++ b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceRun.java
@@ -18,16 +18,21 @@
*/
package org.apache.lens.api.scheduler;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.lens.api.LensSessionHandle;
import org.apache.lens.api.query.QueryHandle;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@EqualsAndHashCode
+@NoArgsConstructor
+@XmlRootElement
public class SchedulerJobInstanceRun {
/**
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceState.java
----------------------------------------------------------------------
diff --git a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceState.java b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceState.java
index 93d3d7e..3d2605e 100644
--- a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceState.java
+++ b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobInstanceState.java
@@ -18,8 +18,11 @@
*/
package org.apache.lens.api.scheduler;
+import javax.xml.bind.annotation.*;
+
import org.apache.lens.api.error.InvalidStateTransitionException;
+@XmlRootElement
public enum SchedulerJobInstanceState
implements StateTransitioner<SchedulerJobInstanceState, SchedulerJobInstanceEvent> {
// repeating same operation will return the same state to ensure idempotent behavior.
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobState.java
----------------------------------------------------------------------
diff --git a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobState.java b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobState.java
index ffaae6c..f4fcce1 100644
--- a/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobState.java
+++ b/lens-api/src/main/java/org/apache/lens/api/scheduler/SchedulerJobState.java
@@ -18,8 +18,11 @@
*/
package org.apache.lens.api.scheduler;
+import javax.xml.bind.annotation.*;
+
import org.apache.lens.api.error.InvalidStateTransitionException;
+@XmlRootElement
public enum SchedulerJobState implements StateTransitioner<SchedulerJobState, SchedulerJobEvent> {
// repeating same operation will return the same state to ensure idempotent behavior.
NEW {
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-api/src/main/resources/scheduler-job-0.1.xsd
----------------------------------------------------------------------
diff --git a/lens-api/src/main/resources/scheduler-job-0.1.xsd b/lens-api/src/main/resources/scheduler-job-0.1.xsd
index 4e6c68b..31f7d66 100644
--- a/lens-api/src/main/resources/scheduler-job-0.1.xsd
+++ b/lens-api/src/main/resources/scheduler-job-0.1.xsd
@@ -126,7 +126,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element type="xs:string" name="resource_path" minOccurs="0" maxOccurs="unbounded">
+ <xs:element type="resource_path" name="resource_path" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Path for resources like jars etc. e.g. /path/to/my/jar
@@ -136,6 +136,18 @@
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="resource_path">
+ <xs:annotation>
+ <xs:documentation>
+ A resource path with file name and type
+ </xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="path" type="xs:string"/>
+ <xs:element name="type" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+
<xs:complexType name="x_job_query">
<xs:annotation>
<xs:documentation>
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-server-api/src/main/java/org/apache/lens/server/api/scheduler/SchedulerService.java
----------------------------------------------------------------------
diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/scheduler/SchedulerService.java b/lens-server-api/src/main/java/org/apache/lens/server/api/scheduler/SchedulerService.java
index c7f73eb..8e1606e 100644
--- a/lens-server-api/src/main/java/org/apache/lens/server/api/scheduler/SchedulerService.java
+++ b/lens-server-api/src/main/java/org/apache/lens/server/api/scheduler/SchedulerService.java
@@ -70,22 +70,20 @@ public interface SchedulerService extends LensService, SessionValidator {
/**
* Returns the definition of a job.
*
- * @param sessionHandle handle for the session.
* @param jobHandle handle for the job
* @return job definition
* @throws LensException the lens exception
*/
- XJob getJobDefinition(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle) throws LensException;
+ XJob getJobDefinition(SchedulerJobHandle jobHandle) throws LensException;
/**
* Returns the details of a job. Details may contain extra system information like id for the job.
*
- * @param sessionHandle handle for the session.
* @param jobHandle handle for the job
* @return job details for the job
* @throws LensException the lens exception
*/
- SchedulerJobInfo getJobDetails(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle) throws LensException;
+ SchedulerJobInfo getJobDetails(SchedulerJobHandle jobHandle) throws LensException;
/**
* Update a job with new definition.
@@ -146,7 +144,6 @@ public interface SchedulerService extends LensService, SessionValidator {
boolean deleteJob(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle) throws LensException;
/**
- * @param sessionHandle handle for the current session.
* @param state filter for status, if specified only jobs in that state will be returned,
* if null no entries will be removed from result
* @param user filter for user who submitted the job, if specified only jobs submitted by the given user
@@ -158,13 +155,12 @@ public interface SchedulerService extends LensService, SessionValidator {
* @return A collection of stats per job
* @throws LensException
*/
- Collection<SchedulerJobStats> getAllJobStats(LensSessionHandle sessionHandle, String state, String user,
+ Collection<SchedulerJobStats> getAllJobStats(String state, String user,
String jobName, long startTime, long endTime) throws LensException;
/**
* Returns stats for a job.
*
- * @param sessionHandle handle for session.
* @param handle handle for the job
* @param state filter for status, if specified only jobs in that state will be returned,
* if null no entries will be removed from result
@@ -172,19 +168,18 @@ public interface SchedulerService extends LensService, SessionValidator {
* @param endTime if specified only instances with scheduleTime before this time will be considered.
* @throws LensException the lens exception
*/
- SchedulerJobStats getJobStats(LensSessionHandle sessionHandle, SchedulerJobHandle handle, String state,
+ SchedulerJobStats getJobStats(SchedulerJobHandle handle, String state,
long startTime, long endTime) throws LensException;
/**
* Returns handles for last <code>numResults</code> instances for the job.
*
- * @param sessionHandle handle for the session.
* @param jobHandle handle for the job
* @param numResults - number of results to be returned, default 100.
* @return list of instance ids for the job
* @throws LensException the lens exception
*/
- List<SchedulerJobInstanceInfo> getJobInstances(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle,
+ List<SchedulerJobInstanceInfo> getJobInstances(SchedulerJobHandle jobHandle,
Long numResults) throws LensException;
/**
@@ -215,12 +210,16 @@ public interface SchedulerService extends LensService, SessionValidator {
/**
* Instance details for an instance.
*
- * @param sessionHandle handle for the session.
* @param instanceHandle handle for the instance.
* @return details for the instance.
* @throws LensException the lens exception
*/
- SchedulerJobInstanceInfo getInstanceDetails(LensSessionHandle sessionHandle,
- SchedulerJobInstanceHandle instanceHandle) throws LensException;
+ SchedulerJobInstanceInfo getInstanceDetails(SchedulerJobInstanceHandle instanceHandle) throws LensException;
+ /**
+ * Create session as user for scheduling the job with no auth.
+ * @param user
+ * @return LensSessionHandle
+ */
+ LensSessionHandle openSessionAsUser(String user) throws LensException;
}
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java
index 4491261..2009a20 100644
--- a/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java
+++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java
@@ -138,13 +138,14 @@ public class AlarmService extends AbstractService implements LensService {
Trigger trigger;
if (frequency.getEnum() != null) { //for enum expression: create a trigger using calendar interval
CalendarIntervalScheduleBuilder scheduleBuilder = CalendarIntervalScheduleBuilder.calendarIntervalSchedule()
- .withInterval(getTimeInterval(frequency.getEnum()), getTimeUnit(frequency.getEnum()))
- .withMisfireHandlingInstructionIgnoreMisfires();
+ .withInterval(getTimeInterval(frequency.getEnum()), getTimeUnit(frequency.getEnum()))
+ .withMisfireHandlingInstructionIgnoreMisfires();
trigger = TriggerBuilder.newTrigger().withIdentity(jobHandle, ALARM_SERVICE).startAt(start.toDate())
- .endAt(end.toDate()).withSchedule(scheduleBuilder).build();
+ .endAt(end.toDate()).withSchedule(scheduleBuilder).build();
} else { // for cron expression create a cron trigger
trigger = TriggerBuilder.newTrigger().withIdentity(jobHandle, ALARM_SERVICE).startAt(start.toDate())
- .endAt(end.toDate()).withSchedule(CronScheduleBuilder.cronSchedule(frequency.getCronExpression())).build();
+ .endAt(end.toDate()).withSchedule(CronScheduleBuilder.cronSchedule(frequency.getCronExpression())
+ .withMisfireHandlingInstructionIgnoreMisfires()).build();
}
// Tell quartz to run the job using our trigger
@@ -190,7 +191,7 @@ public class AlarmService extends AbstractService implements LensService {
try {
return scheduler.deleteJob(JobKey.jobKey(jobHandle.getHandleIdString(), LENS_JOBS));
} catch (SchedulerException e) {
- log.error("Failed to remove alarm triggers for job with jobHandle: " + jobHandle, e);
+ log.error("Failed to remove alarm triggers for job with jobHandle: {}", jobHandle);
throw new LensException("Failed to remove alarm triggers for job with jobHandle: " + jobHandle, e);
}
}
@@ -199,8 +200,8 @@ public class AlarmService extends AbstractService implements LensService {
try {
return scheduler.checkExists(JobKey.jobKey(handle.getHandleIdString(), LENS_JOBS));
} catch (SchedulerException e) {
- log.error("Failed to check the job with jobHandle: " + handle, e);
- throw new LensException("Failed to check the job with jobHandle: " + handle, e);
+ log.error("Failed to check the job with jobHandle: {}", handle);
+ return false;
}
}
@@ -208,7 +209,7 @@ public class AlarmService extends AbstractService implements LensService {
try {
scheduler.pauseJob(JobKey.jobKey(jobHandle.getHandleIdString(), LENS_JOBS));
} catch (SchedulerException e) {
- log.error("Failed to pause alarm triggers for job with jobHandle: " + jobHandle, e);
+ log.error("Failed to pause alarm triggers for job with jobHandle: {}", jobHandle);
throw new LensException("Failed to pause alarm triggers for job with jobHandle: " + jobHandle, e);
}
}
@@ -217,7 +218,7 @@ public class AlarmService extends AbstractService implements LensService {
try {
scheduler.resumeJob(JobKey.jobKey(jobHandle.getHandleIdString(), LENS_JOBS));
} catch (SchedulerException e) {
- log.error("Failed to resume alarm triggers for job with jobHandle: " + jobHandle, e);
+ log.error("Failed to resume alarm triggers for job with jobHandle: {}", jobHandle);
throw new LensException("Failed to resume alarm triggers for job with jobHandle: " + jobHandle, e);
}
}
@@ -230,17 +231,17 @@ public class AlarmService extends AbstractService implements LensService {
DateTime nominalTime = new DateTime(jobExecutionContext.getScheduledFireTime());
SchedulerJobHandle jobHandle = SchedulerJobHandle.fromString(data.getString("jobHandle"));
SchedulerAlarmEvent alarmEvent = new SchedulerAlarmEvent(jobHandle, nominalTime,
- SchedulerAlarmEvent.EventType.SCHEDULE, null);
+ SchedulerAlarmEvent.EventType.SCHEDULE, null);
try {
LensEventService eventService = LensServices.get().getService(LensEventService.NAME);
eventService.notifyEvent(alarmEvent);
if (jobExecutionContext.getNextFireTime() == null) {
eventService
- .notifyEvent(new SchedulerAlarmEvent(jobHandle, nominalTime, SchedulerAlarmEvent.EventType.EXPIRE, null));
+ .notifyEvent(new SchedulerAlarmEvent(jobHandle, nominalTime, SchedulerAlarmEvent.EventType.EXPIRE, null));
}
} catch (LensException e) {
log.error("Failed to notify SchedulerAlarmEvent for jobHandle: {} and scheduleTime: {}",
- jobHandle.getHandleIdString(), nominalTime.toString(), e);
+ jobHandle.getHandleIdString(), nominalTime.toString());
throw new JobExecutionException("Failed to notify alarmEvent", e);
}
}
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java
index 8603edf..7a0b485 100644
--- a/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/ScheduleResource.java
@@ -23,6 +23,7 @@ import java.util.List;
import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
+import javax.xml.bind.JAXBElement;
import org.apache.lens.api.APIResult;
import org.apache.lens.api.LensSessionHandle;
@@ -39,6 +40,7 @@ import org.apache.commons.lang3.StringUtils;
@Path("scheduler")
@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
public class ScheduleResource {
+ private static final ObjectFactory OBJECT_FACTORY = new ObjectFactory();
public enum INSTANCE_ACTIONS {
KILL, RERUN;
@@ -94,21 +96,22 @@ public class ScheduleResource {
@DefaultValue("user") @QueryParam("user") String user,
@DefaultValue("-1") @QueryParam("start") long start,
@DefaultValue("-1") @QueryParam("end") long end) throws LensException {
- return getSchedulerService().getAllJobStats(sessionId, status, user, jobName, start, end);
+ validateSession(sessionId);
+ return getSchedulerService().getAllJobStats(status, user, jobName, start, end);
}
@GET
@Path("jobs/{jobHandle}")
- public XJob getJobDefinition(@QueryParam("sessionid") LensSessionHandle sessionId,
+ public JAXBElement<XJob> getJobDefinition(@QueryParam("sessionid") LensSessionHandle sessionId,
@PathParam("jobHandle") SchedulerJobHandle jobHandle) throws LensException {
- return getSchedulerService().getJobDefinition(sessionId, jobHandle);
+ return OBJECT_FACTORY.createJob(getSchedulerService().getJobDefinition(jobHandle));
}
@DELETE
@Path("jobs/{jobHandle}")
public APIResult deleteJob(@QueryParam("sessionid") LensSessionHandle sessionId,
- @QueryParam("jobHandle") SchedulerJobHandle jobHandle) throws LensException {
+ @PathParam("jobHandle") SchedulerJobHandle jobHandle) throws LensException {
validateSession(sessionId);
getSchedulerService().deleteJob(sessionId, jobHandle);
return APIResult.success();
@@ -155,11 +158,11 @@ public class ScheduleResource {
}
@GET
- @Path("jobs/{jobHandle}/stats")
+ @Path("jobs/{jobHandle}/info")
public SchedulerJobInfo getJobDetails(@QueryParam("sessionid") LensSessionHandle sessionId,
@PathParam("jobHandle") SchedulerJobHandle jobHandle) throws LensException {
validateSession(sessionId);
- return getSchedulerService().getJobDetails(sessionId, jobHandle);
+ return getSchedulerService().getJobDetails(jobHandle);
}
@GET
@@ -168,7 +171,7 @@ public class ScheduleResource {
@PathParam("jobHandle") SchedulerJobHandle jobHandle,
@QueryParam("numResults") Long numResults) throws LensException {
validateSession(sessionId);
- return getSchedulerService().getJobInstances(sessionId, jobHandle, numResults);
+ return getSchedulerService().getJobInstances(jobHandle, numResults);
}
@GET
@@ -177,34 +180,33 @@ public class ScheduleResource {
@PathParam("instanceHandle")
SchedulerJobInstanceHandle instanceHandle) throws LensException {
validateSession(sessionId);
- return getSchedulerService().getInstanceDetails(sessionId, instanceHandle);
+ return getSchedulerService().getInstanceDetails(instanceHandle);
}
@POST
@Path("instances/{instanceHandle}")
public APIResult updateInstance(@QueryParam("sessionid") LensSessionHandle sessionId,
- @PathParam("instanceHandle") SchedulerJobInstanceHandle instanceHandle,
- @QueryParam("action") INSTANCE_ACTIONS action) throws LensException {
+ @PathParam("instanceHandle") SchedulerJobInstanceHandle instanceHandle,
+ @QueryParam("action") INSTANCE_ACTIONS action) throws LensException {
+ APIResult res = null;
validateSession(sessionId);
-
- APIResult res;
switch (action) {
case KILL:
if (getSchedulerService().killInstance(sessionId, instanceHandle)) {
res = new APIResult(APIResult.Status.SUCCEEDED,
- "Killing the instance with id " + instanceHandle + " was successful");
+ "Killing the instance with id " + instanceHandle + " was successful");
} else {
res = new APIResult(APIResult.Status.FAILED,
- "Killing the instance with id " + instanceHandle + " was not successful");
+ "Killing the instance with id " + instanceHandle + " was not successful");
}
break;
case RERUN:
if (getSchedulerService().rerunInstance(sessionId, instanceHandle)) {
res = new APIResult(APIResult.Status.SUCCEEDED,
- "Rerunning the instance with id " + instanceHandle + " was successful");
+ "Rerunning the instance with id " + instanceHandle + " was successful");
} else {
res = new APIResult(APIResult.Status.FAILED,
- "Rerunning the instance with id " + instanceHandle + " was not successful");
+ "Rerunning the instance with id " + instanceHandle + " was not successful");
}
break;
default:
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java
index 7a2b06a..6a4c77b 100644
--- a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java
+++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerDAO.java
@@ -286,7 +286,7 @@ public class SchedulerDAO {
protected static final String COLUMN_USER = "username";
protected static final String COLUMN_STATUS = "status";
protected static final String COLUMN_CREATED_ON = "createdon";
- protected static final String COLUMN_SCHEDULE_TIME = "schedultime";
+ protected static final String COLUMN_SCHEDULE_TIME = "scheduledtime";
protected static final String COLUMN_MODIFIED_ON = "modifiedon";
protected static final String COLUMN_JOB_ID = "jobid";
protected static final String COLUMN_SESSION_HANDLE = "sessionhandle";
@@ -376,8 +376,8 @@ public class SchedulerDAO {
public int insertIntoJobInstanceRunTable(SchedulerJobInstanceRun instanceRun) throws SQLException {
String insetSQL = "INSERT INTO " + JOB_INSTANCE_RUN_TABLE + " VALUES(?,?,?,?,?,?,?,?)";
return runner.update(insetSQL, instanceRun.getHandle().getHandleIdString(), instanceRun.getRunId(),
- instanceRun.getSessionHandle().toString(), instanceRun.getStartTime(), instanceRun.getEndTime(),
- instanceRun.getResultPath(),
+ instanceRun.getSessionHandle() == null ? "" : instanceRun.getSessionHandle().toString(),
+ instanceRun.getStartTime(), instanceRun.getEndTime(), instanceRun.getResultPath(),
instanceRun.getQueryHandle() == null ? "" : instanceRun.getQueryHandle().getHandleIdString(),
instanceRun.getInstanceState().name());
}
@@ -665,7 +665,7 @@ public class SchedulerDAO {
"CREATE TABLE IF NOT EXISTS " + JOB_INSTANCE_RUN_TABLE + "( " + COLUMN_ID + " VARCHAR(255) NOT NULL, "
+ COLUMN_RUN_ID + " INT NOT NULL, " + COLUMN_SESSION_HANDLE + " VARCHAR(255), " + COLUMN_START_TIME
+ " BIGINT, " + COLUMN_END_TIME + " BIGINT, " + COLUMN_RESULT_PATH + " TEXT, " + COLUMN_QUERY_HANDLE
- + " TEXT, " + COLUMN_STATUS + " VARCHAR(20), " + " PRIMARY KEY ( " + COLUMN_ID + ", " + COLUMN_RUN_ID
+ + " VARCHAR(255), " + COLUMN_STATUS + " VARCHAR(20), " + " PRIMARY KEY ( " + COLUMN_ID + ", " + COLUMN_RUN_ID
+ ")" + ")";
runner.update(createSQL);
}
@@ -709,7 +709,7 @@ public class SchedulerDAO {
"CREATE TABLE IF NOT EXISTS " + JOB_INSTANCE_RUN_TABLE + "( " + COLUMN_ID + " VARCHAR(255) NOT NULL, "
+ COLUMN_RUN_ID + " INT NOT NULL, " + COLUMN_SESSION_HANDLE + " VARCHAR(255), " + COLUMN_START_TIME
+ " BIGINT, " + COLUMN_END_TIME + " BIGINT, " + COLUMN_RESULT_PATH + " VARCHAR(1024),"
- + COLUMN_QUERY_HANDLE + " VARCHAR(1024), " + COLUMN_STATUS + " VARCHAR(20), " + " PRIMARY KEY ( "
+ + COLUMN_QUERY_HANDLE + " VARCHAR(255), " + COLUMN_STATUS + " VARCHAR(20), " + " PRIMARY KEY ( "
+ COLUMN_ID + ", " + COLUMN_RUN_ID + " )" + ")";
runner.update(createSQL);
}
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerEventListener.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerEventListener.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerEventListener.java
index 7323add..d1d4a68 100644
--- a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerEventListener.java
+++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerEventListener.java
@@ -19,9 +19,7 @@
package org.apache.lens.server.scheduler;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import org.apache.lens.api.LensConf;
import org.apache.lens.api.LensSessionHandle;
@@ -33,9 +31,10 @@ import org.apache.lens.server.api.LensConfConstants;
import org.apache.lens.server.api.error.LensException;
import org.apache.lens.server.api.events.AsyncEventListener;
import org.apache.lens.server.api.events.SchedulerAlarmEvent;
+import org.apache.lens.server.api.metastore.CubeMetastoreService;
import org.apache.lens.server.api.query.QueryExecutionService;
import org.apache.lens.server.api.scheduler.SchedulerService;
-import org.apache.lens.server.query.QueryExecutionServiceImpl;
+import org.apache.lens.server.api.session.SessionService;
import org.apache.lens.server.util.UtilityMethods;
import org.joda.time.DateTime;
@@ -55,14 +54,48 @@ public class SchedulerEventListener extends AsyncEventListener<SchedulerAlarmEve
protected QueryExecutionService queryService;
private SchedulerDAO schedulerDAO;
private SchedulerService schedulerService;
+ private SessionService sessionService;
+ private CubeMetastoreService cubeMetastoreService;
public SchedulerEventListener(SchedulerDAO schedulerDAO) {
super(CORE_POOL_SIZE);
this.queryService = LensServices.get().getService(QueryExecutionService.NAME);
this.schedulerService = LensServices.get().getService(SchedulerService.NAME);
+ this.sessionService = LensServices.get().getService(SessionService.NAME);
+ this.cubeMetastoreService = LensServices.get().getService(CubeMetastoreService.NAME);
this.schedulerDAO = schedulerDAO;
}
+ private LensSessionHandle getSessionHandle(String user) throws LensException {
+ return schedulerService.openSessionAsUser(user);
+ }
+
+ private void setSessionConf(LensSessionHandle sessionHandle, XJob job) throws LensException {
+ XExecution execution = job.getExecution();
+ XSessionType executionSession = execution.getSession();
+ cubeMetastoreService.setCurrentDatabase(sessionHandle, executionSession.getDb());
+ List<MapType> sessionConfList = executionSession.getConf();
+ for (MapType element : sessionConfList) {
+ sessionService.setSessionParameter(sessionHandle, element.getKey(), element.getValue());
+ }
+ List<ResourcePath> resourceList = executionSession.getResourcePath();
+ for (ResourcePath path : resourceList) {
+ sessionService.addResource(sessionHandle, path.getType(), path.getPath());
+ }
+ }
+
+ private LensConf getLensConf(XJob job, SchedulerJobInstanceHandle instanceHandle, DateTime scheduledTime) {
+ List<MapType> jobConf = job.getExecution().getQuery().getConf();
+ LensConf queryConf = new LensConf();
+ for (MapType element : jobConf) {
+ queryConf.addProperty(element.getKey(), element.getValue());
+ }
+ queryConf.addProperty(JOB_INSTANCE_ID_KEY, instanceHandle.getHandleId());
+ // Current time is used for resolving date.
+ queryConf.addProperty(LensConfConstants.QUERY_CURRENT_TIME_IN_MILLIS, scheduledTime.getMillis());
+ return queryConf;
+ }
+
/**
* @param event the event
*/
@@ -70,14 +103,6 @@ public class SchedulerEventListener extends AsyncEventListener<SchedulerAlarmEve
public void process(SchedulerAlarmEvent event) {
DateTime scheduledTime = event.getNominalTime();
SchedulerJobHandle jobHandle = event.getJobHandle();
- if (event.getType() == SchedulerAlarmEvent.EventType.EXPIRE) {
- try {
- schedulerService.expireJob(null, jobHandle);
- } catch (LensException e) {
- log.error("Error while expiring the job", e);
- }
- return;
- }
/*
* Get the job from the store.
* Create an instance.
@@ -86,75 +111,69 @@ public class SchedulerEventListener extends AsyncEventListener<SchedulerAlarmEve
* If successfully submitted change the status to running.
* Otherwise update the status to killed.
*/
- //TODO: Get the job status and if it is not Scheduled, don't do anything.
XJob job = schedulerDAO.getJob(jobHandle);
String user = schedulerDAO.getUser(jobHandle);
SchedulerJobInstanceHandle instanceHandle = event.getPreviousInstance() == null
? UtilityMethods.generateSchedulerJobInstanceHandle()
: event.getPreviousInstance();
- Map<String, String> conf = new HashMap<>();
- LensSessionHandle sessionHandle = null;
- try {
- // Open the session with the user who submitted the job.
- sessionHandle = ((QueryExecutionServiceImpl) LensServices.get().getService(QueryExecutionServiceImpl.NAME))
- .openSession(user, "dummy", conf, false);
- } catch (LensException e) {
- log.error("Error occurred while opening a session ", e);
- return;
- }
SchedulerJobInstanceInfo instance = null;
SchedulerJobInstanceRun run = null;
- // Session needs to be closed after the launch.
+ LensSessionHandle sessionHandle = null;
+
try {
- long scheduledTimeMillis = scheduledTime.getMillis();
- String query = job.getExecution().getQuery().getQuery();
- List<MapType> jobConf = job.getExecution().getQuery().getConf();
- LensConf queryConf = new LensConf();
- for (MapType element : jobConf) {
- queryConf.addProperty(element.getKey(), element.getValue());
+ sessionHandle = getSessionHandle(user);
+ setSessionConf(sessionHandle, job);
+ if (event.getType() == SchedulerAlarmEvent.EventType.EXPIRE) {
+ try {
+ log.info("Expiring job with handle {}", jobHandle);
+ schedulerService.expireJob(sessionHandle, jobHandle);
+ } catch (LensException e) {
+ log.error("Error while expiring the job", e);
+ }
+ return;
}
- queryConf.addProperty(JOB_INSTANCE_ID_KEY, instanceHandle.getHandleId());
- // Current time is used for resolving date.
- queryConf.addProperty(LensConfConstants.QUERY_CURRENT_TIME_IN_MILLIS, scheduledTime.getMillis());
- String queryName = job.getName();
- queryName += "-" + scheduledTime.getMillis();
+ long scheduledTimeMillis = scheduledTime.getMillis();
// If the instance is new then create otherwise get from the store
if (event.getPreviousInstance() == null) {
instance = new SchedulerJobInstanceInfo(instanceHandle, jobHandle, scheduledTimeMillis,
- new ArrayList<SchedulerJobInstanceRun>());
+ new ArrayList<SchedulerJobInstanceRun>());
+ // Store the instance
+ if (schedulerDAO.storeJobInstance(instance) != 1) {
+ log.error("Store was unsuccessful for instance {} of job {} ", instanceHandle, jobHandle);
+ return;
+ }
} else {
instance = schedulerDAO.getSchedulerJobInstanceInfo(instanceHandle);
}
// Next run of the instance
long currentTime = System.currentTimeMillis();
- run = new SchedulerJobInstanceRun(instanceHandle, instance.getInstanceRunList().size() + 1, sessionHandle,
- currentTime, 0, "N/A", null, SchedulerJobInstanceState.WAITING);
+ run = new SchedulerJobInstanceRun(instanceHandle, instance.getInstanceRunList().size() + 1, null, currentTime, 0,
+ "N/A", null, SchedulerJobInstanceState.WAITING);
instance.getInstanceRunList().add(run);
- boolean success;
- if (event.getPreviousInstance() == null) {
- success = schedulerDAO.storeJobInstance(instance) == 1;
- if (!success) {
- log.error(
- "Exception occurred while storing the instance for instance handle " + instance + " of job " + jobHandle);
- return;
- }
- }
- success = schedulerDAO.storeJobInstanceRun(run) == 1;
- if (!success) {
- log.error(
- "Exception occurred while storing the instance for instance handle " + instance + " of job " + jobHandle);
+ if (schedulerDAO.storeJobInstanceRun(run) != 1) {
+ log.error("Exception occurred while storing the instance run for instance handle {} of job {}", instance,
+ jobHandle);
return;
}
-
+ run.setSessionHandle(sessionHandle);
+ LensConf queryConf = getLensConf(job, instanceHandle, scheduledTime);
+ // Query Launch
+ String query = job.getExecution().getQuery().getQuery();
+ String queryName = job.getName();
+ queryName += "-" + scheduledTimeMillis;
QueryHandle handle = queryService.executeAsync(sessionHandle, query, queryConf, queryName);
+ log.info("Running instance {} of job {} with run {} with query handle {}", instanceHandle, jobHandle,
+ run.getRunId(), handle);
run.setQueryHandle(handle);
run.setInstanceState(run.getInstanceState().nextTransition(SchedulerJobInstanceEvent.ON_RUN));
run.setEndTime(System.currentTimeMillis());
+ // Update run
schedulerDAO.updateJobInstanceRun(run);
+ log.info("Successfully updated instance run with instance {} of job {}", instanceHandle, jobHandle);
} catch (LensException | InvalidStateTransitionException e) {
log.error(
- "Exception occurred while launching the job instance for " + jobHandle + " for nominal time " + scheduledTime
- .getMillis(), e);
+ "Exception occurred while launching the job instance for " + jobHandle + " for nominal time " + scheduledTime
+ .getMillis(), e);
try {
run.setInstanceState(run.getInstanceState().nextTransition(SchedulerJobInstanceEvent.ON_FAILURE));
run.setEndTime(System.currentTimeMillis());
@@ -163,9 +182,9 @@ public class SchedulerEventListener extends AsyncEventListener<SchedulerAlarmEve
log.error("Can't make transition for instance " + instance.getId() + " of job " + instance.getJobId(), e);
}
} finally {
+ // Session needs to be closed after the launch.
try {
- ((QueryExecutionServiceImpl) LensServices.get().getService(QueryExecutionServiceImpl.NAME))
- .closeSession(sessionHandle);
+ sessionService.closeSession(sessionHandle);
} catch (LensException e) {
log.error("Error closing session ", e);
}
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerQueryEventListener.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerQueryEventListener.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerQueryEventListener.java
index 5b12720..077d531 100644
--- a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerQueryEventListener.java
+++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerQueryEventListener.java
@@ -56,10 +56,10 @@ public class SchedulerQueryEventListener extends AsyncEventListener<QueryEnded>
return;
}
SchedulerJobInstanceInfo info = schedulerDAO
- .getSchedulerJobInstanceInfo(SchedulerJobInstanceHandle.fromString(instanceHandle));
+ .getSchedulerJobInstanceInfo(SchedulerJobInstanceHandle.fromString(instanceHandle));
List<SchedulerJobInstanceRun> runList = info.getInstanceRunList();
if (runList.size() == 0) {
- log.error("No instance run for " + instanceHandle + " with query " + queryContext.getQueryHandle());
+ log.error("No instance run for {} with query {}", instanceHandle, queryContext.getQueryHandle());
return;
}
SchedulerJobInstanceRun latestRun = runList.get(runList.size() - 1);
@@ -78,8 +78,10 @@ public class SchedulerQueryEventListener extends AsyncEventListener<QueryEnded>
}
latestRun.setEndTime(System.currentTimeMillis());
latestRun.setInstanceState(state);
- latestRun.setResultPath(queryContext.getDriverResultPath());
+ latestRun.setResultPath(queryContext.getResultSetPath());
schedulerDAO.updateJobInstanceRun(latestRun);
+ log.info("Updated instance run {} for instance {} for job {} to {}", latestRun.getRunId(), info.getId(),
+ info.getJobId(), state);
} catch (InvalidStateTransitionException e) {
log.error("Instance Transition Failed ", e);
}
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java
index 14ca32d..28d7e27 100644
--- a/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/SchedulerServiceImpl.java
@@ -19,6 +19,7 @@
package org.apache.lens.server.scheduler;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import org.apache.lens.api.LensConf;
@@ -94,6 +95,12 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
}
}
+ private void doesSessionBelongToUser(LensSessionHandle sessionHandle, String user) throws LensException {
+ LensSessionImpl session = getSession(sessionHandle);
+ if (!session.getLoggedInUser().equals(user))
+ throw new LensException("Logged in user " + session.getLoggedInUser() + " is not same as " + user);
+ }
+
@Override
public synchronized void start() {
super.start();
@@ -113,6 +120,15 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
* {@inheritDoc}
*/
@Override
+ public LensSessionHandle openSessionAsUser(String user) throws LensException {
+ // Open session with no auth
+ return openSession(user, "Mimbulus Mimbletonia", new HashMap<String, String>(), false);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public SchedulerJobHandle submitJob(LensSessionHandle sessionHandle, XJob job) throws LensException {
LensSessionImpl session = getSession(sessionHandle);
// Validate XJob
@@ -121,8 +137,9 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
long createdOn = System.currentTimeMillis();
long modifiedOn = createdOn;
SchedulerJobInfo info = new SchedulerJobInfo(handle, job, session.getLoggedInUser(), SchedulerJobState.NEW,
- createdOn, modifiedOn);
+ createdOn, modifiedOn);
if (schedulerDAO.storeJob(info) == 1) {
+ log.info("Successfully submitted job with handle {}", handle);
return handle;
} else {
throw new LensException("Could not Submit the job");
@@ -138,6 +155,7 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
@Override
public boolean scheduleJob(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle) throws LensException {
SchedulerJobInfo jobInfo = schedulerDAO.getSchedulerJobInfo(jobHandle);
+ doesSessionBelongToUser(sessionHandle, jobInfo.getUserName());
XJob job = jobInfo.getJob();
DateTime start = new DateTime(job.getStartTime().toGregorianCalendar().getTime());
DateTime end = new DateTime(job.getEndTime().toGregorianCalendar().getTime());
@@ -145,7 +163,8 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
// check query
checkQuery(sessionHandle, job);
alarmService.schedule(start, end, frequency, jobHandle.getHandleIdString());
- return setStateOfJob(jobHandle, SchedulerJobEvent.ON_SCHEDULE) == 1;
+ log.info("Successfully scheduled job with handle {} in AlarmService", jobHandle);
+ return setStateOfJob(jobInfo, SchedulerJobEvent.ON_SCHEDULE) == 1;
}
private void checkQuery(LensSessionHandle sessionHandle, XJob job) throws LensException {
@@ -156,7 +175,7 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
}
queryConf.addProperty(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, false);
queryService.estimate(LensServices.get().getLogSegregationContext().getLogSegragationId(), sessionHandle,
- job.getExecution().getQuery().getQuery(), queryConf);
+ job.getExecution().getQuery().getQuery(), queryConf);
return;
}
@@ -171,7 +190,7 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
* {@inheritDoc}
*/
@Override
- public XJob getJobDefinition(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle) throws LensException {
+ public XJob getJobDefinition(SchedulerJobHandle jobHandle) throws LensException {
return schedulerDAO.getJob(jobHandle);
}
@@ -179,8 +198,7 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
* {@inheritDoc}
*/
@Override
- public SchedulerJobInfo getJobDetails(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle)
- throws LensException {
+ public SchedulerJobInfo getJobDetails(SchedulerJobHandle jobHandle) throws LensException {
return schedulerDAO.getSchedulerJobInfo(jobHandle);
}
@@ -191,8 +209,8 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
public boolean updateJob(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle, XJob newJobDefinition)
throws LensException {
SchedulerJobInfo jobInfo = schedulerDAO.getSchedulerJobInfo(jobHandle);
+ doesSessionBelongToUser(sessionHandle, jobInfo.getUserName());
// This will allow only the job definition and configuration change.
- // TODO: fix start and end time changes
jobInfo.setJob(newJobDefinition);
jobInfo.setModifiedOn(System.currentTimeMillis());
int updated = schedulerDAO.updateJob(jobInfo);
@@ -204,10 +222,13 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
*/
@Override
public boolean expireJob(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle) throws LensException {
+ SchedulerJobInfo info = schedulerDAO.getSchedulerJobInfo(jobHandle);
+ doesSessionBelongToUser(sessionHandle, info.getUserName());
if (alarmService.checkExists(jobHandle)) {
alarmService.unSchedule(jobHandle);
+ log.info("Successfully unscheduled the job with handle {} in AlarmService ", jobHandle);
}
- return setStateOfJob(jobHandle, SchedulerJobEvent.ON_EXPIRE) == 1;
+ return setStateOfJob(info, SchedulerJobEvent.ON_EXPIRE) == 1;
}
/**
@@ -215,8 +236,10 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
*/
@Override
public boolean suspendJob(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle) throws LensException {
+ SchedulerJobInfo info = schedulerDAO.getSchedulerJobInfo(jobHandle);
+ doesSessionBelongToUser(sessionHandle, info.getUserName());
alarmService.pauseJob(jobHandle);
- return setStateOfJob(jobHandle, SchedulerJobEvent.ON_SUSPEND) == 1;
+ return setStateOfJob(info, SchedulerJobEvent.ON_SUSPEND) == 1;
}
/**
@@ -224,8 +247,10 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
*/
@Override
public boolean resumeJob(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle) throws LensException {
+ SchedulerJobInfo info = schedulerDAO.getSchedulerJobInfo(jobHandle);
+ doesSessionBelongToUser(sessionHandle, info.getUserName());
alarmService.resumeJob(jobHandle);
- return setStateOfJob(jobHandle, SchedulerJobEvent.ON_RESUME) == 1;
+ return setStateOfJob(info, SchedulerJobEvent.ON_RESUME) == 1;
}
/**
@@ -233,18 +258,21 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
*/
@Override
public boolean deleteJob(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle) throws LensException {
+ SchedulerJobInfo info = schedulerDAO.getSchedulerJobInfo(jobHandle);
+ doesSessionBelongToUser(sessionHandle, info.getUserName());
if (alarmService.checkExists(jobHandle)) {
alarmService.unSchedule(jobHandle);
+ log.info("Successfully unscheduled the job with handle {} ", jobHandle);
}
- return setStateOfJob(jobHandle, SchedulerJobEvent.ON_DELETE) == 1;
+ return setStateOfJob(info, SchedulerJobEvent.ON_DELETE) == 1;
}
/**
* {@inheritDoc}
*/
@Override
- public Collection<SchedulerJobStats> getAllJobStats(LensSessionHandle sessionHandle, String state, String user,
- String jobName, long startTime, long endTime) throws LensException {
+ public Collection<SchedulerJobStats> getAllJobStats(String state, String user, String jobName, long startTime,
+ long endTime) throws LensException {
return null;
}
@@ -252,8 +280,8 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
* {@inheritDoc}
*/
@Override
- public SchedulerJobStats getJobStats(LensSessionHandle sessionHandle, SchedulerJobHandle handle, String state,
- long startTime, long endTime) throws LensException {
+ public SchedulerJobStats getJobStats(SchedulerJobHandle handle, String state, long startTime, long endTime)
+ throws LensException {
return null;
}
@@ -264,6 +292,7 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
public boolean rerunInstance(LensSessionHandle sessionHandle, SchedulerJobInstanceHandle instanceHandle)
throws LensException {
SchedulerJobInstanceInfo instanceInfo = schedulerDAO.getSchedulerJobInstanceInfo(instanceHandle);
+ doesSessionBelongToUser(sessionHandle, schedulerDAO.getUser(instanceInfo.getJobId()));
if (schedulerDAO.getJobState(instanceInfo.getJobId()) != SchedulerJobState.SCHEDULED) {
throw new LensException("Job with handle " + instanceInfo.getJobId() + " is not scheduled");
}
@@ -277,8 +306,9 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
try {
latestRun.getInstanceState().nextTransition(SchedulerJobInstanceEvent.ON_RERUN);
getEventService().notifyEvent(
- new SchedulerAlarmEvent(instanceInfo.getJobId(), new DateTime(instanceInfo.getScheduleTime()),
- SchedulerAlarmEvent.EventType.SCHEDULE, instanceHandle));
+ new SchedulerAlarmEvent(instanceInfo.getJobId(), new DateTime(instanceInfo.getScheduleTime()),
+ SchedulerAlarmEvent.EventType.SCHEDULE, instanceHandle));
+ log.info("Rerunning the instance with {} for job {} ", instanceHandle, instanceInfo.getJobId());
} catch (InvalidStateTransitionException e) {
throw new LensException("Invalid State Transition ", e);
}
@@ -289,8 +319,8 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
* {@inheritDoc}
*/
@Override
- public List<SchedulerJobInstanceInfo> getJobInstances(LensSessionHandle sessionHandle, SchedulerJobHandle jobHandle,
- Long numResults) throws LensException {
+ public List<SchedulerJobInstanceInfo> getJobInstances(SchedulerJobHandle jobHandle, Long numResults)
+ throws LensException {
return schedulerDAO.getJobInstances(jobHandle);
}
@@ -301,15 +331,28 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
* Get the query handle from the latest run.
*/
SchedulerJobInstanceInfo instanceInfo = schedulerDAO.getSchedulerJobInstanceInfo(instanceHandle);
+ doesSessionBelongToUser(sessionHandle, schedulerDAO.getUser(instanceInfo.getJobId()));
List<SchedulerJobInstanceRun> runList = instanceInfo.getInstanceRunList();
if (runList.size() == 0) {
throw new LensException("Job instance " + instanceHandle + " is not yet run");
}
SchedulerJobInstanceRun latestRun = runList.get(runList.size() - 1);
QueryHandle handle = latestRun.getQueryHandle();
- if (handle.getHandleIdString().isEmpty()) {
- return false;
+ if (handle == null || handle.getHandleIdString().isEmpty()) {
+ SchedulerJobInstanceState state = latestRun.getInstanceState();
+ try {
+ state = state.nextTransition(SchedulerJobInstanceEvent.ON_KILL);
+ } catch (InvalidStateTransitionException e) {
+ throw new LensException("Invalid Transition of state ", e);
+ }
+ latestRun.setEndTime(System.currentTimeMillis());
+ latestRun.setInstanceState(state);
+ schedulerDAO.updateJobInstanceRun(latestRun);
+ log.info("Killing instance with {} for job {} ", instanceHandle, instanceInfo.getJobId());
+ return true;
}
+ log.info("Killing instance with {} for job {} with query handle {} ", instanceHandle, instanceInfo.getJobId(),
+ handle);
// This will cause the QueryEnd event which will set the status of the instance to KILLED.
return queryService.cancelQuery(sessionHandle, handle);
}
@@ -318,19 +361,22 @@ public class SchedulerServiceImpl extends BaseLensService implements SchedulerSe
* {@inheritDoc}
*/
@Override
- public SchedulerJobInstanceInfo getInstanceDetails(LensSessionHandle sessionHandle,
- SchedulerJobInstanceHandle instanceHandle) throws LensException {
+ public SchedulerJobInstanceInfo getInstanceDetails(SchedulerJobInstanceHandle instanceHandle) throws LensException {
return schedulerDAO.getSchedulerJobInstanceInfo(instanceHandle);
}
- private int setStateOfJob(SchedulerJobHandle handle, SchedulerJobEvent event) throws LensException {
+ private int setStateOfJob(SchedulerJobInfo info, SchedulerJobEvent event) throws LensException {
try {
- SchedulerJobInfo info = schedulerDAO.getSchedulerJobInfo(handle);
SchedulerJobState currentState = info.getJobState();
SchedulerJobState nextState = currentState.nextTransition(event);
info.setJobState(nextState);
info.setModifiedOn(System.currentTimeMillis());
- return schedulerDAO.updateJobStatus(info);
+ int ret = schedulerDAO.updateJobStatus(info);
+ if (ret == 1) {
+ log.info("Successfully changed the status of job with handle {} from {} to {}", info.getId(), currentState,
+ nextState);
+ }
+ return ret;
} catch (InvalidStateTransitionException e) {
throw new LensException("Invalid state ", e);
}
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java b/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
index 7b610de..02f371c 100644
--- a/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
+++ b/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
@@ -159,9 +159,10 @@ public class AlarmServiceTest {
SchedulerJobHandle jobHandle = new SchedulerJobHandle(UUID.randomUUID());
System.out.println("jobHandle = " + jobHandle);
XFrequency frequency = new XFrequency();
- frequency.setCronExpression("0/1 * * * * ?");
+ frequency.setCronExpression("0 0 12 * * ?");
alarmService.schedule(start, end, frequency, jobHandle.toString());
- Thread.sleep(2000);
+ Thread.sleep(1000);
+ alarmService.unSchedule(jobHandle);
// Assert that the events are fired and at per second interval.
assertTrue(events.size() > 1);
}
http://git-wip-us.apache.org/repos/asf/lens/blob/ebf018f9/lens-server/src/test/java/org/apache/lens/server/scheduler/TestSchedulerServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/scheduler/TestSchedulerServiceImpl.java b/lens-server/src/test/java/org/apache/lens/server/scheduler/TestSchedulerServiceImpl.java
index ce744af..e182c72 100644
--- a/lens-server/src/test/java/org/apache/lens/server/scheduler/TestSchedulerServiceImpl.java
+++ b/lens-server/src/test/java/org/apache/lens/server/scheduler/TestSchedulerServiceImpl.java
@@ -22,7 +22,6 @@ import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import java.util.GregorianCalendar;
-import java.util.HashMap;
import java.util.List;
import java.util.UUID;
@@ -42,7 +41,6 @@ import org.apache.lens.server.api.query.QueryContext;
import org.apache.lens.server.api.query.QueryEnded;
import org.apache.lens.server.api.query.QueryExecutionService;
import org.apache.lens.server.api.scheduler.SchedulerService;
-import org.apache.lens.server.query.QueryExecutionServiceImpl;
import org.apache.hadoop.conf.Configuration;
@@ -59,8 +57,7 @@ public class TestSchedulerServiceImpl {
SchedulerServiceImpl scheduler;
EventServiceImpl eventService;
- LensSessionHandle sessionHandle = null;
-
+ String user = "someuser";
@BeforeMethod
public void setup() throws Exception {
System.setProperty(LensConfConstants.CONFIG_LOCATION, "target/test-classes/");
@@ -69,19 +66,20 @@ public class TestSchedulerServiceImpl {
private void setupQueryService() throws Exception {
QueryExecutionService queryExecutionService = PowerMockito.mock(QueryExecutionService.class);
scheduler.setQueryService(queryExecutionService);
+ PowerMockito.when(
+ scheduler.getQueryService().estimate(anyString(), any(LensSessionHandle.class), anyString(), any(LensConf.class)))
+ .thenReturn(null);
PowerMockito.when(scheduler.getQueryService()
- .estimate(anyString(), any(LensSessionHandle.class), anyString(), any(LensConf.class))).thenReturn(null);
- PowerMockito.when(scheduler.getQueryService()
- .executeAsync(any(LensSessionHandle.class), anyString(), any(LensConf.class), anyString()))
- .thenReturn(new QueryHandle(UUID.randomUUID()));
+ .executeAsync(any(LensSessionHandle.class), anyString(), any(LensConf.class), anyString()))
+ .thenReturn(new QueryHandle(UUID.randomUUID()));
PowerMockito.when(scheduler.getQueryService().cancelQuery(any(LensSessionHandle.class), any(QueryHandle.class)))
- .thenReturn(true);
+ .thenReturn(true);
scheduler.getSchedulerEventListener().setQueryService(queryExecutionService);
}
private QueryEnded mockQueryEnded(SchedulerJobInstanceHandle instanceHandle, QueryStatus.Status status) {
QueryContext mockContext = PowerMockito.mock(QueryContext.class);
- PowerMockito.when(mockContext.getDriverResultPath()).thenReturn("/tmp/query1/result");
+ PowerMockito.when(mockContext.getResultSetPath()).thenReturn("/tmp/query1/result");
Configuration conf = new Configuration();
// set the instance handle
conf.set("job_instance_key", instanceHandle.getHandleIdString());
@@ -101,8 +99,7 @@ public class TestSchedulerServiceImpl {
scheduler = LensServices.get().getService(SchedulerService.NAME);
eventService = LensServices.get().getService(EventServiceImpl.NAME);
setupQueryService();
- sessionHandle = ((QueryExecutionServiceImpl) LensServices.get().getService(QueryExecutionService.NAME))
- .openSession("someuser", "test", new HashMap<String, String>(), false);
+ LensSessionHandle sessionHandle = scheduler.openSessionAsUser(user);
long currentTime = System.currentTimeMillis();
XJob job = getTestJob("0/5 * * * * ?", currentTime, currentTime + 15000);
SchedulerJobHandle jobHandle = scheduler.submitAndScheduleJob(sessionHandle, job);
@@ -119,16 +116,18 @@ public class TestSchedulerServiceImpl {
Thread.sleep(2000);
// Check the instance value
SchedulerJobInstanceInfo info = scheduler.getSchedulerDAO()
- .getSchedulerJobInstanceInfo(instanceHandleList.get(0).getId());
+ .getSchedulerJobInstanceInfo(instanceHandleList.get(0).getId());
Assert.assertEquals(info.getInstanceRunList().size(), 1);
Assert.assertEquals(info.getInstanceRunList().get(0).getResultPath(), "/tmp/query1/result");
Assert.assertEquals(info.getInstanceRunList().get(0).getInstanceState(), SchedulerJobInstanceState.SUCCEEDED);
+ scheduler.closeSession(sessionHandle);
}
@Test(priority = 2)
public void testSuspendResume() throws Exception {
long currentTime = System.currentTimeMillis();
XJob job = getTestJob("0/10 * * * * ?", currentTime, currentTime + 180000);
+ LensSessionHandle sessionHandle = scheduler.openSessionAsUser(user);
SchedulerJobHandle jobHandle = scheduler.submitAndScheduleJob(sessionHandle, job);
Assert.assertNotNull(jobHandle);
Assert.assertTrue(scheduler.suspendJob(sessionHandle, jobHandle));
@@ -138,6 +137,7 @@ public class TestSchedulerServiceImpl {
Thread.sleep(10000);
Assert.assertTrue(scheduler.expireJob(sessionHandle, jobHandle));
Assert.assertEquals(scheduler.getSchedulerDAO().getJobState(jobHandle), SchedulerJobState.EXPIRED);
+ scheduler.closeSession(sessionHandle);
}
@Test(priority = 2)
@@ -145,6 +145,7 @@ public class TestSchedulerServiceImpl {
long currentTime = System.currentTimeMillis();
XJob job = getTestJob("0/10 * * * * ?", currentTime, currentTime + 180000);
+ LensSessionHandle sessionHandle = scheduler.openSessionAsUser(user);
SchedulerJobHandle jobHandle = scheduler.submitAndScheduleJob(sessionHandle, job);
// Wait for some instances.
Thread.sleep(15000);
@@ -153,7 +154,7 @@ public class TestSchedulerServiceImpl {
eventService.notifyEvent(mockQueryEnded(instanceHandleList.get(0).getId(), QueryStatus.Status.FAILED));
Thread.sleep(1000);
SchedulerJobInstanceInfo info = scheduler.getSchedulerDAO()
- .getSchedulerJobInstanceInfo(instanceHandleList.get(0).getId());
+ .getSchedulerJobInstanceInfo(instanceHandleList.get(0).getId());
// First run
Assert.assertEquals(info.getInstanceRunList().size(), 1);
Assert.assertEquals(info.getInstanceRunList().get(0).getInstanceState(), SchedulerJobInstanceState.FAILED);
@@ -170,13 +171,14 @@ public class TestSchedulerServiceImpl {
Assert.assertEquals(info.getInstanceRunList().get(1).getInstanceState(), SchedulerJobInstanceState.SUCCEEDED);
Assert.assertTrue(scheduler.expireJob(sessionHandle, jobHandle));
Assert.assertEquals(scheduler.getSchedulerDAO().getJobState(jobHandle), SchedulerJobState.EXPIRED);
+ scheduler.closeSession(sessionHandle);
}
@Test(priority = 2)
public void testKillRunningInstance() throws Exception {
long currentTime = System.currentTimeMillis();
-
XJob job = getTestJob("0/5 * * * * ?", currentTime, currentTime + 180000);
+ LensSessionHandle sessionHandle = scheduler.openSessionAsUser(user);
SchedulerJobHandle jobHandle = scheduler.submitAndScheduleJob(sessionHandle, job);
// Let it run
Thread.sleep(6000);
@@ -184,7 +186,7 @@ public class TestSchedulerServiceImpl {
Assert.assertTrue(scheduler.killInstance(sessionHandle, instanceHandleList.get(0).getId()));
Thread.sleep(2000);
SchedulerJobInstanceInfo info = scheduler.getSchedulerDAO()
- .getSchedulerJobInstanceInfo(instanceHandleList.get(0).getId());
+ .getSchedulerJobInstanceInfo(instanceHandleList.get(0).getId());
Assert.assertEquals(info.getInstanceRunList().size(), 1);
Assert.assertEquals(info.getInstanceRunList().get(0).getInstanceState(), SchedulerJobInstanceState.RUNNING);
// Query End event
@@ -194,6 +196,7 @@ public class TestSchedulerServiceImpl {
Assert.assertEquals(info.getInstanceRunList().get(0).getInstanceState(), SchedulerJobInstanceState.KILLED);
Assert.assertTrue(scheduler.expireJob(sessionHandle, jobHandle));
Assert.assertEquals(scheduler.getSchedulerDAO().getJobState(jobHandle), SchedulerJobState.EXPIRED);
+ scheduler.closeSession(sessionHandle);
}
private XTrigger getTestTrigger(String cron) {
@@ -211,7 +214,7 @@ public class TestSchedulerServiceImpl {
query.setQuery("select ID from test_table");
execution.setQuery(query);
XSessionType sessionType = new XSessionType();
- sessionType.setDb("test");
+ sessionType.setDb("default");
execution.setSession(sessionType);
return execution;
}
[31/31] lens git commit: revreser merge form current-release-line
Posted by pu...@apache.org.
revreser merge form current-release-line
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/53909baa
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/53909baa
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/53909baa
Branch: refs/heads/master
Commit: 53909baa1c8e360af45fe06ebab51d0b84deae20
Parents: 547a42f 837e399
Author: Puneet <pu...@inmobi.com>
Authored: Tue Oct 25 15:51:48 2016 +0530
Committer: Puneet <pu...@inmobi.com>
Committed: Tue Oct 25 15:51:48 2016 +0530
----------------------------------------------------------------------
contrib/clients/python/lens/client/__init__.py | 2 +-
contrib/clients/python/setup.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[25/31] lens git commit: LENS-1336: Add contrib(clients) module to
modules section
Posted by pu...@apache.org.
LENS-1336: Add contrib(clients) module to modules section
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/0f7a1d6d
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/0f7a1d6d
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/0f7a1d6d
Branch: refs/heads/master
Commit: 0f7a1d6d91e340381c8f07f648b7d3305573c2ed
Parents: c600c82
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Sat Sep 24 10:56:59 2016 +0800
Committer: rajub <ra...@lazada.com>
Committed: Sat Sep 24 10:58:08 2016 +0800
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/0f7a1d6d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8733649..6dfa049 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1705,6 +1705,7 @@
<module>lens-ml-dist</module>
<module>lens-regression</module>
<module>lens-ui</module>
+ <module>contrib</module>
</modules>
<profiles>
[30/31] lens git commit: [maven-release-plugin] prepare for next
development iteration
Posted by pu...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/837e3994
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/837e3994
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/837e3994
Branch: refs/heads/master
Commit: 837e399447bf125c87df45a78cc2facff4c40980
Parents: 7224d83
Author: Puneet <pu...@inmobi.com>
Authored: Tue Sep 27 16:48:04 2016 +0530
Committer: Puneet <pu...@inmobi.com>
Committed: Tue Sep 27 16:48:04 2016 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +-----
contrib/clients/pom.xml | 2 +-
contrib/clients/python/pom.xml | 2 +-
contrib/pom.xml | 2 +-
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-es/pom.xml | 2 +-
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 2 +-
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-ship-jars/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
lens-ui/pom.xml | 2 +-
pom.xml | 8 ++++----
23 files changed, 26 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 8194153..28ee8fb 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
<build>
<plugins>
@@ -49,8 +49,4 @@
</plugin>
</plugins>
</build>
-
- <scm>
- <tag>apache-lens-2.6.1</tag>
- </scm>
</project>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/contrib/clients/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/clients/pom.xml b/contrib/clients/pom.xml
index 79f14eb..24794cf 100644
--- a/contrib/clients/pom.xml
+++ b/contrib/clients/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>lens-contrib</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-contrib-clients</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/contrib/clients/python/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/clients/python/pom.xml b/contrib/clients/python/pom.xml
index 57ed554..3f09827 100644
--- a/contrib/clients/python/pom.xml
+++ b/contrib/clients/python/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>lens-contrib-clients</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-python-client</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/contrib/pom.xml
----------------------------------------------------------------------
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 04b4045..ec21fbc 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-contrib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 6cd3394..1c709f6 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index 2ab54a2..be3dd98 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 7a35692..c03964c 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 5f065d3..a5cd80d 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index 3efd258..7a3c644 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-driver-es/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-es/pom.xml b/lens-driver-es/pom.xml
index 361b963..01300be 100644
--- a/lens-driver-es/pom.xml
+++ b/lens-driver-es/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-es</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index dbff178..7da5e49 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index f3115b7..194024a 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index ce7246f..dd5dfad 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index 7b3fe81..0d14ba1 100644
--- a/lens-ml-dist/pom.xml
+++ b/lens-ml-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index 4a86136..b1f2254 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index e289dad..5825bd0 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 92f0089..92fc720 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index f066401..faa9b89 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 391b11b..eb9fe1c 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-ship-jars/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ship-jars/pom.xml b/lens-ship-jars/pom.xml
index 12f433f..7f3ce41 100644
--- a/lens-ship-jars/pom.xml
+++ b/lens-ship-jars/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-ship-jars</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index c2b092e..89e44bc 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/lens-ui/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ui/pom.xml b/lens-ui/pom.xml
index f10f8ed..035bdc9 100644
--- a/lens-ui/pom.xml
+++ b/lens-ui/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</parent>
<artifactId>lens-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/837e3994/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 362649e..9f365d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -376,7 +376,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/lens.git</url>
- <tag>apache-lens-2.6.1</tag>
+ <tag>HEAD</tag>
</scm>
<reporting>
@@ -704,7 +704,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
@@ -1804,7 +1804,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2-SNAPSHOT</version>
</dependency>
</dependencies>
<executions>
[05/31] lens git commit: LENS-1246 : Fix NPE in explainFailedAttempt
in Lens Client
Posted by pu...@apache.org.
LENS-1246 : Fix NPE in explainFailedAttempt in Lens Client
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/fbe44ff0
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/fbe44ff0
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/fbe44ff0
Branch: refs/heads/master
Commit: fbe44ff0be1ceca163a3d74310fa10b5ac5918eb
Parents: 68e01c2
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Thu Aug 4 10:51:56 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Aug 4 10:52:35 2016 +0530
----------------------------------------------------------------------
.../apache/lens/client/LensClientSingletonWrapper.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/fbe44ff0/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java b/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
index 4629559..3fd754e 100644
--- a/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
+++ b/lens-client/src/main/java/org/apache/lens/client/LensClientSingletonWrapper.java
@@ -58,15 +58,21 @@ public class LensClientSingletonWrapper {
log.error("failed login attempt", e);
switch (e.getErrorCode()) {
case 401:
- System.console().printf("username/password combination incorrect.\n");
+ printError("username/password combination incorrect.");
break;
case 500:
- System.console().printf("server unresponsive, Returned error code 500\n");
+ printError("server unresponsive, Returned error code 500");
break;
default:
- System.console().printf("ERROR: " + e.getMessage() + "\n");
+ printError("ERROR: " + e.getMessage());
}
}
+ private void printError(String error) {
+ if (System.console() != null) {
+ System.console().printf(error + "\n");
+ }
+ log.error(error);
+ }
public LensClient getClient() {
if (client == null) {
[21/31] lens git commit: [maven-release-plugin] prepare release
apache-lens-2.6.0
Posted by pu...@apache.org.
[maven-release-plugin] prepare release apache-lens-2.6.0
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/925094f4
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/925094f4
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/925094f4
Branch: refs/heads/master
Commit: 925094f44923b33767a9d1d4bc9ea6b2bb3fe229
Parents: d89a4ea
Author: Puneet <pu...@inmobi.com>
Authored: Thu Sep 22 16:15:09 2016 +0530
Committer: Puneet <pu...@inmobi.com>
Committed: Thu Sep 22 16:15:09 2016 +0530
----------------------------------------------------------------------
checkstyle/pom.xml | 6 +++++-
lens-api/pom.xml | 2 +-
lens-cli/pom.xml | 2 +-
lens-client/pom.xml | 2 +-
lens-cube/pom.xml | 2 +-
lens-dist/pom.xml | 2 +-
lens-driver-es/pom.xml | 5 ++---
lens-driver-hive/pom.xml | 2 +-
lens-driver-jdbc/pom.xml | 2 +-
lens-examples/pom.xml | 5 ++---
lens-ml-dist/pom.xml | 2 +-
lens-ml-lib/pom.xml | 2 +-
lens-query-lib/pom.xml | 2 +-
lens-regression/pom.xml | 2 +-
lens-server-api/pom.xml | 2 +-
lens-server/pom.xml | 2 +-
lens-ship-jars/pom.xml | 2 +-
lens-storage-db/pom.xml | 2 +-
lens-ui/pom.xml | 2 +-
pom.xml | 11 +++++------
20 files changed, 30 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index d9bb0bd..207b1b8 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
<name>Lens Checkstyle Rules</name>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<build>
<plugins>
@@ -49,4 +49,8 @@
</plugin>
</plugins>
</build>
+
+ <scm>
+ <tag>apache-lens-2.6.0</tag>
+ </scm>
</project>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-api/pom.xml b/lens-api/pom.xml
index 2471c6a..db25aef 100644
--- a/lens-api/pom.xml
+++ b/lens-api/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-cli/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cli/pom.xml b/lens-cli/pom.xml
index bc2c7d4..39b3a07 100644
--- a/lens-cli/pom.xml
+++ b/lens-cli/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-client/pom.xml
----------------------------------------------------------------------
diff --git a/lens-client/pom.xml b/lens-client/pom.xml
index 3f4357f..1ade6e4 100644
--- a/lens-client/pom.xml
+++ b/lens-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-cube/pom.xml
----------------------------------------------------------------------
diff --git a/lens-cube/pom.xml b/lens-cube/pom.xml
index 96febab..fbc73c3 100644
--- a/lens-cube/pom.xml
+++ b/lens-cube/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-cube</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-dist/pom.xml b/lens-dist/pom.xml
index d506523..1d3a0ef 100644
--- a/lens-dist/pom.xml
+++ b/lens-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-driver-es/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-es/pom.xml b/lens-driver-es/pom.xml
index 03b9d5c..481e2a9 100644
--- a/lens-driver-es/pom.xml
+++ b/lens-driver-es/pom.xml
@@ -19,13 +19,12 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-driver-es</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-driver-hive/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-hive/pom.xml b/lens-driver-hive/pom.xml
index bcbe395..002ef69 100644
--- a/lens-driver-hive/pom.xml
+++ b/lens-driver-hive/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-driver-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/lens-driver-jdbc/pom.xml b/lens-driver-jdbc/pom.xml
index 13e50ae..dbf1c234 100644
--- a/lens-driver-jdbc/pom.xml
+++ b/lens-driver-jdbc/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-driver-jdbc</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-examples/pom.xml
----------------------------------------------------------------------
diff --git a/lens-examples/pom.xml b/lens-examples/pom.xml
index fc234db..240a82d 100644
--- a/lens-examples/pom.xml
+++ b/lens-examples/pom.xml
@@ -19,14 +19,13 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Lens Examples</name>
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-ml-dist/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-dist/pom.xml b/lens-ml-dist/pom.xml
index a496fd4..4adc777 100644
--- a/lens-ml-dist/pom.xml
+++ b/lens-ml-dist/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-ml-dist</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-ml-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ml-lib/pom.xml b/lens-ml-lib/pom.xml
index a4632ac..b7a0486 100644
--- a/lens-ml-lib/pom.xml
+++ b/lens-ml-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-query-lib/pom.xml
----------------------------------------------------------------------
diff --git a/lens-query-lib/pom.xml b/lens-query-lib/pom.xml
index ec16458..a66c850 100644
--- a/lens-query-lib/pom.xml
+++ b/lens-query-lib/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-query-lib</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index f0d3864..db0263c 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-regression</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-server-api/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server-api/pom.xml b/lens-server-api/pom.xml
index 6056a8f..07a84ca 100644
--- a/lens-server-api/pom.xml
+++ b/lens-server-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-server-api</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 4ee514b..f46c6da 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<properties>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-ship-jars/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ship-jars/pom.xml b/lens-ship-jars/pom.xml
index 7bcb27a..7e25021 100644
--- a/lens-ship-jars/pom.xml
+++ b/lens-ship-jars/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-ship-jars</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-storage-db/pom.xml
----------------------------------------------------------------------
diff --git a/lens-storage-db/pom.xml b/lens-storage-db/pom.xml
index 6de1605..dadb999 100644
--- a/lens-storage-db/pom.xml
+++ b/lens-storage-db/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-storage-db</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/lens-ui/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ui/pom.xml b/lens-ui/pom.xml
index 342b77a..32482d1 100644
--- a/lens-ui/pom.xml
+++ b/lens-ui/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apache-lens</artifactId>
<groupId>org.apache.lens</groupId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</parent>
<artifactId>lens-ui</artifactId>
http://git-wip-us.apache.org/repos/asf/lens/blob/925094f4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 075f55c..f9ce799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,7 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -128,7 +127,7 @@
<groupId>org.apache.lens</groupId>
<artifactId>apache-lens</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
<name>Lens</name>
<packaging>pom</packaging>
<description>Unified Analytics Platform</description>
@@ -377,7 +376,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/lens.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/lens.git</url>
- <tag>HEAD</tag>
+ <tag>apache-lens-2.6.0</tag>
</scm>
<reporting>
@@ -705,7 +704,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</dependency>
</dependencies>
<executions>
@@ -1804,7 +1803,7 @@
<dependency>
<groupId>org.apache.lens</groupId>
<artifactId>checkstyle</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.0</version>
</dependency>
</dependencies>
<executions>
[16/31] lens git commit: LENS-952: Bump up enunciate version to work
with java 8
Posted by pu...@apache.org.
LENS-952: Bump up enunciate version to work with java 8
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/be839122
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/be839122
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/be839122
Branch: refs/heads/master
Commit: be839122d897eb1c739facd77d8c7ff086ab97d6
Parents: 466cee3
Author: Deepak Barr <de...@apache.org>
Authored: Wed Aug 24 15:51:11 2016 +0800
Committer: raju <ra...@apache.org>
Committed: Wed Aug 24 15:52:41 2016 +0800
----------------------------------------------------------------------
lens-server/enunciate.xml | 14 +++++--------
lens-server/pom.xml | 45 ++++++++++++++++--------------------------
pom.xml | 26 ++++++++----------------
3 files changed, 30 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/be839122/lens-server/enunciate.xml
----------------------------------------------------------------------
diff --git a/lens-server/enunciate.xml b/lens-server/enunciate.xml
index 7013f13..36b68d1 100644
--- a/lens-server/enunciate.xml
+++ b/lens-server/enunciate.xml
@@ -19,16 +19,12 @@
under the License.
-->
-<enunciate label="lens" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://enunciate.codehaus.org/schemas/enunciate-1.25.xsd">
+<enunciate slug="lens" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://enunciate.webcohesion.com/schemas/enunciate-2.0.0-M.4.xsd">
<namespaces>
<namespace uri="https://git-wip-us.apache.org/repos/asf/lens.git" id="lens"/>
</namespaces>
- <services>
- <rest defaultRestSubcontext="/">
- <custom-resource-parameter-annotation qualifiedName="org.glassfish.jersey.media.multipart.FormDataParam"/>
- </rest>
- </services>
+ <modules>
<api-classes>
<include pattern="org.apache.lens.server.query.*"/>
<include pattern="org.apache.lens.server.query.save.*"/>
@@ -37,10 +33,10 @@
<include pattern="org.apache.lens.server.scheduler.*"/>
<include pattern="org.apache.lens.server.session.*"/>
</api-classes>
- <modules>
- <docs docsDir="lens-server" title="Lens Server REST API"/>
+ <docs docsDir="target/enunciate/lens-server"/>
<csharp disabled="true"/>
<c disabled="true"/>
<obj-c disabled="true"></obj-c>
+ <java-json-client disabled="true"/>
</modules>
</enunciate>
http://git-wip-us.apache.org/repos/asf/lens/blob/be839122/lens-server/pom.xml
----------------------------------------------------------------------
diff --git a/lens-server/pom.xml b/lens-server/pom.xml
index 29098d4..4ee514b 100644
--- a/lens-server/pom.xml
+++ b/lens-server/pom.xml
@@ -391,33 +391,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.webcohesion.enunciate</groupId>
+ <artifactId>enunciate-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>docs</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ <configFile>enunciate.xml</configFile>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>enunciate</id>
- <activation>
- <jdk>[1.7,1.8)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>maven-enunciate-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>docs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <configFile>enunciate.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lens/blob/be839122/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c181a58..0a898cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
<jaxb2.basics.plugin.version>0.9.5</jaxb2.basics.plugin.version>
<jaxb2.fluent.plugin.version>3.0</jaxb2.fluent.plugin.version>
<exec.plugin.version>1.2.1</exec.plugin.version>
- <enunciate.plugin.version>1.28</enunciate.plugin.version>
+ <enunciate.plugin.version>2.5.0</enunciate.plugin.version>
<reports.plugin.version>2.7</reports.plugin.version>
<javadoc.plugin.version>2.10.3</javadoc.plugin.version>
<surefire.plugin.version>2.15</surefire.plugin.version>
@@ -556,8 +556,8 @@
<version>${exec.plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>maven-enunciate-plugin</artifactId>
+ <groupId>com.webcohesion.enunciate</groupId>
+ <artifactId>enunciate-maven-plugin</artifactId>
<version>${enunciate.plugin.version}</version>
</plugin>
<plugin>
@@ -749,6 +749,11 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>com.webcohesion.enunciate</groupId>
+ <artifactId>enunciate-maven-plugin</artifactId>
+ <version>${enunciate.plugin.version}</version>
+ </plugin>
</plugins>
</build>
<repositories>
@@ -1860,21 +1865,6 @@
</build>
</profile>
<profile>
- <id>enunciate</id>
- <activation>
- <jdk>[1.7,1.8)</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.enunciate</groupId>
- <artifactId>maven-enunciate-plugin</artifactId>
- <version>${enunciate.plugin.version}</version>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>dev</id>
<properties>
<skipCheck>true</skipCheck>
[17/31] lens git commit: LENS-1197 : Update doc for api getAllFacts
of a cube
Posted by pu...@apache.org.
LENS-1197 : Update doc for api getAllFacts of a cube
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/ca19ead4
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/ca19ead4
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/ca19ead4
Branch: refs/heads/master
Commit: ca19ead475e4f929a7154de4ca9c92dc034b0f2c
Parents: be83912
Author: Archana H <ar...@gmail.com>
Authored: Thu Sep 8 09:43:09 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Sep 8 09:43:58 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/lens/server/metastore/MetastoreResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/ca19ead4/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java b/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
index f684247..9d823da 100644
--- a/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
+++ b/lens-server/src/main/java/org/apache/lens/server/metastore/MetastoreResource.java
@@ -668,7 +668,7 @@ public class MetastoreResource {
*
* @param sessionid The sessionid in which user is working
* @param cubeName name of the base cube or derived cube
- * @return List of {@link XFactTable} objects
+ * @return StringList consisting of all the fact names in the given cube
*/
@GET
@Path("/cubes/{cubeName}/facts")
[27/31] lens git commit: LENS-1338: (incremental patch) Fix lens
version in hivedriver-site.xml
Posted by pu...@apache.org.
LENS-1338: (incremental patch) Fix lens version in hivedriver-site.xml
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/e4ac1534
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/e4ac1534
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/e4ac1534
Branch: refs/heads/master
Commit: e4ac1534221e03d3be23faeb17393027c7b4f73a
Parents: 7efc643
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Mon Sep 26 13:46:44 2016 +0800
Committer: rajub <ra...@lazada.com>
Committed: Mon Sep 26 13:46:44 2016 +0800
----------------------------------------------------------------------
.../server/drivers/hive/hive1/hivedriver-site.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/e4ac1534/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml
----------------------------------------------------------------------
diff --git a/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml b/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml
index eb86933..34995d5 100644
--- a/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml
+++ b/tools/conf-pseudo-distr/server/drivers/hive/hive1/hivedriver-site.xml
@@ -52,6 +52,6 @@
</property>
<property>
<name>hive.aux.jars.path</name>
- <value>file:///opt/lens/lens-ml-dist/target/apache-lens-2.6.0-SNAPSHOT-ml/lib/lens-ml-lib-2.6.0-SNAPSHOT.jar,file:///usr/local/spark-1.3.0-bin-hadoop2.4/lib/spark-assembly-1.3.0-hadoop2.4.0.jar</value>
+ <value>file:///opt/lens/lens-ml-dist/target/apache-lens-2.6.1-ml/lib/lens-ml-lib-2.6.1.jar,file:///usr/local/spark-1.3.0-bin-hadoop2.4/lib/spark-assembly-1.3.0-hadoop2.4.0.jar</value>
</property>
</configuration>
[12/31] lens git commit: LENS-1241 : Fix tests failures with setup
and teardown issues
Posted by pu...@apache.org.
LENS-1241 : Fix tests failures with setup and teardown issues
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/8fcc1a12
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/8fcc1a12
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/8fcc1a12
Branch: refs/heads/master
Commit: 8fcc1a12b652c667fb153bb0e95e4a8de4f8638a
Parents: 35aba09
Author: Sushil Mohanty <su...@apache.org>
Authored: Mon Aug 22 17:20:25 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Mon Aug 22 17:28:57 2016 +0530
----------------------------------------------------------------------
.../lens/server/metrics/MetricsServiceImpl.java | 6 ------
.../org/apache/lens/server/TestServerMode.java | 20 +++++++++++++++-----
.../server/healthcheck/TestHealthChecks.java | 4 +---
.../server/metastore/TestMetastoreService.java | 11 +++++++++--
.../metrics/TestResourceMethodMetrics.java | 15 ++++++++++-----
.../lens/server/query/TestEventService.java | 4 ++--
.../server/query/TestQueryEndEmailNotifier.java | 10 +++++++++-
.../server/query/TestQueryResultPurger.java | 8 +++-----
.../lens/server/query/TestQueryService.java | 10 +++++++++-
.../lens/server/query/TestResultFormatting.java | 16 +++++++++++-----
.../query/save/TestSavedQueryService.java | 14 ++++++++++----
.../TestUserQueryToCubeQueryRewriter.java | 4 ++--
.../lens/server/scheduler/AlarmServiceTest.java | 4 ++--
.../server/session/TestSessionResource.java | 9 +++++++--
.../lens/server/user/TestUserConfigLoader.java | 8 +++-----
15 files changed, 93 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java b/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
index e09180f..b88c717 100644
--- a/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
+++ b/lens-server/src/main/java/org/apache/lens/server/metrics/MetricsServiceImpl.java
@@ -585,12 +585,6 @@ public class MetricsServiceImpl extends AbstractService implements MetricsServic
isHealthy = false;
}
- // Also unhealthy if 30% of queries have failed.
- if (getTotalFailedQueries()/(float)getTotalAcceptedQueries() > 0.3) {
- details.append("30% of queries have failed.");
- isHealthy = false;
- }
-
if (!isHealthy) {
log.error(details.toString());
}
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java b/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
index caf968a..bc3955d 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestServerMode.java
@@ -43,9 +43,7 @@ import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
/**
* The Class TestServerMode.
@@ -61,8 +59,12 @@ public class TestServerMode extends LensAllApplicationJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
- LensServerTestUtil.createTable("test_table", target(), RestAPITestUtil.openFooBarSession(target(), defaultMT),
- defaultMT);
+ }
+ @BeforeClass
+ public void create() throws Exception {
+ LensSessionHandle fooBarSessonHandle = RestAPITestUtil.openFooBarSession(target(), defaultMT);
+ LensServerTestUtil.createTable("test_table", target(), fooBarSessonHandle, defaultMT);
+ RestAPITestUtil.closeSession(target(), fooBarSessonHandle, defaultMT);
}
/*
@@ -75,6 +77,14 @@ public class TestServerMode extends LensAllApplicationJerseyTest {
super.tearDown();
}
+ @AfterClass
+ public void drop() throws Exception {
+ LensSessionHandle fooBarSessonHandle = RestAPITestUtil.openFooBarSession(target(), defaultMT);
+ LensServerTestUtil.dropTable("test_table", target(), fooBarSessonHandle,
+ defaultMT);
+ RestAPITestUtil.closeSession(target(), fooBarSessonHandle, defaultMT);
+ }
+
/**
* Test read only mode.
*
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java b/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java
index 56c67fb..1a1476a 100644
--- a/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java
+++ b/lens-server/src/test/java/org/apache/lens/server/healthcheck/TestHealthChecks.java
@@ -32,9 +32,7 @@ import org.apache.lens.server.quota.QuotaServiceImpl;
import org.apache.lens.server.scheduler.SchedulerServiceImpl;
import org.apache.lens.server.session.HiveSessionService;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import com.codahale.metrics.health.HealthCheck;
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
index 61bc133..0c1b25b 100644
--- a/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/metastore/TestMetastoreService.java
@@ -85,18 +85,25 @@ public class TestMetastoreService extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
cubeObjectFactory = new ObjectFactory();
metastoreService = LensServices.get().getService(CubeMetastoreService.NAME);
lensSessionId = metastoreService.openSession("foo", "bar", new HashMap<String, String>());
-
}
@AfterTest
public void tearDown() throws Exception {
- metastoreService.closeSession(lensSessionId);
super.tearDown();
}
+ @AfterClass
+ public void drop() throws Exception {
+ metastoreService.closeSession(lensSessionId);
+ }
+
@Override
protected Application configure() {
enable(TestProperties.LOG_TRAFFIC);
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java b/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
index c20ddf8..14fae18 100644
--- a/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
+++ b/lens-server/src/test/java/org/apache/lens/server/metrics/TestResourceMethodMetrics.java
@@ -55,9 +55,7 @@ import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.test.TestProperties;
import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import lombok.extern.slf4j.Slf4j;
@@ -78,13 +76,16 @@ public class TestResourceMethodMetrics extends LensAllApplicationJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
metricsSvc = LensServices.get().getService(MetricsService.NAME);
metastoreService = LensServices.get().getService(CubeMetastoreService.NAME);
lensSessionId = metastoreService.openSession("foo", "bar", new HashMap<String, String>());
methodMetricsMap = metricsSvc.getMethodMetricsFactory().getMethodMetricsMap();
//reset
}
-
private void createTable(String tblName) throws InterruptedException {
LensServerTestUtil.createTable(tblName, target(), lensSessionId, defaultMT);
}
@@ -95,9 +96,13 @@ public class TestResourceMethodMetrics extends LensAllApplicationJerseyTest {
@AfterTest
public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
LensServerTestUtil.dropTable(TestQueryService.TEST_TABLE, target(), lensSessionId, defaultMT);
metastoreService.closeSession(lensSessionId);
- super.tearDown();
}
private void disableResourceMethodMetering() {
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
index 50baf5f..94011d2 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestEventService.java
@@ -47,7 +47,7 @@ import org.apache.lens.server.api.session.SessionRestored;
import org.apache.lens.server.query.QueryExecutionServiceImpl.QueryStatusLogger;
import org.apache.lens.server.stats.event.query.QueryExecutionStatistics;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import lombok.extern.slf4j.Slf4j;
@@ -277,7 +277,7 @@ public class TestEventService {
*
* @throws Exception the exception
*/
- @BeforeTest
+ @BeforeClass
public void setup() throws Exception {
System.setProperty(LensConfConstants.CONFIG_LOCATION, "target/test-classes/");
LensServices.get().init(LensServerConf.getHiveConf());
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
index 5196c9b..cfdd1dd 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryEndEmailNotifier.java
@@ -85,6 +85,10 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
wiser = new Wiser();
wiser.setHostname("localhost");
wiser.setPort(25000);
@@ -112,10 +116,14 @@ public class TestQueryEndEmailNotifier extends LensJerseyTest {
*/
@AfterTest
public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
wiser.stop();
dropTable(TEST_TABLE);
queryService.closeSession(lensSessionId);
- super.tearDown();
}
/*
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java
index c498ada..50415de 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryResultPurger.java
@@ -30,9 +30,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
@Test(groups = "unit-test")
public class TestQueryResultPurger {
@@ -47,7 +45,7 @@ public class TestQueryResultPurger {
* @throws IOException Signals that an I/O exception has occurred.
*/
- @BeforeTest
+ @BeforeClass
public void setUp() throws IOException {
String resultsetPath = "target/" + getClass().getSimpleName();
conf = new Configuration();
@@ -59,7 +57,7 @@ public class TestQueryResultPurger {
createTestFiles();
}
- @AfterTest
+ @AfterClass
public void cleanup() throws Exception {
Path dir = new Path(conf.get(LensConfConstants.RESULT_SET_PARENT_DIR));
FileSystem fs = dir.getFileSystem(conf);
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
index 9f40a01..defc8b4 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestQueryService.java
@@ -126,6 +126,10 @@ public class TestQueryService extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
queryService = LensServices.get().getService(QueryExecutionService.NAME);
metricsSvc = LensServices.get().getService(MetricsService.NAME);
Map<String, String> sessionconf = new HashMap<>();
@@ -165,6 +169,11 @@ public class TestQueryService extends LensJerseyTest {
*/
@AfterTest
public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
dropTable(TEST_TABLE);
queryService.closeSession(lensSessionId);
for (LensDriver driver : queryService.getDrivers()) {
@@ -172,7 +181,6 @@ public class TestQueryService extends LensJerseyTest {
assertFalse(((HiveDriver) driver).hasLensSession(lensSessionId));
}
}
- super.tearDown();
}
/*
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java b/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
index cb0d858..4f8b8ff 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/TestResultFormatting.java
@@ -52,9 +52,7 @@ import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import lombok.extern.slf4j.Slf4j;
@@ -79,10 +77,14 @@ public class TestResultFormatting extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
queryService = LensServices.get().getService(QueryExecutionService.NAME);
lensSessionId = queryService.openSession("foo", "bar", new HashMap<String, String>());
createTable(testTable, target(), lensSessionId,
- "(ID INT, IDSTR STRING, IDARR ARRAY<INT>, IDSTRARR ARRAY<STRING>)", defaultMT);
+ "(ID INT, IDSTR STRING, IDARR ARRAY<INT>, IDSTRARR ARRAY<STRING>)", defaultMT);
loadDataFromClasspath(testTable, TestResourceFile.TEST_DATA2_FILE.getValue(), target(), lensSessionId, defaultMT);
}
@@ -93,9 +95,13 @@ public class TestResultFormatting extends LensJerseyTest {
*/
@AfterTest
public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
dropTable(testTable, target(), lensSessionId, defaultMT);
queryService.closeSession(lensSessionId);
- super.tearDown();
}
/*
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java b/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java
index a8b58b2..af156ad 100644
--- a/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java
+++ b/lens-server/src/test/java/org/apache/lens/server/query/save/TestSavedQueryService.java
@@ -45,9 +45,7 @@ import org.apache.lens.server.query.QueryExecutionServiceImpl;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.session.SessionState;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import com.beust.jcommander.internal.Maps;
import com.beust.jcommander.internal.Sets;
@@ -93,6 +91,10 @@ public class TestSavedQueryService extends LensJerseyTest {
@BeforeTest
public void setUp() throws Exception {
super.setUp();
+ }
+
+ @BeforeClass
+ public void create() throws Exception {
savedQueryService = LensServices.get().getService(SavedQueryService.NAME);
queryService = LensServices.get().getService(QueryExecutionService.NAME);
metricsSvc = LensServices.get().getService(MetricsService.NAME);
@@ -105,10 +107,14 @@ public class TestSavedQueryService extends LensJerseyTest {
@AfterTest
public void tearDown() throws Exception {
super.tearDown();
+ }
+
+ @AfterClass
+ public void drop() throws Exception {
queryService.closeSession(lensSessionId);
- super.tearDown();
}
+
@Override
protected Application configure() {
return new SavedQueryTestApp();
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java b/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java
index 38f8d71..0f0187d 100644
--- a/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java
+++ b/lens-server/src/test/java/org/apache/lens/server/rewrite/TestUserQueryToCubeQueryRewriter.java
@@ -30,7 +30,7 @@ import org.apache.lens.server.api.query.rewrite.Phase1Rewriter;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
public class TestUserQueryToCubeQueryRewriter {
@@ -66,7 +66,7 @@ public class TestUserQueryToCubeQueryRewriter {
UserQueryToCubeQueryRewriter rewriter;
- @BeforeTest
+ @BeforeClass
public void setup() throws LensException {
Configuration conf = new Configuration();
conf.set(LensConfConstants.QUERY_PHASE1_REWRITERS, Rewriter1.class.getName() + "," + Rewriter2.class.getName());
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java b/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
index 02f371c..4feef4f 100644
--- a/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
+++ b/lens-server/src/test/java/org/apache/lens/server/scheduler/AlarmServiceTest.java
@@ -41,8 +41,8 @@ import org.joda.time.format.DateTimeFormatter;
import org.quartz.*;
import org.quartz.impl.StdSchedulerFactory;
import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import lombok.extern.slf4j.Slf4j;
@@ -75,7 +75,7 @@ public class AlarmServiceTest {
events = new LinkedList<>();
}
- @BeforeTest
+ @BeforeClass
public void setUp() {
System.setProperty(LensConfConstants.CONFIG_LOCATION, "target/test-classes/");
LensServices.get().init(LensServerConf.getHiveConf());
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
index 9ebe17c..e7ddd37 100644
--- a/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
+++ b/lens-server/src/test/java/org/apache/lens/server/session/TestSessionResource.java
@@ -68,6 +68,8 @@ import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.test.TestProperties;
import org.testng.Assert;
import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeClass;
+
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@@ -88,11 +90,14 @@ public class TestSessionResource extends LensJerseyTest {
*/
@BeforeTest
public void setUp() throws Exception {
- metricsSvc = LensServices.get().getService(MetricsService.NAME);
- LensServices.get().getLogSegregationContext().setLogSegregationId("logid");
super.setUp();
}
+ @BeforeClass
+ public void create() throws Exception {
+ metricsSvc = LensServices.get().getService(MetricsService.NAME);
+ LensServices.get().getLogSegregationContext().setLogSegregationId("logid");
+ }
/*
* (non-Javadoc)
*
http://git-wip-us.apache.org/repos/asf/lens/blob/8fcc1a12/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
----------------------------------------------------------------------
diff --git a/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java b/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
index 1656f4e..6e96f63 100644
--- a/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
+++ b/lens-server/src/test/java/org/apache/lens/server/user/TestUserConfigLoader.java
@@ -33,9 +33,7 @@ import org.apache.hadoop.hive.conf.HiveConf;
import org.hsqldb.server.Server;
import org.testng.Assert;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
import liquibase.Liquibase;
import liquibase.database.jvm.HsqlConnection;
@@ -54,7 +52,7 @@ public class TestUserConfigLoader {
/**
* Inits the.
*/
- @BeforeTest(alwaysRun = true)
+ @BeforeClass(alwaysRun = true)
public void init() {
conf = new HiveConf(LensServerConf.getHiveConf());
}
@@ -62,7 +60,7 @@ public class TestUserConfigLoader {
/**
* Reset factory.
*/
- @AfterTest
+ @AfterClass
public void resetFactory() {
init();
UserConfigLoaderFactory.init(conf);
[07/31] lens git commit: LENS-1270 : AlarmService should be inited
through configuration
Posted by pu...@apache.org.
LENS-1270 : AlarmService should be inited through configuration
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/05533d1a
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/05533d1a
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/05533d1a
Branch: refs/heads/master
Commit: 05533d1a094db317eccbae86fb2c59b4ef368717
Parents: 1b03269
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Wed Aug 10 08:19:32 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Wed Aug 10 08:22:07 2016 +0530
----------------------------------------------------------------------
.../org/apache/lens/server/LensServices.java | 2 -
.../lens/server/scheduler/AlarmService.java | 7 +-
.../src/main/resources/lensserver-default.xml | 8 +-
lens-server/src/test/resources/lens-site.xml | 2 +-
src/site/apt/admin/config.apt | 220 ++++++++++---------
5 files changed, 122 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/05533d1a/lens-server/src/main/java/org/apache/lens/server/LensServices.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/LensServices.java b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
index a709f16..7ff5cbb 100644
--- a/lens-server/src/main/java/org/apache/lens/server/LensServices.java
+++ b/lens-server/src/main/java/org/apache/lens/server/LensServices.java
@@ -37,7 +37,6 @@ import org.apache.lens.server.api.metrics.MetricsService;
import org.apache.lens.server.metrics.MetricsServiceImpl;
import org.apache.lens.server.model.LogSegregationContext;
import org.apache.lens.server.model.MappedDiagnosticLogSegregationContext;
-import org.apache.lens.server.scheduler.AlarmService;
import org.apache.lens.server.session.LensSessionImpl;
import org.apache.lens.server.stats.StatisticsService;
import org.apache.lens.server.user.UserConfigLoaderFactory;
@@ -203,7 +202,6 @@ public class LensServices extends CompositeService implements ServiceProvider {
UserConfigLoaderFactory.init(conf);
// Add default services
addService(cliService);
- addService(new AlarmService(AlarmService.NAME));
addService(new EventServiceImpl(LensEventService.NAME));
addService(new MetricsServiceImpl(MetricsService.NAME));
addService(new StatisticsService(StatisticsService.STATS_SVC_NAME));
http://git-wip-us.apache.org/repos/asf/lens/blob/05533d1a/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java
----------------------------------------------------------------------
diff --git a/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java b/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java
index 217879f..4491261 100644
--- a/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java
+++ b/lens-server/src/main/java/org/apache/lens/server/scheduler/AlarmService.java
@@ -48,7 +48,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class AlarmService extends AbstractService implements LensService {
- public static final String NAME = "alarm-service";
+ public static final String NAME = "alarm";
public static final String LENS_JOBS = "LensJobs";
public static final String ALARM_SERVICE = "AlarmService";
@@ -68,10 +68,9 @@ public class AlarmService extends AbstractService implements LensService {
/**
* Creates a new instance of AlarmService.
*
- * @param name the name
*/
- public AlarmService(String name) {
- super(name);
+ public AlarmService() {
+ super(NAME);
}
@Override
http://git-wip-us.apache.org/repos/asf/lens/blob/05533d1a/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 e9525fd..4e20dea 100644
--- a/lens-server/src/main/resources/lensserver-default.xml
+++ b/lens-server/src/main/resources/lensserver-default.xml
@@ -55,7 +55,7 @@
<property>
<name>lens.server.servicenames</name>
- <value>session,query,savedquery,metastore,scheduler,quota</value>
+ <value>session,alarm,query,savedquery,metastore,scheduler,quota</value>
<description>These services would be started in the specified order when lens-server starts up</description>
</property>
@@ -90,6 +90,12 @@
</property>
<property>
+ <name>lens.server.alarm.service.impl</name>
+ <value>org.apache.lens.server.scheduler.AlarmService</value>
+ <description>Implementation class for alarm service</description>
+ </property>
+
+ <property>
<name>lens.server.scheduler.service.impl</name>
<value>org.apache.lens.server.scheduler.SchedulerServiceImpl</value>
<description>Implementation class for query scheduler service</description>
http://git-wip-us.apache.org/repos/asf/lens/blob/05533d1a/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 908fbb2..7d72928 100644
--- a/lens-server/src/test/resources/lens-site.xml
+++ b/lens-server/src/test/resources/lens-site.xml
@@ -140,7 +140,7 @@
<property>
<name>lens.server.servicenames</name>
- <value>session,query,metastore,scheduler,quota,mocknonlens,savedquery</value>
+ <value>session,alarm,query,metastore,scheduler,quota,mocknonlens,savedquery</value>
</property>
<property>
http://git-wip-us.apache.org/repos/asf/lens/blob/05533d1a/src/site/apt/admin/config.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/admin/config.apt b/src/site/apt/admin/config.apt
index db859e6..c57eb57 100644
--- a/src/site/apt/admin/config.apt
+++ b/src/site/apt/admin/config.apt
@@ -42,227 +42,229 @@ Lens server configuration
*--+--+---+--+
|9|lens.query.current.time.millis|0|Query current time in millis. This is used to resolve 'now'. If value is set to zero, 'now' is resolved to current value|
*--+--+---+--+
-|10|lens.server.appevent.ws.listener.impl|org.apache.lens.server.LensApplicationListener|Implementation class for Lens Application Listener|
+|10|lens.server.alarm.service.impl|org.apache.lens.server.scheduler.AlarmService|Implementation class for alarm service|
*--+--+---+--+
-|11|lens.server.base.url|http://0.0.0.0:9999/lensapi/|The base url for the lens server|
+|11|lens.server.appevent.ws.listener.impl|org.apache.lens.server.LensApplicationListener|Implementation class for Lens Application Listener|
*--+--+---+--+
-|12|lens.server.consistentState.ws.filter.impl|org.apache.lens.server.ConsistentStateFilter|Implementation class for ConsistentState Filter|
+|12|lens.server.base.url|http://0.0.0.0:9999/lensapi/|The base url for the lens server|
*--+--+---+--+
-|13|lens.server.database.resource.dir|/tmp/lens/resources|Top level directory to store database specific static resources which are added to each database. To add a static resource for a DB, create a directory with the same name as that of the DB under this directory, and place the resources inside the DB directory. Any subdirectories under the DB directory and the resources under them will be ignored|
+|13|lens.server.consistentState.ws.filter.impl|org.apache.lens.server.ConsistentStateFilter|Implementation class for ConsistentState Filter|
*--+--+---+--+
-|14|lens.server.db.driver.name|org.hsqldb.jdbcDriver|Database driver for database where Finished queries have to be stored. Also used for database based user config loaders|
+|14|lens.server.database.resource.dir|/tmp/lens/resources|Top level directory to store database specific static resources which are added to each database. To add a static resource for a DB, create a directory with the same name as that of the DB under this directory, and place the resources inside the DB directory. Any subdirectories under the DB directory and the resources under them will be ignored|
*--+--+---+--+
-|15|lens.server.db.jdbc.pass| |JDBC Password for Finished queries table. Also used for database based user config loaders|
+|15|lens.server.db.driver.name|org.hsqldb.jdbcDriver|Database driver for database where Finished queries have to be stored. Also used for database based user config loaders|
*--+--+---+--+
-|16|lens.server.db.jdbc.url|jdbc:hsqldb:/tmp/lensserver/queries.db|JDBC URL where the database for storing finished queries is located. Also used for database based user config loaders|
+|16|lens.server.db.jdbc.pass| |JDBC Password for Finished queries table. Also used for database based user config loaders|
*--+--+---+--+
-|17|lens.server.db.jdbc.user|SA|JDBC User for Finished queries table. Also used for database based user config loaders|
+|17|lens.server.db.jdbc.url|jdbc:hsqldb:/tmp/lensserver/queries.db|JDBC URL where the database for storing finished queries is located. Also used for database based user config loaders|
*--+--+---+--+
-|18|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.\ |
+|18|lens.server.db.jdbc.user|SA|JDBC User for Finished queries table. Also used for database based user config loaders|
+*--+--+---+--+
+|19|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}} \ |
| | | | |
*--+--+---+--+
-|19|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.|
+|20|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.|
*--+--+---+--+
-|20|lens.server.driver.selector.class|org.apache.lens.server.api.driver.MinQueryCostSelector|Class for selecting best driver given the query context|
+|21|lens.server.driver.selector.class|org.apache.lens.server.api.driver.MinQueryCostSelector|Class for selecting best driver given the query context|
*--+--+---+--+
-|21|lens.server.drivers|hive:org.apache.lens.driver.hive.HiveDriver|Drivers enabled for this lens server instance|
+|22|lens.server.drivers|hive:org.apache.lens.driver.hive.HiveDriver|Drivers enabled for this lens server instance|
*--+--+---+--+
-|22|lens.server.duplicate.query.allowed|false|If this is false and same query is submitted by a user in the same session and with the same configuration while earlier query is not completed then lens server will return the handle of the previous query|
+|23|lens.server.duplicate.query.allowed|false|If this is false and same query is submitted by a user in the same session and with the same configuration while earlier query is not completed then lens server will return the handle of the previous query|
*--+--+---+--+
-|23|lens.server.enable.console.metrics|false|Enable metrics to be reported on console|
+|24|lens.server.enable.console.metrics|false|Enable metrics to be reported on console|
*--+--+---+--+
-|24|lens.server.enable.csv.metrics|false|Enable metrics to be reported as csv files in a directory|
+|25|lens.server.enable.csv.metrics|false|Enable metrics to be reported as csv files in a directory|
*--+--+---+--+
-|25|lens.server.enable.ganglia.metrics|false|Enable metrics to be reported on ganglia|
+|26|lens.server.enable.ganglia.metrics|false|Enable metrics to be reported on ganglia|
*--+--+---+--+
-|26|lens.server.enable.graphite.metrics|false|Enable metrics to be reported on graphite|
+|27|lens.server.enable.graphite.metrics|false|Enable metrics to be reported on graphite|
*--+--+---+--+
-|27|lens.server.enable.resource.method.metering|false|Whether to Enable metering for all resource methods.|
+|28|lens.server.enable.resource.method.metering|false|Whether to Enable metering for all resource methods.|
*--+--+---+--+
-|28|lens.server.estimate.pool.keepalive.millis|60000|Thread keep alive time in milliseconds for the estimate thread pool. If there are no estimate requests for this period,then cached threads are released from the pool.|
+|29|lens.server.estimate.pool.keepalive.millis|60000|Thread keep alive time in milliseconds for the estimate thread pool. If there are no estimate requests for this period,then cached threads are released from the pool.|
*--+--+---+--+
-|29|lens.server.estimate.pool.max.threads|100|Maximum number of threads in the estimate thread pool|
+|30|lens.server.estimate.pool.max.threads|100|Maximum number of threads in the estimate thread pool|
*--+--+---+--+
-|30|lens.server.estimate.pool.min.threads|3|Minimum number of threads in the estimate thread pool|
+|31|lens.server.estimate.pool.min.threads|3|Minimum number of threads in the estimate thread pool|
*--+--+---+--+
-|31|lens.server.estimate.timeout.millis|300000|Timeout for parallel query estimate calls in milliseconds. A driver needs to comeback with a query estimate within this timeout. If the timeout is reached, only the drivers that have provided an estimate would be considered for query selection. If the timeout is reached and none of the drivers have provided an estimate then estimate calls fails with an exception.|
+|32|lens.server.estimate.timeout.millis|300000|Timeout for parallel query estimate calls in milliseconds. A driver needs to comeback with a query estimate within this timeout. If the timeout is reached, only the drivers that have provided an estimate would be considered for query selection. If the timeout is reached and none of the drivers have provided an estimate then estimate calls fails with an exception.|
*--+--+---+--+
-|32|lens.server.event.service.thread.pool.size| |The size of thread pool for notifying events. The no value is specified, it uses the available processors as the number.|
+|33|lens.server.event.service.thread.pool.size| |The size of thread pool for notifying events. The no value is specified, it uses the available processors as the number.|
*--+--+---+--+
-|33|lens.server.hdfs.output.retention|1 day|hdfs output retention period. Default 1 day|
+|34|lens.server.hdfs.output.retention|1 day|hdfs output retention period. Default 1 day|
*--+--+---+--+
-|34|lens.server.index.ws.resource.impl|org.apache.lens.server.IndexResource|Implementation class for Index Resource|
+|35|lens.server.index.ws.resource.impl|org.apache.lens.server.IndexResource|Implementation class for Index Resource|
*--+--+---+--+
-|35|lens.server.inmemory.resultset.ttl.secs|300|This property defines the TTL(time to live) in seconds for all result sets of type InMemoryResultSet beyond which they are eligible for purging irrespective of whether the result set has been read or not. The default value is 300 seconds (5 minutes).|
+|36|lens.server.inmemory.resultset.ttl.secs|300|This property defines the TTL(time to live) in seconds for all result sets of type InMemoryResultSet beyond which they are eligible for purging irrespective of whether the result set has been read or not. The default value is 300 seconds (5 minutes).|
*--+--+---+--+
-|36|lens.server.launcher.pool.keepalive.millis|60000|Thread keep alive time in milliseconds for the query launcher thread pool. If there are no query launches for this period,then cached threads will be released from the pool.|
+|37|lens.server.launcher.pool.keepalive.millis|60000|Thread keep alive time in milliseconds for the query launcher thread pool. If there are no query launches for this period,then cached threads will be released from the pool.|
*--+--+---+--+
-|37|lens.server.launcher.pool.max.threads|100|Maximum number of threads in the query launcher thread pool. Keeping the default to hundred, we may never grow till there, it would go to max for concurrrent queries allowed on all drivers together. This value should be greater than the max concurrent queries allowed on all drivers.|
+|38|lens.server.launcher.pool.max.threads|100|Maximum number of threads in the query launcher thread pool. Keeping the default to hundred, we may never grow till there, it would go to max for concurrrent queries allowed on all drivers together. This value should be greater than the max concurrent queries allowed on all drivers.|
*--+--+---+--+
-|38|lens.server.launcher.pool.min.threads|3|Minimum number of threads in the query launcher thread pool|
+|39|lens.server.launcher.pool.min.threads|3|Minimum number of threads in the query launcher thread pool|
*--+--+---+--+
-|39|lens.server.log.ws.resource.impl|org.apache.lens.server.LogResource|Implementation class for Log Resource|
+|40|lens.server.log.ws.resource.impl|org.apache.lens.server.LogResource|Implementation class for Log Resource|
*--+--+---+--+
-|40|lens.server.mail.from.address|blah@company.com|The from field in the notifier mail to the submitter.|
+|41|lens.server.mail.from.address|blah@company.com|The from field in the notifier mail to the submitter.|
*--+--+---+--+
-|41|lens.server.mail.host|mail-host.company.com|SMTP Host for sending mail|
+|42|lens.server.mail.host|mail-host.company.com|SMTP Host for sending mail|
*--+--+---+--+
-|42|lens.server.mail.port|25|SMTP Port|
+|43|lens.server.mail.port|25|SMTP Port|
*--+--+---+--+
-|43|lens.server.mail.smtp.connectiontimeout|15000|Socket connection timeout value in milliseconds. This timeout is implemented by java.net.Socket. Default is 15 seconds.|
+|44|lens.server.mail.smtp.connectiontimeout|15000|Socket connection timeout value in milliseconds. This timeout is implemented by java.net.Socket. Default is 15 seconds.|
*--+--+---+--+
-|44|lens.server.mail.smtp.timeout|30000|Socket read timeout value in milliseconds. This timeout is implemented by java.net.Socket. Default is 30 seconds.|
+|45|lens.server.mail.smtp.timeout|30000|Socket read timeout value in milliseconds. This timeout is implemented by java.net.Socket. Default is 30 seconds.|
*--+--+---+--+
-|45|lens.server.max.sessions.per.user|10|Number of sessions can be allowed for each user. User has to close one of the active sessions to open a new session once limit is reached. Otherwise Server throws an exception by saying that opened session limit has been already reached for user.|
+|46|lens.server.max.sessions.per.user|10|Number of sessions can be allowed for each user. User has to close one of the active sessions to open a new session once limit is reached. Otherwise Server throws an exception by saying that opened session limit has been already reached for user.|
*--+--+---+--+
-|46|lens.server.metastore.service.impl|org.apache.lens.server.metastore.CubeMetastoreServiceImpl|Implementation class for metastore service|
+|47|lens.server.metastore.service.impl|org.apache.lens.server.metastore.CubeMetastoreServiceImpl|Implementation class for metastore service|
*--+--+---+--+
-|47|lens.server.metastore.ws.resource.impl|org.apache.lens.server.metastore.MetastoreResource|Implementation class for Metastore Resource|
+|48|lens.server.metastore.ws.resource.impl|org.apache.lens.server.metastore.MetastoreResource|Implementation class for Metastore Resource|
*--+--+---+--+
-|48|lens.server.metrics.csv.directory.path|metrics/|Path of the directory in which to report metrics as separate csv files.|
+|49|lens.server.metrics.csv.directory.path|metrics/|Path of the directory in which to report metrics as separate csv files.|
*--+--+---+--+
-|49|lens.server.metrics.ganglia.host| |The ganglia host name|
+|50|lens.server.metrics.ganglia.host| |The ganglia host name|
*--+--+---+--+
-|50|lens.server.metrics.ganglia.port| |The ganglia port|
+|51|lens.server.metrics.ganglia.port| |The ganglia port|
*--+--+---+--+
-|51|lens.server.metrics.graphite.host| |The graphite host name|
+|52|lens.server.metrics.graphite.host| |The graphite host name|
*--+--+---+--+
-|52|lens.server.metrics.graphite.port| |The graphite port|
+|53|lens.server.metrics.graphite.port| |The graphite port|
*--+--+---+--+
-|53|lens.server.metrics.reporting.period|10|The reporting period for metrics. The value is in seconds|
+|54|lens.server.metrics.reporting.period|10|The reporting period for metrics. The value is in seconds|
*--+--+---+--+
-|54|lens.server.mode|OPEN|The mode in which server should run. Allowed values are OPEN, READ_ONLY, METASTORE_READONLY, METASTORE_NODROP. OPEN mode will allow all requests. READ_ONLY mode will allow all requests on session resouce and only GET requests on all other resources. METASTORE_READONLY will allow GET on metastore and all other requests in other services. METASTORE_NODROP will not allow DELETE on metastore, will allow all other requests.|
+|55|lens.server.mode|OPEN|The mode in which server should run. Allowed values are OPEN, READ_ONLY, METASTORE_READONLY, METASTORE_NODROP. OPEN mode will allow all requests. READ_ONLY mode will allow all requests on session resouce and only GET requests on all other resources. METASTORE_READONLY will allow GET on metastore and all other requests in other services. METASTORE_NODROP will not allow DELETE on metastore, will allow all other requests.|
*--+--+---+--+
-|55|lens.server.moxyjson.ws.feature.impl|org.glassfish.jersey.moxy.json.MoxyJsonFeature|Enable Moxy json feature|
+|56|lens.server.moxyjson.ws.feature.impl|org.glassfish.jersey.moxy.json.MoxyJsonFeature|Enable Moxy json feature|
*--+--+---+--+
-|56|lens.server.moxyjsonconfigresovler.ws.feature.impl|org.apache.lens.api.util.MoxyJsonConfigurationContextResolver|Moxy json configuration resolver|
+|57|lens.server.moxyjsonconfigresovler.ws.feature.impl|org.apache.lens.api.util.MoxyJsonConfigurationContextResolver|Moxy json configuration resolver|
*--+--+---+--+
-|57|lens.server.multipart.ws.feature.impl|org.glassfish.jersey.media.multipart.MultiPartFeature|Implementation class for query scheduler resource|
+|58|lens.server.multipart.ws.feature.impl|org.glassfish.jersey.media.multipart.MultiPartFeature|Implementation class for query scheduler resource|
*--+--+---+--+
-|58|lens.server.persist.location|file:///tmp/lensserver|The directory in which lens server will persist its state when it is going down. The location be on any Hadoop compatible file system. Server will read from the location when it is restarted and recovery is enabled. So, Server should have both read and write permissions to the location|
+|59|lens.server.persist.location|file:///tmp/lensserver|The directory in which lens server will persist its state when it is going down. The location be on any Hadoop compatible file system. Server will read from the location when it is restarted and recovery is enabled. So, Server should have both read and write permissions to the location|
*--+--+---+--+
-|59|lens.server.query.acceptors| |Query Acceptors configured. Query acceptors are consulted first, before anything happens for the given query. They can either return null or return a messaging indicating why the given query shouldn't be accepted. These can be used to filter out queries at the earliest.|
+|60|lens.server.query.acceptors| |Query Acceptors configured. Query acceptors are consulted first, before anything happens for the given query. They can either return null or return a messaging indicating why the given query shouldn't be accepted. These can be used to filter out queries at the earliest.|
*--+--+---+--+
-|60|lens.server.query.launching.constraint.factories|org.apache.lens.server.query.constraint.TotalQueryCostCeilingConstraintFactory|Factories used to instantiate constraints enforced on queries by lens. Every Factory should be an implementation of org.apache.lens.server.api.common.ConfigBasedObjectCreationFactory and create an implementation of org.apache.lens.server.api.query.constraint.QueryLaunchingConstraint. A query will be launched only if all constraints pass.|
+|61|lens.server.query.launching.constraint.factories|org.apache.lens.server.query.constraint.TotalQueryCostCeilingConstraintFactory|Factories used to instantiate constraints enforced on queries by lens. Every Factory should be an implementation of org.apache.lens.server.api.common.ConfigBasedObjectCreationFactory and create an implementation of org.apache.lens.server.api.query.constraint.QueryLaunchingConstraint. A query will be launched only if all constraints pass.|
*--+--+---+--+
-|61|lens.server.query.phase1.rewriters| |Query phase 1 rewriters. This is to convert user query to cube query. The resulting cube query will be passed for validation and rewriting to hql query.\ |
+|62|lens.server.query.phase1.rewriters| |Query phase 1 rewriters. This is to convert user query to cube query. The resulting cube query will be passed for validation and rewriting to hql query.\ |
| | | |Use cases will be to use extra intelligence to convert user query to optimized cube query. \ |
| | | |Or define shortcuts for certain frequently used queries :) |
*--+--+---+--+
-|62|lens.server.query.resultset.retention|1 day|Lens query resultset retention period. Default 1 day|
+|63|lens.server.query.resultset.retention|1 day|Lens query resultset retention period. Default 1 day|
*--+--+---+--+
-|63|lens.server.query.service.impl|org.apache.lens.server.query.QueryExecutionServiceImpl|Implementation class for query execution service|
+|64|lens.server.query.service.impl|org.apache.lens.server.query.QueryExecutionServiceImpl|Implementation class for query execution service|
*--+--+---+--+
-|64|lens.server.query.state.logger.enabled|true|Disable or enable the query state logger with this config. The location for the logger can be specified in logback xml for the class org.apache.lens.server.query.QueryExecutionServiceImpl.QueryStatusLogger|
+|65|lens.server.query.state.logger.enabled|true|Disable or enable the query state logger with this config. The location for the logger can be specified in logback xml for the class org.apache.lens.server.query.QueryExecutionServiceImpl.QueryStatusLogger|
*--+--+---+--+
-|65|lens.server.query.ws.resource.impl|org.apache.lens.server.query.QueryServiceResource|Implementation class for Query Resource|
+|66|lens.server.query.ws.resource.impl|org.apache.lens.server.query.QueryServiceResource|Implementation class for Query Resource|
*--+--+---+--+
-|66|lens.server.querypurger.sleep.interval|10000|The interval(milliseconds) with which purger to run periodically. Default 10 sec.|
+|67|lens.server.querypurger.sleep.interval|10000|The interval(milliseconds) with which purger to run periodically. Default 10 sec.|
*--+--+---+--+
-|67|lens.server.quota.service.impl|org.apache.lens.server.quota.QuotaServiceImpl|Implementation class for quota service|
+|68|lens.server.quota.service.impl|org.apache.lens.server.quota.QuotaServiceImpl|Implementation class for quota service|
*--+--+---+--+
-|68|lens.server.quota.ws.resource.impl|org.apache.lens.server.quota.QuotaResource|Implementation class for Quota Resource|
+|69|lens.server.quota.ws.resource.impl|org.apache.lens.server.quota.QuotaResource|Implementation class for Quota Resource|
*--+--+---+--+
-|69|lens.server.requestlogger.ws.filter.impl|org.apache.lens.server.LensRequestLoggingFilter|Implementation class for Request logging Filter|
+|70|lens.server.requestlogger.ws.filter.impl|org.apache.lens.server.LensRequestLoggingFilter|Implementation class for Request logging Filter|
*--+--+---+--+
-|70|lens.server.resultset.purge.enabled|false|Whether to purge the query results|
+|71|lens.server.resultset.purge.enabled|false|Whether to purge the query results|
*--+--+---+--+
-|71|lens.server.resultsetpurger.sleep.interval.secs|3600|Periodicity for Query result purger runs. Default 1 hour.|
+|72|lens.server.resultsetpurger.sleep.interval.secs|3600|Periodicity for Query result purger runs. Default 1 hour.|
*--+--+---+--+
-|72|lens.server.savedquery.jdbc.dialectclass|org.apache.lens.server.query.save.SavedQueryDao$HSQLDialect|Dialect of the target DB, Default is HSQL. Override with the target DB used.|
+|73|lens.server.savedquery.jdbc.dialectclass|org.apache.lens.server.query.save.SavedQueryDao$HSQLDialect|Dialect of the target DB, Default is HSQL. Override with the target DB used.|
*--+--+---+--+
-|73|lens.server.savedquery.list.default.count|20|Key denoting the default fetch value of saved query list api.|
+|74|lens.server.savedquery.list.default.count|20|Key denoting the default fetch value of saved query list api.|
*--+--+---+--+
-|74|lens.server.savedquery.list.default.offset|0|Key denoting the default start value of saved query list api.|
+|75|lens.server.savedquery.list.default.offset|0|Key denoting the default start value of saved query list api.|
*--+--+---+--+
-|75|lens.server.savedquery.service.impl|org.apache.lens.server.query.save.SavedQueryServiceImpl|Implementation class for saved query service|
+|76|lens.server.savedquery.service.impl|org.apache.lens.server.query.save.SavedQueryServiceImpl|Implementation class for saved query service|
*--+--+---+--+
-|76|lens.server.savedquery.ws.resource.impl|org.apache.lens.server.query.save.SavedQueryResource|Implementation class for Saved query Resource|
+|77|lens.server.savedquery.ws.resource.impl|org.apache.lens.server.query.save.SavedQueryResource|Implementation class for Saved query Resource|
*--+--+---+--+
-|77|lens.server.scheduler.service.impl|org.apache.lens.server.scheduler.SchedulerServiceImpl|Implementation class for query scheduler service|
+|78|lens.server.scheduler.service.impl|org.apache.lens.server.scheduler.SchedulerServiceImpl|Implementation class for query scheduler service|
*--+--+---+--+
-|78|lens.server.scheduler.store.class|org.apache.lens.server.scheduler.SchedulerDAO$SchedulerHsqlDBStore|A subclass of SchedulerDBStore class used for storing scheduler related information.|
+|79|lens.server.scheduler.store.class|org.apache.lens.server.scheduler.SchedulerDAO$SchedulerHsqlDBStore|A subclass of SchedulerDBStore class used for storing scheduler related information.|
*--+--+---+--+
-|79|lens.server.scheduler.ws.resource.impl|org.apache.lens.server.scheduler.ScheduleResource|Implementation class for query scheduler resource|
+|80|lens.server.scheduler.ws.resource.impl|org.apache.lens.server.scheduler.ScheduleResource|Implementation class for query scheduler resource|
*--+--+---+--+
-|80|lens.server.scheduling.queue.poll.interval.millisec|2000|The interval at which submission thread will poll scheduling queue to fetch the next query for submission. If value is less than equal to 0, then it would mean that thread will continuosly poll without sleeping. The interval has to be given in milliseconds.|
+|81|lens.server.scheduling.queue.poll.interval.millisec|2000|The interval at which submission thread will poll scheduling queue to fetch the next query for submission. If value is less than equal to 0, then it would mean that thread will continuosly poll without sleeping. The interval has to be given in milliseconds.|
*--+--+---+--+
-|81|lens.server.serverMode.ws.filter.impl|org.apache.lens.server.ServerModeFilter|Implementation class for ServerMode Filter|
+|82|lens.server.serverMode.ws.filter.impl|org.apache.lens.server.ServerModeFilter|Implementation class for ServerMode Filter|
*--+--+---+--+
-|82|lens.server.service.provider.factory|org.apache.lens.server.ServiceProviderFactoryImpl|Service provider factory implementation class. This parameter is used to lookup the factory implementation class name that would provide an instance of ServiceProvider. Users should instantiate the class to obtain its instance. Example -- Class spfClass = conf.getClass("lens.server.service.provider.factory", null, ServiceProviderFactory.class); ServiceProviderFactory spf = spfClass.newInstance(); ServiceProvider serviceProvider = spf.getServiceProvider(); -- This is not supposed to be overridden by users.|
+|83|lens.server.service.provider.factory|org.apache.lens.server.ServiceProviderFactoryImpl|Service provider factory implementation class. This parameter is used to lookup the factory implementation class name that would provide an instance of ServiceProvider. Users should instantiate the class to obtain its instance. Example -- Class spfClass = conf.getClass("lens.server.service.provider.factory", null, ServiceProviderFactory.class); ServiceProviderFactory spf = spfClass.newInstance(); ServiceProvider serviceProvider = spf.getServiceProvider(); -- This is not supposed to be overridden by users.|
*--+--+---+--+
-|83|lens.server.servicenames|session,query,savedquery,metastore,scheduler,quota|These services would be started in the specified order when lens-server starts up|
+|84|lens.server.servicenames|session,alarm,query,savedquery,metastore,scheduler,quota|These services would be started in the specified order when lens-server starts up|
*--+--+---+--+
-|84|lens.server.session.expiry.service.interval.secs|3600|Interval at which lens session expiry service runs|
+|85|lens.server.session.expiry.service.interval.secs|3600|Interval at which lens session expiry service runs|
*--+--+---+--+
-|85|lens.server.session.service.impl|org.apache.lens.server.session.HiveSessionService|Implementation class for session service|
+|86|lens.server.session.service.impl|org.apache.lens.server.session.HiveSessionService|Implementation class for session service|
*--+--+---+--+
-|86|lens.server.session.timeout.seconds|86400|Lens session timeout in seconds.If there is no activity on the session for this period then the session will be closed.Default timeout is one day.|
+|87|lens.server.session.timeout.seconds|86400|Lens session timeout in seconds.If there is no activity on the session for this period then the session will be closed.Default timeout is one day.|
*--+--+---+--+
-|87|lens.server.session.ws.resource.impl|org.apache.lens.server.session.SessionResource|Implementation class for Session Resource|
+|88|lens.server.session.ws.resource.impl|org.apache.lens.server.session.SessionResource|Implementation class for Session Resource|
*--+--+---+--+
-|88|lens.server.state.persist.out.stream.buffer.size|1048576|Output Stream Buffer Size used in writing lens server state to file system. Size is in bytes.|
+|89|lens.server.state.persist.out.stream.buffer.size|1048576|Output Stream Buffer Size used in writing lens server state to file system. Size is in bytes.|
*--+--+---+--+
-|89|lens.server.state.persistence.enabled|true|If flag is enabled, state of all the services will be persisted periodically to a location specified by lens.server.persist.location and on server restart all the services will be started from last saved state.|
+|90|lens.server.state.persistence.enabled|true|If flag is enabled, state of all the services will be persisted periodically to a location specified by lens.server.persist.location and on server restart all the services will be started from last saved state.|
*--+--+---+--+
-|90|lens.server.state.persistence.interval.millis|300000|Lens server state persistence time interval in milliseconds|
+|91|lens.server.state.persistence.interval.millis|300000|Lens server state persistence time interval in milliseconds|
*--+--+---+--+
-|91|lens.server.statistics.db|lensstats|Database to which statistics tables are created and partitions are added.|
+|92|lens.server.statistics.db|lensstats|Database to which statistics tables are created and partitions are added.|
*--+--+---+--+
-|92|lens.server.statistics.log.rollover.interval|3600000|Default rate which log statistics store scans for rollups in milliseconds.|
+|93|lens.server.statistics.log.rollover.interval|3600000|Default rate which log statistics store scans for rollups in milliseconds.|
*--+--+---+--+
-|93|lens.server.statistics.store.class|org.apache.lens.server.stats.store.log.LogStatisticsStore|Default implementation of class used to persist Lens Statistics.|
+|94|lens.server.statistics.store.class|org.apache.lens.server.stats.store.log.LogStatisticsStore|Default implementation of class used to persist Lens Statistics.|
*--+--+---+--+
-|94|lens.server.statistics.warehouse.dir|file:///tmp/lens/statistics/warehouse|Default top level location where stats are moved by the log statistics store.|
+|95|lens.server.statistics.warehouse.dir|file:///tmp/lens/statistics/warehouse|Default top level location where stats are moved by the log statistics store.|
*--+--+---+--+
-|95|lens.server.status.update.exponential.wait.millis|30000|Number of millis that would grow exponentially for next update, incase of transient failures.|
+|96|lens.server.status.update.exponential.wait.millis|30000|Number of millis that would grow exponentially for next update, incase of transient failures.|
*--+--+---+--+
-|96|lens.server.status.update.maximum.delay.secs|1800|The maximum delay in seconds for next status update to happen after any transient failure. This will be used a maximum delay sothat exponential wait times not to grow to bigger value.|
+|97|lens.server.status.update.maximum.delay.secs|1800|The maximum delay in seconds for next status update to happen after any transient failure. This will be used a maximum delay sothat exponential wait times not to grow to bigger value.|
*--+--+---+--+
-|97|lens.server.status.update.num.retries|10|The number of retries a status update will tried with exponentital back off, in case of transient issues, upon which query will be marked FAILED.|
+|98|lens.server.status.update.num.retries|10|The number of retries a status update will tried with exponentital back off, in case of transient issues, upon which query will be marked FAILED.|
*--+--+---+--+
-|98|lens.server.total.query.cost.ceiling.per.user|-1.0|A query submitted by user will be launched only if total query cost of all current launched queries of user is less than or equal to total query cost ceiling defined by this property. This configuration value is only useful when TotalQueryCostCeilingConstraint is enabled by using org.apache.lens.server.query.constraint.TotalQueryCostCeilingConstraintFactory as one of the factories in lens.server.query.constraint.factories property. Default is -1.0 which means that there is no limit on the total query cost of launched queries submitted by a user.|
+|99|lens.server.total.query.cost.ceiling.per.user|-1.0|A query submitted by user will be launched only if total query cost of all current launched queries of user is less than or equal to total query cost ceiling defined by this property. This configuration value is only useful when TotalQueryCostCeilingConstraint is enabled by using org.apache.lens.server.query.constraint.TotalQueryCostCeilingConstraintFactory as one of the factories in lens.server.query.constraint.factories property. Default is -1.0 which means that there is no limit on the total query cost of launched queries submitted by a user.|
*--+--+---+--+
-|99|lens.server.user.resolver.custom.class|full.package.name.Classname|Required for CUSTOM user resolver. In case the provided implementations are not sufficient for user config resolver, a custom classname can be provided. Class should extend org.apache.lens.server.user.UserConfigLoader|
+|100|lens.server.user.resolver.custom.class|full.package.name.Classname|Required for CUSTOM user resolver. In case the provided implementations are not sufficient for user config resolver, a custom classname can be provided. Class should extend org.apache.lens.server.user.UserConfigLoader|
*--+--+---+--+
-|100|lens.server.user.resolver.db.keys|lens.session.cluster.user,mapred.job.queue.name|Required for DATABASE and LDAP_BACKED_DATABASE user resolvers. For database based user config loaders, the conf keys that will be loaded from database.|
+|101|lens.server.user.resolver.db.keys|lens.session.cluster.user,mapred.job.queue.name|Required for DATABASE and LDAP_BACKED_DATABASE user resolvers. For database based user config loaders, the conf keys that will be loaded from database.|
*--+--+---+--+
-|101|lens.server.user.resolver.db.query|select clusteruser,queue from user_config_table where username=?|Required for DATABASE and LDAP_BACKED_DATABASE user resolvers. For database based user config loader, this query will be run with single argument = logged in user and the result columns will be assigned to lens.server.user.resolver.db.keys in order. For ldap backed database resolver, the argument to this query will be the intermediate values obtained from ldap.|
+|102|lens.server.user.resolver.db.query|select clusteruser,queue from user_config_table where username=?|Required for DATABASE and LDAP_BACKED_DATABASE user resolvers. For database based user config loader, this query will be run with single argument = logged in user and the result columns will be assigned to lens.server.user.resolver.db.keys in order. For ldap backed database resolver, the argument to this query will be the intermediate values obtained from ldap.|
*--+--+---+--+
-|102|lens.server.user.resolver.fixed.value| |Required for FIXED user resolver. when lens.server.user.resolver.type=FIXED, This will be the value cluster user will resolve to.|
+|103|lens.server.user.resolver.fixed.value| |Required for FIXED user resolver. when lens.server.user.resolver.type=FIXED, This will be the value cluster user will resolve to.|
*--+--+---+--+
-|103|lens.server.user.resolver.ldap.bind.dn| |Required for LDAP_BACKED_DATABASE user resolvers. ldap dn for admin binding example: CN=company-it-admin,ou=service-account,ou=company-service-account,dc=dc1,dc=com...|
+|104|lens.server.user.resolver.ldap.bind.dn| |Required for LDAP_BACKED_DATABASE user resolvers. ldap dn for admin binding example: CN=company-it-admin,ou=service-account,ou=company-service-account,dc=dc1,dc=com...|
*--+--+---+--+
-|104|lens.server.user.resolver.ldap.bind.password| |Required for LDAP_BACKED_DATABASE user resolvers. ldap password for admin binding above|
+|105|lens.server.user.resolver.ldap.bind.password| |Required for LDAP_BACKED_DATABASE user resolvers. ldap password for admin binding above|
*--+--+---+--+
-|105|lens.server.user.resolver.ldap.fields|department|Required for LDAP_BACKED_DATABASE user resolvers. list of fields to be obtained from ldap. These will be cached by the intermediate db.|
+|106|lens.server.user.resolver.ldap.fields|department|Required for LDAP_BACKED_DATABASE user resolvers. list of fields to be obtained from ldap. These will be cached by the intermediate db.|
*--+--+---+--+
-|106|lens.server.user.resolver.ldap.intermediate.db.delete.sql|delete from user_department where username=?|Required for LDAP_BACKED_DATABASE user resolvers. query to delete intermediate values from database backing ldap as cache. one argument: logged in user.|
+|107|lens.server.user.resolver.ldap.intermediate.db.delete.sql|delete from user_department where username=?|Required for LDAP_BACKED_DATABASE user resolvers. query to delete intermediate values from database backing ldap as cache. one argument: logged in user.|
*--+--+---+--+
-|107|lens.server.user.resolver.ldap.intermediate.db.insert.sql|insert into user_department (username, department, expiry) values (?, ?, ?)|Required for LDAP_BACKED_DATABASE user resolvers. query to insert intermediate values from database backing ldap as cache. arguments: first logged in user, then all intermediate values, then current time + expiration time|
+|108|lens.server.user.resolver.ldap.intermediate.db.insert.sql|insert into user_department (username, department, expiry) values (?, ?, ?)|Required for LDAP_BACKED_DATABASE user resolvers. query to insert intermediate values from database backing ldap as cache. arguments: first logged in user, then all intermediate values, then current time + expiration time|
*--+--+---+--+
-|108|lens.server.user.resolver.ldap.intermediate.db.query|select department from user_department where username=? and expiry>?|Required for LDAP_BACKED_DATABASE user resolvers. query to obtain intermediate values from database backing ldap as cache. two arguments: logged in user and current time.|
+|109|lens.server.user.resolver.ldap.intermediate.db.query|select department from user_department where username=? and expiry>?|Required for LDAP_BACKED_DATABASE user resolvers. query to obtain intermediate values from database backing ldap as cache. two arguments: logged in user and current time.|
*--+--+---+--+
-|109|lens.server.user.resolver.ldap.search.base| |Required for LDAP_BACKED_DATABASE user resolvers. for searching intermediate values for a user, the search keys. example: cn=users,dc=dc1,dc=dc2...|
+|110|lens.server.user.resolver.ldap.search.base| |Required for LDAP_BACKED_DATABASE user resolvers. for searching intermediate values for a user, the search keys. example: cn=users,dc=dc1,dc=dc2...|
*--+--+---+--+
-|110|lens.server.user.resolver.ldap.search.filter|(&(objectClass=user)(sAMAccountName=%s))|Required for LDAP_BACKED_DATABASE user resolvers. filter pattern for ldap search|
+|111|lens.server.user.resolver.ldap.search.filter|(&(objectClass=user)(sAMAccountName=%s))|Required for LDAP_BACKED_DATABASE user resolvers. filter pattern for ldap search|
*--+--+---+--+
-|111|lens.server.user.resolver.ldap.url| |Required for LDAP_BACKED_DATABASE user resolvers. ldap url to connect to.|
+|112|lens.server.user.resolver.ldap.url| |Required for LDAP_BACKED_DATABASE user resolvers. ldap url to connect to.|
*--+--+---+--+
-|112|lens.server.user.resolver.propertybased.filename|/path/to/propertyfile|Required for PROPERTYBASED user resolver. when lens.server.user.resolver.type is PROPERTYBASED, then this file will be read and parsed to determine cluster user. Each line should contain username followed by DOT followed by property full name followed by equal-to sign and followed by value. example schema of the file is: user1.lens.server.cluster.user=clusteruser1 user1.mapred.job.queue.name=queue1 *.lens.server.cluster.user=defaultclusteruser *.mapred.job.queue.name=default|
+|113|lens.server.user.resolver.propertybased.filename|/path/to/propertyfile|Required for PROPERTYBASED user resolver. when lens.server.user.resolver.type is PROPERTYBASED, then this file will be read and parsed to determine cluster user. Each line should contain username followed by DOT followed by property full name followed by equal-to sign and followed by value. example schema of the file is: user1.lens.server.cluster.user=clusteruser1 user1.mapred.job.queue.name=queue1 *.lens.server.cluster.user=defaultclusteruser *.mapred.job.queue.name=default|
*--+--+---+--+
-|113|lens.server.user.resolver.type|FIXED|Type of user config resolver. allowed values are FIXED, PROPERTYBASED, DATABASE, LDAP_BACKED_DATABASE, CUSTOM.|
+|114|lens.server.user.resolver.type|FIXED|Type of user config resolver. allowed values are FIXED, PROPERTYBASED, DATABASE, LDAP_BACKED_DATABASE, CUSTOM.|
*--+--+---+--+
-|114|lens.server.waiting.queries.selection.policy.factories|org.apache.lens.server.query.collect.UserSpecificWaitingQueriesSelectionPolicyFactory|Factories used to instantiate waiting queries selection policies. Every factory should be an implementation of org.apache.lens.server.api.common.ConfigBasedObjectCreationFactory and create an implementation of org.apache.lens.server.api.query.collect.WaitingQueriesSelectionPolicy.|
+|115|lens.server.waiting.queries.selection.policy.factories|org.apache.lens.server.query.collect.UserSpecificWaitingQueriesSelectionPolicyFactory|Factories used to instantiate waiting queries selection policies. Every factory should be an implementation of org.apache.lens.server.api.common.ConfigBasedObjectCreationFactory and create an implementation of org.apache.lens.server.api.query.collect.WaitingQueriesSelectionPolicy.|
*--+--+---+--+
-|115|lens.server.ws.featurenames|multipart,moxyjson,moxyjsonconfigresovler|These JAX-RS Feature(s) would be started in the specified order when lens-server starts up|
+|116|lens.server.ws.featurenames|multipart,moxyjson,moxyjsonconfigresovler|These JAX-RS Feature(s) would be started in the specified order when lens-server starts up|
*--+--+---+--+
-|116|lens.server.ws.filternames|requestlogger,consistentState,serverMode|These JAX-RS filters would be started in the specified order when lens-server starts up|
+|117|lens.server.ws.filternames|requestlogger,consistentState,serverMode|These JAX-RS filters would be started in the specified order when lens-server starts up|
*--+--+---+--+
-|117|lens.server.ws.listenernames|appevent|These listeners would be called in the specified order when lens-server starts up|
+|118|lens.server.ws.listenernames|appevent|These listeners would be called in the specified order when lens-server starts up|
*--+--+---+--+
-|118|lens.server.ws.resourcenames|session,metastore,query,savedquery,quota,scheduler,index,log|These JAX-RS resources would be started in the specified order when lens-server starts up|
+|119|lens.server.ws.resourcenames|session,metastore,query,savedquery,quota,scheduler,index,log|These JAX-RS resources would be started in the specified order when lens-server starts up|
*--+--+---+--+
The configuration parameters and their default values
[06/31] lens git commit: LENS-1245 : Fix error message in
LensAPIException
Posted by pu...@apache.org.
LENS-1245 : Fix error message in LensAPIException
Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/1b032694
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/1b032694
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/1b032694
Branch: refs/heads/master
Commit: 1b0326948b43190370d9c32ac14cb521a449479d
Parents: fbe44ff
Author: Amareshwari Sriramadasu <am...@apache.org>
Authored: Thu Aug 4 11:04:10 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Thu Aug 4 11:04:39 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/lens/client/exceptions/LensAPIException.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lens/blob/1b032694/lens-client/src/main/java/org/apache/lens/client/exceptions/LensAPIException.java
----------------------------------------------------------------------
diff --git a/lens-client/src/main/java/org/apache/lens/client/exceptions/LensAPIException.java b/lens-client/src/main/java/org/apache/lens/client/exceptions/LensAPIException.java
index fcc53c5..13fc7e8 100644
--- a/lens-client/src/main/java/org/apache/lens/client/exceptions/LensAPIException.java
+++ b/lens-client/src/main/java/org/apache/lens/client/exceptions/LensAPIException.java
@@ -45,4 +45,8 @@ public class LensAPIException extends Exception {
public String getLensAPIRequestId() {
return this.errorResult.getId();
}
+
+ public String getMessage() {
+ return getLensAPIErrorMessage();
+ }
}