LEN-873: Merge release branch into master

Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/73716cb6
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/73716cb6
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/73716cb6

Branch: refs/heads/LENS-581
Commit: 73716cb6fee54811c1e7c942d52e4636cc49606b
Parents: b66592c
Author: Raju Bairishetti <[email protected]>
Authored: Wed Nov 25 08:22:17 2015 +0800
Committer: Raju Bairishetti <[email protected]>
Committed: Wed Nov 25 08:22:17 2015 +0800

----------------------------------------------------------------------
 .../lens/cube/parse/TestCubeRewriter.java       |  2 ++
 .../org/apache/lens/cube/parse/TestQuery.java   |  1 +
 .../driver/jdbc/TestColumnarSQLRewriter.java    |  2 --
 lens-regression/pom.xml                         | 13 +++++----
 lens-ship-jars/pom.xml                          |  4 +--
 src/site/apt/releases/download.apt              |  2 +-
 src/site/apt/releases/release-history.apt       | 28 ++++++++++++++++++++
 7 files changed, 40 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lens/blob/73716cb6/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java
----------------------------------------------------------------------
diff --git 
a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java 
b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java
index 04b7ab1..fea70b7 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestCubeRewriter.java
@@ -39,6 +39,7 @@ import 
org.apache.lens.cube.parse.CandidateTablePruneCause.SkipStorageCode;
 import org.apache.lens.server.api.error.LensException;
 
 import org.apache.commons.lang.time.DateUtils;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
@@ -54,6 +55,7 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j

http://git-wip-us.apache.org/repos/asf/lens/blob/73716cb6/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQuery.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQuery.java 
b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQuery.java
index db3ba9b..cd20fef 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQuery.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQuery.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.hive.ql.parse.ASTNode;
 import com.google.common.base.Objects;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 

http://git-wip-us.apache.org/repos/asf/lens/blob/73716cb6/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
----------------------------------------------------------------------
diff --git 
a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
 
b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
index 7772d16..cf795fa 100644
--- 
a/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
+++ 
b/lens-driver-jdbc/src/test/java/org/apache/lens/driver/jdbc/TestColumnarSQLRewriter.java
@@ -629,7 +629,6 @@ public class TestColumnarSQLRewriter {
             + "( time_dim___time_dim . day ), ( item_dim___item_dim . item_key 
) "
             + "order by dollars_sold  desc";
     compareQueries(actual, expected);
-
   }
 
   @Test
@@ -683,7 +682,6 @@ public class TestColumnarSQLRewriter {
             + " ( time_dim___time_dim . day ), ( item_dim___item_dim . 
item_key ) "
             + "order by dollars_sold  desc";
     compareQueries(actual, expected);
-
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/lens/blob/73716cb6/lens-regression/pom.xml
----------------------------------------------------------------------
diff --git a/lens-regression/pom.xml b/lens-regression/pom.xml
index 8555e36..807d3b2 100644
--- a/lens-regression/pom.xml
+++ b/lens-regression/pom.xml
@@ -87,14 +87,13 @@
                         </goals>
                         <configuration>
                             <target>
-                                <property name="build.compiler" 
value="extJavac"/>
-                                <property name="compile_classpath" 
refid="maven.compile.classpath"/>
-                                <mkdir 
dir="${project.build.directory}/additional-classes"/>
-                                <javac includeantruntime="false" 
srcdir="src/additional/java"
-                                       
destdir="${project.build.directory}/additional-classes" 
classpath="${compile_classpath}"/>
-                                <mkdir 
dir="${project.build.directory}/testjars"/>
+                                <property name="build.compiler" 
value="extJavac" />
+                                <property name="compile_classpath" 
refid="maven.compile.classpath" />
+                                <mkdir 
dir="${project.build.directory}/additional-classes" />
+                                <javac includeantruntime="false" 
srcdir="src/additional/java" 
destdir="${project.build.directory}/additional-classes" 
classpath="${compile_classpath}" />
+                                <mkdir 
dir="${project.build.directory}/testjars" />
                                 <jar 
destfile="${project.build.directory}/testjars/hiveudftest.jar">
-                                    <fileset 
dir="${project.build.directory}/additional-classes" includes="SampleUdf.class"/>
+                                    <fileset 
dir="${project.build.directory}/additional-classes" includes="SampleUdf.class" 
/>
                                 </jar>
                             </target>
                         </configuration>

