Repository: calcite Updated Branches: refs/heads/master 1945c9a92 -> d26330f2c
Following [CALCITE-2111], fix compilation error that occurs on guava-21 and higher Close apache/calcite#592 Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d26330f2 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d26330f2 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d26330f2 Branch: refs/heads/master Commit: d26330f2c58c1ccd470dc27d2b41b6b4dbb41b45 Parents: 1945c9a Author: Julian Hyde <[email protected]> Authored: Thu Jan 4 11:04:48 2018 -0800 Committer: Julian Hyde <[email protected]> Committed: Thu Jan 4 16:01:10 2018 -0800 ---------------------------------------------------------------------- .../calcite/rel/rules/AggregateExtractProjectRule.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/d26330f2/core/src/main/java/org/apache/calcite/rel/rules/AggregateExtractProjectRule.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExtractProjectRule.java b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExtractProjectRule.java index 5bb88ec..0e4f76d 100644 --- a/core/src/main/java/org/apache/calcite/rel/rules/AggregateExtractProjectRule.java +++ b/core/src/main/java/org/apache/calcite/rel/rules/AggregateExtractProjectRule.java @@ -24,6 +24,7 @@ import org.apache.calcite.rel.core.Aggregate; import org.apache.calcite.rel.core.AggregateCall; import org.apache.calcite.rel.core.Project; import org.apache.calcite.rex.RexNode; +import org.apache.calcite.runtime.PredicateImpl; import org.apache.calcite.tools.RelBuilder; import org.apache.calcite.tools.RelBuilderFactory; import org.apache.calcite.util.ImmutableBitSet; @@ -57,11 +58,12 @@ public class AggregateExtractProjectRule extends RelOptRule { /** Predicate that prevents matching against an {@code Aggregate} whose input * is already a {@code Project}. This will prevent this rule firing * repeatedly. */ - private static final Predicate<RelNode> PREDICATE = new Predicate<RelNode>() { - @Override public boolean apply(@Nullable RelNode relNode) { - return !(relNode instanceof Project); - } - }; + private static final Predicate<RelNode> PREDICATE = + new PredicateImpl<RelNode>() { + public boolean test(@Nullable RelNode relNode) { + return !(relNode instanceof Project); + } + }; /** * Creates an AggregateExtractProjectRule.
