Repository: lens Updated Branches: refs/heads/master a963d985b -> 96fc4422a
Fix for column start and end times not working in Virtual facts [LENS-1480] Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/96fc4422 Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/96fc4422 Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/96fc4422 Branch: refs/heads/master Commit: 96fc4422a4b3b3c2722c787cd43973f6fc606daa Parents: a963d98 Author: Rajitha R <[email protected]> Authored: Tue Dec 19 16:46:33 2017 +0530 Committer: Puneet Gupta <[email protected]> Committed: Tue Dec 19 16:46:33 2017 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/lens/cube/metadata/CubeFactTable.java | 5 +++++ .../org/apache/lens/cube/metadata/CubeVirtualFactTable.java | 5 +++++ .../src/main/java/org/apache/lens/cube/metadata/FactTable.java | 1 + .../main/java/org/apache/lens/cube/parse/StorageCandidate.java | 4 ++-- 4 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/96fc4422/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeFactTable.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeFactTable.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeFactTable.java index c57a9c1..43e827a 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeFactTable.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeFactTable.java @@ -393,6 +393,11 @@ public class CubeFactTable extends AbstractCubeTable implements FactTable { return this.getName(); } + @Override + public Map<String, String> getSourceFactProperties() { + return getProperties(); + } + public String getTablePrefix(String storage, UpdatePeriod updatePeriod) { return storagePrefixUpdatePeriodMap.get(storage).get(updatePeriod); } http://git-wip-us.apache.org/repos/asf/lens/blob/96fc4422/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeVirtualFactTable.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeVirtualFactTable.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeVirtualFactTable.java index 8b55985..96948cc 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeVirtualFactTable.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/CubeVirtualFactTable.java @@ -190,4 +190,9 @@ public class CubeVirtualFactTable extends AbstractCubeTable implements FactTable public String getSourceFactName() { return this.sourceCubeFactTable.getName(); } + + @Override + public Map<String, String> getSourceFactProperties() { + return getSourceCubeFactTable().getProperties(); + } } http://git-wip-us.apache.org/repos/asf/lens/blob/96fc4422/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactTable.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactTable.java b/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactTable.java index a463c47..e351d7f 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactTable.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/metadata/FactTable.java @@ -163,4 +163,5 @@ public interface FactTable extends Named { */ String getSourceFactName(); + Map<String, String> getSourceFactProperties(); } http://git-wip-us.apache.org/repos/asf/lens/blob/96fc4422/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageCandidate.java ---------------------------------------------------------------------- diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageCandidate.java b/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageCandidate.java index fd07bf2..3ee66ee 100644 --- a/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageCandidate.java +++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/StorageCandidate.java @@ -315,7 +315,7 @@ public class StorageCandidate implements Candidate, CandidateTable { public Optional<Date> getColumnStartTime(String column) { Date startTime = null; - for (String key : getTable().getProperties().keySet()) { + for (String key : this.getFact().getSourceFactProperties().keySet()) { if (key.contains(MetastoreConstants.FACT_COL_START_TIME_PFX)) { String propCol = StringUtils.substringAfter(key, MetastoreConstants.FACT_COL_START_TIME_PFX); if (column.equals(propCol)) { @@ -329,7 +329,7 @@ public class StorageCandidate implements Candidate, CandidateTable { @Override public Optional<Date> getColumnEndTime(String column) { Date endTime = null; - for (String key : getTable().getProperties().keySet()) { + for (String key : this.getFact().getSourceFactProperties().keySet()) { if (key.contains(MetastoreConstants.FACT_COL_END_TIME_PFX)) { String propCol = StringUtils.substringAfter(key, MetastoreConstants.FACT_COL_END_TIME_PFX); if (column.equals(propCol)) {
