lens git commit: LENS-1466 : Fix for 'Rewritten queries not resolving time_range_in clause'

2017-09-01 Thread amareshwari 
Repository: lens
Updated Branches:
  refs/heads/current-release-line 10eef27a0 -> ff4f3726a


LENS-1466 : Fix for 'Rewritten queries not resolving time_range_in clause'


Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/ff4f3726
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/ff4f3726
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/ff4f3726

Branch: refs/heads/current-release-line
Commit: ff4f3726a25db684ff7623fea68e954712dd925f
Parents: 10eef27
Author: Rajitha R 
Authored: Fri Sep 1 13:02:32 2017 +0530
Committer: Amareshwari Sriramadasu 
Committed: Fri Sep 1 15:23:45 2017 +0530

--
 .../lens/cube/parse/StorageCandidate.java   |  2 +-
 .../apache/lens/cube/metadata/DateFactory.java  |  6 ++
 .../apache/lens/cube/parse/CubeTestSetup.java   | 47 +++--
 .../lens/cube/parse/TestCubeRewriter.java   | 15 -
 .../resources/schema/cubes/base/testcube.xml|  2 +
 .../test/resources/schema/facts/summary5.xml| 70 
 .../src/test/resources/schema/storages/c98.xml  | 26 
 7 files changed, 159 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/lens/blob/ff4f3726/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 2b1add3..27835b3 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
