Changeset: 9a3cce78fb1b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a3cce78fb1b
Modified Files:
MonetDB5/src/mal/mal_linker.mx
sql/src/backends/monet5/sql_scenario.mx
Branch: default
Log Message:
Merged from Jun2010
diffs (21 lines):
diff -r 850d797d30c8 -r 9a3cce78fb1b MonetDB5/src/modules/kernel/group.mx
--- a/MonetDB5/src/modules/kernel/group.mx Thu May 13 19:55:07 2010 +0200
+++ b/MonetDB5/src/modules/kernel/group.mx Thu May 13 20:04:52 2010 +0200
@@ -2804,7 +2804,7 @@
/* scan b, and add increment totals for true values */
if (range > SMALL_AGGR_MAX) {
- if (*ignore_nils) {
+ if (*ignore_nils && !b->T->nonil) {
ALGODEBUG THRprintf(GDKout, "#CMDaggr_count: range(="
OIDFMT ") > SMALL_AGGR_MAX(=%d) => large_aggr_count(if
(ATOMcmp(btt,t,bt_nil)))\n", range, SMALL_AGGR_MAX);
@:large_aggr_count(if(ATOMcmp(btt,t,bt_nil)))@
@@ -2814,7 +2814,7 @@
@:large_aggr_count()@
}
} else {
- if (*ignore_nils) {
+ if (*ignore_nils && !b->T->nonil) {
ALGODEBUG THRprintf(GDKout, "#CMDaggr_count: range(="
OIDFMT ") <= SMALL_AGGR_MAX(=%d) => small_aggr_count(if
(ATOMcmp(btt,t,bt_nil)))\n", range, SMALL_AGGR_MAX);
@:small_aggr_count(if(ATOMcmp(btt,t,bt_nil)))@
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
