You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by am...@apache.org on 2016/02/19 05:14:28 UTC

lens git commit: LENS-959 : Remove cube keyword from all test cases of lens-cube

Repository: lens
Updated Branches:
  refs/heads/master 1608b32b7 -> c0199ead2


LENS-959 : Remove cube keyword from all test cases of lens-cube


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

Branch: refs/heads/master
Commit: c0199ead2c4696599201b19000af2cd7a8cfa162
Parents: 1608b32
Author: Rajat Khandelwal <pr...@apache.org>
Authored: Fri Feb 19 09:44:16 2016 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Fri Feb 19 09:44:16 2016 +0530

----------------------------------------------------------------------
 .../lens/cube/parse/TestBaseCubeQueries.java    | 10 +++----
 .../lens/cube/parse/TestCubeRewriter.java       | 28 ++++++++++----------
 .../lens/cube/parse/TestExpressionResolver.java |  8 +++---
 .../lens/cube/parse/TestQueryMetrics.java       |  2 +-
 .../lens/cube/parse/TestRewriterPlan.java       | 10 +++----
 .../lens/cube/parse/TestTimeRangeResolver.java  |  4 +--
 .../parse/TestTimeRangeWriterWithQuery.java     |  2 +-
 7 files changed, 32 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lens/blob/c0199ead/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBaseCubeQueries.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBaseCubeQueries.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBaseCubeQueries.java
index 1d27558..de1d3ce 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBaseCubeQueries.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestBaseCubeQueries.java
@@ -77,7 +77,7 @@ public class TestBaseCubeQueries extends TestQueryRewrite {
             + TWO_DAYS_RANGE, conf);
     //maxCause : FACT_NOT_AVAILABLE_IN_RANGE, Ordinal : 1
     NoCandidateFactAvailableException ne2 = (NoCandidateFactAvailableException)
-            getLensExceptionInRewrite("cube select dim1 from " + cubeName + " where " + LAST_YEAR_RANGE, getConf());
+            getLensExceptionInRewrite("select dim1 from " + cubeName + " where " + LAST_YEAR_RANGE, getConf());
     assertEquals(ne1.compareTo(ne2), 8);
   }
 
