[calcite] branch main updated (34b96765fc -> 26719b3b22)

[jh...@apache.org]

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

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


 discard 34b96765fc [MINOR][JAVADOC] Updated javadoc instructions for RelColumnOrigin#isDerived method
     new 26719b3b22 Update javadoc for RelColumnOrigin#isDerived method

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   (34b96765fc)
            \
             N -- N -- N   refs/heads/main (26719b3b22)

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:

[calcite] 01/01: Update javadoc for RelColumnOrigin#isDerived method

[jh...@apache.org]

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

jhyde pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git

commit 26719b3b22636418a8533f5776543dfe381e1425
Author: zhujiang.97 <37...@qq.com>
AuthorDate: Fri Mar 17 20:11:17 2023 +0800

    Update javadoc for RelColumnOrigin#isDerived method
---
 core/src/main/java/org/apache/calcite/rel/metadata/RelColumnOrigin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnOrigin.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnOrigin.java
index 28aa144d5a..974501b50b 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnOrigin.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelColumnOrigin.java
@@ -62,7 +62,7 @@ public class RelColumnOrigin {
   /**
    * Consider the query <code>select a+b as c, d as e from t</code>. The
    * output column c has two origins (a and b), both of them derived. The
-   * output column d as one origin (c), which is not derived.
+   * output column e has one origin (d), which is not derived.
    *
    * @return false if value taken directly from column in origin table; true
    * otherwise