[CALCITE-1273] Update references to EnumerableTableAccessRel to EnumerableTableScan
This class was renamed a long time ago, in [CALCITE-306], but the doc didn't catch up. Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/063f5788 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/063f5788 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/063f5788 Branch: refs/heads/master Commit: 063f5788bb2eb29311f43f642660a8d56ed1f40e Parents: 62db463 Author: Julian Hyde <[email protected]> Authored: Mon Jun 6 12:11:53 2016 -0700 Committer: Julian Hyde <[email protected]> Committed: Mon Jun 6 12:11:53 2016 -0700 ---------------------------------------------------------------------- .../apache/calcite/schema/TranslatableTable.java | 11 ++++++----- .../org/apache/calcite/adapter/tpcds/TpcdsTest.java | 16 ++++++++-------- site/_docs/tutorial.md | 2 +- .../calcite/adapter/splunk/SplunkPushDownRule.java | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/063f5788/core/src/main/java/org/apache/calcite/schema/TranslatableTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/schema/TranslatableTable.java b/core/src/main/java/org/apache/calcite/schema/TranslatableTable.java index 0a254ba..c93afcd 100644 --- a/core/src/main/java/org/apache/calcite/schema/TranslatableTable.java +++ b/core/src/main/java/org/apache/calcite/schema/TranslatableTable.java @@ -21,13 +21,14 @@ import org.apache.calcite.rel.RelNode; /** * Extension to {@link Table} that specifies how it is to be translated to - * a {@link org.apache.calcite.rel.RelNode planner node}. + * a {@link org.apache.calcite.rel.RelNode relational expression}. * - * <p>It is optional for a Table to implement this interface. A Table that does - * not implement this interface, a Table will be converted to an - * EnumerableTableAccessRel. Generally a Table will implements this interface to + * <p>It is optional for a Table to implement this interface. If Table does + * not implement this interface, it will be converted to an + * {@link org.apache.calcite.adapter.enumerable.EnumerableTableScan}. + * Generally a Table will implement this interface to * create a particular subclass of RelNode, and also register rules that act - * on that particular subclass of RelNode.</p> + * on that particular subclass of RelNode. */ public interface TranslatableTable extends Table { /** Converts this table into a {@link RelNode relational expression}. */ http://git-wip-us.apache.org/repos/asf/calcite/blob/063f5788/plus/src/test/java/org/apache/calcite/adapter/tpcds/TpcdsTest.java ---------------------------------------------------------------------- diff --git a/plus/src/test/java/org/apache/calcite/adapter/tpcds/TpcdsTest.java b/plus/src/test/java/org/apache/calcite/adapter/tpcds/TpcdsTest.java index b7f1f1c..715e6f4 100644 --- a/plus/src/test/java/org/apache/calcite/adapter/tpcds/TpcdsTest.java +++ b/plus/src/test/java/org/apache/calcite/adapter/tpcds/TpcdsTest.java @@ -133,22 +133,22 @@ public class TpcdsTest { + " EnumerableCalcRel(expr#0..211=[{inputs}], expr#212=[*($t89, $t89)], expr#213=[*($t140, $t140)], expr#214=[*($t196, $t196)], I_ITEM_ID=[$t58], I_ITEM_DESC=[$t61], S_STATE=[$t24], SS_QUANTITY=[$t89], SR_RETURN_QUANTITY=[$t140], CS_QUANTITY=[$t196], $f6=[$t212], $f7=[$t213], $f8=[$t214]): rowcount = 5.434029018852197E27, cumulative cost = {1.0868058037845108E28 rows, 1.2172225002228922E30 cpu, 0.0 io}\n" + " EnumerableJoinRel(condition=[AND(=($82, $133), =($81, $132), =($88, $139))], joinType=[inner]): rowcount = 5.434029018852197E27, cumulative cost = {5.434029018992911E27 rows, 1.8579845E7 cpu, 0.0 io}\n" + " EnumerableJoinRel(condition=[=($0, $86)], joinType=[inner]): rowcount = 2.3008402586892598E13, cumulative cost = {4.8588854672853766E13 rows, 7354409.0 cpu, 0.0 io}\n" - + " EnumerableTableAccessRel(table=[[TPCDS, STORE]]): rowcount = 12.0, cumulative cost = {12.0 rows, 13.0 cpu, 0.0 io}\n" + + " EnumerableTableScan(table=[[TPCDS, STORE]]): rowcount = 12.0, cumulative cost = {12.0 rows, 13.0 cpu, 0.0 io}\n" + " EnumerableJoinRel(condition=[=($0, $50)], joinType=[inner]): rowcount = 1.2782445881607E13, cumulative cost = {1.279800620431234E13 rows, 7354396.0 cpu, 0.0 io}\n" + " EnumerableCalcRel(expr#0..27=[{inputs}], expr#28=[CAST($t15):VARCHAR(6) CHARACTER SET \"ISO-8859-1\" COLLATE \"ISO-8859-1$en_US$primary\"], expr#29=['1998Q1'], expr#30=[=($t28, $t29)], proj#0..27=[{exprs}], $condition=[$t30]): rowcount = 10957.35, cumulative cost = {84006.35 rows, 4455990.0 cpu, 0.0 io}\n" - + " EnumerableTableAccessRel(table=[[TPCDS, DATE_DIM]]): rowcount = 73049.0, cumulative cost = {73049.0 rows, 73050.0 cpu, 0.0 io}\n" + + " EnumerableTableScan(table=[[TPCDS, DATE_DIM]]): rowcount = 73049.0, cumulative cost = {73049.0 rows, 73050.0 cpu, 0.0 io}\n" + " EnumerableJoinRel(condition=[=($0, $24)], joinType=[inner]): rowcount = 7.7770908E9, cumulative cost = {7.783045975286664E9 rows, 2898406.0 cpu, 0.0 io}\n" - + " EnumerableTableAccessRel(table=[[TPCDS, ITEM]]): rowcount = 18000.0, cumulative cost = {18000.0 rows, 18001.0 cpu, 0.0 io}\n" - + " EnumerableTableAccessRel(table=[[TPCDS, STORE_SALES]]): rowcount = 2880404.0, cumulative cost = {2880404.0 rows, 2880405.0 cpu, 0.0 io}\n" + + " EnumerableTableScan(table=[[TPCDS, ITEM]]): rowcount = 18000.0, cumulative cost = {18000.0 rows, 18001.0 cpu, 0.0 io}\n" + + " EnumerableTableScan(table=[[TPCDS, STORE_SALES]]): rowcount = 2880404.0, cumulative cost = {2880404.0 rows, 2880405.0 cpu, 0.0 io}\n" + " EnumerableJoinRel(condition=[AND(=($31, $79), =($30, $91))], joinType=[inner]): rowcount = 6.9978029381741304E16, cumulative cost = {6.9978054204658736E16 rows, 1.1225436E7 cpu, 0.0 io}\n" + " EnumerableJoinRel(condition=[=($0, $28)], joinType=[inner]): rowcount = 7.87597881975E8, cumulative cost = {7.884434222216867E8 rows, 5035701.0 cpu, 0.0 io}\n" + " EnumerableCalcRel(expr#0..27=[{inputs}], expr#28=['1998Q1'], expr#29=[=($t15, $t28)], expr#30=['1998Q2'], expr#31=[=($t15, $t30)], expr#32=['1998Q3'], expr#33=[=($t15, $t32)], expr#34=[OR($t29, $t31, $t33)], proj#0..27=[{exprs}], $condition=[$t34]): rowcount = 18262.25, cumulative cost = {91311.25 rows, 4748186.0 cpu, 0.0 io}\n" - + " EnumerableTableAccessRel(table=[[TPCDS, DATE_DIM]]): rowcount = 73049.0, cumulative cost = {73049.0 rows, 73050.0 cpu, 0.0 io}\n" - + " EnumerableTableAccessRel(table=[[TPCDS, STORE_RETURNS]]): rowcount = 287514.0, cumulative cost = {287514.0 rows, 287515.0 cpu, 0.0 io}\n" + + " EnumerableTableScan(table=[[TPCDS, DATE_DIM]]): rowcount = 73049.0, cumulative cost = {73049.0 rows, 73050.0 cpu, 0.0 io}\n" + + " EnumerableTableScan(table=[[TPCDS, STORE_RETURNS]]): rowcount = 287514.0, cumulative cost = {287514.0 rows, 287515.0 cpu, 0.0 io}\n" + " EnumerableJoinRel(condition=[=($0, $28)], joinType=[inner]): rowcount = 3.94888649445E9, cumulative cost = {3.9520401026966867E9 rows, 6189735.0 cpu, 0.0 io}\n" + " EnumerableCalcRel(expr#0..27=[{inputs}], expr#28=['1998Q1'], expr#29=[=($t15, $t28)], expr#30=['1998Q2'], expr#31=[=($t15, $t30)], expr#32=['1998Q3'], expr#33=[=($t15, $t32)], expr#34=[OR($t29, $t31, $t33)], proj#0..27=[{exprs}], $condition=[$t34]): rowcount = 18262.25, cumulative cost = {91311.25 rows, 4748186.0 cpu, 0.0 io}\n" - + " EnumerableTableAccessRel(table=[[TPCDS, DATE_DIM]]): rowcount = 73049.0, cumulative cost = {73049.0 rows, 73050.0 cpu, 0.0 io}\n" - + " EnumerableTableAccessRel(table=[[TPCDS, CATALOG_SALES]]): rowcount = 1441548.0, cumulative cost = {1441548.0 rows, 1441549.0 cpu, 0.0 io}\n")); + + " EnumerableTableScan(table=[[TPCDS, DATE_DIM]]): rowcount = 73049.0, cumulative cost = {73049.0 rows, 73050.0 cpu, 0.0 io}\n" + + " EnumerableTableScan(table=[[TPCDS, CATALOG_SALES]]): rowcount = 1441548.0, cumulative cost = {1441548.0 rows, 1441549.0 cpu, 0.0 io}\n")); } @Test public void testQuery27() { http://git-wip-us.apache.org/repos/asf/calcite/blob/063f5788/site/_docs/tutorial.md ---------------------------------------------------------------------- diff --git a/site/_docs/tutorial.md b/site/_docs/tutorial.md index 73f8f8f..c907cef 100644 --- a/site/_docs/tutorial.md +++ b/site/_docs/tutorial.md @@ -481,7 +481,7 @@ sqlline> explain plan for select name from emps; | PLAN | +-----------------------------------------------------+ | EnumerableCalcRel(expr#0..9=[{inputs}], NAME=[$t1]) | -| EnumerableTableAccessRel(table=[[SALES, EMPS]]) | +| EnumerableTableScan(table=[[SALES, EMPS]]) | +-----------------------------------------------------+ sqlline> !connect jdbc:calcite:model=target/test-classes/smart.json admin admin sqlline> explain plan for select name from emps; http://git-wip-us.apache.org/repos/asf/calcite/blob/063f5788/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java ---------------------------------------------------------------------- diff --git a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java index a9c0d8e..31e73d8 100644 --- a/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java +++ b/splunk/src/main/java/org/apache/calcite/adapter/splunk/SplunkPushDownRule.java @@ -415,7 +415,7 @@ public class SplunkPushDownRule assert false; /* RelNode rel = - new EnumerableRules.EnumerableTableAccessRel( + new EnumerableTableScan( udxRel.getCluster(), udxRel.getTable(), udxRel.getRowType(),
