Changeset: 3829bce08f77 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3829bce08f77
Modified Files:
        clients/Tests/MAL-signatures.test
        sql/server/rel_optimize_others.c
Branch: default
Log Message:

merged with dec2023


diffs (78 lines):

diff --git a/clients/Tests/MAL-signatures.test 
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -38765,7 +38765,12 @@ SQLwindow_bound;
 computes window ranges for each row
 sqlcatalog
 alter_add_range_partition
-pattern sqlcatalog.alter_add_range_partition(X_0:str, X_1:str, X_2:str, 
X_3:str, X_4:any_1, X_5:any_1, X_6:bit, X_7:int):void 
+pattern sqlcatalog.alter_add_range_partition(X_0:str, X_1:str, X_2:str, 
X_3:str, X_4:any_1, X_5:any_1, X_6:bit, X_7:int, X_8:bat[:lng]):void 
+SQLalter_add_range_partition;
+Catalog operation alter_add_range_partition
+sqlcatalog
+alter_add_range_partition
+pattern sqlcatalog.alter_add_range_partition(X_0:str, X_1:str, X_2:str, 
X_3:str, X_4:any_1, X_5:any_1, X_6:bit, X_7:int, X_8:lng):void 
 SQLalter_add_range_partition;
 Catalog operation alter_add_range_partition
 sqlcatalog
@@ -38775,12 +38780,22 @@ SQLalter_add_table;
 Catalog operation alter_add_table
 sqlcatalog
 alter_add_value_partition
-pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str, 
X_3:str, X_4:bit, X_5:int):void 
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str, 
X_3:str, X_4:bit, X_5:int, X_6:bat[:lng]):void 
 SQLalter_add_value_partition;
 Catalog operation alter_add_value_partition
 sqlcatalog
 alter_add_value_partition
-pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str, 
X_3:str, X_4:bit, X_5:int, X_6:any...):void 
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str, 
X_3:str, X_4:bit, X_5:int, X_6:bat[:lng], X_7:any...):void 
+SQLalter_add_value_partition;
+Catalog operation alter_add_value_partition
+sqlcatalog
+alter_add_value_partition
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str, 
X_3:str, X_4:bit, X_5:int, X_6:lng):void 
+SQLalter_add_value_partition;
+Catalog operation alter_add_value_partition
+sqlcatalog
+alter_add_value_partition
+pattern sqlcatalog.alter_add_value_partition(X_0:str, X_1:str, X_2:str, 
X_3:str, X_4:bit, X_5:int, X_6:lng, X_7:any...):void 
 SQLalter_add_value_partition;
 Catalog operation alter_add_value_partition
 sqlcatalog
diff --git a/sql/server/rel_optimize_others.c b/sql/server/rel_optimize_others.c
--- a/sql/server/rel_optimize_others.c
+++ b/sql/server/rel_optimize_others.c
@@ -392,6 +392,8 @@ rel_exps_mark_used(sql_allocator *sa, sq
                for (node *n = rel->attr->h; n; n = n->next) {
                        sql_exp *e = n->data;
 
+                       if (e->type != e_aggr) /* keep all group by's */
+                               e->used = 1;
                        if (e->used)
                                nr += exp_mark_used(subrel, e, -2);
                }
diff --git a/sql/server/rel_statistics_functions.c 
b/sql/server/rel_statistics_functions.c
--- a/sql/server/rel_statistics_functions.c
+++ b/sql/server/rel_statistics_functions.c
@@ -409,7 +409,11 @@ sql_sign_propagate_statistics(mvc *sql, 
                atom *zero1 = atom_zero_value(sql->sa, &(omin->tpe));
                int cmp1 = atom_cmp(omax, zero1), cmp2 = atom_cmp(omin, zero1);
 
-               if (cmp1 >= 0 && cmp2 >= 0) {
+               if (cmp1 == 0 && cmp2 == 0) {
+                       set_minmax_property(sql, e, PROP_MAX, atom_int(sql->sa, 
bte, 0));
+                       set_minmax_property(sql, e, PROP_MIN, atom_int(sql->sa, 
bte, 0));
+                       properties_set = true;
+               } else if (cmp1 > 0 && cmp2 > 0) {
                        set_minmax_property(sql, e, PROP_MAX, atom_int(sql->sa, 
bte, 1));
                        set_minmax_property(sql, e, PROP_MIN, atom_int(sql->sa, 
bte, 1));
                        properties_set = true;
diff --git a/sql/test/BugTracker-2024/Tests/All 
b/sql/test/BugTracker-2024/Tests/All
--- a/sql/test/BugTracker-2024/Tests/All
+++ b/sql/test/BugTracker-2024/Tests/All
@@ -24,3 +24,4 @@ between-boolean-7451
 concat_order-7455
 order-by-false-or-false-Bug-7456
 constant-expression-issue-7457
+sign-issue-7458
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to