[calcite] branch master updated (af89226 -> 27c067a)

[hy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hyuan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git.


    omit af89226  Add back API annotation in AbstractRelNode
     new 27c067a  Add back API annotation in AbstractRelNode

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (af89226)
            \
             N -- N -- N   refs/heads/master (27c067a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[calcite] 01/01: Add back API annotation in AbstractRelNode

[hy...@apache.org]

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

commit 27c067a983cf4c71d46c6ee49608151912662f88
Author: Haisheng Yuan <h....@alibaba-inc.com>
AuthorDate: Sun Jul 26 09:35:02 2020 -0500

    Add back API annotation in AbstractRelNode
---
 core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java b/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java
index 3f2aa28..f6c2987 100644
--- a/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java
+++ b/core/src/main/java/org/apache/calcite/rel/AbstractRelNode.java
@@ -406,6 +406,7 @@ public abstract class AbstractRelNode implements RelNode {
    * @return Whether the 2 RelNodes are equivalent or have the same digest.
    * @see #deepHashCode()
    */
+  @API(since = "1.25", status = API.Status.MAINTAINED)
   public boolean deepEquals(Object obj) {
     if (this == obj) {
       return true;
@@ -441,6 +442,7 @@ public abstract class AbstractRelNode implements RelNode {
    *
    * @see #deepEquals(Object)
    */
+  @API(since = "1.25", status = API.Status.MAINTAINED)
   public int deepHashCode() {
     int result = 31 + getTraitSet().hashCode();
     List<Pair<String, Object>> items = this.getDigestItems();