You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2015/12/15 21:41:12 UTC
phoenix git commit: Remove temporary fix for CALCITE-1018
Repository: phoenix
Updated Branches:
refs/heads/calcite 5a833c326 -> cdc400876
Remove temporary fix for CALCITE-1018
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cdc40087
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cdc40087
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cdc40087
Branch: refs/heads/calcite
Commit: cdc400876c781ec12b15949d828ddb287864d13b
Parents: 5a833c3
Author: maryannxue <ma...@gmail.com>
Authored: Tue Dec 15 15:40:43 2015 -0500
Committer: maryannxue <ma...@gmail.com>
Committed: Tue Dec 15 15:40:43 2015 -0500
----------------------------------------------------------------------
.../metadata/PhoenixRelMdMaxRowCount.java | 31 --------------------
.../metadata/PhoenixRelMetadataProvider.java | 1 -
2 files changed, 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cdc40087/phoenix-core/src/main/java/org/apache/phoenix/calcite/metadata/PhoenixRelMdMaxRowCount.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/metadata/PhoenixRelMdMaxRowCount.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/metadata/PhoenixRelMdMaxRowCount.java
deleted file mode 100644
index af0a52d..0000000
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/metadata/PhoenixRelMdMaxRowCount.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.apache.phoenix.calcite.metadata;
-
-import org.apache.calcite.plan.volcano.RelSubset;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.core.Sort;
-import org.apache.calcite.rel.metadata.ReflectiveRelMetadataProvider;
-import org.apache.calcite.rel.metadata.RelMetadataProvider;
-import org.apache.calcite.rex.RexLiteral;
-import org.apache.calcite.util.BuiltInMethod;
-
-public class PhoenixRelMdMaxRowCount {
- public static final RelMetadataProvider SOURCE =
- ReflectiveRelMetadataProvider.reflectiveSource(
- BuiltInMethod.MAX_ROW_COUNT.method, new PhoenixRelMdMaxRowCount());
-
- private PhoenixRelMdMaxRowCount() {
- }
-
- public Double getMaxRowCount(RelSubset rel) {
- for (RelNode node : rel.getRels()) {
- if (node instanceof Sort) {
- Sort sort = (Sort) node;
- if (sort.fetch != null) {
- return (double) RexLiteral.intValue(sort.fetch);
- }
- }
- }
-
- return Double.POSITIVE_INFINITY;
- }
-}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cdc40087/phoenix-core/src/main/java/org/apache/phoenix/calcite/metadata/PhoenixRelMetadataProvider.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/calcite/metadata/PhoenixRelMetadataProvider.java b/phoenix-core/src/main/java/org/apache/phoenix/calcite/metadata/PhoenixRelMetadataProvider.java
index e198477..c9412c6 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/calcite/metadata/PhoenixRelMetadataProvider.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/calcite/metadata/PhoenixRelMetadataProvider.java
@@ -10,7 +10,6 @@ public class PhoenixRelMetadataProvider extends ChainedRelMetadataProvider {
super(ImmutableList.of(
PhoenixRelMdRowCount.SOURCE,
PhoenixRelMdCollation.SOURCE,
- PhoenixRelMdMaxRowCount.SOURCE,
new DefaultRelMetadataProvider()));
}