You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lens.apache.org by pr...@apache.org on 2015/08/11 14:20:45 UTC
[22/50] [abbrv] incubator-lens git commit: LENS-692: getJoinChains()
on AbstractBaseTable should return from cached value
LENS-692: getJoinChains() on AbstractBaseTable should return from cached value
Project: http://git-wip-us.apache.org/repos/asf/incubator-lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-lens/commit/c63ecede
Tree: http://git-wip-us.apache.org/repos/asf/incubator-lens/tree/c63ecede
Diff: http://git-wip-us.apache.org/repos/asf/incubator-lens/diff/c63ecede
Branch: refs/heads/current-release-line
Commit: c63ecede036f28fe13be0f2120d91272942a3c27
Parents: 456690c
Author: Amareshwari Sriramadasu <am...@gmail.com>
Authored: Wed Jul 29 14:11:18 2015 +0530
Committer: Rajat Khandelwal <pr...@apache.org>
Committed: Wed Jul 29 14:11:18 2015 +0530
----------------------------------------------------------------------
.../org/apache/lens/cube/metadata/AbstractBaseTable.java | 8 ++++----
.../main/java/org/apache/lens/cube/metadata/JoinChain.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/c63ecede/lens-cube/src/main/java/org/apache/lens/cube/metadata/AbstractBaseTable.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/AbstractBaseTable.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/AbstractBaseTable.java
index a60d2e0..88c9ee8 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/AbstractBaseTable.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/AbstractBaseTable.java
@@ -82,7 +82,7 @@ public abstract class AbstractBaseTable extends AbstractCubeTable {
for (ExprColumn expr : expressions) {
exprMap.put(expr.getName().toLowerCase(), expr);
}
- this.joinChains = getJoinChains();
+ this.joinChains = getJoinChains(this, getJoinChainListPropKey(getName()), getProperties());
chainMap = new HashMap<String, JoinChain>();
for (JoinChain chain : joinChains) {
chainMap.put(chain.getName().toLowerCase(), chain);
@@ -263,13 +263,13 @@ public abstract class AbstractBaseTable extends AbstractCubeTable {
*
* @return
*/
- public Set<JoinChain> getJoinChains() {
+ private static Set<JoinChain> getJoinChains(AbstractBaseTable tbl, String propName, Map<String, String> props) {
Set<JoinChain> joinChains = new HashSet<JoinChain>();
- String joinChainsStr = MetastoreUtil.getNamedStringValue(getProperties(), getJoinChainListPropKey(getName()));
+ String joinChainsStr = MetastoreUtil.getNamedStringValue(props, propName);
if (!StringUtils.isBlank(joinChainsStr)) {
String[] cnames = joinChainsStr.split(",");
for (String chainName : cnames) {
- JoinChain chain = new JoinChain(this, chainName);
+ JoinChain chain = new JoinChain(tbl, chainName);
joinChains.add(chain);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-lens/blob/c63ecede/lens-cube/src/main/java/org/apache/lens/cube/metadata/JoinChain.java
----------------------------------------------------------------------
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/JoinChain.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/JoinChain.java
index c7a2d3d..e394e20 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/JoinChain.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/JoinChain.java
@@ -105,7 +105,7 @@ public class JoinChain implements Named {
* @param table
* @param name
*/
- public JoinChain(AbstractCubeTable table, String name) {
+ public JoinChain(AbstractBaseTable table, String name) {
boolean isCube = (table instanceof Cube);
this.name = name;
this.paths = new ArrayList<Path>();