http://git-wip-us.apache.org/repos/asf/lens/blob/73716cb6/lens-ship-jars/pom.xml
----------------------------------------------------------------------
diff --git a/lens-ship-jars/pom.xml b/lens-ship-jars/pom.xml
index b1d937b..6268445 100644
--- a/lens-ship-jars/pom.xml
+++ b/lens-ship-jars/pom.xml
@@ -99,8 +99,8 @@
                 <transformer 
implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
                   <resource>log4j.properties</resource>
                 </transformer>
-                <transformer 
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
-                <transformer 
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+                <transformer 
implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"
 />
+                <transformer 
implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"
 />
               </transformers>
             </configuration>
           </execution>

http://git-wip-us.apache.org/repos/asf/lens/blob/73716cb6/src/site/apt/releases/download.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/releases/download.apt 
b/src/site/apt/releases/download.apt
index eba5172..37ac480 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.cgi/lens/2.3-beta}downloaded from the 
ASF}}.
+  {{{http://www.apache.org/dyn/closer.lua/lens/2.4-beta}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/73716cb6/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 b683360..1879acc 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.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}} | - |
+*--+--+---+--+--+--+--+
 |2.3.0-beta | Per Query Logs, Server side XML validation, File size in query 
result, File name suggestions in CLI, Phase 1 Query rewriter, Elastic Search 
driver, Query launching constraints, Update partition api, Lens Service Health 
check, Doc/javadoc improvements, Code cleanup, bug fixes| 
{{{../versions/2.3.0-beta/index.html} 2.3.x docs}} | 
{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12332350&projectId=12315923}
 2.3 release notes}}| {{{http://archive.apache.org/dist/lens/2.3-beta/} 
Download}} | {{{#a2.3.x_from_2.2.x} 2.3.x-incompatibilities}} | - |
 *--+--+---+--+--+--+--+
 |2.2.0-beta-incubating| CLI Improvements, Support for multiple expressions and 
and union queries, More descriptive error codes, Zeppelin integration, Code 
cleanup| {{{../versions/2.2.0-beta-incubating/index.html} 2.2.x-incubating 
docs}} | 
{{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12329586&projectId=12315923}
 2.2 release notes}}| 
{{{http://archive.apache.org/dist/incubator/lens/2.2-beta-incubating/} 
Download}} | {{{#a2.2.x_from_2.1.x} 2.2.x-incompatibilities}} | - |
@@ -40,6 +42,32 @@ All Apache Lens releases
 
 * Incompatibilities
 
+** 2.4.x from 2.3.x
+
+  * LENS-187: Moved all errors from inmobi hive to lens. All errors will be 
having same error code but all exceptions
+    are mapped to LensException instead of HiveException, SemanticException.
+
+  * LENS-446: Removed all server params from session and driver 
configurations. Earlier, all server params was passed to
+    drivers and showing through session api. We can not see anymore server 
side properties from session params.
+
+  * LENS-224: Driver class name also will be stored for finished queries. This 
will be an additional column(driverclass)
+    in finished_queries table.
+
+  * LENS-693: Purges the finished queries to DB periodically. Added a new 
config property
+    lens.server.querypurger.sleep.interval for configuring purge interval. No 
more depends on number of finished queries
+    to purge the finished queries to DB.
+
+  * LENS-734: All query output files are generated through HadoopFileFormatter 
and ZipFileFormatter will be having
+    query name in output file name. Earlier, query output file does not 
contain query name in the output file
+
+  * LENS-737: Give single error with LensMultiException to user. Earlier, we 
used give Internal server error to users as
+    multiple drivers gives different errors.
+
+  * LENS-774: Fixed spelling mistake in 
lens.server.session.expiry.service.interval.secs property.
+    Earlier, LensConfConstants.java file and lensserver-default.xml are having 
different property name
+    because of spelling error. Due to that we were unable to override 
lens.server.session.expiry.service.interval.secs
+    property.
+
 ** 2.3.x from 2.2.x
 
   * LENS-681 : Passing a malformed xml doesn't succeed anymore.

Reply via email to