Changeset: 36ef29637284 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/36ef29637284
Modified Files:
        sql/server/rel_unnest.c
        sql/test/SQLancer/Tests/sqlancer18.test
Branch: default
Log Message:

make sure we reset the cardinality of a project correctly
fixed output


diffs (28 lines):

diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -1996,8 +1996,11 @@ exp_reset_card_and_freevar_set_physical_
        }
        if (is_simple_project(rel->op) && need_distinct(rel)) /* Need distinct, 
all expressions should have CARD_AGGR at max */
                e->card = MIN(e->card, CARD_AGGR);
-       if (!is_set(rel->op) && (!is_groupby(rel->op) || !list_empty(rel->r))) 
/* global groupings have atomic cardinality */
+       if (!is_set(rel->op) && (!is_groupby(rel->op) || !list_empty(rel->r))){ 
/* global groupings have atomic cardinality */
                rel->card = MAX(e->card, rel->card); /* the relation 
cardinality may get updated too */
+               if (!is_groupby(rel->op) && rel->card == CARD_AGGR)
+                       rel->card = CARD_MULTI;
+       }
        return e;
 }
 
diff --git a/sql/test/SQLancer/Tests/sqlancer18.test 
b/sql/test/SQLancer/Tests/sqlancer18.test
--- a/sql/test/SQLancer/Tests/sqlancer18.test
+++ b/sql/test/SQLancer/Tests/sqlancer18.test
@@ -342,7 +342,7 @@ 1
 statement ok
 create view vy(vc0) as (select distinct (select 4 from t1))
 
-statement error GDK reported error: mergejoin: more than one match
+statement error GDK reported error: BATsubcross: more than one match
 select greatest(1, (select (select vy.vc0 from t1) from vy))
 
 statement ok
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to