This is an automated email from the ASF dual-hosted git repository.
hyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push:
new 29f798f [CALCITE-4032] Mark CalcMergeRule as TransformationRule
29f798f is described below
commit 29f798fb6919f24d95776658b7e659af179a8b15
Author: Haisheng Yuan <[email protected]>
AuthorDate: Sun May 31 12:02:09 2020 -0500
[CALCITE-4032] Mark CalcMergeRule as TransformationRule
So that in VolcanoPlanner, CalcMergeRule doesn't match EnumerableCalc
anymore.
It only matches LogicalCalc.
Close #1997
---
core/src/main/java/org/apache/calcite/rel/rules/CalcMergeRule.java | 2 +-
site/_docs/history.md | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/calcite/rel/rules/CalcMergeRule.java
b/core/src/main/java/org/apache/calcite/rel/rules/CalcMergeRule.java
index fc4a2e8..a65f81e 100644
--- a/core/src/main/java/org/apache/calcite/rel/rules/CalcMergeRule.java
+++ b/core/src/main/java/org/apache/calcite/rel/rules/CalcMergeRule.java
@@ -35,7 +35,7 @@ import org.apache.calcite.tools.RelBuilderFactory;
* {@link org.apache.calcite.rel.logical.LogicalCalc}, but expressed in terms
of
* the lower {@link org.apache.calcite.rel.logical.LogicalCalc}'s inputs.
*/
-public class CalcMergeRule extends RelOptRule {
+public class CalcMergeRule extends RelOptRule implements TransformationRule {
//~ Static fields/initializers ---------------------------------------------
public static final CalcMergeRule INSTANCE =
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 7e40ae4..b769b48 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -27,6 +27,13 @@ For a full list of releases, see
<a href="https://github.com/apache/calcite/releases";>github</a>.
Downloads are available on the
[downloads page]({{ site.baseurl }}/downloads/).
+## <a
href="https://github.com/apache/calcite/releases/tag/calcite-1.24.0";>1.24.0</a>
/ under development
+{: #v1-24-0}
+
+#### Breaking Changes
+
+* [<a
href="https://issues.apache.org/jira/browse/CALCITE-4032";>CALCITE-4032</a>]
+ Mark `CalcMergeRule` as `TransformationRule`
## <a
href="https://github.com/apache/calcite/releases/tag/calcite-1.23.0";>1.23.0</a>
/ 2020-05-23
{: #v1-23-0}
