Repository: calcite Updated Branches: refs/heads/master 0e13a8a02 -> 6b1d24746
[CALCITE-2187] Fix build issue caused by CALCITE-2170 Close apache/calcite#631 Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/6b1d2474 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/6b1d2474 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/6b1d2474 Branch: refs/heads/master Commit: 6b1d24746624b13c97df401f344449f44cb6b3bd Parents: 0e13a8a Author: Slim <[email protected]> Authored: Sat Feb 17 14:06:23 2018 -0800 Committer: Jesus Camacho Rodriguez <[email protected]> Committed: Sat Feb 17 21:50:26 2018 -0800 ---------------------------------------------------------------------- .../apache/calcite/adapter/druid/DruidQuery.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/6b1d2474/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java ---------------------------------------------------------------------- diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java index aa9a02a..cc5eeda 100644 --- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java +++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java @@ -202,17 +202,13 @@ public class DruidQuery extends AbstractRelNode implements BindableRel { /** Creates a DruidQuery. */ public static DruidQuery create(RelOptCluster cluster, RelTraitSet traitSet, RelOptTable table, DruidTable druidTable, List<RelNode> rels) { - final ImmutableMap converterOperatorMap = ImmutableMap.<SqlOperator, - DruidSqlOperatorConverter>builder().putAll( - Lists.transform(DEFAULT_OPERATORS_LIST, new Function<DruidSqlOperatorConverter, - Map.Entry<SqlOperator, DruidSqlOperatorConverter>>() { - @Nullable @Override public Map.Entry<SqlOperator, DruidSqlOperatorConverter> apply( - final DruidSqlOperatorConverter input) { - return Maps.immutableEntry(input.calciteOperator(), input); - } - })).build(); + final ImmutableMap.Builder<SqlOperator, DruidSqlOperatorConverter> mapBuilder = ImmutableMap + .builder(); + for (DruidSqlOperatorConverter converter : DEFAULT_OPERATORS_LIST) { + mapBuilder.put(converter.calciteOperator(), converter); + } return create(cluster, traitSet, table, druidTable, druidTable.intervals, rels, - converterOperatorMap); + mapBuilder.build()); } /** Creates a DruidQuery. */
