Repository: phoenix Updated Branches: refs/heads/calcite e17523320 -> eb51d8bb4
Adapt calcite interface change Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/eb51d8bb Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/eb51d8bb Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/eb51d8bb Branch: refs/heads/calcite Commit: eb51d8bb41752b43c2952bfe0e0b17b57204088d Parents: e175233 Author: maryannxue <[email protected]> Authored: Tue Jan 31 23:16:29 2017 -0800 Committer: maryannxue <[email protected]> Committed: Tue Jan 31 23:16:29 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb51d8bb/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java index a4969ca..7311e58 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/PhoenixPrepareImpl.java @@ -16,7 +16,6 @@ import org.apache.calcite.plan.RelOptCostFactory; import org.apache.calcite.plan.RelOptPlanner; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.prepare.CalcitePrepareImpl; -import org.apache.calcite.prepare.Prepare.Materialization; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; import org.apache.calcite.rel.logical.LogicalSort; @@ -270,11 +269,10 @@ public class PhoenixPrepareImpl extends CalcitePrepareImpl { } })); - hooks.add(Hook.PROGRAM.add(new Function<org.apache.calcite.util.Pair<List<Materialization>, Holder<Program>>, Object>() { + hooks.add(Hook.PROGRAM.add(new Function<Holder<Program>, Object>() { @Override - public Object apply( - org.apache.calcite.util.Pair<List<Materialization>, Holder<Program>> input) { - input.getValue().set(Programs.standard(PhoenixRel.METADATA_PROVIDER)); + public Object apply(Holder<Program> input) { + input.set(Programs.standard(PhoenixRel.METADATA_PROVIDER)); return null; } }));