@@ -533,9 +533,9 @@ public class StorageCandidate implements Candidate, 
CandidateTable {
   log.debug("Adding non existing partition {}", part);
   if (addNonExistingParts) {
 // Add non existing partitions for all cases of whether we 
populate all non existing or not.
-this.participatingUpdatePeriods.add(maxInterval);
 missingPartitions.add(part);
 if (!failOnPartialData) {
+  this.participatingUpdatePeriods.add(maxInterval);
   partitions.add(part);
   part.getStorageTables().add(storageTable);
 }

http://git-wip-us.apache.org/repos/asf/lens/blob/ff4f3726/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java
--
diff --git 
a/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java 
b/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java
index 855f54a..75f2abd 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java
@@ -150,6 +150,7 @@ public class DateFactory {
 
   // Time Instances as Date Type
   public static final Date NOW;
+  public static final Date ONEDAY_BACK;
   public static final Date TWODAYS_BACK;
   public static final Date TWO_MONTHS_BACK;
   public static final Date THIS_MONTH_TRUNCATED;
@@ -168,6 +169,7 @@ public class DateFactory {
   public static final String TWO_DAYS_RANGE_TTD2;
   public static final String TWO_DAYS_RANGE_TTD2_BEFORE_4_DAYS;
   public static final String TWO_DAYS_RANGE_IT;
+  public static final String ONE_DAY_RANGE_IT;
   public static final String THIS_YEAR_RANGE;
   public static final String LAST_YEAR_RANGE;
   public static final String TWO_MONTHS_RANGE_UPTO_MONTH;
@@ -189,6 +191,9 @@ public class DateFactory {
 // Figure out if current hour is 0th hour
 zerothHour = getDateStringWithOffset(HOURLY, 0).endsWith("-00");
 
+ONEDAY_BACK = getDateWithOffset(DAILY, -1);
+System.out.println("Test ONEDAY_BACK:" + ONEDAY_BACK);
+
 TWODAYS_BACK = getDateWithOffset(DAILY, -2);
 System.out.println("Test TWODAYS_BACK:" + TWODAYS_BACK);
 
@@ -214,6 +219,7 @@ public class DateFactory {
 TWO_DAYS_RANGE_TTD2 = getTimeRangeString("test_time_dim2", DAILY, -2, 0, 
HOURLY);
 TWO_DAYS_RANGE_TTD2_BEFORE_4_DAYS = getTimeRangeString("test_time_dim2", 
DAILY, -6, -4, HOURLY);
 TWO_DAYS_RANGE_IT = getTimeRangeString("it", DAILY, -2, 0, HOURLY);
+ONE_DAY_RANGE_IT = getTimeRangeString("it", DAILY, -1, 0, DAILY);
 THIS_YEAR_RANGE = getTimeRangeString(YEARLY, 0, 1);
 LAST_YEAR_RANGE = getTimeRangeString(YEARLY, -1, 0);
 TWO_MONTHS_RANGE_UPTO_MONTH = getTimeRangeString(MONTHLY, -2, 0);

http://git-wip-us.apache.org/repos/asf/lens/blob/ff4f3726/lens-cube/src/test/java/org/apache/lens/cube/parse/CubeTestSetup.java
--
diff --git

lens git commit: LENS-1466 : Fix for 'Rewritten queries not resolving time_range_in clause'

2017-09-01 Thread amareshwari 
Repository: lens
Updated Branches:
  refs/heads/master ef6e59c61 -> 8baae4133


LENS-1466 : Fix for 'Rewritten queries not resolving time_range_in clause'


Project: http://git-wip-us.apache.org/repos/asf/lens/repo
Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/8baae413
Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/8baae413
Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/8baae413

Branch: refs/heads/master
Commit: 8baae4133d8f8306d9a49ff4512c091a997b1234
Parents: ef6e59c
Author: Rajitha R 
Authored: Fri Sep 1 13:02:32 2017 +0530
Committer: Amareshwari Sriramadasu 
Committed: Fri Sep 1 13:02:32 2017 +0530

--
 .../lens/cube/parse/StorageCandidate.java   |  2 +-
 .../apache/lens/cube/metadata/DateFactory.java  |  6 ++
 .../apache/lens/cube/parse/CubeTestSetup.java   | 47 +++--
 .../lens/cube/parse/TestCubeRewriter.java   | 15 -
 .../resources/schema/cubes/base/testcube.xml|  2 +
 .../test/resources/schema/facts/summary5.xml| 70 
 .../src/test/resources/schema/storages/c98.xml  | 26 
 7 files changed, 159 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/lens/blob/8baae413/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 2b1add3..27835b3 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
@@ -533,9 +533,9 @@ public class StorageCandidate implements Candidate, 
CandidateTable {
   log.debug("Adding non existing partition {}", part);
   if (addNonExistingParts) {
 // Add non existing partitions for all cases of whether we 
populate all non existing or not.
-this.participatingUpdatePeriods.add(maxInterval);
 missingPartitions.add(part);
 if (!failOnPartialData) {
+  this.participatingUpdatePeriods.add(maxInterval);
   partitions.add(part);
   part.getStorageTables().add(storageTable);
 }

http://git-wip-us.apache.org/repos/asf/lens/blob/8baae413/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java
--
diff --git 
a/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java 
b/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java
index 855f54a..75f2abd 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/metadata/DateFactory.java
@@ -150,6 +150,7 @@ public class DateFactory {
 
   // Time Instances as Date Type
   public static final Date NOW;
+  public static final Date ONEDAY_BACK;
   public static final Date TWODAYS_BACK;
   public static final Date TWO_MONTHS_BACK;
   public static final Date THIS_MONTH_TRUNCATED;
@@ -168,6 +169,7 @@ public class DateFactory {
   public static final String TWO_DAYS_RANGE_TTD2;
   public static final String TWO_DAYS_RANGE_TTD2_BEFORE_4_DAYS;
   public static final String TWO_DAYS_RANGE_IT;
+  public static final String ONE_DAY_RANGE_IT;
   public static final String THIS_YEAR_RANGE;
   public static final String LAST_YEAR_RANGE;
   public static final String TWO_MONTHS_RANGE_UPTO_MONTH;
@@ -189,6 +191,9 @@ public class DateFactory {
 // Figure out if current hour is 0th hour
 zerothHour = getDateStringWithOffset(HOURLY, 0).endsWith("-00");
 
+ONEDAY_BACK = getDateWithOffset(DAILY, -1);
+System.out.println("Test ONEDAY_BACK:" + ONEDAY_BACK);
+
 TWODAYS_BACK = getDateWithOffset(DAILY, -2);
 System.out.println("Test TWODAYS_BACK:" + TWODAYS_BACK);
 
@@ -214,6 +219,7 @@ public class DateFactory {
 TWO_DAYS_RANGE_TTD2 = getTimeRangeString("test_time_dim2", DAILY, -2, 0, 
HOURLY);
 TWO_DAYS_RANGE_TTD2_BEFORE_4_DAYS = getTimeRangeString("test_time_dim2", 
DAILY, -6, -4, HOURLY);
 TWO_DAYS_RANGE_IT = getTimeRangeString("it", DAILY, -2, 0, HOURLY);
+ONE_DAY_RANGE_IT = getTimeRangeString("it", DAILY, -1, 0, DAILY);
 THIS_YEAR_RANGE = getTimeRangeString(YEARLY, 0, 1);
 LAST_YEAR_RANGE = getTimeRangeString(YEARLY, -1, 0);
 TWO_MONTHS_RANGE_UPTO_MONTH = getTimeRangeString(MONTHLY, -2, 0);

http://git-wip-us.apache.org/repos/asf/lens/blob/8baae413/lens-cube/src/test/java/org/apache/lens/cube/parse/CubeTestSetup.java
--
diff --git 
a/lens-cube/src/test/java/org/apache/lens/cube/parse/CubeTestSetup.java