Repository: lens Updated Branches: refs/heads/master 09419a577 -> e264e53f3
LENS-849 : Fix test failures because of merge with LENS-850 Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/e264e53f Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/e264e53f Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/e264e53f Branch: refs/heads/master Commit: e264e53f3a338961a34478b158c7980591280c0f Parents: 09419a5 Author: Amareshwari Sriramadasu <[email protected]> Authored: Wed Oct 28 09:42:58 2015 +0530 Committer: Amareshwari Sriramadasu <[email protected]> Committed: Wed Oct 28 09:42:58 2015 +0530 ---------------------------------------------------------------------- .../lens/cube/parse/TestAggregateResolver.java | 4 +- .../lens/cube/parse/TestCubeRewriter.java | 12 +++--- .../lens/cube/parse/TestExpressionResolver.java | 4 +- .../driver/jdbc/TestColumnarSQLRewriter.java | 41 +++++++++++--------- 4 files changed, 32 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/e264e53f/lens-cube/src/test/java/org/apache/lens/cube/parse/TestAggregateResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestAggregateResolver.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestAggregateResolver.java index 9791502..8da5263 100644 --- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestAggregateResolver.java +++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestAggregateResolver.java @@ -121,7 +121,7 @@ public class TestAggregateResolver extends TestQueryRewrite { getExpectedQuery(cubeName, "SELECT testcube.cityid," + " sum(testCube.msr2) * max(testCube.msr3) from ", null, "group by testcube.cityid", getWhereForDailyAndHourly2days(cubeName, "C2_testfact")); String expectedq9 = - getExpectedQuery(cubeName, "SELECT testcube.cityid c1," + " max(testCube.msr3) m3 from ", "c1 > 100", + getExpectedQuery(cubeName, "SELECT testcube.cityid as `c1`," + " max(testCube.msr3) as `m3` from ", "c1 > 100", "group by testcube.cityid" + " having sum(testCube.msr2) < 100 AND (m3 > 1000)", getWhereForDailyAndHourly2days(cubeName, "c2_testfact")); String expectedq10 = @@ -247,7 +247,7 @@ public class TestAggregateResolver extends TestQueryRewrite { cubeql = rewriteCtx(query, conf); hQL = cubeql.toHQL(); expectedQL = - getExpectedQuery(cubeName, "SELECT testcube.cityid," + " sum(testCube.msr2) m2 from ", null, + getExpectedQuery(cubeName, "SELECT testcube.cityid," + " sum(testCube.msr2) as `m2` from ", null, "group by testcube.cityid order by m2 asc", getWhereForDailyAndHourly2days(cubeName, "C2_testfact")); compareQueries(expectedQL, hQL); http://git-wip-us.apache.org/repos/asf/lens/blob/e264e53f/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 efe0980..d7484d8 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 @@ -740,7 +740,7 @@ public class TestCubeRewriter extends TestQueryRewrite { rewrite("select round(zipcode) rzc," + " msr2 from testCube where " + TWO_DAYS_RANGE + " group by zipcode" + " order by rzc", conf); expected = - getExpectedQuery(cubeName, "select round(testcube.zipcode) rzc," + " sum(testcube.msr2) FROM ", null, + getExpectedQuery(cubeName, "select round(testcube.zipcode) as `rzc`," + " sum(testcube.msr2) FROM ", null, " group by testcube.zipcode order by rzc asc", getWhereForDailyAndHourly2days(cubeName, "C2_testfact")); compareQueries(hqlQuery, expected); @@ -916,7 +916,7 @@ public class TestCubeRewriter extends TestQueryRewrite { String hqlQuery = rewrite("select SUM(msr2) m2 from" + " testCube where " + TWO_DAYS_RANGE, getConfWithStorages( "C2")); String expected = - getExpectedQuery(cubeName, "select sum(testcube.msr2)" + " m2 FROM ", null, null, + getExpectedQuery(cubeName, "select sum(testcube.msr2) as `m2` FROM ", null, null, getWhereForDailyAndHourly2days(cubeName, "C2_testfact")); compareQueries(hqlQuery, expected); @@ -936,13 +936,13 @@ public class TestCubeRewriter extends TestQueryRewrite { hqlQuery = rewrite("select mycube.msr2 m2 from testCube" + " mycube where " + TWO_DAYS_RANGE, getConfWithStorages( "C2")); expected = - getExpectedQuery("mycube", "select sum(mycube.msr2) m2 FROM ", null, null, + getExpectedQuery("mycube", "select sum(mycube.msr2) as `m2` FROM ", null, null, getWhereForDailyAndHourly2days("mycube", "C2_testfact")); compareQueries(hqlQuery, expected); hqlQuery = rewrite("select testCube.msr2 m2 from testCube" + " where " + TWO_DAYS_RANGE, getConfWithStorages("C2")); expected = - getExpectedQuery(cubeName, "select sum(testcube.msr2) m2 FROM ", null, null, + getExpectedQuery(cubeName, "select sum(testcube.msr2) as `m2` FROM ", null, null, getWhereForDailyAndHourly2days(cubeName, "C2_testfact")); compareQueries(hqlQuery, expected); } @@ -1121,11 +1121,11 @@ public class TestCubeRewriter extends TestQueryRewrite { hqlQuery = rewrite("select name n, count(1) from citydim" + " group by name order by n ", conf); expected = - getExpectedQuery("citydim", "select citydim.name n," + " count(1) from ", + getExpectedQuery("citydim", "select citydim.name as `n`," + " count(1) from ", "groupby citydim.name order by n asc", "c2_citytable", false); compareQueries(hqlQuery, expected); - hqlQuery = rewrite("select name n, count(1) from citydim" + " order by n ", conf); + hqlQuery = rewrite("select name as `n`, count(1) from citydim" + " order by n ", conf); compareQueries(hqlQuery, expected); hqlQuery = rewrite("select count(1) from citydim" + " group by name order by name ", conf); expected = http://git-wip-us.apache.org/repos/asf/lens/blob/e264e53f/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 e90603c..9dcced0 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 @@ -141,7 +141,7 @@ public class TestExpressionResolver extends TestQueryRewrite { rewrite("select TC.substrexpr as subdim1, TC.avgmsr from testCube TC" + " where " + TWO_DAYS_RANGE + " and subdim1 != 'XYZ'", conf); String expected = - getExpectedQuery("tc", "select substr(tc.dim1, 3) subdim1, avg(tc.msr1 + tc.msr2) FROM ", null, + getExpectedQuery("tc", "select substr(tc.dim1, 3) as `subdim1`, avg(tc.msr1 + tc.msr2) FROM ", null, " and subdim1 != 'XYZ' group by substr(tc.dim1, 3)", getWhereForHourly2days("tc", "C1_testfact2_raw")); TestCubeRewriter.compareQueries(hqlQuery, expected); @@ -278,7 +278,7 @@ public class TestExpressionResolver extends TestQueryRewrite { rewrite("cube 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 bc," + getExpectedQuery(cubeName, "select testCube.dim1 != 'x' AND testCube.dim2 != 10 as `bc`," + " sum(testCube.msr2) FROM ", null, " and substr(testCube.dim1, 3) != 'XYZ' " + " group by testCube.dim1 != 'x' AND testCube.dim2 != 10" + " having (sum(testCube.msr2) + max(testCube.msr3))/ count(testcube.msr4) > 100.0" + " order by bc asc", http://git-wip-us.apache.org/repos/asf/lens/blob/e264e53f/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 758f549..7772d16 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 @@ -598,7 +598,7 @@ public class TestColumnarSQLRewriter { String actual = qtest.rewrite(query, conf, hconf); String expected = "select ( sales_fact___fact . time_key ), ( time_dim___time_dim . day_of_week ), " - + "( time_dim___time_dim . day ), ( item_dim___item_dim . item_key ), sum(alias1) dollars_sold , " + + "( time_dim___time_dim . day ), ( item_dim___item_dim . item_key ), sum(alias1) as `dollars_sold` , " + "round(sum(alias2), 2 ), avg(alias3), min(alias4), max(alias5), location_name " + "from (select sales_fact___fact.time_key, sales_fact___fact.location_key, " + "sales_fact___fact.item_key,sum( case when (( sales_fact___fact . dollars_sold ) = 0 ) " @@ -653,8 +653,9 @@ public class TestColumnarSQLRewriter { String actual = qtest.rewrite(query, conf, hconf); String expected = "select ( sales_fact___fact . time_key ), ( time_dim___time_dim . day_of_week ), " + "( time_dim___time_dim . day ), ( item_dim___item_dim . item_key ), " - + "sum(alias1) dollars_sold , round(sum(alias2), 2 ), avg(alias6) avg_dollars_sold , min(alias4), " - + "max(alias5) max_dollars_sold , location_name , (avg(alias6) / 1.0 ) from " + + "sum(alias1) as `dollars_sold` , round(sum(alias2), 2 ), avg(alias6) as `avg_dollars_sold` ," + + " min(alias4), " + + "max(alias5) as `max_dollars_sold` , location_name , (avg(alias6) / 1.0 ) from " + "(select sales_fact___fact.time_key, sales_fact___fact.location_key, " + "sales_fact___fact.item_key,sum( case when (( sales_fact___fact . dollars_sold ) = 0 ) " + "then 0.0 end ) as alias1, sum(( sales_fact___fact . units_sold )) as alias2, " @@ -763,7 +764,8 @@ public class TestColumnarSQLRewriter { String actual = qtest.rewrite(query, conf, hconf); String expected = "select ( sales_fact__db_sales_fact_fact . time_key ), ( time_dim___time_dim . day_of_week ), " + "( time_dim___time_dim . day ), case when (sum(alias2) = 0 ) " - + "then 0.0 else sum(alias2) end dollars_sold from (select sales_fact__db_sales_fact_fact.time_key, " + + "then 0.0 else sum(alias2) end as `dollars_sold` from (select sales_fact__db_sales_fact_fact" + + ".time_key, " + "sales_fact__db_sales_fact_fact.location_key,sum(( sales_fact__db_sales_fact_fact . dollars_sold )) " + "as alias1, sum(( sales_fact__db_sales_fact_fact . dollars_sold )) as alias2 from db.sales_fact " + "sales_fact__db_sales_fact_fact where sales_fact__db_sales_fact_fact.time_key in " @@ -799,8 +801,9 @@ public class TestColumnarSQLRewriter { SessionState.start(hconf); String actual = qtest.rewrite(query, conf, hconf); - String expected = "select ( dim1___dim1 . date ) date , sum(alias1) msr1 , ( dim2___dim2 . name ) dim2_name , " - + "( dim3___dim3 . name ) dim3_name , ( dim4___dim4 . name ) dim4_name " + String expected = "select ( dim1___dim1 . date ) as `date` , sum(alias1) as `msr1` , ( dim2___dim2 . name ) " + + "as `dim2_name` , " + + "( dim3___dim3 . name ) as `dim3_name` , ( dim4___dim4 . name ) as `dim4_name` " + "from (select fact___f.dim1_id, fact___f.dim2_id, fact___f.dim3_id,sum(( fact___f . msr1 )) " + "as alias1 from fact fact___f where fact___f.dim1_id in ( select dim1 .id from dim1 where " + "(( dim1. date ) = '2014-11-25 00:00:00' ) ) " @@ -830,8 +833,8 @@ public class TestColumnarSQLRewriter { SessionState.start(hconf); String actual = qtest.rewrite(query, conf, hconf); - String expected = "select ( dim1___dim1 . date ) date , sum(alias1) msr1 , ( dim2___dim2 . name ) " - + "dim2_name from (select fact___f.dim1_id, fact___f.m2, fact___f.dim2_id, fact___f.m3, fact___f.m4, " + String expected = "select ( dim1___dim1 . date ) as `date` , sum(alias1) as `msr1` , ( dim2___dim2 . name ) " + + "as `dim2_name` from (select fact___f.dim1_id, fact___f.m2, fact___f.dim2_id, fact___f.m3, fact___f.m4, " + "sum(( fact___f . msr1 )) as alias1 from fact fact___f where ( fact___f . m4 ) " + "is not null and (( fact___f . m2 ) = '1234' ) and (( fact___f . m3 ) > 3000 ) and " + "fact___f.dim1_id in ( select dim1 .id from dim1 where (( dim1. date ) = '2014-11-25 00:00:00' ) ) " @@ -859,8 +862,8 @@ public class TestColumnarSQLRewriter { String actual = qtest.rewrite(query, conf, hconf); - String expected = "select ( dim1___dim1 . date ) dim1_date , sum(alias1) msr1 , " - + "( dim2___dim2 . name ) dim2_name " + String expected = "select ( dim1___dim1 . date ) as `dim1_date` , sum(alias1) as `msr1` , " + + "( dim2___dim2 . name ) as `dim2_name` " + "from (select fact___f.dim1_id, fact___f.m2, fact___f.dim2_id, fact___f.m3, fact___f.m4" + "sum(( fact___f . msr1 )) as alias1 from fact fact___f where ( fact___f . m4 ) " + "is not null and (( fact___f . m2 ) = '1234' ) and (( fact___f . m3 ) > 3000 ) " @@ -888,8 +891,8 @@ public class TestColumnarSQLRewriter { SessionState.start(hconf); String actual = qtest.rewrite(query, conf, hconf); - String expected = "select ( dim1___dim1 . date ) dim1_date , sum(alias1) msr1 , " - + "( dim2___dim2 . name ) dim2_name from (select fact___f.dim1_id, fact___f.m2, fact___f.dim2_id," + String expected = "select ( dim1___dim1 . date ) as `dim1_date` , sum(alias1) as `msr1` , " + + "( dim2___dim2 . name ) as `dim2_name` from (select fact___f.dim1_id, fact___f.m2, fact___f.dim2_id," + "fact___f.dim3_id, " + "fact___f.m4, sum(( fact___f . msr1 )) as alias1 from fact fact___f where ( fact___f . m4 ) " + "is not null and (( fact___f . m2 ) = '1234' ) and fact___f.dim1_id in ( select dim1 .id from dim1 " @@ -923,7 +926,7 @@ public class TestColumnarSQLRewriter { String actual = qtest.rewrite(query, conf, hconf); String expected = "select ( sales_fact___fact . time_key ), ( time_dim___time_dim . day_of_week ), " + "( time_dim___time_dim . day ), ( item_dim___item_dim . item_key ), " - + "case when (sum(alias2) = 0 ) then 0.0 else sum(alias2) end dollars_sold ," + + "case when (sum(alias2) = 0 ) then 0.0 else sum(alias2) end as `dollars_sold` ," + " sum(alias3), avg(alias4), min(alias5), max(alias6) from (select sales_fact___fact.time_key, " + "sales_fact___fact.location_key, sales_fact___fact.item_key,sum(( sales_fact___fact . dollars_sold )) " + "as alias1, sum(( sales_fact___fact . dollars_sold )) as alias2, " @@ -973,8 +976,8 @@ public class TestColumnarSQLRewriter { String actual = qtest.rewrite(query, conf, hconf); String expected = "select ( sales_fact__db_sales_fact_fact . time_key ), ( time_dim___time_dim . day_of_week ), " - + "( time_dim___time_dim . day ), ((sum(alias1) + 0 ) + (sum(alias2) + 0 )) expr1 , " - + "((sum(alias3) * 1000 ) / sum(alias4)) expr2 from " + + "( time_dim___time_dim . day ), ((sum(alias1) + 0 ) + (sum(alias2) + 0 )) as `expr1` , " + + "((sum(alias3) * 1000 ) / sum(alias4)) as `expr2` from " + "(select sales_fact__db_sales_fact_fact.time_key, sales_fact__db_sales_fact_fact.location_key," + "sum(( sales_fact__db_sales_fact_fact . item_count )) as alias1, " + "sum(( sales_fact__db_sales_fact_fact . product_count )) as alias2, " @@ -1063,8 +1066,8 @@ public class TestColumnarSQLRewriter { String actual = qtest.rewrite(query, conf, hconf); String expected = "select ( sales_fact__db_sales_fact_fact . time_key ), ( time_dim___time_dim . day_of_week )," - + " ( time_dim___time_dim . day ), ((sum(alias1) + 0 ) + (sum(alias2) + 0 )) expr1 , " - + "((sum(alias3) * 1000 ) / sum(alias4)) expr2 from " + + " ( time_dim___time_dim . day ), ((sum(alias1) + 0 ) + (sum(alias2) + 0 )) as `expr1` , " + + "((sum(alias3) * 1000 ) / sum(alias4)) as `expr2` from " + "(select sales_fact__db_sales_fact_fact.time_key, sales_fact__db_sales_fact_fact." + "location_key,sum(( sales_fact__db_sales_fact_fact . item_count )) as alias1, " + "sum(( sales_fact__db_sales_fact_fact . product_count )) as alias2, " @@ -1109,8 +1112,8 @@ public class TestColumnarSQLRewriter { SessionState.start(hconf); String actual = qtest.rewrite(query, conf, hconf); - String expected = "select ( sales_fact__db_sales_fact_fact . time_key ) time_key , " - + "( time_dim___time_dim . day_of_week ), sum(alias1) total_item_sold from " + String expected = "select ( sales_fact__db_sales_fact_fact . time_key ) as `time_key` , " + + "( time_dim___time_dim . day_of_week ), sum(alias1) as `total_item_sold` from " + " (select sales_fact__db_sales_fact_fact.time_key,sum(( sales_fact__db_sales_fact_fact ." + " item_sold )) as alias1, sum(( sales_fact__db_sales_fact_fact . dollar_sold )) " + "as alias2 from db.sales_fact sales_fact__db_sales_fact_fact where "
