diff --git druid-handler/pom.xml druid-handler/pom.xml
index 81c744f..48b2af9 100644
--- druid-handler/pom.xml
+++ druid-handler/pom.xml
@@ -53,6 +53,18 @@
com.google.guava
guava
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
@@ -119,18 +131,6 @@
${druid.version}
- com.fasterxml.jackson.core
- jackson-core
-
-
- com.fasterxml.jackson.core
- jackson-annotations
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
com.google.code.findbugs
annotations
@@ -216,24 +216,20 @@
com.google.guava
guava
-
-
-
- org.apache.calcite
- calcite-druid
- ${calcite.version}
-
- org.apache.calcite.avatica
- avatica-core
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
-
- org.apache.calcite.avatica
- avatica
- ${avatica.version}
-
junit
diff --git druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java
index 2aeb279..fb15830 100644
--- druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java
+++ druid-handler/src/test/org/apache/hadoop/hive/druid/TestHiveDruidQueryBasedInputFormat.java
@@ -139,7 +139,7 @@ public void testCreateSplitsIntervals() throws Exception {
private static final String TIMESERIES_QUERY =
"{ \"queryType\": \"timeseries\", "
+ " \"dataSource\": \"sample_datasource\", "
- + " \"granularity\": \"day\", "
+ + " \"granularity\": \"DAY\", "
+ " \"descending\": \"true\", "
+ " \"intervals\": [ \"2012-01-01T00:00:00.000/2012-01-03T00:00:00.000\" ]}";
private static final String TIMESERIES_QUERY_SPLIT =
@@ -149,7 +149,7 @@ public void testCreateSplitsIntervals() throws Exception {
+ "\"descending\":true,"
+ "\"virtualColumns\":[],"
+ "\"filter\":null,"
- + "\"granularity\":{\"type\":\"period\",\"period\":\"P1D\",\"timeZone\":\"America/Los_Angeles\",\"origin\":null},"
+ + "\"granularity\":\"DAY\","
+ "\"aggregations\":[],"
+ "\"postAggregations\":[],"
+ "\"context\":null}, [localhost:8082]}]";
@@ -213,7 +213,7 @@ public void testCreateSplitsIntervals() throws Exception {
+ "\"intervals\":{\"type\":\"LegacySegmentSpec\",\"intervals\":[\"2012-01-01T00:00:00.000-08:00/2012-01-03T00:00:00.000-08:00\"]},"
+ "\"virtualColumns\":[],"
+ "\"filter\":null,"
- + "\"granularity\":{\"type\":\"period\",\"period\":\"P1D\",\"timeZone\":\"America/Los_Angeles\",\"origin\":null},"
+ + "\"granularity\":\"DAY\","
+ "\"dimensions\":[{\"type\":\"LegacyDimensionSpec\",\"dimension\":\"country\",\"outputName\":\"country\",\"outputType\":\"STRING\"},"
+ "{\"type\":\"LegacyDimensionSpec\",\"dimension\":\"device\",\"outputName\":\"device\",\"outputType\":\"STRING\"}],"
+ "\"aggregations\":[{\"type\":\"longSum\",\"name\":\"total_usage\",\"fieldName\":\"user_count\",\"expression\":null},"