[calcite] branch master updated (52c1284 -> d4e1eea)

[jh...@apache.org]

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

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


 discard 52c1284  [CALCITE-4514] When merging RelSets, fine-tune which set is merged into which, for efficiency (Botong Huang)
     add d4e1eea  [CALCITE-4514] When merging RelSets, fine-tune which set is merged into which, for efficiency (Botong Huang)

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   (52c1284)
            \
             N -- N -- N   refs/heads/master (d4e1eea)

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.

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/calcite/plan/volcano/VolcanoPlanner.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)