diff --git a/druid-lookups/pom.xml b/druid-lookups/pom.xml
index d3c23ce56..edf26821d 100644
--- a/druid-lookups/pom.xml
+++ b/druid-lookups/pom.xml
@@ -163,19 +163,19 @@
org.apache.druid
druid-processing
- ${druid.version}
+ 0.23.0
provided
org.apache.druid
druid-server
- ${druid.version}
+ 0.23.0
provided
org.apache.druid
druid-sql
- ${druid.version}
+ 0.23.0
provided
@@ -290,14 +290,14 @@
org.apache.druid
druid-server
- ${druid.version}
+ 0.23.0
test-jar
test
org.apache.druid.extensions
druid-hdfs-storage
- ${druid.version}
+ 0.23.0
test
diff --git a/druid-lookups/src/main/java/com/yahoo/maha/maha_druid_lookups/query/lookup/MahaLookupExtractor.java b/druid-lookups/src/main/java/com/yahoo/maha/maha_druid_lookups/query/lookup/MahaLookupExtractor.java
index 13b999ef8..0406d9d4b 100644
--- a/druid-lookups/src/main/java/com/yahoo/maha/maha_druid_lookups/query/lookup/MahaLookupExtractor.java
+++ b/druid-lookups/src/main/java/com/yahoo/maha/maha_druid_lookups/query/lookup/MahaLookupExtractor.java
@@ -9,6 +9,7 @@
import org.apache.druid.java.util.common.logger.Logger;
import java.util.Map;
+import java.util.Set;
abstract public class MahaLookupExtractor extends LookupExtractor {
private static final Logger LOG = new Logger(MahaLookupExtractor.class);
@@ -44,4 +45,19 @@ public String apply(@Nullable String key) {
}
return null;
}
+
+ @Override
+ public Set keySet() {
+ return null;
+ }
+
+ @Override
+ public boolean canGetKeySet() {
+ return false;
+ }
+
+ @Override
+ public byte[] getCacheKey() {
+ return null;
+ }
}
diff --git a/druid-lookups/src/main/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupExprMacro.java b/druid-lookups/src/main/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupExprMacro.java
index afce0b399..d712de11c 100644
--- a/druid-lookups/src/main/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupExprMacro.java
+++ b/druid-lookups/src/main/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupExprMacro.java
@@ -29,10 +29,7 @@
import org.apache.druid.java.util.common.IAE;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.java.util.common.logger.Logger;
-import org.apache.druid.math.expr.Expr;
-import org.apache.druid.math.expr.ExprEval;
-import org.apache.druid.math.expr.ExprMacroTable;
-import org.apache.druid.math.expr.ExprType;
+import org.apache.druid.math.expr.*;
import org.apache.druid.query.lookup.LookupExtractorFactoryContainerProvider;
import org.apache.druid.query.lookup.LookupReferencesManager;
@@ -139,9 +136,9 @@ public Expr visit(Shuttle shuttle)
@Nullable
@Override
- public ExprType getOutputType(InputBindingInspector inspector)
+ public ExpressionType getOutputType(InputBindingInspector inspector)
{
- return ExprType.STRING;
+ return ExpressionType.STRING;
}
@Override
diff --git a/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupExprMacroTest.java b/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupExprMacroTest.java
index 9e31c7ffc..4bf01cd2e 100644
--- a/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupExprMacroTest.java
+++ b/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupExprMacroTest.java
@@ -29,6 +29,7 @@
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.math.expr.Expr;
import org.apache.druid.math.expr.ExprMacroTable;
+import org.apache.druid.math.expr.InputBindings;
import org.apache.druid.math.expr.Parser;
import org.apache.druid.metadata.MetadataStorageConnectorConfig;
import org.apache.druid.query.lookup.*;
@@ -46,7 +47,7 @@
public class MahaLookupExprMacroTest {
- private static final Expr.ObjectBinding BINDINGS = Parser.withMap(
+ private static final Expr.ObjectBinding BINDINGS = InputBindings.withMap(
ImmutableMap.builder()
.put("id1", "dim_key1")
.build()
diff --git a/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupOperatorConversionTest.java b/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupOperatorConversionTest.java
index b06913c2c..bfad9ca89 100644
--- a/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupOperatorConversionTest.java
+++ b/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupOperatorConversionTest.java
@@ -30,6 +30,7 @@
import org.apache.druid.common.config.NullHandling;
import org.apache.druid.math.expr.ExprMacroTable;
import org.apache.druid.query.lookup.*;
+import org.apache.druid.segment.column.ColumnType;
import org.apache.druid.segment.column.RowSignature;
import org.apache.druid.segment.column.ValueType;
import org.apache.druid.sql.calcite.expression.DruidExpression;
@@ -58,10 +59,10 @@ public void testLookupReturnsExpectedResults() throws JsonProcessingException {
RexBuilder rexBuilder = new RexBuilder(util.typeFactory);
RowSignature ROW_SIGNATURE = RowSignature
.builder()
- .add("d", ValueType.DOUBLE)
- .add("l", ValueType.LONG)
- .add("s", ValueType.STRING)
- .add("student_id", ValueType.STRING)
+ .add("d", ColumnType.DOUBLE)
+ .add("l", ColumnType.LONG)
+ .add("s", ColumnType.STRING)
+ .add("student_id", ColumnType.STRING)
.build();
final LookupExtractorFactoryContainerProvider manager = EasyMock.createStrictMock(LookupReferencesManager.class);
@@ -97,10 +98,10 @@ public void testBasicMappedLookup() throws JsonProcessingException {
RexBuilder rexBuilder = new RexBuilder(util.typeFactory);
RowSignature ROW_SIGNATURE = RowSignature
.builder()
- .add("d", ValueType.DOUBLE)
- .add("l", ValueType.LONG)
- .add("grade", ValueType.STRING)
- .add("student_id", ValueType.STRING)
+ .add("d", ColumnType.DOUBLE)
+ .add("l", ColumnType.LONG)
+ .add("grade", ColumnType.STRING)
+ .add("student_id", ColumnType.STRING)
.build();
final LookupExtractorFactoryContainerProvider manager = EasyMock.createStrictMock(LookupReferencesManager.class);
@@ -139,10 +140,10 @@ public void testInvalidLookupCol() {
RexBuilder rexBuilder = new RexBuilder(util.typeFactory);
RowSignature ROW_SIGNATURE = RowSignature
.builder()
- .add("d", ValueType.DOUBLE)
- .add("l", ValueType.LONG)
- .add("grade", ValueType.STRING)
- .add("student_id", ValueType.STRING)
+ .add("d", ColumnType.DOUBLE)
+ .add("l", ColumnType.LONG)
+ .add("grade", ColumnType.STRING)
+ .add("student_id", ColumnType.STRING)
.build();
final LookupExtractorFactoryContainerProvider manager = EasyMock.createStrictMock(LookupReferencesManager.class);
@@ -175,10 +176,10 @@ public void testInvalidValueCol() throws JsonProcessingException {
RexBuilder rexBuilder = new RexBuilder(util.typeFactory);
RowSignature ROW_SIGNATURE = RowSignature
.builder()
- .add("d", ValueType.DOUBLE)
- .add("l", ValueType.LONG)
- .add("grade", ValueType.STRING)
- .add("student_id", ValueType.STRING)
+ .add("d", ColumnType.DOUBLE)
+ .add("l", ColumnType.LONG)
+ .add("grade", ColumnType.STRING)
+ .add("student_id", ColumnType.STRING)
.build();
final LookupExtractorFactoryContainerProvider manager = EasyMock.createStrictMock(LookupReferencesManager.class);
@@ -219,10 +220,10 @@ public void testMappedLookupWithNullKeys() throws JsonProcessingException {
RexBuilder rexBuilder = new RexBuilder(util.typeFactory);
RowSignature ROW_SIGNATURE = RowSignature
.builder()
- .add("d", ValueType.DOUBLE)
- .add("l", ValueType.LONG)
- .add("grade", ValueType.STRING)
- .add("student_id", ValueType.STRING)
+ .add("d", ColumnType.DOUBLE)
+ .add("l", ColumnType.LONG)
+ .add("grade", ColumnType.STRING)
+ .add("student_id", ColumnType.STRING)
.build();
final LookupExtractorFactoryContainerProvider manager = EasyMock.createStrictMock(LookupReferencesManager.class);
diff --git a/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupTestUtil.java b/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupTestUtil.java
index df5f02be8..a8cdd1666 100644
--- a/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupTestUtil.java
+++ b/druid-lookups/src/test/java/com/yahoo/maha/maha_druid_lookups/server/lookup/namespace/MahaLookupTestUtil.java
@@ -12,6 +12,7 @@
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.granularity.Granularities;
import org.apache.druid.query.groupby.GroupByQuery;
+import org.apache.druid.segment.column.ColumnType;
import org.apache.druid.segment.column.RowSignature;
import org.apache.druid.segment.column.ValueType;
import org.apache.druid.sql.calcite.aggregation.DimensionExpression;
@@ -45,7 +46,7 @@ String convertToJson(DruidExpression druidExpression, String cubeName, String ou
.setInterval(lastWeek + "T00:00:00.000Z/" + today + "T00:00:00.000Z")
.setGranularity(Granularities.ALL)
.setDimensions(
- DimensionExpression.ofSimpleColumn(outputName, druidExpression, ValueType.STRING).toDimensionSpec()
+ DimensionExpression.ofSimpleColumn(outputName, druidExpression, ColumnType.STRING).toDimensionSpec()
)
.build();