[calcite] branch master updated (2d8fc5d -> 3ccad7b)

[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.


    omit 2d8fc5d  Following [CALCITE-4364], fix the plan diff of TpcdsTest
    omit c6b3fb7  Add regression warning to prevent users from upgrading to 1.26.0
     new 3ccad7b  Following [CALCITE-4364], fix the plan diff of TpcdsTest

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   (2d8fc5d)
            \
             N -- N -- N   refs/heads/master (3ccad7b)

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:
 site/_posts/2020-10-06-release-1.26.0.md | 4 ----
 1 file changed, 4 deletions(-)

[calcite] 01/01: Following [CALCITE-4364], fix the plan diff of TpcdsTest

[jh...@apache.org]

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

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

commit 3ccad7b2bcc962d48c1dee1c9604fd085d82c608
Author: yuzhao.cyz <yu...@gmail.com>
AuthorDate: Fri Nov 13 10:49:57 2020 +0800

    Following [CALCITE-4364], fix the plan diff of TpcdsTest
---
 .../src/test/java/org/apache/calcite/adapter/tpcds/TpcdsTest.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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 f0a868e..927167a 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
@@ -384,11 +384,9 @@ class TpcdsTest {
         + "LogicalSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC], fetch=[100])\n"
         + "  LogicalAggregate(group=[{84, 90}], AGG1=[AVG($10)], AGG2=[AVG($12)], AGG3=[AVG($19)], AGG4=[AVG($13)])\n"
         + "    LogicalFilter(condition=[AND(=($0, $32), =($2, $89), "
-        + "=($7, $60), =($4, $23), SEARCH($24, Sarg['M']:CHAR(1)), "
-        + "SEARCH($25, Sarg['S']:CHAR(1)), "
-        + "SEARCH($26, Sarg['HIGH SCHOOL']:CHAR(11)), "
-        + "SEARCH($38, Sarg[1998]), SEARCH($84, Sarg['CA', 'MD', 'OK', 'OR', "
-        + "'TX', 'WA']:CHAR(2)))])\n"
+        + "=($7, $60), =($4, $23), =($24, 'M'), "
+        + "=($25, 'S'), =($26, 'HIGH SCHOOL'), =($38, 1998), "
+        + "SEARCH($84, Sarg['CA', 'MD', 'OK', 'OR', 'TX', 'WA']:CHAR(2)))])\n"
         + "      LogicalJoin(condition=[true], joinType=[inner])\n"
         + "        LogicalTableScan(table=[[TPCDS, STORE_SALES]])\n"
         + "        LogicalJoin(condition=[true], joinType=[inner])\n"