Repository: lens Updated Branches: refs/heads/master 7035de9d7 -> b1f38d55e
LENS-929: Fact skipping should be logged Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/b1f38d55 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/b1f38d55 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/b1f38d55 Branch: refs/heads/master Commit: b1f38d55eddf261426aa47bfaa37c54a1eefa3d0 Parents: 7035de9 Author: Rajat Khandelwal <[email protected]> Authored: Mon Jan 25 14:03:55 2016 +0530 Committer: Rajat Khandelwal <[email protected]> Committed: Mon Jan 25 14:03:55 2016 +0530 ---------------------------------------------------------------------- .../apache/lens/cube/parse/CubeQueryContext.java | 1 + .../server/api/driver/MinQueryCostSelector.java | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/b1f38d55/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java index 3e930de..79dd88c 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/CubeQueryContext.java @@ -465,6 +465,7 @@ public class CubeQueryContext implements TrackQueriedColumns, QueryAST { } public void addFactPruningMsgs(CubeFactTable fact, CandidateTablePruneCause factPruningMsg) { + log.info("Pruning fact {} with cause: {}", fact, factPruningMsg); factPruningMsgs.addPruningMsg(fact, factPruningMsg); } http://git-wip-us.apache.org/repos/asf/lens/blob/b1f38d55/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java ---------------------------------------------------------------------- diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java b/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java index 8fdde1d..6f17327 100644 --- a/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java +++ b/lens-server-api/src/main/java/org/apache/lens/server/api/driver/MinQueryCostSelector.java @@ -18,13 +18,18 @@ */ package org.apache.lens.server.api.driver; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import org.apache.lens.server.api.query.AbstractQueryContext; import org.apache.lens.server.api.query.cost.QueryCost; import org.apache.hadoop.conf.Configuration; +import lombok.extern.slf4j.Slf4j; + +@Slf4j public class MinQueryCostSelector implements DriverSelector { /** @@ -38,12 +43,15 @@ public class MinQueryCostSelector implements DriverSelector { public LensDriver select(final AbstractQueryContext ctx, final Configuration conf) { final Collection<LensDriver> drivers = ctx.getDriverContext().getDriversWithValidQueryCost(); - + log.info("Candidate drivers: {}", drivers); + for (LensDriver driver : drivers) { + log.debug("Cost on driver {}: {}", driver, ctx.getDriverQueryCost(driver)); + } return Collections.min(drivers, new Comparator<LensDriver>() { @Override public int compare(LensDriver d1, LensDriver d2) { - final QueryCost c1 = ctx.getDriverContext().getDriverQueryCost(d1); - final QueryCost c2 = ctx.getDriverContext().getDriverQueryCost(d2); + final QueryCost c1 = ctx.getDriverQueryCost(d1); + final QueryCost c2 = ctx.getDriverQueryCost(d2); return c1.compareTo(c2); } });
