Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce code duplication between test ExprMacroTables. (#4979)

This commit is contained in:
Gian Merlino 2017-10-18 13:57:49 -07:00 committed by Himanshu
parent 4881bb273b
commit 5fc6891404
5 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/io/druid/math/expr/ExprMacroTable.java
View File

@ -19,6 +19,7 @@
package io.druid.math.expr;
import com.google.common.collect.ImmutableList;
import io.druid.java.util.common.StringUtils;
import javax.annotation.Nullable;
@ -48,6 +49,11 @@ public class ExprMacroTable
return NIL;
}
public List<ExprMacro> getMacros()
{
return ImmutableList.copyOf(macroMap.values());
}
/**
* Returns an expr corresponding to a function call if this table has an entry for {@code functionName}.
* Otherwise, returns null.

4
indexing-service/src/test/java/io/druid/indexing/common/TestUtils.java
View File

@ -29,7 +29,7 @@ import io.druid.jackson.DefaultObjectMapper;
import io.druid.java.util.common.ISE;
import io.druid.java.util.common.logger.Logger;
import io.druid.math.expr.ExprMacroTable;
import io.druid.query.expression.TestExpressionMacroTable;
import io.druid.query.expression.LookupEnabledTestExprMacroTable;
import io.druid.segment.IndexIO;
import io.druid.segment.IndexMergerV9;
import io.druid.segment.column.ColumnConfig;
@ -74,7 +74,7 @@ public class TestUtils
jsonMapper.setInjectableValues(
new InjectableValues.Std()
.addValue(ExprMacroTable.class.getName(), TestExpressionMacroTable.INSTANCE)
.addValue(ExprMacroTable.class.getName(), LookupEnabledTestExprMacroTable.INSTANCE)
.addValue(IndexIO.class, indexIO)
.addValue(ObjectMapper.class, jsonMapper)
.addValue(ChatHandlerProvider.class, new NoopChatHandlerProvider())

2
server/src/test/java/io/druid/query/expression/ExprMacroTest.java
View File

@ -174,7 +174,7 @@ public class ExprMacroTest
private void assertExpr(final String expression, final Object expectedResult)
{
final Expr expr = Parser.parse(expression, TestExpressionMacroTable.INSTANCE);
final Expr expr = Parser.parse(expression, LookupEnabledTestExprMacroTable.INSTANCE);
Assert.assertEquals(expression, expectedResult, expr.eval(BINDINGS).value());
}
}

34
server/src/test/java/io/druid/query/expression/TestExpressionMacroTable.java → server/src/test/java/io/druid/query/expression/LookupEnabledTestExprMacroTable.java
View File

@ -19,8 +19,9 @@
package io.druid.query.expression;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import io.druid.math.expr.ExprMacroTable;
import io.druid.query.extraction.MapLookupExtractor;
import io.druid.query.lookup.LookupExtractor;
@ -31,27 +32,26 @@ import io.druid.query.lookup.LookupReferencesManager;
import org.easymock.EasyMock;
import javax.annotation.Nullable;
import java.util.Collections;
public class TestExpressionMacroTable extends ExprMacroTable
/**
* Separate from {@link TestExprMacroTable} since that one is in druid-processing, which doesn't have
* {@link LookupReferencesManager}.
*/
public class LookupEnabledTestExprMacroTable extends ExprMacroTable
{
public static final ExprMacroTable INSTANCE = new TestExpressionMacroTable();
public static final ExprMacroTable INSTANCE = new LookupEnabledTestExprMacroTable();
private TestExpressionMacroTable()
private LookupEnabledTestExprMacroTable()
{
super(
ImmutableList.of(
new LikeExprMacro(),
new LookupExprMacro(createTestLookupReferencesManager(ImmutableMap.of("foo", "xfoo"))),
new RegexpExtractExprMacro(),
new TimestampCeilExprMacro(),
new TimestampExtractExprMacro(),
new TimestampFloorExprMacro(),
new TimestampFormatExprMacro(),
new TimestampParseExprMacro(),
new TimestampShiftExprMacro(),
new TrimExprMacro.BothTrimExprMacro(),
new TrimExprMacro.LeftTrimExprMacro(),
new TrimExprMacro.RightTrimExprMacro()
Lists.newArrayList(
Iterables.concat(
TestExprMacroTable.INSTANCE.getMacros(),
Collections.singletonList(
new LookupExprMacro(createTestLookupReferencesManager(ImmutableMap.of("foo", "xfoo")))
)
)
)
);
}

4
sql/src/test/java/io/druid/sql/calcite/util/CalciteTests.java
View File

@ -58,7 +58,7 @@ import io.druid.query.aggregation.DoubleSumAggregatorFactory;
import io.druid.query.aggregation.FloatSumAggregatorFactory;
import io.druid.query.aggregation.hyperloglog.HyperUniquesAggregatorFactory;
import io.druid.query.expression.LookupExprMacro;
import io.druid.query.expression.TestExpressionMacroTable;
import io.druid.query.expression.LookupEnabledTestExprMacroTable;
import io.druid.query.groupby.GroupByQuery;
import io.druid.query.groupby.GroupByQueryConfig;
import io.druid.query.groupby.GroupByQueryRunnerTest;
@ -140,7 +140,7 @@ public class CalciteTests
binder.bind(LookupReferencesManager.class)
.toInstance(
TestExpressionMacroTable.createTestLookupReferencesManager(
LookupEnabledTestExprMacroTable.createTestLookupReferencesManager(
ImmutableMap.of(
"a", "xa",
"abc", "xabc"