lens git commit: LENS-1450 : Fix duplicate filters in query writing

[amareshwari]

Repository: lens
Updated Branches:
  refs/heads/master 3da3bce4b -> 6c40b24ff


LENS-1450 : Fix duplicate filters in query writing


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

Branch: refs/heads/master
Commit: 6c40b24ffa8ff66b448a4f61054fb3897cffdd6a
Parents: 3da3bce
Author: Rajitha R 
Authored: Mon Aug 7 17:29:26 2017 +0530
Committer: Amareshwari Sriramadasu 
Committed: Mon Aug 7 17:29:26 2017 +0530

--
 .../java/org/apache/lens/cube/parse/CubeQueryContext.java |  3 ++-
 .../java/org/apache/lens/cube/parse/TestCubeRewriter.java | 10 +-
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/lens/blob/6c40b24f/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java
--
diff --git 
a/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java 
b/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java
index b5330a7..8b9583a 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java
@@ -1169,7 +1169,8 @@ public class CubeQueryContext extends 
TracksQueriedColumns implements QueryAST,
 }
   }
 } else if (node.getParent() == null
-&& node.getToken().getType() != HiveParser.KW_AND) {
+&& node.getToken().getType() != HiveParser.KW_AND
+  && node.getChild(0).getType() != HiveParser.KW_AND) {
   // if node is the only child
   allFilters.add(HQLParser.getString((ASTNode) node));
 }

http://git-wip-us.apache.org/repos/asf/lens/blob/6c40b24f/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 1c75e6c..bc0fa2e 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
@@ -509,8 +509,16 @@ public class TestCubeRewriter extends TestQueryRewrite {
 conf.setBoolean(DISABLE_AUTO_JOINS, false);
 conf.setBoolean(REWRITE_DIM_FILTER_TO_FACT_FILTER, true);
 
+// No filter
+String hql = rewrite("select cityid , msr2 from testCube where " + 
TWO_DAYS_RANGE, conf);
+
+String expectedQuery =  getExpectedQuery(TEST_CUBE_NAME, "select 
(testcube.cityid) as `cityid`, "
++ "sum((testcube.msr2)) as `msr2` from ", null, "group by 
testcube.cityid",
+  getWhereForHourly2days(TEST_CUBE_NAME, "c3_testfact2_raw"));
+compareQueries(expectedQuery, hql);
+
 // filter with =
-String hql = rewrite(
+hql = rewrite(
 "select cubecountry.name, msr2 from" + " testCube" + " where 
cubecountry.region = 'asia' and "
 + TWO_DAYS_RANGE, conf);
 String filterSubquery = "testcube.countryid in ( select id from 
TestQueryRewrite.c3_countrytable_partitioned "

lens git commit: LENS-1458 : RESULT_SET_PARENT_DIR set at driver level getting overwritten for queued queries after server restart

[sushilmohanty]

Repository: lens
Updated Branches:
  refs/heads/master 6c40b24ff -> 0ea84729a


LENS-1458 : RESULT_SET_PARENT_DIR set at driver level getting overwritten for 
queued queries after server restart


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

Branch: refs/heads/master
Commit: 0ea84729ad0a1ff0ee7869f43600bcd38bdf
Parents: 6c40b24
Author: Sushil Mohanty 
Authored: Mon Aug 7 18:38:15 2017 +0530
Committer: sushilmohanty 
Committed: Mon Aug 7 18:38:15 2017 +0530

--
 .../apache/lens/server/api/query/DriverSelectorQueryContext.java   | 2 +-
 .../src/test/java/org/apache/lens/server/TestServerRestart.java| 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/lens/blob/0ea84729/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java
--
diff --git 
a/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java
 
b/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java
index 41e533e..9cec42a 100644
--- 
a/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java
+++ 
b/lens-server-api/src/main/java/org/apache/lens/server/api/query/DriverSelectorQueryContext.java
@@ -254,7 +254,7 @@ public class DriverSelectorQueryContext {
   }
 
   public void setDriverConf(LensDriver driver, Configuration conf) {
-driverQueryContextMap.get(driver).setDriverSpecificConf(conf);
+driverQueryContextMap.get(driver).setDriverSpecificConf(mergeConf(driver, 
conf));
   }
 
   public void setDriverCost(LensDriver driver, QueryCost cost) {

http://git-wip-us.apache.org/repos/asf/lens/blob/0ea84729/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
--
diff --git 
a/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java 
b/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
index 20aa8cb..8b7728e 100644
--- a/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
+++ b/lens-server/src/test/java/org/apache/lens/server/TestServerRestart.java
@@ -39,6 +39,7 @@ import org.apache.lens.api.APIResult.Status;
 import org.apache.lens.api.query.*;
 import org.apache.lens.api.result.LensAPIResult;
 import org.apache.lens.driver.hive.TestRemoteHiveDriver;
+import org.apache.lens.server.api.LensConfConstants;
 import org.apache.lens.server.api.error.LensException;
 import org.apache.lens.server.api.query.QueryContext;
 import org.apache.lens.server.api.query.QueryExecutionService;
@@ -245,6 +246,7 @@ public class TestServerRestart extends 
LensAllApplicationJerseyTest {
 assertEquals(lensQueryConf.getProperty(KEY_POST_SELECT), 
VALUE_POST_SELECT);
 
 if (afterRestart) {
+  assertEquals(driverConf.get(LensConfConstants.RESULT_SET_PARENT_DIR), 
"target/hive-lens-results");
   //This will be unavailable since if was not updated in LensConf by 
MockDriverQueryHook
   assertNull(driverConf.get(UNSAVED_KEY_POST_SELECT));
 } else {