diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/HiveDruidQueryBasedInputFormat.java druid-handler/src/java/org/apache/hadoop/hive/druid/HiveDruidQueryBasedInputFormat.java index 3df1452..a18e590 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/HiveDruidQueryBasedInputFormat.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/HiveDruidQueryBasedInputFormat.java @@ -25,6 +25,8 @@ import java.util.List; import java.util.Map; +import org.apache.calcite.adapter.druid.DruidDateTimeUtils; +import org.apache.calcite.adapter.druid.DruidTable; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; @@ -37,8 +39,6 @@ import org.apache.hadoop.hive.druid.serde.DruidTimeseriesQueryRecordReader; import org.apache.hadoop.hive.druid.serde.DruidTopNQueryRecordReader; import org.apache.hadoop.hive.druid.serde.DruidWritable; -import org.apache.hadoop.hive.ql.optimizer.calcite.druid.DruidIntervalUtils; -import org.apache.hadoop.hive.ql.optimizer.calcite.druid.DruidTable; import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapred.JobConf; @@ -273,7 +273,7 @@ private static String createSelectStarQuery(String address, String dataSource) t } private static List> createSplitsIntervals(List intervals, int numSplits) { - final long totalTime = DruidIntervalUtils.extractTotalTime(intervals); + final long totalTime = DruidDateTimeUtils.extractTotalTime(intervals); long startTime = intervals.get(0).getStartMillis(); long endTime = startTime; long currTime = 0; diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java index 226060f..49e096b 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidGroupByQueryRecordReader.java @@ -21,9 +21,9 @@ import java.io.InputStream; import java.util.List; +import org.apache.calcite.adapter.druid.DruidTable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.druid.DruidStorageHandlerUtils; -import org.apache.hadoop.hive.ql.optimizer.calcite.druid.DruidTable; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.InputSplit; diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSelectQueryRecordReader.java druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSelectQueryRecordReader.java index 70b493c..fccf7c4 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSelectQueryRecordReader.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSelectQueryRecordReader.java @@ -22,8 +22,8 @@ import java.util.Iterator; import java.util.List; +import org.apache.calcite.adapter.druid.DruidTable; import org.apache.hadoop.hive.druid.DruidStorageHandlerUtils; -import org.apache.hadoop.hive.ql.optimizer.calcite.druid.DruidTable; import org.apache.hadoop.io.NullWritable; import com.fasterxml.jackson.core.type.TypeReference; diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSerDe.java druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSerDe.java index 8f53d4a..238f7a3 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSerDe.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidSerDe.java @@ -25,11 +25,11 @@ import java.util.Map.Entry; import java.util.Properties; +import org.apache.calcite.adapter.druid.DruidTable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.Constants; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.druid.DruidStorageHandlerUtils; -import org.apache.hadoop.hive.ql.optimizer.calcite.druid.DruidTable; import org.apache.hadoop.hive.serde2.AbstractSerDe; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeSpec; diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTimeseriesQueryRecordReader.java druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTimeseriesQueryRecordReader.java index 812ae03..b91178c 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTimeseriesQueryRecordReader.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTimeseriesQueryRecordReader.java @@ -21,8 +21,8 @@ import java.io.InputStream; import java.util.List; +import org.apache.calcite.adapter.druid.DruidTable; import org.apache.hadoop.hive.druid.DruidStorageHandlerUtils; -import org.apache.hadoop.hive.ql.optimizer.calcite.druid.DruidTable; import org.apache.hadoop.io.NullWritable; import com.fasterxml.jackson.core.type.TypeReference; diff --git druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTopNQueryRecordReader.java druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTopNQueryRecordReader.java index 0b87976..0b77a9b 100644 --- druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTopNQueryRecordReader.java +++ druid-handler/src/java/org/apache/hadoop/hive/druid/serde/DruidTopNQueryRecordReader.java @@ -22,8 +22,8 @@ import java.util.Iterator; import java.util.List; +import org.apache.calcite.adapter.druid.DruidTable; import org.apache.hadoop.hive.druid.DruidStorageHandlerUtils; -import org.apache.hadoop.hive.ql.optimizer.calcite.druid.DruidTable; import org.apache.hadoop.io.NullWritable; import com.fasterxml.jackson.core.type.TypeReference; diff --git pom.xml pom.xml index 5d13344..98d2dc2 100644 --- pom.xml +++ pom.xml @@ -112,9 +112,10 @@ 3.4 1.5.6 0.1 + 1.8.0 1.7.7 0.8.0.RELEASE - 1.6.0 + 1.10.0 4.2.1 4.1.6 4.1.7 diff --git ql/pom.xml ql/pom.xml index 2a93bb7..489c6f3 100644 --- ql/pom.xml +++ ql/pom.xml @@ -383,8 +383,13 @@ org.apache.calcite - calcite-avatica + calcite-druid ${calcite.version} + + + org.apache.calcite.avatica + avatica + ${avatica.version}