http://git-wip-us.apache.org/repos/asf/lens/blob/ae83caae/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 7e06a5c..bab1080 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 @@ -35,8 +35,6 @@ import org.apache.lens.cube.error.LensCubeErrorCode; import org.apache.lens.cube.error.NoCandidateDimAvailableException; import org.apache.lens.cube.error.NoCandidateFactAvailableException; import org.apache.lens.cube.metadata.*; -import org.apache.lens.cube.parse.CandidateTablePruneCause.SkipStorageCause; -import org.apache.lens.cube.parse.CandidateTablePruneCause.SkipStorageCode; import org.apache.lens.server.api.LensServerAPITestUtil; import org.apache.lens.server.api.error.LensException; @@ -53,7 +51,6 @@ import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import com.google.common.base.Splitter; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; @@ -81,7 +78,7 @@ public class TestCubeRewriter extends TestQueryRewrite { @Test public void testQueryWithNow() throws Exception { LensException e = getLensExceptionInRewrite( - "select SUM(msr2) from testCube where " + getTimeRangeString("NOW - 2DAYS", "NOW"), getConf()); + "select SUM(msr2) from testCube where " + getTimeRangeString("NOW - 2DAYS", "NOW"), getConf()); assertEquals(e.getErrorCode(), LensCubeErrorCode.NO_CANDIDATE_FACT_AVAILABLE.getLensErrorInfo().getErrorCode()); } @@ -90,7 +87,7 @@ public class TestCubeRewriter extends TestQueryRewrite { Configuration conf = getConf(); conf.set(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, "true"); conf.setClass(CubeQueryConfUtil.TIME_RANGE_WRITER_CLASS, BetweenTimeRangeWriter.class, TimeRangeWriter.class); - + conf.setBoolean(REPLACE_TIMEDIM_WITH_PART_COL, false); DateFormat qFmt = new SimpleDateFormat("yyyy-MM-dd-HH:mm:ss"); String timeRangeString; timeRangeString = getTimeRangeString(DAILY, -2, 0, qFmt); @@ -99,15 +96,17 @@ public class TestCubeRewriter extends TestQueryRewrite { String to = getDateStringWithOffset(DAILY, 0, CONTINUOUS); String from = getDateStringWithOffset(DAILY, -2, CONTINUOUS); - String expected = "select SUM((testCube.msr15)) from TestQueryRewrite.c0_testFact_CONTINUOUS testcube" - + " WHERE ((( testcube . dt ) between '" + from + "' and '" + to + "' ))"; + String expected = "select SUM((testCube.msr15)) as `sum(msr15)` from " + + "TestQueryRewrite.c0_testFact_CONTINUOUS testcube" + + " WHERE ((( testcube . d_time ) between '" + from + "' and '" + to + "' ))"; System.out.println("rewrittenQuery.toHQL() " + rewrittenQuery.toHQL()); System.out.println("expected " + expected); compareQueries(rewrittenQuery.toHQL(), expected); //test with msr2 on different fact + conf.setBoolean(REPLACE_TIMEDIM_WITH_PART_COL, true); rewrittenQuery = rewriteCtx("select SUM(msr2) from testCube where " + timeRangeString, conf); - expected = "select SUM((testCube.msr2)) from TestQueryRewrite.c0_testFact testcube" + expected = "select SUM((testCube.msr2)) as `sum(msr2)` from TestQueryRewrite.c2_testfact testcube" + " WHERE ((( testcube . dt ) between '" + from + "' and '" + to + "' ))"; System.out.println("rewrittenQuery.toHQL() " + rewrittenQuery.toHQL()); System.out.println("expected " + expected); @@ -137,11 +136,12 @@ public class TestCubeRewriter extends TestQueryRewrite { CubeQueryContext rewrittenQuery = 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, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); - compareQueries(rewrittenQuery.toHQL(), expected); + String hql = rewrittenQuery.toHQL(); + compareQueries(hql, expected); System.out.println("Non existing parts:" + rewrittenQuery.getNonExistingParts()); - assertNotNull(rewrittenQuery.getNonExistingParts()); +// assertNotNull(rewrittenQuery.getNonExistingParts()); } @Test @@ -152,15 +152,9 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.set(DRIVER_SUPPORTED_STORAGES, "C1,C2,C4"); CubeQueryContext cubeQueryContext = 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()) { - for (CandidateTablePruneCause cause : entry.getValue()) { - if (cause.getCause().equals(LESS_DATA)) { - lessDataCauses++; - } - } - } + PruneCauses<StorageCandidate> pruneCause = cubeQueryContext.getStoragePruningMsgs(); + long lessDataCauses = pruneCause.values().stream() + .flatMap(Collection::stream).map(CandidateTablePruneCause::getCause).filter(LESS_DATA::equals).count(); assertTrue(lessDataCauses > 0); } @@ -170,7 +164,7 @@ public class TestCubeRewriter extends TestQueryRewrite { 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, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); @@ -178,7 +172,7 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.setBoolean(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, true); hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForHourly2days("c1_testfact2")); compareQueries(hqlQuery, expected); @@ -194,8 +188,8 @@ public class TestCubeRewriter extends TestQueryRewrite { pruneCauses.getBrief().substring(0, endIndex), MISSING_PARTITIONS.errorFormat.substring(0, endIndex) ); - assertEquals(pruneCauses.getDetails().get("testfact").size(), 1); - assertEquals(pruneCauses.getDetails().get("testfact").iterator().next().getCause(), + assertEquals(pruneCauses.getDetails().get("c1_testfact").size(), 1); + assertEquals(pruneCauses.getDetails().get("c1_testfact").iterator().next().getCause(), MISSING_PARTITIONS); } @@ -204,11 +198,13 @@ public class TestCubeRewriter extends TestQueryRewrite { CubeQueryContext rewrittenQuery = 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, + getExpectedQuery(DERIVED_CUBE_NAME, "select sum(derivedCube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForDailyAndHourly2days(DERIVED_CUBE_NAME, "C2_testfact")); compareQueries(rewrittenQuery.toHQL(), expected); - System.out.println("Non existing parts:" + rewrittenQuery.getNonExistingParts()); - assertNotNull(rewrittenQuery.getNonExistingParts()); + + System.out.println("Non existing parts:" + ((StorageCandidate) rewrittenQuery.getCandidates().iterator().next()) + .getNonExistingPartitions()); + assertNotNull(((StorageCandidate) rewrittenQuery.getCandidates().iterator().next()).getNonExistingPartitions()); LensException th = getLensExceptionInRewrite( "select SUM(msr4) from derivedCube where " + TWO_DAYS_RANGE, getConf()); @@ -251,7 +247,7 @@ public class TestCubeRewriter extends TestQueryRewrite { + TWO_DAYS_RANGE, conf); Map<String, String> wh = getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact"); String expected = "insert overwrite directory 'target/test' " - + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, wh); + + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, wh); compareQueries(hqlQuery, expected); hqlQuery = rewrite("insert overwrite directory" + " 'target/test' select SUM(msr2) from testCube where " @@ -262,18 +258,18 @@ public class TestCubeRewriter extends TestQueryRewrite { + TWO_DAYS_RANGE, conf); wh = getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact"); expected = "insert overwrite local directory 'target/test' " - + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, wh); + + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, wh); compareQueries(hqlQuery, expected); - hqlQuery = rewrite("insert overwrite local directory" + " 'target/test' select SUM(msr2) from testCube where " - + TWO_DAYS_RANGE, conf); + hqlQuery = rewrite("insert overwrite local directory" + " 'target/test' select SUM(msr2) as `sum(msr2)` " + + "from testCube where " + TWO_DAYS_RANGE, conf); compareQueries(hqlQuery, expected); hqlQuery = rewrite("insert overwrite table temp" + " select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, conf); wh = getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact"); expected = "insert overwrite table temp " - + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, wh); + + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, wh); compareQueries(hqlQuery, expected); hqlQuery = rewrite("insert overwrite table temp" + " select SUM(msr2) from testCube where " + TWO_DAYS_RANGE, @@ -315,7 +311,7 @@ public class TestCubeRewriter extends TestQueryRewrite { String hqlQuery, expected; hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, getConfWithStorages("C2")); expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); @@ -324,7 +320,7 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.setBoolean(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, true); hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)`FROM ", null, null, getWhereForHourly2days("c1_testfact2")); compareQueries(hqlQuery, expected); conf.setBoolean(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, false); @@ -334,7 +330,7 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.set(DRIVER_SUPPORTED_STORAGES, "C1"); hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C1_testfact")); compareQueries(hqlQuery, expected); @@ -342,7 +338,7 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.set(CubeQueryConfUtil.getValidFactTablesKey(TEST_CUBE_NAME), "testFact"); hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); @@ -350,7 +346,7 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.set(CubeQueryConfUtil.getValidFactTablesKey(TEST_CUBE_NAME), "testFact2"); hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForHourly2days("c1_testfact2")); compareQueries(hqlQuery, expected); @@ -359,7 +355,7 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.set(getValidStorageTablesKey("testFact2"), "C1_testFact2"); hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForHourly2days("c1_testfact2")); compareQueries(hqlQuery, expected); @@ -368,7 +364,7 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.set(getValidUpdatePeriodsKey("testfact", "C1"), "HOURLY"); hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); expected = getExpectedQuery(TEST_CUBE_NAME, - "select sum(testcube.msr2) FROM ", null, null, getWhereForHourly2days("c1_testfact")); + "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForHourly2days("c1_testfact")); compareQueries(hqlQuery, expected); conf.set(DRIVER_SUPPORTED_STORAGES, "C2"); @@ -376,16 +372,16 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.set(getValidUpdatePeriodsKey("testfact", "C2"), "HOURLY"); hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); expected = getExpectedQuery(TEST_CUBE_NAME, - "select sum(testcube.msr2) FROM ", null, null, getWhereForHourly2days("c2_testfact")); + "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForHourly2days("c2_testfact")); compareQueries(hqlQuery, expected); // max interval test conf = new Configuration(); conf.set(CubeQueryConfUtil.QUERY_MAX_INTERVAL, "HOURLY"); - conf.set(DRIVER_SUPPORTED_STORAGES, "C1,C2"); + conf.set(DRIVER_SUPPORTED_STORAGES, "C1"); hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); expected = getExpectedQuery(TEST_CUBE_NAME, - "select sum(testcube.msr2) FROM ", null, null, getWhereForHourly2days("c1_testfact2")); + "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForHourly2days("c1_testfact2")); compareQueries(hqlQuery, expected); } @@ -400,7 +396,8 @@ public class TestCubeRewriter extends TestQueryRewrite { "select cubecountry.name, msr2 from" + " testCube" + " where cubecountry.region = 'asia' and " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select cubecountry.name, sum(testcube.msr2)" + " FROM ", " JOIN " + getDbName() + getExpectedQuery(TEST_CUBE_NAME, "select cubecountry.name as `name`, sum(testcube.msr2) as `msr2` " + + " FROM ", " JOIN " + getDbName() + "c3_countrytable_partitioned cubecountry on testcube.countryid=cubecountry.id and cubecountry.dt='latest'", "cubecountry.region='asia'", " group by cubecountry.name ", null, @@ -410,7 +407,8 @@ public class TestCubeRewriter extends TestQueryRewrite { "select cubestate.name, cubestate.countryid, msr2 from" + " testCube" + " where cubestate.countryid = 5 and " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select cubestate.name, cubestate.countryid, sum(testcube.msr2)" + " FROM ", + getExpectedQuery(TEST_CUBE_NAME, "select cubestate.name as `name`, " + + "cubestate.countryid as `countryid`, sum(testcube.msr2) as `msr2`" + " FROM ", " JOIN " + getDbName() + "c3_statetable_partitioned cubestate ON" + " testCube.stateid = cubestate.id and cubestate.dt = 'latest'", "cubestate.countryid=5", @@ -428,7 +426,7 @@ public class TestCubeRewriter extends TestQueryRewrite { rewrite("select SUM(msr2) from testCube" + " join citydim on testCube.cityid = citydim.id" + " where " + TWO_DAYS_RANGE, conf); String expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2)" + " FROM ", " INNER JOIN " + getDbName() + getExpectedQuery(TEST_CUBE_NAME, "SELECT sum((testcube.msr2)) as `sum(msr2)` FROM ", " INNER JOIN " + getDbName() + "c2_citytable citydim ON" + " testCube.cityid = citydim.id", null, null, null, getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); @@ -450,7 +448,7 @@ public class TestCubeRewriter extends TestQueryRewrite { + " right outer join zipdim on citydim.zipcode = zipdim.code" + " where " + TWO_DAYS_RANGE, getConf()); expected = getExpectedQuery(TEST_CUBE_NAME, - "select statedim.name," + " sum(testcube.msr2) FROM ", "INNER JOIN " + getDbName() + "select statedim.name as `name`," + " sum(testcube.msr2) as `SUM(msr2)` FROM ", "INNER JOIN " + getDbName() + "c1_citytable citydim ON testCube.cityid = citydim.id and citydim.dt='latest' LEFT OUTER JOIN " + getDbName() + "c1_statetable statedim" + " ON statedim.id = citydim.stateid AND " @@ -466,7 +464,8 @@ public class TestCubeRewriter extends TestQueryRewrite { + " left outer join statedim ST on ST.id = CT.stateid" + " right outer join zipdim ZT on CT.zipcode = ZT.code" + " where " + TWO_DAYS_RANGE, getConf()); expected = - getExpectedQuery("tc", "select st.name," + " sum(tc.msr2) FROM ", " INNER JOIN " + getDbName() + getExpectedQuery("tc", "select st.name as `name`," + " sum(tc.msr2) as `sum(msr2)` FROM ", + " INNER JOIN " + getDbName() + "c1_citytable ct ON" + " tc.cityid = ct.id and ct.dt='latest' LEFT OUTER JOIN " + getDbName() + "c1_statetable st" + " ON st.id = ct.stateid and (st.dt = 'latest') " + "RIGHT OUTER JOIN " + getDbName() + "c1_ziptable" @@ -480,7 +479,8 @@ public class TestCubeRewriter extends TestQueryRewrite { + " left outer join citydim on testCube.cityid = citydim.id" + " left outer join zipdim on citydim.zipcode = zipdim.code" + " where " + TWO_DAYS_RANGE, getConf()); expected = - getExpectedQuery(TEST_CUBE_NAME, "select citydim.name," + " sum(testcube.msr2) FROM ", " LEFT OUTER JOIN " + getExpectedQuery(TEST_CUBE_NAME, "select citydim.name as `name`," + " sum(testcube.msr2) as `sum(msr2)`FROM ", + " LEFT OUTER JOIN " + getDbName() + "c1_citytable citydim ON" + " testCube.cityid = citydim.id and (citydim.dt = 'latest') " + " LEFT OUTER JOIN " + getDbName() + "c1_ziptable" + " zipdim ON citydim.zipcode = zipdim.code AND " + "(zipdim.dt = 'latest')", null, " group by" + " citydim.name ", null, @@ -491,7 +491,7 @@ public class TestCubeRewriter extends TestQueryRewrite { rewrite("select SUM(msr2) from testCube" + " join countrydim on testCube.countryid = countrydim.id" + " where " + TWO_MONTHS_RANGE_UPTO_MONTH, getConf()); expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", " INNER JOIN " + getDbName() + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", " INNER JOIN " + getDbName() + "c1_countrytable countrydim ON testCube.countryid = " + " countrydim.id", null, null, null, getWhereForMonthly2months("c2_testfactmonthly")); compareQueries(hqlQuery, expected); @@ -578,8 +578,9 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.set(DRIVER_SUPPORTED_STORAGES, "C2"); String hqlQuery1 = rewrite("select cityid, 99, \"placeHolder\", -1001, SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); - String expected1 = getExpectedQuery(TEST_CUBE_NAME, "select testcube.cityid, 99, \"placeHolder\", -1001," - + " sum(testcube.msr2) FROM ", null, " group by testcube.cityid ", + String expected1 = getExpectedQuery(TEST_CUBE_NAME, "SELECT (testcube.cityid) as `cityid`, 99 as `99`, " + + "\"placeHolder\" as `\"placeHolder\"`, (-1001) as `(-1001)`, sum((testcube.msr2)) as `sum(msr2)` FROM ", + null, " group by testcube.cityid ", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery1, expected1); @@ -588,8 +589,9 @@ public class TestCubeRewriter extends TestQueryRewrite { "select cityid, case when stateid = 'za' then \"Not Available\" end, 99, \"placeHolder\", -1001, " + "SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); String expected2 = getExpectedQuery(TEST_CUBE_NAME, - "select testcube.cityid, case when testcube.stateid = 'za' then \"Not Available\" end, 99, \"placeHolder\"," - + " -1001, sum(testcube.msr2) FROM ", null, + "SELECT (testcube.cityid) as `cityid`, case when ((testcube.stateid) = 'za') then \"Not Available\" end " + + "as `case when (stateid = 'za') then \"Not Available\" end`, 99 as `99`, \"placeHolder\" " + + "as `\"placeHolder\"`, (-1001) as `(-1001)`, sum((testcube.msr2)) as `sum(msr2)` FROM ", null, " group by testcube.cityid, case when testcube.stateid = 'za' then \"Not Available\" end ", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery2, expected2); @@ -601,10 +603,14 @@ public class TestCubeRewriter extends TestQueryRewrite { + "SUM(msr2), SUM(msr2 + 39), SUM(msr2) + 567 from testCube" + " where " + TWO_DAYS_RANGE, conf); String expected3 = getExpectedQuery( TEST_CUBE_NAME, - "select testcube.cityid, testcube.stateid + 99, 44 + testcube.stateid, testcube.stateid - 33," - + " 999 - testcube.stateid, TRUE, FALSE, round(123.4567,2), " - + "case when testcube.stateid='za' then 99 else -1001 end," - + " sum(testcube.msr2), sum(testcube.msr2 + 39), sum(testcube.msr2) + 567 FROM ", + "SELECT (testcube.cityid) as `cityid`, ((testcube.stateid) + 99) as `(stateid + 99)`, " + + "(44 + (testcube.stateid)) as `(44 + stateid)`, ((testcube.stateid) - 33) as `(stateid - 33)`, " + + "(999 - (testcube.stateid)) as `(999 - stateid)`, true as `true`, false " + + "as `false`, round(123.4567, 2) as `round(123.4567, 2)`, " + + "case when ((testcube.stateid) = 'za') then 99 else (-1001) end " + + "as `case when (stateid = 'za') then 99 else (-1001) end`, " + + "sum((testcube.msr2)) as `sum(msr2)`, sum(((testcube.msr2) + 39)) " + + "as `sum((msr2 + 39))`, (sum((testcube.msr2)) + 567) as `(sum(msr2) + 567)` FROM ", null, " group by testcube.cityid,testcube.stateid + 99, 44 + testcube.stateid, testcube.stateid - 33, " + "999 - testcube.stateid, " @@ -622,68 +628,74 @@ public class TestCubeRewriter extends TestQueryRewrite { rewrite("select name, SUM(msr2) from" + " testCube join citydim on testCube.cityid = citydim.id where " + TWO_DAYS_RANGE, conf); String expected = - getExpectedQuery(TEST_CUBE_NAME, "select citydim.name," + " sum(testcube.msr2) FROM ", "INNER JOIN " + getDbName() - + "c2_citytable citydim ON" + " testCube.cityid = citydim.id", null, " group by citydim.name ", + getExpectedQuery(TEST_CUBE_NAME, "select citydim.name as `name`, sum(testcube.msr2) as `sum(msr2)` FROM " + , "INNER JOIN " + getDbName() + "c2_citytable citydim ON" + " testCube.cityid = citydim.id", + null, " group by citydim.name ", null, getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); hqlQuery = - rewrite("select SUM(msr2) from testCube" + " join citydim on testCube.cityid = citydim.id" + " where " + rewrite("select SUM(msr2) from testCube join citydim on testCube.cityid = citydim.id where " + TWO_DAYS_RANGE + " group by name", conf); compareQueries(hqlQuery, expected); - hqlQuery = rewrite("select cityid, SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE, conf); + hqlQuery = rewrite("select cityid, sum(msr2) from testCube where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.cityid," + " sum(testcube.msr2) FROM ", null, - " group by testcube.cityid ", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); + getExpectedQuery(TEST_CUBE_NAME, "select testcube.cityid as `cityid`, sum(testcube.msr2) as `sum(msr2)` from ", + null, " group by testcube.cityid ", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); - hqlQuery = rewrite("select round(cityid), SUM(msr2) from" + " testCube where " + TWO_DAYS_RANGE, conf); + hqlQuery = rewrite("select round(cityid), sum(msr2) from" + " testCube where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select round(testcube.cityid)," + " sum(testcube.msr2) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select round(testcube.cityid) as `round(cityid)`," + + " sum(testcube.msr2) as `sum(msr2)` FROM ", null, " group by round(testcube.cityid) ", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); hqlQuery = - rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE + "group by round(zipcode)", conf); + rewrite("select sum(msr2) from testCube where " + TWO_DAYS_RANGE + "group by round(zipcode)", conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select round(testcube.zipcode)," + " sum(testcube.msr2) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select round(testcube.zipcode) as `round((testcube.zipcode))`," + + " sum(testcube.msr2) as `sum(msr2)` FROM ", null, " group by round(testcube.zipcode) ", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); hqlQuery = - rewrite("select round(cityid), SUM(msr2) from" + " testCube where " + TWO_DAYS_RANGE + " group by zipcode", + rewrite("select round(cityid), sum(msr2) from" + " testCube where " + TWO_DAYS_RANGE + " group by zipcode", conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select " + " round(testcube.cityid), sum(testcube.msr2) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select round(testcube.cityid) as `round(cityid)`, " + + "sum(testcube.msr2) as `sum(msr2)` FROM ", null, " group by testcube.zipcode", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); - hqlQuery = rewrite("select round(cityid), SUM(msr2) from" + " testCube where " + TWO_DAYS_RANGE, conf); + hqlQuery = rewrite("select round(cityid), sum(msr2) from testCube where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select " + " round(testcube.cityid), sum(testcube.msr2) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select round(testcube.cityid) as `round(cityid)`, " + + "sum(testcube.msr2) as `sum(msr2)` FROM ", null, " group by round(testcube.cityid)", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); hqlQuery = - rewrite("select cityid, SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE + " group by round(zipcode)", + rewrite("select cityid, sum(msr2) from testCube" + " where " + TWO_DAYS_RANGE + " group by round(zipcode)", conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select " + " testcube.cityid, sum(testcube.msr2) FROM ", null, - " group by round(testcube.zipcode)", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); + getExpectedQuery(TEST_CUBE_NAME, "select testcube.cityid as `cityid`, sum(testcube.msr2) as `sum(msr2)` FROM ", + null, " group by round(testcube.zipcode)", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); hqlQuery = - rewrite("select SUM(msr2) from testCube" + " where " + TWO_DAYS_RANGE + " group by round(zipcode)", conf); + rewrite("select sum(msr2) from testCube where " + TWO_DAYS_RANGE + " group by round(zipcode)", conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select round(testcube.zipcode)," + " sum(testcube.msr2) FROM ", null, - " group by round(testcube.zipcode)", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); + getExpectedQuery(TEST_CUBE_NAME, "select round(testcube.zipcode) as `round(testcube.zipcode)`, " + + "sum(testcube.msr2) as `sum(msr2)` FROM ", null, " group by round(testcube.zipcode)", + getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); hqlQuery = - rewrite("select cityid, msr2 from testCube" + " where " + TWO_DAYS_RANGE + " group by round(zipcode)", conf); + rewrite("select cityid, msr2 from testCube where " + TWO_DAYS_RANGE + " group by round(zipcode)", conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select " + " testcube.cityid, sum(testcube.msr2) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select testcube.cityid as `cityid`, sum(testcube.msr2) as `msr2` FROM ", null, " group by round(testcube.zipcode)", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); @@ -691,24 +703,26 @@ 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(TEST_CUBE_NAME, "select round(testcube.zipcode) as `rzc`," + " sum(testcube.msr2) FROM ", null, - " group by testcube.zipcode order by rzc asc", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); + getExpectedQuery(TEST_CUBE_NAME, "select round(testcube.zipcode) as `rzc`, sum(testcube.msr2) as `msr2` FROM ", + null, " group by testcube.zipcode order by rzc asc", + getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); //Dim attribute with aggregate function hqlQuery = - rewrite("select countofdistinctcityid, zipcode from" + " testCube where " + TWO_DAYS_RANGE, conf); + rewrite("select countofdistinctcityid, zipcode from testCube where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select " + " count(distinct (testcube.cityid)), (testcube.zipcode) FROM ", - null, " group by (testcube.zipcode)", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); + getExpectedQuery(TEST_CUBE_NAME, "select count(distinct(testcube.cityid)) as `countofdistinctcityid`" + + ", (testcube.zipcode) as `zipcode` FROM ", null, " group by (testcube.zipcode)", + getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); //Dim attribute with single row function hqlQuery = rewrite("select notnullcityid, zipcode from" + " testCube where " + TWO_DAYS_RANGE, conf); expected = - getExpectedQuery(TEST_CUBE_NAME, "select " + " distinct case when (testcube.cityid) is null then 0 " - + "else (testcube.cityid) end, (testcube.zipcode) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select distinct case when (testcube.cityid) is null then 0 " + + "else (testcube.cityid) end as `notnullcityid`, (testcube.zipcode) as `zipcode` FROM ", null, "", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); @@ -894,14 +908,14 @@ public class TestCubeRewriter extends TestQueryRewrite { hqlQuery = rewrite("select SUM(msr2) from testCube mycube" + " where " + TWO_DAYS_RANGE, getConfWithStorages("C2")); expected = - getExpectedQuery("mycube", "select sum(mycube.msr2) FROM ", null, null, + getExpectedQuery("mycube", "select sum(mycube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForDailyAndHourly2days("mycube", "C2_testfact")); compareQueries(hqlQuery, expected); hqlQuery = rewrite("select SUM(testCube.msr2) from testCube" + " where " + TWO_DAYS_RANGE, getConfWithStorages("C2")); expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(testCube.msr2)` FROM ", null, null, getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")); compareQueries(hqlQuery, expected); @@ -924,7 +938,7 @@ public class TestCubeRewriter extends TestQueryRewrite { String hqlQuery = rewrite("select SUM(msr2) from testCube" + " where " + TWO_MONTHS_RANGE_UPTO_HOURS, getConfWithStorages("C2")); String expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, getWhereForMonthlyDailyAndHourly2months("C2_testfact")); compareQueries(hqlQuery, expected); } @@ -938,27 +952,27 @@ public class TestCubeRewriter extends TestQueryRewrite { Configuration conf = getConf(); conf.setStrings(CubeQueryConfUtil.COMPLETENESS_CHECK_PART_COL, "dt"); String hqlQuery = rewrite("select SUM(msr1) from basecube where " + TWO_DAYS_RANGE, conf); - String expected = getExpectedQuery("basecube", "select sum(basecube.msr1) FROM ", null, null, + String expected = getExpectedQuery("basecube", "select sum(basecube.msr1) as `sum(msr1)` FROM ", null, null, getWhereForHourly2days("basecube", "c1_testfact1_raw_base")); compareQueries(hqlQuery, expected); } @Test public void testQueryWithMeasureWithDataCompletenessPresentInMultipleFacts() throws ParseException, - LensException { + LensException { /*In this query a measure is used which is present in two facts with different %completeness. While resolving the facts, the fact with the higher dataCompletenessFactor gets picked up.*/ Configuration conf = getConf(); conf.setStrings(CubeQueryConfUtil.COMPLETENESS_CHECK_PART_COL, "dt"); String hqlQuery = rewrite("select SUM(msr9) from basecube where " + TWO_DAYS_RANGE, conf); - String expected = getExpectedQuery("basecube", "select sum(basecube.msr9) FROM ", null, null, - getWhereForHourly2days("basecube", "c1_testfact5_raw_base")); + String expected = getExpectedQuery("basecube", "select sum(basecube.msr9) as `sum(msr9)` FROM ", null, null, + getWhereForHourly2days("basecube", "c1_testfact5_raw_base")); compareQueries(hqlQuery, expected); } @Test public void testCubeWhereQueryWithMeasureWithDataCompletenessAndFailIfPartialDataFlagSet() throws ParseException, - LensException { + LensException { /*In this query a measure is used for which dataCompletenessTag is set and the flag FAIL_QUERY_ON_PARTIAL_DATA is set. The partitions for the queried range are present but some of the them have incomplete data. So, the query throws NO_CANDIDATE_FACT_AVAILABLE Exception*/ @@ -966,13 +980,16 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.setStrings(CubeQueryConfUtil.COMPLETENESS_CHECK_PART_COL, "dt"); conf.setBoolean(CubeQueryConfUtil.FAIL_QUERY_ON_PARTIAL_DATA, true); - LensException e = getLensExceptionInRewrite("select SUM(msr9) from basecube where " + TWO_DAYS_RANGE, conf); + LensException e = getLensExceptionInRewrite("select SUM(msr9) from basecube where " + + TWO_DAYS_RANGE, conf); assertEquals(e.getErrorCode(), LensCubeErrorCode.NO_CANDIDATE_FACT_AVAILABLE.getLensErrorInfo().getErrorCode()); NoCandidateFactAvailableException ne = (NoCandidateFactAvailableException) e; PruneCauses.BriefAndDetailedError pruneCauses = ne.getJsonMessage(); /*Since the Flag FAIL_QUERY_ON_PARTIAL_DATA is set, and the queried fact has incomplete data, hence, we expect the prune cause to be INCOMPLETE_PARTITION. The below check is to validate this.*/ - assertEquals(pruneCauses.getBrief(), String.format(INCOMPLETE_PARTITION.errorFormat, "[msr9]")); + for(String part: INCOMPLETE_PARTITION.errorFormat.split("%s")) { + assertTrue(pruneCauses.getBrief().contains(part), pruneCauses.getBrief()); + } } @Test @@ -990,31 +1007,27 @@ public class TestCubeRewriter extends TestQueryRewrite { pruneCauses.getBrief().substring(0, MISSING_PARTITIONS.errorFormat.length() - 3), MISSING_PARTITIONS.errorFormat.substring(0, MISSING_PARTITIONS.errorFormat.length() - 3), pruneCauses.getBrief()); - - Set<String> expectedSet = - Sets.newTreeSet(Arrays.asList("summary1", "summary2", "testfact2_raw", "summary3", "testfact")); - boolean missingPartitionCause = false; - for (String key : pruneCauses.getDetails().keySet()) { - Set<String> actualKeySet = Sets.newTreeSet(Splitter.on(',').split(key)); - if (expectedSet.equals(actualKeySet)) { - assertEquals(pruneCauses.getDetails().get(key).iterator() - .next().getCause(), MISSING_PARTITIONS); - missingPartitionCause = true; - } - } - assertTrue(missingPartitionCause, MISSING_PARTITIONS + " error does not occur for facttables set " + expectedSet - + " Details :" + pruneCauses.getDetails()); - assertEquals(pruneCauses.getDetails().get("testfactmonthly").iterator().next().getCause(), - NO_FACT_UPDATE_PERIODS_FOR_GIVEN_RANGE); - assertEquals(pruneCauses.getDetails().get("testfact2").iterator().next().getCause(), + List<CandidateTablePruneCause> missingPartitionCauses = pruneCauses.enhanced().get( + Sets.newHashSet("c1_testfact2_raw", "c1_summary3", "c1_summary2", + "c1_summary1", "c2_testfact", "c1_testfact")); + assertEquals(missingPartitionCauses.size(), 1); + CandidateTablePruneCause missingPartitionCause = missingPartitionCauses.iterator().next(); + assertEquals(missingPartitionCause.getCause(), MISSING_PARTITIONS); + assertEquals(pruneCauses.getDetails().get("c1_testfact2").iterator().next().getCause(), MISSING_PARTITIONS); - assertEquals(pruneCauses.getDetails().get("cheapfact").iterator().next().getCause(), - NO_CANDIDATE_STORAGES); + /* + assertEquals(pruneCauses.getDetails().get("c4_testfact,c3_testfact,c3_testfact2_raw,c4_testfact2," + + "c99_cheapfact,c5_testfact").iterator().next().getCause(), + UNSUPPORTED_STORAGE); + CandidateTablePruneCause cheapFactPruneCauses = pruneCauses.getDetails().get("cheapfact").iterator().next(); - assertEquals(cheapFactPruneCauses.getStorageCauses().get("c0").getCause(), SkipStorageCode.RANGE_NOT_ANSWERABLE); - assertEquals(cheapFactPruneCauses.getStorageCauses().get("c99").getCause(), SkipStorageCode.UNSUPPORTED); + assertEquals(cheapFactPruneCauses.getDimStoragePruningCauses().get("c0"), + CandidateTablePruneCause.CandidateTablePruneCode.TIME_RANGE_NOT_ANSWERABLE); + assertEquals(cheapFactPruneCauses.getDimStoragePruningCauses().get("c99"), + CandidateTablePruneCause.CandidateTablePruneCode.UNSUPPORTED_STORAGE); assertEquals(pruneCauses.getDetails().get("summary4").iterator().next().getCause(), TIMEDIM_NOT_SUPPORTED); assertTrue(pruneCauses.getDetails().get("summary4").iterator().next().getUnsupportedTimeDims().contains("d_time")); + */ } @Test @@ -1023,26 +1036,28 @@ public class TestCubeRewriter extends TestQueryRewrite { String hqlQuery = rewrite("select cityid, SUM(msr2) from testCube" + " where " + TWO_MONTHS_RANGE_UPTO_MONTH, getConfWithStorages("C2")); String expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.cityid," + " sum(testcube.msr2) FROM ", null, - "group by testcube.cityid", getWhereForMonthly2months("c2_testfact")); + getExpectedQuery(TEST_CUBE_NAME, "select testcube.cityid as `cityid`, sum(testcube.msr2) " + + "as `sum(msr2)` FROM ", null, "group by testcube.cityid", + getWhereForMonthly2months("c2_testfact")); compareQueries(hqlQuery, expected); } @Test public void testNoCandidateDimAvailableExceptionCompare() throws Exception { - //Max cause COLUMN_NOT_FOUND, Ordinal 9 - PruneCauses<CubeDimensionTable> pr1 = new PruneCauses<CubeDimensionTable>(); + //Max cause COLUMN_NOT_FOUND, Ordinal 2 + PruneCauses<CubeDimensionTable> pr1 = new PruneCauses<>(); pr1.addPruningMsg(new CubeDimensionTable(new Table("test", "citydim")), - CandidateTablePruneCause.columnNotFound("test1", "test2", "test3")); + CandidateTablePruneCause.columnNotFound( + "test1", "test2", "test3")); NoCandidateDimAvailableException ne1 = new NoCandidateDimAvailableException(pr1); - //Max cause EXPRESSION_NOT_EVALUABLE, Ordinal 6 + //Max cause EXPRESSION_NOT_EVALUABLE, Ordinal 14 PruneCauses<CubeDimensionTable> pr2 = new PruneCauses<CubeDimensionTable>(); pr2.addPruningMsg(new CubeDimensionTable(new Table("test", "citydim")), CandidateTablePruneCause.expressionNotEvaluable("testexp1", "testexp2")); NoCandidateDimAvailableException ne2 = new NoCandidateDimAvailableException(pr2); - assertEquals(ne1.compareTo(ne2), 3); + assertEquals(ne1.compareTo(ne2), -7); } @Test @@ -1068,17 +1083,18 @@ public class TestCubeRewriter extends TestQueryRewrite { NO_CANDIDATE_STORAGES.errorFormat, new HashMap<String, List<CandidateTablePruneCause>>() { { - put("statetable", Arrays.asList(CandidateTablePruneCause.noCandidateStorages( - new HashMap<String, SkipStorageCause>() { + put("statetable", Arrays.asList(CandidateTablePruneCause.noCandidateStoragesForDimtable( + new HashMap<String, CandidateTablePruneCause.CandidateTablePruneCode>() { { - put("c1_statetable", new SkipStorageCause(SkipStorageCode.NO_PARTITIONS)); + put("c1_statetable", CandidateTablePruneCause.CandidateTablePruneCode.NO_PARTITIONS); + put("c6_statetable", CandidateTablePruneCause.CandidateTablePruneCode.UNSUPPORTED_STORAGE); } })) ); - put("statetable_partitioned", Arrays.asList(CandidateTablePruneCause.noCandidateStorages( - new HashMap<String, SkipStorageCause>() { + put("statetable_partitioned", Arrays.asList(CandidateTablePruneCause.noCandidateStoragesForDimtable( + new HashMap<String, CandidateTablePruneCause.CandidateTablePruneCode>() { { - put("C3_statetable_partitioned", new SkipStorageCause(SkipStorageCode.UNSUPPORTED)); + put("C3_statetable_partitioned", CandidateTablePruneCause.CandidateTablePruneCode.UNSUPPORTED_STORAGE); } })) ); @@ -1223,14 +1239,14 @@ public class TestCubeRewriter extends TestQueryRewrite { }; String[] expectedQueries = { - getExpectedQuery("t", "SELECT t.cityid, sum(t.msr2) FROM ", null, " group by t.cityid", + getExpectedQuery("t", "SELECT t.cityid as `cityid`, sum(t.msr2) as `msr2` FROM ", null, " group by t.cityid", getWhereForDailyAndHourly2days("t", "C2_testfact")), - getExpectedQuery(TEST_CUBE_NAME, "SELECT testCube.cityid, sum(testCube.msr2)" + " FROM ", + getExpectedQuery(TEST_CUBE_NAME, "SELECT testCube.cityid as `cityid`, sum(testCube.msr2) as `msr2`" + " FROM ", " testcube.cityid > 100 ", " group by testcube.cityid having" + " sum(testCube.msr2) < 1000", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")), - getExpectedQuery(TEST_CUBE_NAME, "SELECT testCube.cityid, sum(testCube.msr2)" + " FROM ", - " testcube.cityid > 100 ", " group by testcube.cityid having" - + " sum(testCube.msr2) < 1000 order by testCube.cityid asc", + getExpectedQuery(TEST_CUBE_NAME, "SELECT testCube.cityid as `cityid`, sum(testCube.msr2) as `msr2`" + " FROM ", + " testcube.cityid > 100 ", " group by testCube.cityid having" + + " sum(testCube.msr2) < 1000 order by cityid asc", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C2_testfact")), }; Configuration conf = getConf(); @@ -1246,23 +1262,26 @@ public class TestCubeRewriter extends TestQueryRewrite { String hqlQuery = rewrite("select dim1, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE, getConfWithStorages("C1")); String expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1, max(testcube.msr3), sum(testcube.msr2) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1 as `dim1`, max(testcube.msr3) as `max(msr3)`" + + ", sum(testcube.msr2) as `msr2` FROM ", null, " group by testcube.dim1", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C1_summary1")); compareQueries(hqlQuery, expected); hqlQuery = rewrite("select dim1, dim2, COUNT(msr4)," + " SUM(msr2), msr3 from testCube" + " where " + TWO_DAYS_RANGE, getConfWithStorages("C1")); expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1, testcube,dim2, count(testcube.msr4)," - + " sum(testcube.msr2), max(testcube.msr3) FROM ", null, " group by testcube.dim1, testcube.dim2", + getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1 as `dim1`, testcube,dim2 as `dim2`, " + + "count(testcube.msr4) as `count(msr4)`,sum(testcube.msr2) as `sum(msr2)`, " + + "max(testcube.msr3) as `msr3`FROM ", null, " group by testcube.dim1, testcube.dim2", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C1_summary2")); compareQueries(hqlQuery, expected); hqlQuery = rewrite("select dim1, dim2, cityid, msr4," + " SUM(msr2), msr3 from testCube" + " where " + TWO_DAYS_RANGE, getConfWithStorages("C1")); expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1, testcube,dim2, testcube.cityid," - + " count(testcube.msr4), sum(testcube.msr2), max(testcube.msr3) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1 as `dim1`, testcube,dim2 as `dim2`, " + + "testcube.cityid as `cityid`, count(testcube.msr4) as `msr4`, " + + "sum(testcube.msr2) as `sum(msr2)`, max(testcube.msr3) as `msr3` FROM ", null, " group by testcube.dim1, testcube.dim2, testcube.cityid", getWhereForDailyAndHourly2days(TEST_CUBE_NAME, "C1_summary3")); compareQueries(hqlQuery, expected); @@ -1274,7 +1293,8 @@ public class TestCubeRewriter extends TestQueryRewrite { String hqlQuery = rewrite("select dim1, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE_IT, getConf()); String expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1, max(testcube.msr3), sum(testcube.msr2) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1 as `dim1`, max(testcube.msr3) as `max(msr3)`, " + + "sum(testcube.msr2) as `msr2` FROM ", null, " group by testcube.dim1", getWhereForDailyAndHourly2daysWithTimeDim(TEST_CUBE_NAME, "it", "C2_summary1"), null); compareQueries(hqlQuery, expected); @@ -1282,8 +1302,9 @@ public class TestCubeRewriter extends TestQueryRewrite { rewrite("select dim1, dim2, COUNT(msr4)," + " SUM(msr2), msr3 from testCube" + " where " + TWO_DAYS_RANGE_IT, getConf()); expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1, testcube,dim2, count(testcube.msr4)," - + " sum(testcube.msr2), max(testcube.msr3) FROM ", null, " group by testcube.dim1, testcube.dim2", + getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1 as `dim1`, testcube,dim2 as `dim2`, " + + "count(testcube.msr4) as `count(msr4)`, sum(testcube.msr2) as `sum(msr2)`, " + + "max(testcube.msr3) as `msr3` FROM ", null, " group by testcube.dim1, testcube.dim2", getWhereForDailyAndHourly2daysWithTimeDim(TEST_CUBE_NAME, "it", "C2_summary2"), null); compareQueries(hqlQuery, expected); @@ -1291,8 +1312,9 @@ public class TestCubeRewriter extends TestQueryRewrite { rewrite("select dim1, dim2, cityid, count(msr4)," + " SUM(msr2), msr3 from testCube" + " where " + TWO_DAYS_RANGE_IT, getConf()); expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1, testcube,dim2, testcube.cityid," - + " count(testcube.msr4), sum(testcube.msr2), max(testcube.msr3) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1 as `dim1`, testcube,dim2 as `dim2`, " + + "testcube.cityid as `cityid`, count(testcube.msr4) as `count(msr4)`, sum(testcube.msr2) " + + "as `sum(msr2)`, max(testcube.msr3) as `msr3`FROM ", null, " group by testcube.dim1, testcube.dim2, testcube.cityid", getWhereForDailyAndHourly2daysWithTimeDim(TEST_CUBE_NAME, "it", "C2_summary3"), null); @@ -1360,15 +1382,15 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.setClass(CubeQueryConfUtil.TIME_RANGE_WRITER_CLASS, AbridgedTimeRangeWriter.class, TimeRangeWriter.class); CubeQueryContext ctx = rewriteCtx("select dim1, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE_IT, conf); - assertEquals(ctx.candidateFacts.size(), 1); - CandidateFact candidateFact = ctx.candidateFacts.iterator().next(); - Set<FactPartition> partsQueried = new TreeSet<>(candidateFact.getPartsQueried()); + assertEquals(ctx.getCandidates().size(), 1); + Candidate candidate = ctx.getCandidates().iterator().next(); + Set<FactPartition> partsQueried = new TreeSet<>(((StorageCandidate)candidate).getParticipatingPartitions()); Date ceilDay = DAILY.getCeilDate(getDateWithOffset(DAILY, -2)); Date nextDay = DateUtils.addDays(ceilDay, 1); Date nextToNextDay = DateUtils.addDays(nextDay, 1); HashSet<String> storageTables = Sets.newHashSet(); - for (String storageTable : candidateFact.getStorageTables()) { - storageTables.add(storageTable.split("\\.")[1]); + for (StorageCandidate sc : CandidateUtil.getStorageCandidates(candidate)) { + storageTables.add(sc.getStorageTable()); } TreeSet<FactPartition> expectedPartsQueried = Sets.newTreeSet(); for (TimePartition p : Iterables.concat( @@ -1389,7 +1411,8 @@ public class TestCubeRewriter extends TestQueryRewrite { conf.setInt(CubeQueryConfUtil.LOOK_AHEAD_PT_PARTS_PFX, 3); ctx = rewriteCtx("select dim1, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE_IT, conf); - partsQueried = new TreeSet<>(ctx.candidateFacts.iterator().next().getPartsQueried()); + partsQueried = new TreeSet<>(((StorageCandidate)ctx.getCandidates().iterator().next()) + .getParticipatingPartitions()); // pt does not exist beyond 1 day. So in this test, max look ahead possible is 3 assertEquals(partsQueried, expectedPartsQueried); } @@ -1404,30 +1427,33 @@ public class TestCubeRewriter extends TestQueryRewrite { getWhereForDailyAndHourly2daysWithTimeDim(TEST_CUBE_NAME, "dt", TWODAYS_BACK, NOW) + " OR " + getWhereForDailyAndHourly2daysWithTimeDim(TEST_CUBE_NAME, "dt", BEFORE_6_DAYS, BEFORE_4_DAYS); - String expected = getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) FROM ", + String expected = getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)` FROM ", null, null, expectedRangeWhere, "c2_testfact"); compareQueries(hqlQuery, expected); hqlQuery = rewrite("select dim1, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE + " OR " + TWO_DAYS_RANGE_BEFORE_4_DAYS, getConfWithStorages("C1")); expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1, max(testcube.msr3), sum(testcube.msr2) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1 as `dim1`, max(testcube.msr3) as `max(msr3)`" + + ", sum(testcube.msr2) as `msr2` FROM ", null, " group by testcube.dim1", expectedRangeWhere, "C1_summary1"); compareQueries(hqlQuery, expected); hqlQuery = rewrite("select dim1, dim2, COUNT(msr4)," + " SUM(msr2), msr3 from testCube" + " where " + TWO_DAYS_RANGE + " OR " + TWO_DAYS_RANGE_BEFORE_4_DAYS, getConfWithStorages("C1")); expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1, testcube,dim2, count(testcube.msr4)," - + " sum(testcube.msr2), max(testcube.msr3) FROM ", null, " group by testcube.dim1, testcube.dim2", + getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1 as `dim1`, testcube.dim2 as `dim2`, " + + "count(testcube.msr4) as `COUNT(msr4`, sum(testcube.msr2) as `sum(msr2)`, " + + "max(testcube.msr3) as `msr3` FROM ", null, " group by testcube.dim1, testcube.dim2", expectedRangeWhere, "C1_summary2"); compareQueries(hqlQuery, expected); hqlQuery = rewrite("select dim1, dim2, cityid, count(msr4)," + " SUM(msr2), msr3 from testCube" + " where " + TWO_DAYS_RANGE + " OR " + TWO_DAYS_RANGE_BEFORE_4_DAYS, getConfWithStorages("C1")); expected = - getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1, testcube,dim2, testcube.cityid," - + " count(testcube.msr4), sum(testcube.msr2), max(testcube.msr3) FROM ", null, + getExpectedQuery(TEST_CUBE_NAME, "select testcube.dim1 as `dim1`, testcube.dim2 as `dim2`, " + + "testcube.cityid as `cityid`, count(testcube.msr4) as `count(msr4)`, " + + "sum(testcube.msr2) as `sum(msr2)`, max(testcube.msr3) as `msr3` FROM ", null, " group by testcube.dim1, testcube.dim2, testcube.cityid", expectedRangeWhere, "C1_summary3"); compareQueries(hqlQuery, expected); } @@ -1468,7 +1494,8 @@ public class TestCubeRewriter extends TestQueryRewrite { + db + "c1_citytable c2 ON (( s1 . countryid ) = ( c2 . id )) AND (c2.dt = 'latest')"; String expected = - getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2)" + " FROM ", expectedJoin, null, null, null, + getExpectedQuery(TEST_CUBE_NAME, "select sum(testcube.msr2) as `sum(msr2)`" + + " FROM ", expectedJoin, null, null, null, getWhereForHourly2days(TEST_CUBE_NAME, "C1_testfact2")); compareQueries(hqlQuery, expected); }
http://git-wip-us.apache.org/repos/asf/lens/blob/ae83caae/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDenormalizationResolver.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDenormalizationResolver.java b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDenormalizationResolver.java index 5505ed4..d97c0e6 100644 --- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDenormalizationResolver.java +++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDenormalizationResolver.java @@ -20,8 +20,12 @@ package org.apache.lens.cube.parse; import static org.apache.lens.cube.metadata.DateFactory.*; +import static org.apache.lens.cube.parse.CandidateTablePruneCause.columnNotFound; import static org.apache.lens.cube.parse.CubeTestSetup.*; +import static com.google.common.collect.Lists.newArrayList; +import static com.google.common.collect.Sets.newHashSet; + import java.util.*; import org.apache.lens.cube.error.NoCandidateFactAvailableException; @@ -36,8 +40,7 @@ import org.testng.Assert; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import com.google.common.base.Splitter; -import com.google.common.collect.Sets; +import com.google.common.collect.Maps; public class TestDenormalizationResolver extends TestQueryRewrite { @@ -60,7 +63,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { String hqlQuery = rewrite("select dim2big1, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE_IT, conf); String expecteddim2big1 = - getExpectedQuery(cubeName, "select testcube.dim2big1," + " max(testcube.msr3), sum(testcube.msr2) FROM ", null, + getExpectedQuery(cubeName, "SELECT (testcube.dim2big1) as `dim2big1`, max((testcube.msr3)) as `max(msr3)`, " + + "sum((testcube.msr2)) as `msr2` FROM ", null, " group by testcube.dim2big1", getWhereForDailyAndHourly2daysWithTimeDim(cubeName, "it", "C2_summary4"), null); TestCubeRewriter.compareQueries(hqlQuery, expecteddim2big1); @@ -68,8 +72,9 @@ public class TestDenormalizationResolver extends TestQueryRewrite { hqlQuery = rewrite("select dim2big1, cubecity.name, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE_IT, conf); String expecteddim2big1WithAnotherTable = getExpectedQuery(cubeName, - "select testcube.dim2big1, cubecity.name, max(testcube.msr3), sum(testcube.msr2) FROM ", " JOIN " - + getDbName() + "c1_citytable cubecity " + "on testcube.cityid = cubecity.id and cubecity.dt = 'latest' ", null, + "SELECT (testcube.dim2big1) as `dim2big1`, (cubecity.name) as `name`, max((testcube.msr3)) as `max(msr3)`, " + + "sum((testcube.msr2)) as `msr2` FROM ", " JOIN " + getDbName() + "c1_citytable cubecity " + + "on testcube.cityid = cubecity.id and cubecity.dt = 'latest' ", null, " group by testcube.dim2big1, cubecity.name", null, getWhereForDailyAndHourly2daysWithTimeDim(cubeName, "it", "C2_summary4"), null); @@ -77,9 +82,9 @@ public class TestDenormalizationResolver extends TestQueryRewrite { hqlQuery = rewrite("select dim2big2, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE_IT, conf); String expecteddim2big2 = - getExpectedQuery(cubeName, "select testcube.dim2big2, max(testcube.msr3), sum(testcube.msr2) FROM ", null, - " group by testcube.dim2big2", getWhereForDailyAndHourly2daysWithTimeDim(cubeName, "it", "C2_summary4"), - null); + getExpectedQuery(cubeName, "SELECT (testcube.dim2big2) as `dim2big2`, max((testcube.msr3)) as `max(msr3)`, " + + "sum((testcube.msr2)) as `msr2` FROM ", null, " group by testcube.dim2big2", + getWhereForDailyAndHourly2daysWithTimeDim(cubeName, "it", "C2_summary4"), null); TestCubeRewriter.compareQueries(hqlQuery, expecteddim2big2); Configuration conf2 = new Configuration(conf); @@ -88,7 +93,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { + TWO_DAYS_RANGE_IT, conf2); String expected = getExpectedQuery(cubeName, - "select dim3chain.name, testcube.dim2big1, max(testcube.msr3), sum(testcube.msr2) FROM ", " JOIN " + "SELECT (dim3chain.name) as `name`, (testcube.dim2big1) as `dim2big1`, max((testcube.msr3)) as `max(msr3)`," + + " sum((testcube.msr2)) as `msr2` FROM ", " JOIN " + getDbName() + "c2_testdim2tbl3 testdim2 " + "on testcube.dim2big1 = testdim2.bigid1" + " join " + getDbName() + "c2_testdim3tbl dim3chain on " + "testdim2.testdim3id = dim3chain.id", null, " group by dim3chain.name, (testcube.dim2big1)", null, @@ -110,7 +116,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { String hqlQuery = rewrite("select dim2big1, max(msr3), msr2 from testCube where " + TWO_DAYS_RANGE, tconf); String expected = - getExpectedQuery(cubeName, "select dim2chain.bigid1, max(testcube.msr3), sum(testcube.msr2) FROM ", " JOIN " + getExpectedQuery(cubeName, "select (dim2chain.bigid1) as `dim2big1`, max((testcube.msr3)) " + + "as `max(msr3)`, sum((testcube.msr2)) as `msr2` FROM ", " JOIN " + getDbName() + "c1_testdim2tbl2 dim2chain ON testcube.dim2 = " + " dim2chain.id and (dim2chain.dt = 'latest') ", null, "group by (dim2chain.bigid1)", null, getWhereForDailyAndHourly2days(cubeName, "c1_summary2")); @@ -125,7 +132,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { tconf); String expected = getExpectedQuery(cubeName, - "select dim2chain.name, dim2chain.bigid1, max(testcube.msr3), sum(testcube.msr2) FROM ", " JOIN " + "select (dim2chain.name) as `name`, (dim2chain.bigid1) as `dim2big1`, max((testcube.msr3)) as `max(msr3)`, " + + "sum((testcube.msr2)) as `msr2` FROM ", " JOIN " + getDbName() + "c1_testdim2tbl2 dim2chain ON testcube.dim2 = " + " dim2chain.id and (dim2chain.dt = 'latest') ", null, "group by dim2chain.name, dim2chain.bigid1", null, getWhereForDailyAndHourly2days(cubeName, "c1_summary2")); @@ -141,7 +149,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { tconf); String expected = getExpectedQuery(cubeName, - "select dim2chain.name, dim2chain.bigid1, max(testcube.msr3), sum(testcube.msr2) FROM ", " LEFT OUTER JOIN " + "select (dim2chain.name) as `name`, (dim2chain.bigid1) as `dim2big1`, max((testcube.msr3)) " + + "as `max(msr3)`, sum((testcube.msr2)) as `msr2` FROM ", " LEFT OUTER JOIN " + getDbName() + "c1_testdim2tbl2 dim2chain ON testcube.dim2 = " + " dim2chain.id and (dim2chain.dt = 'latest') ", null, "group by dim2chain.name, dim2chain.bigid1", null, getWhereForDailyAndHourly2days(cubeName, "c1_summary2")); @@ -167,7 +176,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { tconf); String expected = getExpectedQuery(cubeName, - "select dim3chain.name, dim2chain.bigid1, max(testcube.msr3), sum(testcube.msr2) FROM ", " JOIN " + " SELECT (dim3chain.name) as `name`, (dim2chain.bigid1) as `dim2big1`, max((testcube.msr3)) " + + "as `max(msr3)`, sum((testcube.msr2)) as `msr2` FROM ", " JOIN " + getDbName() + "c1_testdim2tbl3 dim2chain " + "on testcube.dim2 = dim2chain.id AND (dim2chain.dt = 'latest')" + " join " + getDbName() + "c1_testdim3tbl dim3chain on " + "dim2chain.testdim3id = dim3chain.id AND (dim3chain.dt = 'latest')", @@ -184,41 +194,23 @@ public class TestDenormalizationResolver extends TestQueryRewrite { "select dim2big2, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE, tconf); NoCandidateFactAvailableException ne = (NoCandidateFactAvailableException) e; PruneCauses.BriefAndDetailedError error = ne.getJsonMessage(); - Assert.assertEquals(error.getBrief(), CandidateTablePruneCode.NO_CANDIDATE_STORAGES.errorFormat); - - HashMap<String, List<CandidateTablePruneCause>> details = error.getDetails(); - - for (Map.Entry<String, List<CandidateTablePruneCause>> entry : details.entrySet()) { - if (entry.getValue().equals(Arrays.asList(CandidateTablePruneCause.columnNotFound("dim2big2")))) { - Set<String> expectedKeySet = - Sets.newTreeSet(Splitter.on(',').split("summary1,cheapfact,testfactmonthly,testfact2,testfact")); - Assert.assertTrue(expectedKeySet.equals(Sets.newTreeSet(Splitter.on(',').split(entry.getKey())))); - } - - if (entry.getValue().equals( - Arrays.asList(new CandidateTablePruneCause(CandidateTablePruneCode.INVALID_DENORM_TABLE)))) { - Set<String> expectedKeySet = - Sets.newTreeSet(Splitter.on(',').split("summary2,testfact2_raw,summary3")); - Assert.assertTrue(expectedKeySet.equals(Sets.newTreeSet(Splitter.on(',').split(entry.getKey())))); - } - - if (entry.getKey().equals("testfact_continuous")) { - Assert.assertTrue(entry.getValue().equals( - Arrays.asList(CandidateTablePruneCause.columnNotFound("msr2", "msr3"))) - || entry.getValue().equals(Arrays.asList(CandidateTablePruneCause.columnNotFound("msr3", "msr2")))); - } - - if (entry.getKey().equals("summary4")) { - List<CandidateTablePruneCause> expectedPruneCauses = Arrays.asList(CandidateTablePruneCause.noCandidateStorages( - new HashMap<String, CandidateTablePruneCause.SkipStorageCause>() { - { - put("C2", new CandidateTablePruneCause.SkipStorageCause( - CandidateTablePruneCause.SkipStorageCode.UNSUPPORTED)); - } - })); - Assert.assertTrue(entry.getValue().equals(expectedPruneCauses)); - } - } + Assert.assertEquals(error.getBrief(), CandidateTablePruneCode.INVALID_DENORM_TABLE.errorFormat); + + Map<HashSet<String>, List<CandidateTablePruneCause>> enhanced = error.enhanced(); + Map<Set<String>, List<CandidateTablePruneCause>> expected = Maps.newHashMap(); + expected.put(newHashSet("c1_summary1", "c1_testfact", "c1_testfact2"), + newArrayList(columnNotFound("dim2big2"))); + expected.put(newHashSet("c2_summary2", "c2_summary3", "c1_testfact2_raw", "" + + "c3_testfact2_raw", "c1_summary3", "c1_summary2"), + newArrayList(new CandidateTablePruneCause(CandidateTablePruneCode.INVALID_DENORM_TABLE))); + expected.put(newHashSet("c0_testfact_continuous"), newArrayList(columnNotFound( + "msr2", "msr3"))); + expected.put(newHashSet("c2_summary2", "c2_summary3", "c2_summary4", "c4_testfact", "c2_summary1", + "c3_testfact", "c3_testfact2_raw", "c6_testfact", "c4_testfact2", "c5_testfact", "c99_cheapfact", + "c2_testfact", "c0_cheapfact", "c2_testfactmonthly", "c0_testfact"), + newArrayList(new CandidateTablePruneCause(CandidateTablePruneCode.UNSUPPORTED_STORAGE))); + + Assert.assertEquals(enhanced, expected); } @Test @@ -226,7 +218,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { String hqlQuery = rewrite("select substrdim2big1, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE_IT, conf); String expecteddim2big1 = - getExpectedQuery(cubeName, "select substr(testcube.dim2big1, 5), max(testcube.msr3), sum(testcube.msr2) FROM ", + getExpectedQuery(cubeName, "SELECT substr((testcube.dim2big1), 5) as `substrdim2big1`, max((testcube.msr3)) " + + "as `max(msr3)`, sum((testcube.msr2)) as `msr2` FROM ", null, " group by substr(testcube.dim2big1, 5)", getWhereForDailyAndHourly2daysWithTimeDim(cubeName, "it", "C2_summary4"), null); @@ -240,7 +233,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { String hqlQuery = rewrite("select substrdim2big1, max(msr3)," + " msr2 from testCube" + " where " + TWO_DAYS_RANGE, tconf); String expected = - getExpectedQuery(cubeName, "select substr(dim2chain.bigid1, 5), max(testcube.msr3), sum(testcube.msr2) FROM ", + getExpectedQuery(cubeName, "SELECT substr((dim2chain.bigid1), 5) as `substrdim2big1`, max((testcube.msr3)) " + + "as `max(msr3)`, sum((testcube.msr2)) as `msr2` FROM ", " JOIN " + getDbName() + "c1_testdim2tbl2 dim2chain ON testcube.dim2 = " + " dim2chain.id and (dim2chain.dt = 'latest') ", null, "group by substr(dim2chain.bigid1, 5)", null, getWhereForDailyAndHourly2days(cubeName, "c1_summary2")); @@ -274,15 +268,11 @@ public class TestDenormalizationResolver extends TestQueryRewrite { public void testCubeQueryWithTwoRefCols() throws Exception { Configuration tConf = new Configuration(conf); tConf.set(CubeQueryConfUtil.DRIVER_SUPPORTED_STORAGES, ""); - CubeQueryContext cubeql = rewriteCtx("select dim2, test_time_dim2 from testcube where " + TWO_DAYS_RANGE, tConf); - Set<String> candidateFacts = new HashSet<String>(); - for (CandidateFact cfact : cubeql.getCandidateFacts()) { - candidateFacts.add(cfact.getName().toLowerCase()); - } - // testfact contains test_time_dim_day_id, but not dim2 - it should have been removed. - Assert.assertFalse(candidateFacts.contains("testfact")); - // summary2 contains dim2, but not test_time_dim2 - it should have been removed. - Assert.assertFalse(candidateFacts.contains("summary2")); + //test_time_dim2 and dim2 are not querable together + NoCandidateFactAvailableException e = (NoCandidateFactAvailableException)getLensExceptionInRewrite( + "select dim2, test_time_dim2 from testcube where " + TWO_DAYS_RANGE, tConf); + Assert.assertEquals(e.getJsonMessage().getBrief(), + "Range not answerable"); // getting storage update periods are not valid for given time range } @Test @@ -293,8 +283,9 @@ public class TestDenormalizationResolver extends TestQueryRewrite { tConf.set(CubeQueryConfUtil.getValidStorageTablesKey("testFact2"), "C1_testFact2"); String hqlQuery = rewrite("select test_time_dim2, msr2 from testcube where " + TWO_DAYS_RANGE, tConf); String expected = - getExpectedQuery(cubeName, "select timehourchain2.full_hour, sum(testcube.msr2) FROM ", " join " + getDbName() - + "c4_hourDimTbl timehourchain2 on testcube.test_time_dim_hour_id2 = timehourchain2.id", null, + getExpectedQuery(cubeName, "select timehourchain2.full_hour as `test_time_dim2`, sum(testcube.msr2) as `msr2` " + + "FROM ", " join " + getDbName() + + "c4_hourDimTbl timehourchain2 on testcube.test_time_dim_hour_id2 = timehourchain2.id", null, " group by timehourchain2 . full_hour ", null, getWhereForHourly2days("c1_testfact2")); TestCubeRewriter.compareQueries(hqlQuery, expected); @@ -308,9 +299,10 @@ public class TestDenormalizationResolver extends TestQueryRewrite { tConf.set(CubeQueryConfUtil.getValidStorageTablesKey("testFact"), "C1_testFact"); String hqlQuery = rewrite("select test_time_dim2, msr2 from testcube where " + TWO_DAYS_RANGE, tConf); String expected = - getExpectedQuery(cubeName, "select timedatechain2.full_date, sum(testcube.msr2) FROM ", " join " + getDbName() - + "c4_dayDimTbl timedatechain2 on testcube.test_time_dim_day_id2 = timedatechain2.id", null, - " group by timedatechain2 . full_date ", null, + getExpectedQuery(cubeName, "select timedatechain2.full_date as `test_time_dim2`, sum(testcube.msr2) as `msr2` " + + "FROM ", " join " + getDbName() + + "c4_dayDimTbl timedatechain2 on testcube.test_time_dim_day_id2 = timedatechain2.id", null, + " group by timedatechain2 . full_date ", null, getWhereForDailyAndHourly2days(cubeName, "c1_testfact")); TestCubeRewriter.compareQueries(hqlQuery, expected); } @@ -323,8 +315,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { + "c1_citytable citydim on basecube.cityid = citydim.id and (citydim.dt = 'latest') " + " join " + getDbName() + "c1_ziptable cityzip on citydim.zipcode = cityzip.code and (cityzip.dt = 'latest')"; String expected = - getExpectedQuery("basecube", "select cityzip.code, basecube.dim22, basecube.msr11 FROM ", - joinExpr, null, null, null, + getExpectedQuery("basecube", "SELECT (cityzip.code) as `code`, (basecube.dim22) as `dim22`, " + + "(basecube.msr11) as `msr11` FROM ", joinExpr, null, null, null, getWhereForHourly2days("basecube", "C1_testfact2_raw_base")); TestCubeRewriter.compareQueries(hqlQuery, expected); } @@ -338,7 +330,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { + " join " + getDbName() + "c1_citytable cubecity2 on testcube.cityid2 = cubecity2.id and (cubecity2.dt = 'latest')"; String expected = - getExpectedQuery("testcube", "select cubecity1.name, cubecity2.name, sum(testcube.msr2) FROM ", + getExpectedQuery("testcube", "SELECT (cubecity1.name) as `name`, (cubecity2.name) as `name`, " + + "sum((testcube.msr2)) as `msr2` FROM ", joinExpr, null, " group by cubecity1.name, cubecity2.name", null, getWhereForHourly2days("testcube", "c1_testfact2_raw")); TestCubeRewriter.compareQueries(hqlQuery, expected); @@ -350,7 +343,7 @@ public class TestDenormalizationResolver extends TestQueryRewrite { CubeQueryContext cubeql = rewriteCtx("select citydim.zipcode, citydim.statename from" + " citydim", tConf); Set<String> candidateDims = new HashSet<>(); for (CandidateDim cdim : cubeql.getCandidateDims().get(cubeql.getMetastoreClient().getDimension("citydim"))) { - candidateDims.add(cdim.getName()); + candidateDims.add(cdim.getStorageTable()); } // city_table2 contains stateid, but not zipcode - it should have been removed. Assert.assertFalse(candidateDims.contains("city_table2")); @@ -386,7 +379,8 @@ public class TestDenormalizationResolver extends TestQueryRewrite { + " join " + getDbName() + "c1_countrytable cubecitystatecountry on statedim.countryid =" + " cubecitystatecountry.id"; String expected = - getExpectedQuery("basecube", "select cubecitystatecountry.capital, sum(basecube.msr12) FROM ", + getExpectedQuery("basecube", "SELECT (cubecitystatecountry.capital) as `cubecountrycapital`, " + + "sum((basecube.msr12)) as `msr12` FROM ", joinExpr, null, " group by cubecitystatecountry.capital ", null, getWhereForHourly2days("basecube", "C1_testfact2_raw_base")); TestCubeRewriter.compareQueries(hqlQuery, expected);
