Reverse merge current-release-line
diff --git a/README.md b/README.md
index 169791d..732dcd9 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
across multiple tiered data stores and optimal execution environment for the analytical query.
Prerequisites :
-Apache Lens requires JDK(>=1.7) and Apache Maven(3.x) to be installed for the build.
+Apache Lens requires JDK(>=1.8) and Apache Maven(3.x) to be installed for the build.
JAVA_HOME is required for running tests.
@@ -15,7 +15,7 @@
# echo ${JAVA_HOME}
Additionally MAVEN_OPTS can be configured as :
- # export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m"
+ # export MAVEN_OPTS="-Xmx1024m"
Build the project :
# mvn clean package
diff --git a/contrib/clients/python/pom.xml b/contrib/clients/python/pom.xml
index ac842bd..8fd6eda 100644
--- a/contrib/clients/python/pom.xml
+++ b/contrib/clients/python/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>
<name>Lens Python Client</name>
<parent>
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 e83eacb..4fdb822 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
@@ -1526,6 +1526,19 @@
}
@Test
+ public void testTimeRangeIn() throws Exception {
+ //check whether time_range_in is resolving in cube rewrite
+ Configuration conf = getConf();
+ conf.set(CubeQueryConfUtil.PROCESS_TIME_PART_COL, "pt");
+ conf.set(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, "true");
+ conf.setClass(CubeQueryConfUtil.TIME_RANGE_WRITER_CLASS, AbridgedTimeRangeWriter.class, TimeRangeWriter.class);
+ CubeQueryContext ctx = rewriteCtx("select dim1, sum(msr23)" + " from testCube" + " where " + ONE_DAY_RANGE_IT,
+ conf);
+ String rewrittenQuery = ctx.toHQL();
+ assertTrue(!rewrittenQuery.contains("time_range_in"));
+ }
+
+ @Test
public void testCubeQueryWithMultipleRanges() throws Exception {
String hqlQuery =
rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE + " OR "
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 b7cdb88..3752132 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
@@ -2034,7 +2034,7 @@
+ (lensQuery.getFinishTime() - lensQuery.getLaunchTime()));
}
- @Test(dataProvider = "mediaTypeData")
+ //@Test(dataProvider = "mediaTypeData")
public void testEstimateRejectionException(MediaType mt) throws Exception {
class EstimateRunnable implements Runnable {
boolean failed = false;
diff --git a/lens-server/src/test/java/org/apache/lens/server/scheduler/SchedulerDAOTest.java b/lens-server/src/test/java/org/apache/lens/server/scheduler/SchedulerDAOTest.java
index 4754c1e..d878cb1 100644
--- a/lens-server/src/test/java/org/apache/lens/server/scheduler/SchedulerDAOTest.java
+++ b/lens-server/src/test/java/org/apache/lens/server/scheduler/SchedulerDAOTest.java
@@ -192,7 +192,7 @@
schedulerDAO.storeJob(info);
// There should be 3 jobs till now.
Assert.assertEquals(schedulerDAO.getJobs("lens", null, null, SchedulerJobState.values()).size(), 3);
- Assert.assertEquals(schedulerDAO.getJobs("lens", 1L, System.currentTimeMillis(), SchedulerJobState.NEW).size(), 2);
+ //Assert.assertEquals(schedulerDAO.getJobs("lens", 1L, System.currentTimeMillis(), SchedulerJobState.NEW).size(), 2);
Assert.assertEquals(schedulerDAO.getJobs("Alice", null, null, SchedulerJobState.NEW).size(), 0);
}
}
diff --git a/lens-ui/app/actions/SessionAction.js b/lens-ui/app/actions/SessionAction.js
index c3d78f9..17eccd5 100644
--- a/lens-ui/app/actions/SessionAction.js
+++ b/lens-ui/app/actions/SessionAction.js
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
import AppDispatcher from "../dispatcher/AppDispatcher";
import SessionConstants from "../constants/SessionConstants";
import SessionAdapter from "../adapters/SessionAdapter";
diff --git a/lens-ui/app/adapters/SessionAdapter.js b/lens-ui/app/adapters/SessionAdapter.js
index 8e4fe74..105ad8b 100644
--- a/lens-ui/app/adapters/SessionAdapter.js
+++ b/lens-ui/app/adapters/SessionAdapter.js
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
import BaseAdapter from "./BaseAdapter";
import Config from 'config.json';
diff --git a/lens-ui/app/components/SessionListComponent.js b/lens-ui/app/components/SessionListComponent.js
index a71281c..8e88174 100644
--- a/lens-ui/app/components/SessionListComponent.js
+++ b/lens-ui/app/components/SessionListComponent.js
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
import React from "react";
import Session from "../stores/SessionStore";
import SessionAction from "../actions/SessionAction";
diff --git a/lens-ui/app/constants/SessionConstants.js b/lens-ui/app/constants/SessionConstants.js
index 3c31e5d..4088eed 100644
--- a/lens-ui/app/constants/SessionConstants.js
+++ b/lens-ui/app/constants/SessionConstants.js
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
import KeyMirror from 'keymirror';
const SessionConstants = KeyMirror({
diff --git a/lens-ui/app/stores/SessionStore.js b/lens-ui/app/stores/SessionStore.js
index 3840720..359da4f 100644
--- a/lens-ui/app/stores/SessionStore.js
+++ b/lens-ui/app/stores/SessionStore.js
@@ -1,3 +1,21 @@
+/**
+ * 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.
+ */
import assign from "object-assign";
import SessionConstants from "../constants/SessionConstants";
import AppDispatcher from "../dispatcher/AppDispatcher";
diff --git a/pom.xml b/pom.xml
index 1855cbb..bd08b0d 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>
@@ -421,6 +420,7 @@
<reportSet>
<id>aggregate</id>
<configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
<quiet>true</quiet>
<verbose>false</verbose>
<includeDependencySources>false</includeDependencySources>
@@ -481,6 +481,14 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc.plugin.version}</version>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${reports.plugin.version}</version>
<configuration>
diff --git a/src/site/apt/releases/download.apt b/src/site/apt/releases/download.apt
index df4df1d..a190053 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.6.1}downloaded from the ASF}}.
+ {{{http://www.apache.org/dyn/closer.lua/lens/2.7.0}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}}.
diff --git a/src/site/apt/releases/release-history.apt b/src/site/apt/releases/release-history.apt
index 7b9723b..2f687c7 100644
--- a/src/site/apt/releases/release-history.apt
+++ b/src/site/apt/releases/release-history.apt
@@ -23,6 +23,8 @@
*--+--+---+--+--+--+--+
|Release version|Major features|Release documentation|Release Notes|Download|Incompatibilities|More Info |
*--+--+---+--+--+--+--+
+|2.7.0| Cube segmentation, Unioning data across facts, Support for source data completion checking, Added Retry feature for transient errors on query execution, Added an ability to analyze active sessions, Moving Lens to java8, Support for PreparedStatement in Lens JDBC client, Notifications on query completpletion, Limiting the max number of jobs scheduled per user, Support for creating the schema from CLI, Code cleanup and refactor, Doc/javadoc improvements, Bug fixes | {{{../versions/2.7.0/index.html} 2.7.x docs}} | {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315923&version=12336851} 2.7 release notes}} | {{{http://archive.apache.org/dist/lens/2.7.0/} Download}} | {{{#a2.7.x_from_2.6.x} 2.7.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.1/} 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}} | - |
@@ -46,6 +48,14 @@
* Incompatibilities
+** 2.7.x from 2.6.x
+
+ * LENS-1387: Moved Lens to Java8
+
+ * LENS-1317: Finished_Queries store stores the LensConf
+
+ * LENS-1304: Storing Driver query in finished_queries tables for better analytics purposes
+
** 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"
diff --git a/tools/scripts/generate-site-public.sh b/tools/scripts/generate-site-public.sh
index a547465..0fe6d63 100755
--- a/tools/scripts/generate-site-public.sh
+++ b/tools/scripts/generate-site-public.sh
@@ -44,7 +44,7 @@
echo "Running site in current lens branch" $CURR_BRANCH
mvn clean test -Dtest=org.apache.lens.doc.TestGenerateConfigDoc,org.apache.lens.cli.doc.TestGenerateCLIUserDoc -DskipCheck || die "Unable to generate config docs"
mvn install -DskipTests -DskipCheck
-mvn site site:stage -Ddependency.locations.enabled=false -Ddependency.details.enabled=false -Pjavadoc || die "unable to generate site"
+mvn site site:stage -Ddependency.locations.enabled=false -Ddependency.details.enabled=false -Dcobertura.skip=true -Pjavadoc || die "unable to generate site"
echo "Site gen complete"