@@ -554,7 +554,7 @@ public class TestBaseCubeQueries extends TestQueryRewrite {
     conf.setBoolean(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, false);
     String hql, expected;
     // Prefer fact that has a storage with part col on queried time dim
-    hql = rewrite("cube select msr12 from basecube where " + TWO_DAYS_RANGE, conf);
+    hql = rewrite("select msr12 from basecube where " + TWO_DAYS_RANGE, conf);
     expected = getExpectedQuery(BASE_CUBE_NAME, "select sum(basecube.msr12) FROM ", null, null,
       getWhereForDailyAndHourly2days(BASE_CUBE_NAME, "c1_testfact2_base"));
     compareQueries(hql, expected);
@@ -563,7 +563,7 @@ public class TestBaseCubeQueries extends TestQueryRewrite {
     conf.set(CubeQueryConfUtil.DRIVER_SUPPORTED_STORAGES, "C4");
     conf.setBoolean(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, true);
     LensException exc =
-      getLensExceptionInRewrite("cube select msr12 from basecube where " + TWO_DAYS_RANGE, conf);
+      getLensExceptionInRewrite("select msr12 from basecube where " + TWO_DAYS_RANGE, conf);
     NoCandidateFactAvailableException ne = (NoCandidateFactAvailableException) exc;
     PruneCauses.BriefAndDetailedError pruneCause = ne.getJsonMessage();
     assertTrue(pruneCause.getBrief().contains("Missing partitions"));
@@ -578,7 +578,7 @@ public class TestBaseCubeQueries extends TestQueryRewrite {
 
     // fail on partial false. Should go to fallback column. Also testing transitivity of timedim relations
     conf.setBoolean(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, false);
-    hql = rewrite("cube select msr12 from basecube where " + TWO_DAYS_RANGE, conf);
+    hql = rewrite("select msr12 from basecube where " + TWO_DAYS_RANGE, conf);
     String dTimeWhereClause = "basecube.d_time >= '" + HIVE_QUERY_DATE_PARSER.get().format(ABSDATE_PARSER.get().parse(
       getAbsDateFormatString(getDateUptoHours(
         TWODAYS_BACK)))) + "' and "
@@ -598,7 +598,7 @@ public class TestBaseCubeQueries extends TestQueryRewrite {
 
     // Multiple timedims in single query. test that
     CubeQueryContext ctx =
-      rewriteCtx("cube select msr12 from basecube where " + TWO_DAYS_RANGE + " and " + TWO_DAYS_RANGE_TTD, conf);
+      rewriteCtx("select msr12 from basecube where " + TWO_DAYS_RANGE + " and " + TWO_DAYS_RANGE_TTD, conf);
     assertEquals(ctx.getCandidateFactSets().size(), 1);
     assertEquals(ctx.getCandidateFactSets().iterator().next().size(), 1);
     CandidateFact cfact = ctx.getCandidateFactSets().iterator().next().iterator().next();

http://git-wip-us.apache.org/repos/asf/lens/blob/c0199ead/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 45b4334..9dde3cd 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
@@ -135,7 +135,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
   @Test
   public void testCubeQuery() throws Exception {
     CubeQueryContext rewrittenQuery =
-      rewriteCtx("cube select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, getConfWithStorages("C2"));
+      rewriteCtx("select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, getConfWithStorages("C2"));
     String expected =
       getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null,
         getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact"));
@@ -151,7 +151,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
     conf.setBoolean(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, false);
     conf.set(DRIVER_SUPPORTED_STORAGES, "C1,C2,C4");
     CubeQueryContext cubeQueryContext =
-      rewriteCtx("cube select SUM(msr2) from testCube where " + THIS_YEAR_RANGE, conf);
+      rewriteCtx("select SUM(msr2) from testCube where " + THIS_YEAR_RANGE, conf);
     PruneCauses<CubeFactTable> pruneCause = cubeQueryContext.getFactPruningMsgs();
     int lessDataCauses = 0;
     for (Map.Entry<CubeFactTable, List<CandidateTablePruneCause>> entry : pruneCause.entrySet()) {
@@ -167,7 +167,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
   @Test
   public void testLightestFactFirst() throws Exception {
     // testFact is lighter than testFact2.
-    String hqlQuery = rewrite("cube select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, getConfWithStorages(
+    String hqlQuery = rewrite("select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, getConfWithStorages(
       "C2"));
     String expected =
       getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null,
@@ -202,7 +202,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
   @Test
   public void testDerivedCube() throws ParseException, LensException, HiveException, ClassNotFoundException {
     CubeQueryContext rewrittenQuery =
-      rewriteCtx("cube select SUM(msr2) from derivedCube where " + TWO_DAYS_RANGE, getConfWithStorages("C2"));
+      rewriteCtx("select SUM(msr2) from derivedCube where " + TWO_DAYS_RANGE, getConfWithStorages("C2"));
     String expected =
       getExpectedQuery(DERIVED_CUBE_NAME, "select sum(derivedCube.msr2) FROM ", null, null,
         getWhereForDailyAndHourly2days(DERIVED_CUBE_NAME, "C2_testfact"));
@@ -221,7 +221,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
 
     /*
     Accessing join chains from derived cubes are not supported yet.
-    hqlQuery = rewrite("cube select dim2chain.name, SUM(msr2) from derivedCube where " + TWO_DAYS_RANGE, conf);
+    hqlQuery = rewrite("select dim2chain.name, SUM(msr2) from derivedCube where " + TWO_DAYS_RANGE, conf);
     expected =
       getExpectedQuery(DERIVED_CUBE_NAME, "select dim2chain.name, sum(derivedCube.msr2) FROM ", " JOIN "
           + getDbName() + "c1_testdim2tbl dim2chain ON derivedCube.dim2 = "
@@ -232,7 +232,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
     // Test that explicit join query passes with join resolver disabled
     conf.setBoolean(DISABLE_AUTO_JOINS, true);
     hqlQuery =
-      rewrite("cube select citydim.name, SUM(msr2) from derivedCube "
+      rewrite("select citydim.name, SUM(msr2) from derivedCube "
         + " inner join citydim on derivedCube.cityid = citydim.id where " + TWO_DAYS_RANGE, conf);
     expected =
       getExpectedQuery(DERIVED_CUBE_NAME, "select citydim.name, sum(derivedCube.msr2) FROM ",
@@ -254,7 +254,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
       + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, wh);
     compareQueries(hqlQuery, expected);
 
-    hqlQuery = rewrite("insert overwrite directory" + " 'target/test' cube select SUM(msr2) from testCube where "
+    hqlQuery = rewrite("insert overwrite directory" + " 'target/test' select SUM(msr2) from testCube where "
       + TWO_DAYS_RANGE, conf);
     compareQueries(hqlQuery, expected);
 
@@ -265,7 +265,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
       + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, wh);
     compareQueries(hqlQuery, expected);
 
-    hqlQuery = rewrite("insert overwrite local directory" + " 'target/test' cube select SUM(msr2) from testCube where "
+    hqlQuery = rewrite("insert overwrite local directory" + " 'target/test' select SUM(msr2) from testCube where "
       + TWO_DAYS_RANGE, conf);
     compareQueries(hqlQuery, expected);
 
@@ -276,7 +276,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
       + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, wh);
     compareQueries(hqlQuery, expected);
 
-    hqlQuery = rewrite("insert overwrite table temp" + " cube select SUM(msr2) from testCube where " + TWO_DAYS_RANGE,
+    hqlQuery = rewrite("insert overwrite table temp" + " select SUM(msr2) from testCube where " + TWO_DAYS_RANGE,
       conf);
     compareQueries(hqlQuery, expected);
   }
@@ -551,15 +551,15 @@ public class TestCubeRewriter extends TestQueryRewrite {
     CubeTestSetup.getStorageToUpdatePeriodMap().put("c1_testfact", Lists.newArrayList(HOURLY));
     CubeTestSetup.getStorageToUpdatePeriodMap().put("c2_testfact", Lists.newArrayList(DAILY));
     String whereCond = "zipcode = 'a' and cityid = 'b' and (" + TWO_DAYS_RANGE_SPLIT_OVER_UPDATE_PERIODS + ")";
-    String hqlQuery = rewrite("cube select zipcode, count(msr4), sum(msr15) from testCube where " + whereCond, conf);
+    String hqlQuery = rewrite("select zipcode, count(msr4), sum(msr15) from testCube where " + whereCond, conf);
     System.out.println(hqlQuery);
     String possibleStart1 = "SELECT COALESCE(mq1.zipcode, mq2.zipcode) zipcode, mq1.msr4 msr4, mq2.msr15 msr15 FROM ";
     String possibleStart2 = "SELECT COALESCE(mq1.zipcode, mq2.zipcode) zipcode, mq2.msr4 msr4, mq1.msr15 msr15 FROM ";
 
     assertTrue(hqlQuery.startsWith(possibleStart1) || hqlQuery.startsWith(possibleStart2));
-    compareContains(rewrite("cube select zipcode as `zipcode`, sum(msr15) as `msr15` from testcube where " + whereCond,
+    compareContains(rewrite("select zipcode as `zipcode`, sum(msr15) as `msr15` from testcube where " + whereCond,
       conf), hqlQuery);
-    compareContains(rewrite("cube select zipcode as `zipcode`, count(msr4) as `msr4` from testcube where " + whereCond,
+    compareContains(rewrite("select zipcode as `zipcode`, count(msr4) as `msr4` from testcube where " + whereCond,
       conf), hqlQuery);
     assertTrue(hqlQuery.endsWith("on mq1.zipcode <=> mq2.zipcode"));
     // No time_range_in should be remaining
@@ -1013,7 +1013,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
   public void testSelectExprPromotionToGroupByWithSpacesInDimensionAliasAndWithAsKeywordBwColAndAlias()
     throws ParseException, LensException, HiveException {
 
-    String inputQuery = "cube select name as `Alias With Spaces`, SUM(msr2) as `TestMeasure` from testCube join citydim"
+    String inputQuery = "select name as `Alias With Spaces`, SUM(msr2) as `TestMeasure` from testCube join citydim"
       + " on testCube.cityid = citydim.id where " + LAST_HOUR_TIME_RANGE;
 
     String expectedRewrittenQuery = "SELECT ( citydim . name ) as `Alias With Spaces` , sum(( testcube . msr2 )) "
@@ -1030,7 +1030,7 @@ public class TestCubeRewriter extends TestQueryRewrite {
   public void testSelectExprPromotionToGroupByWithSpacesInDimensionAliasAndWithoutAsKeywordBwColAndAlias()
     throws ParseException, LensException, HiveException {
 
-    String inputQuery = "cube select name `Alias With Spaces`, SUM(msr2) as `TestMeasure` from testCube join citydim"
+    String inputQuery = "select name `Alias With Spaces`, SUM(msr2) as `TestMeasure` from testCube join citydim"
       + " on testCube.cityid = citydim.id where " + LAST_HOUR_TIME_RANGE;
 
     String expectedRewrittenQuery = "SELECT ( citydim . name ) as `Alias With Spaces` , sum(( testcube . msr2 )) "

http://git-wip-us.apache.org/repos/asf/lens/blob/c0199ead/lens-cube/src/test/java/org/apache/lens/cube/parse/TestExpressionResolver.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestExpressionResolver.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestExpressionResolver.java
index 6816fac..fa07b67 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestExpressionResolver.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestExpressionResolver.java
@@ -69,7 +69,7 @@ public class TestExpressionResolver extends TestQueryRewrite {
   @Test
   public void testCubeQueryExpressionSelection() throws Exception {
     // select with expression
-    String hqlQuery = rewrite("cube select avgmsr from testCube where " + TWO_DAYS_RANGE, conf);
+    String hqlQuery = rewrite("select avgmsr from testCube where " + TWO_DAYS_RANGE, conf);
     String expected =
       getExpectedQuery(cubeName, "select avg(testCube.msr1 + testCube.msr2) FROM ", null, null,
         getWhereForHourly2days("C1_testfact2_raw"));
@@ -222,7 +222,7 @@ public class TestExpressionResolver extends TestQueryRewrite {
   public void testExpressionInHaving() throws Exception {
     // expression with having clause
     String hqlQuery =
-      rewrite("cube select booleancut, avgmsr from testCube" + " where " + TWO_DAYS_RANGE + " and substrexpr != 'XYZ'"
+      rewrite("select booleancut, avgmsr from testCube" + " where " + TWO_DAYS_RANGE + " and substrexpr != 'XYZ'"
         + " having msr6 > 100.0", conf);
     String expected =
       getExpectedQuery(cubeName, "select testCube.dim1 != 'x' AND testCube.dim2 != 10 ,"
@@ -237,7 +237,7 @@ public class TestExpressionResolver extends TestQueryRewrite {
   public void testExpressionInOrderby() throws Exception {
     // expression with orderby clause
     String hqlQuery =
-      rewrite("cube select avgmsr from testCube " + " where " + TWO_DAYS_RANGE + " and substrexpr != 'XYZ'"
+      rewrite("select avgmsr from testCube " + " where " + TWO_DAYS_RANGE + " and substrexpr != 'XYZ'"
         + " group by booleancut having msr6 > 100.0 order by booleancut", conf);
     String expected =
       getExpectedQuery(cubeName, "select testCube.dim1 != 'x' AND testCube.dim2 != 10 ,"
@@ -250,7 +250,7 @@ public class TestExpressionResolver extends TestQueryRewrite {
   @Test
   public void testExpressionWithAliasInOrderby() throws Exception {
     String hqlQuery =
-      rewrite("cube select booleancut bc, msr2 from testCube" + " where " + TWO_DAYS_RANGE + " and substrexpr != 'XYZ'"
+      rewrite("select booleancut bc, msr2 from testCube" + " where " + TWO_DAYS_RANGE + " and substrexpr != 'XYZ'"
         + " having msr6 > 100.0 order by bc", conf);
     String expected =
       getExpectedQuery(cubeName, "select testCube.dim1 != 'x' AND testCube.dim2 != 10 as `bc`,"

http://git-wip-us.apache.org/repos/asf/lens/blob/c0199ead/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryMetrics.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryMetrics.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryMetrics.java
index 571f7de..857bc90 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryMetrics.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestQueryMetrics.java
@@ -41,7 +41,7 @@ public class TestQueryMetrics extends TestQueryRewrite {
     conf.set(LensConfConstants.QUERY_METRIC_UNIQUE_ID_CONF_KEY, TestQueryMetrics.class.getSimpleName());
     conf.set(LensConfConstants.QUERY_METRIC_DRIVER_STACK_NAME, "testCubeRewriteStackName");
 
-    rewriteCtx("cube select" + " SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
+    rewriteCtx("select" + " SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
     MetricRegistry reg = LensMetricsRegistry.getStaticRegistry();
 
     Assert.assertTrue(reg.getGauges().keySet().containsAll(Arrays.asList(

http://git-wip-us.apache.org/repos/asf/lens/blob/c0199ead/lens-cube/src/test/java/org/apache/lens/cube/parse/TestRewriterPlan.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestRewriterPlan.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestRewriterPlan.java
index 2d7babb..7f26b24 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestRewriterPlan.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestRewriterPlan.java
@@ -51,7 +51,7 @@ public class TestRewriterPlan extends TestQueryRewrite {
   public void testPlanExtractionForSimpleQuery() throws Exception {
     // simple query
     Configuration conf = getConfWithStorages("C2");
-    CubeQueryContext ctx = rewriteCtx("cube select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
+    CubeQueryContext ctx = rewriteCtx("select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
     ctx.toHQL();
     RewriterPlan plan = new RewriterPlan(Collections.singleton(ctx));
     Assert.assertNotNull(plan);
@@ -67,7 +67,7 @@ public class TestRewriterPlan extends TestQueryRewrite {
   public void testPlanExtractionForComplexQuery() throws Exception {
     // complex query
     Configuration conf = getConfWithStorages("C1,C2");
-    CubeQueryContext ctx = rewriteCtx("cube select cubecity.name, SUM(msr2) from testCube where "
+    CubeQueryContext ctx = rewriteCtx("select cubecity.name, SUM(msr2) from testCube where "
       + " cubecity.name != \"XYZ\" and " + TWO_DAYS_RANGE + " having sum(msr2) > 1000 order by cubecity.name limit 50",
       conf);
     ctx.toHQL();
@@ -89,9 +89,9 @@ public class TestRewriterPlan extends TestQueryRewrite {
   public void testPlanExtractionForMultipleQueries() throws Exception {
     // simple query
     Configuration conf = getConfWithStorages("C1,C2");
-    CubeQueryContext ctx1 = rewriteCtx("cube select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
+    CubeQueryContext ctx1 = rewriteCtx("select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
     ctx1.toHQL();
-    CubeQueryContext ctx2 = rewriteCtx("cube select cubecity.name, SUM(msr2) from testCube where "
+    CubeQueryContext ctx2 = rewriteCtx("select cubecity.name, SUM(msr2) from testCube where "
       + " cubecity.name != \"XYZ\" and " + TWO_DAYS_RANGE + " having sum(msr2) > 1000 order by cubecity.name limit 50",
       conf);
     ctx2.toHQL();
@@ -111,7 +111,7 @@ public class TestRewriterPlan extends TestQueryRewrite {
 
   @Test
   public void testUnimplemented() throws ParseException, LensException, HiveException {
-    CubeQueryContext ctx = rewriteCtx("cube select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
+    CubeQueryContext ctx = rewriteCtx("select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
     ctx.toHQL();
     RewriterPlan plan = new RewriterPlan(Collections.singleton(ctx));
     Assert.assertNotNull(plan);

http://git-wip-us.apache.org/repos/asf/lens/blob/c0199ead/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeResolver.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeResolver.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeResolver.java
index 2ac837d..c8a9ac6 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeResolver.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeResolver.java
@@ -65,7 +65,7 @@ public class TestTimeRangeResolver extends TestQueryRewrite {
   @Test
   public void testFactValidity() throws ParseException, LensException, HiveException, ClassNotFoundException {
     LensException e =
-      getLensExceptionInRewrite("cube select msr2 from " + cubeName + " where " + LAST_YEAR_RANGE,
+      getLensExceptionInRewrite("select msr2 from " + cubeName + " where " + LAST_YEAR_RANGE,
         getConf());
     NoCandidateFactAvailableException ne = (NoCandidateFactAvailableException) e;
     PruneCauses.BriefAndDetailedError causes = ne.getJsonMessage();
@@ -86,7 +86,7 @@ public class TestTimeRangeResolver extends TestQueryRewrite {
   @Test
   public void testAbsoluteValidity() throws ParseException, HiveException, LensException {
     CubeQueryContext ctx =
-      rewriteCtx("cube select msr12 from basecube where " + TWO_DAYS_RANGE + " or " + TWO_DAYS_RANGE_BEFORE_4_DAYS,
+      rewriteCtx("select msr12 from basecube where " + TWO_DAYS_RANGE + " or " + TWO_DAYS_RANGE_BEFORE_4_DAYS,
         getConf());
     assertEquals(ctx.getFactPruningMsgs().get(ctx.getMetastoreClient().getCubeFact("testfact_deprecated")).size(), 1);
     CandidateTablePruneCause pruningMsg =

http://git-wip-us.apache.org/repos/asf/lens/blob/c0199ead/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeWriterWithQuery.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeWriterWithQuery.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeWriterWithQuery.java
index a0ee56d..7010849 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeWriterWithQuery.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestTimeRangeWriterWithQuery.java
@@ -83,7 +83,7 @@ public class TestTimeRangeWriterWithQuery extends TestQueryRewrite {
   public void testCubeQueryContinuousUpdatePeriod() throws Exception {
     LensException th = null;
     try {
-      rewrite("cube select" + " SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
+      rewrite("select" + " SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf);
     } catch (LensException e) {
       th = e;
       log.error("Semantic exception while testing cube query.", e);