[30/50] [abbrv] lens git commit: LENS-891 : Fix Weekly covering info for last Sunday of year and first Sunday of next year

2015-12-29 Thread sharad 
LENS-891 : Fix Weekly covering info for last Sunday of year and first Sunday of 
next year


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

Branch: refs/heads/LENS-581
Commit: b63e06c0cdec67ffb6dc5f14d89f7d10091ef2d5
Parents: b3b7e5f
Author: Rajat Khandelwal 
Authored: Thu Dec 10 11:06:52 2015 +0530
Committer: Amareshwari Sriramadasu 
Committed: Thu Dec 10 11:06:52 2015 +0530

--
 .../src/main/java/org/apache/lens/cube/parse/DateUtil.java  | 9 +
 .../test/java/org/apache/lens/cube/parse/TestDateUtil.java  | 4 
 2 files changed, 5 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/lens/blob/b63e06c0/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java
--
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java 
b/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java
index 5e17eac..cd05c68 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java
@@ -343,20 +343,13 @@ public final class DateUtil {
 
 Calendar cal = Calendar.getInstance();
 cal.setTime(from);
-int fromWeek = cal.get(Calendar.WEEK_OF_YEAR);
 int fromDay = cal.get(Calendar.DAY_OF_WEEK);
-int fromYear = cal.get(YEAR);
-
-cal.clear();
-cal.set(YEAR, fromYear);
-cal.set(Calendar.WEEK_OF_YEAR, fromWeek);
 cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
-int maxDayInWeek = cal.getActualMaximum(Calendar.DAY_OF_WEEK);
 Date fromWeekStartDate = cal.getTime();
 boolean coverable = dayDiff % 7 == 0;
 if (fromWeekStartDate.before(from)) {
   // Count from the start of next week
-  dayDiff -= (maxDayInWeek - (fromDay - Calendar.SUNDAY));
+  dayDiff -= (cal.getActualMaximum(Calendar.DAY_OF_WEEK) - (fromDay - 
Calendar.SUNDAY));
   coverable = false;
 }
 

http://git-wip-us.apache.org/repos/asf/lens/blob/b63e06c0/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java
--
diff --git 
a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java 
b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java
index ab88fbe..ff9a96d 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java
@@ -76,6 +76,7 @@ public class TestDateUtil {
 }
   }
 
+
   @Test
   public void testMonthsBetween() throws Exception {
 int i = 0;
@@ -194,6 +195,9 @@ public class TestDateUtil {
 
 weeks = getWeeklyCoveringInfo(DATE_FMT.parse("2013-May-26"), 
DATE_FMT.parse("2013-Jun-10"));
 assertEquals(weeks, new CoveringInfo(2, false), "2013-May-26 to 
2013-Jun-10");
+
+weeks = getWeeklyCoveringInfo(DATE_FMT.parse("2015-Dec-27"), 
DATE_FMT.parse("2016-Jan-03"));
+assertEquals(weeks, new CoveringInfo(1, true), "2015-Dec-27 to 
2016-Jan-03");
   }
 
   @Test

lens git commit: LENS-891 : Fix Weekly covering info for last Sunday of year and first Sunday of next year

2015-12-09 Thread amareshwari 
Repository: lens
Updated Branches:
  refs/heads/master b3b7e5f4d -> b63e06c0c


LENS-891 : Fix Weekly covering info for last Sunday of year and first Sunday of 
next year


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

Branch: refs/heads/master
Commit: b63e06c0cdec67ffb6dc5f14d89f7d10091ef2d5
Parents: b3b7e5f
Author: Rajat Khandelwal 
Authored: Thu Dec 10 11:06:52 2015 +0530
Committer: Amareshwari Sriramadasu 
Committed: Thu Dec 10 11:06:52 2015 +0530

--
 .../src/main/java/org/apache/lens/cube/parse/DateUtil.java  | 9 +
 .../test/java/org/apache/lens/cube/parse/TestDateUtil.java  | 4 
 2 files changed, 5 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/lens/blob/b63e06c0/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java
--
diff --git a/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java 
b/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java
index 5e17eac..cd05c68 100644
--- a/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java
+++ b/lens-cube/src/main/java/org/apache/lens/cube/parse/DateUtil.java
@@ -343,20 +343,13 @@ public final class DateUtil {
 
 Calendar cal = Calendar.getInstance();
 cal.setTime(from);
-int fromWeek = cal.get(Calendar.WEEK_OF_YEAR);
 int fromDay = cal.get(Calendar.DAY_OF_WEEK);
-int fromYear = cal.get(YEAR);
-
-cal.clear();
-cal.set(YEAR, fromYear);
-cal.set(Calendar.WEEK_OF_YEAR, fromWeek);
 cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
-int maxDayInWeek = cal.getActualMaximum(Calendar.DAY_OF_WEEK);
 Date fromWeekStartDate = cal.getTime();
 boolean coverable = dayDiff % 7 == 0;
 if (fromWeekStartDate.before(from)) {
   // Count from the start of next week
-  dayDiff -= (maxDayInWeek - (fromDay - Calendar.SUNDAY));
+  dayDiff -= (cal.getActualMaximum(Calendar.DAY_OF_WEEK) - (fromDay - 
Calendar.SUNDAY));
   coverable = false;
 }
 

http://git-wip-us.apache.org/repos/asf/lens/blob/b63e06c0/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java
--
diff --git 
a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java 
b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java
index ab88fbe..ff9a96d 100644
--- a/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java
+++ b/lens-cube/src/test/java/org/apache/lens/cube/parse/TestDateUtil.java
@@ -76,6 +76,7 @@ public class TestDateUtil {
 }
   }
 
+
   @Test
   public void testMonthsBetween() throws Exception {
 int i = 0;
@@ -194,6 +195,9 @@ public class TestDateUtil {
 
 weeks = getWeeklyCoveringInfo(DATE_FMT.parse("2013-May-26"), 
DATE_FMT.parse("2013-Jun-10"));
 assertEquals(weeks, new CoveringInfo(2, false), "2013-May-26 to 
2013-Jun-10");
+
+weeks = getWeeklyCoveringInfo(DATE_FMT.parse("2015-Dec-27"), 
DATE_FMT.parse("2016-Jan-03"));
+assertEquals(weeks, new CoveringInfo(1, true), "2015-Dec-27 to 
2016-Jan-03");
   }
 
   @Test