diff --git a/druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java b/druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java index b20168d..9ccd48e 100644 --- a/druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java +++ b/druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java @@ -23,6 +23,7 @@ import java.util.List; import org.joda.time.Interval; +import org.joda.time.chrono.ISOChronology; import org.junit.Test; import junit.framework.TestCase; @@ -44,57 +45,57 @@ public void testCreateSplitsIntervals() throws Exception { // Test 1 : single split, create 4 intervals = new ArrayList<>(); - intervals.add(new Interval(1262304000000L, 1293840000000L)); + intervals.add(new Interval(1262304000000L, 1293840000000L, ISOChronology.getInstanceUTC())); resultList = (List>) method1.invoke(input, intervals, 4); expectedResultList = new ArrayList<>(); - expectedResultList.add(Arrays.asList(new Interval(1262304000000L, 1270188000000L))); - expectedResultList.add(Arrays.asList(new Interval(1270188000000L, 1278072000000L))); - expectedResultList.add(Arrays.asList(new Interval(1278072000000L, 1285956000000L))); - expectedResultList.add(Arrays.asList(new Interval(1285956000000L, 1293840000000L))); + expectedResultList.add(Arrays.asList(new Interval(1262304000000L, 1270188000000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1270188000000L, 1278072000000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1278072000000L, 1285956000000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1285956000000L, 1293840000000L, ISOChronology.getInstanceUTC()))); assertEquals(expectedResultList, resultList); // Test 2 : two splits, create 4 intervals = new ArrayList<>(); - intervals.add(new Interval(1262304000000L, 1293840000000L)); - intervals.add(new Interval(1325376000000L, 1356998400000L)); + intervals.add(new Interval(1262304000000L, 1293840000000L, ISOChronology.getInstanceUTC())); + intervals.add(new Interval(1325376000000L, 1356998400000L, ISOChronology.getInstanceUTC())); resultList = (List>) method1.invoke(input, intervals, 4); expectedResultList = new ArrayList<>(); - expectedResultList.add(Arrays.asList(new Interval(1262304000000L, 1278093600000L))); - expectedResultList.add(Arrays.asList(new Interval(1278093600000L, 1293840000000L), - new Interval(1325376000000L, 1325419200000L))); - expectedResultList.add(Arrays.asList(new Interval(1325419200000L, 1341208800000L))); - expectedResultList.add(Arrays.asList(new Interval(1341208800000L, 1356998400000L))); + expectedResultList.add(Arrays.asList(new Interval(1262304000000L, 1278093600000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1278093600000L, 1293840000000L, ISOChronology.getInstanceUTC()), + new Interval(1325376000000L, 1325419200000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1325419200000L, 1341208800000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1341208800000L, 1356998400000L, ISOChronology.getInstanceUTC()))); assertEquals(expectedResultList, resultList); // Test 3 : two splits, create 5 intervals = new ArrayList<>(); - intervals.add(new Interval(1262304000000L, 1293840000000L)); - intervals.add(new Interval(1325376000000L, 1356998400000L)); + intervals.add(new Interval(1262304000000L, 1293840000000L, ISOChronology.getInstanceUTC())); + intervals.add(new Interval(1325376000000L, 1356998400000L, ISOChronology.getInstanceUTC())); resultList = (List>) method1.invoke(input, intervals, 5); expectedResultList = new ArrayList<>(); - expectedResultList.add(Arrays.asList(new Interval(1262304000000L, 1274935680000L))); - expectedResultList.add(Arrays.asList(new Interval(1274935680000L, 1287567360000L))); - expectedResultList.add(Arrays.asList(new Interval(1287567360000L, 1293840000000L), - new Interval(1325376000000L, 1331735040000L))); - expectedResultList.add(Arrays.asList(new Interval(1331735040000L, 1344366720000L))); - expectedResultList.add(Arrays.asList(new Interval(1344366720000L, 1356998400000L))); + expectedResultList.add(Arrays.asList(new Interval(1262304000000L, 1274935680000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1274935680000L, 1287567360000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1287567360000L, 1293840000000L, ISOChronology.getInstanceUTC()), + new Interval(1325376000000L, 1331735040000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1331735040000L, 1344366720000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1344366720000L, 1356998400000L, ISOChronology.getInstanceUTC()))); assertEquals(expectedResultList, resultList); // Test 4 : three splits, different ranges, create 6 intervals = new ArrayList<>(); - intervals.add(new Interval(1199145600000L, 1201824000000L)); // one month - intervals.add(new Interval(1325376000000L, 1356998400000L)); // one year - intervals.add(new Interval(1407283200000L, 1407888000000L)); // 7 days + intervals.add(new Interval(1199145600000L, 1201824000000L, ISOChronology.getInstanceUTC())); // one month + intervals.add(new Interval(1325376000000L, 1356998400000L, ISOChronology.getInstanceUTC())); // one year + intervals.add(new Interval(1407283200000L, 1407888000000L, ISOChronology.getInstanceUTC())); // 7 days resultList = (List>) method1.invoke(input, intervals, 6); expectedResultList = new ArrayList<>(); - expectedResultList.add(Arrays.asList(new Interval(1199145600000L, 1201824000000L), - new Interval(1325376000000L, 1328515200000L))); - expectedResultList.add(Arrays.asList(new Interval(1328515200000L, 1334332800000L))); - expectedResultList.add(Arrays.asList(new Interval(1334332800000L, 1340150400000L))); - expectedResultList.add(Arrays.asList(new Interval(1340150400000L, 1345968000000L))); - expectedResultList.add(Arrays.asList(new Interval(1345968000000L, 1351785600000L))); - expectedResultList.add(Arrays.asList(new Interval(1351785600000L, 1356998400000L), - new Interval(1407283200000L, 1407888000000L))); + expectedResultList.add(Arrays.asList(new Interval(1199145600000L, 1201824000000L, ISOChronology.getInstanceUTC()), + new Interval(1325376000000L, 1328515200000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1328515200000L, 1334332800000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1334332800000L, 1340150400000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1340150400000L, 1345968000000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1345968000000L, 1351785600000L, ISOChronology.getInstanceUTC()))); + expectedResultList.add(Arrays.asList(new Interval(1351785600000L, 1356998400000L, ISOChronology.getInstanceUTC()), + new Interval(1407283200000L, 1407888000000L, ISOChronology.getInstanceUTC()))); assertEquals(expectedResultList, resultList); }