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 2015/03/06 04:45:31 UTC
incubator-lens git commit: LENS-382 : Fixes NPE in JoinResolver for
wrong chains (Sushil Mohanty via amareshwari)
Repository: incubator-lens
Updated Branches:
refs/heads/master a70c8224a -> 0393d7bef
LENS-382 : Fixes NPE in JoinResolver for wrong chains (Sushil Mohanty via amareshwari)
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/0393d7be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/0393d7be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/0393d7be
Branch: refs/heads/master
Commit: 0393d7bef931462d1aeb4a4eb2f067c0e05843eb
Parents: a70c822
Author: Sushil Mohanty <su...@gmail.com>
Authored: Fri Mar 6 09:15:20 2015 +0530
Committer: Amareshwari Sriramadasu <am...@apache.org>
Committed: Fri Mar 6 09:15:20 2015 +0530
----------------------------------------------------------------------
.../src/main/java/org/apache/lens/cube/parse/JoinResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/0393d7be/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java
index b2c2572..44c474a 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/JoinResolver.java
@@ -664,7 +664,7 @@ class JoinResolver implements ContextRewriter {
for (AbstractCubeTable refTable : jp.getAllTables()) {
List<String> cols = jp.getColumnsForTable(refTable);
if (refTable instanceof Dimension) {
- if (cols != null && !dimColumns.get(refTable).containsAll(cols)) {
+ if (cols != null && (dimColumns.get(refTable) == null || !dimColumns.get(refTable).containsAll(cols))) {
// This path requires some columns from the cube which are not present in any candidate dim
// Remove this path
LOG.info("Removing join path:" + jp + " as columns :" + cols + " dont exist");