MonetDB: default - Don't make output BAT too large.

[Sjoerd Mullender via checkin-list]

Changeset: c6b24bb1671a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c6b24bb1671a
Modified Files:
        sql/backends/monet5/generator/generator.c
Branch: default
Log Message:

Don't make output BAT too large.


diffs (39 lines):

diff --git a/sql/backends/monet5/generator/generator.c 
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -248,7 +248,8 @@ VLTgenerator_table_(BAT **result, Client
                        if (bn == NULL)
                                throw(MAL, "generator.table", SQLSTATE(HY013) 
MAL_MALLOC_FAIL);
                        v = (date *) Tloc(bn, 0);
-                       for (BUN c = 0; c < n && f < l; c++) {
+                       BUN c;
+                       for (c = 0; c < n && f < l; c++) {
                                *v++ = f;
                                f = date_add_month(f, s);
                                if (is_date_nil(f)) {
@@ -256,6 +257,7 @@ VLTgenerator_table_(BAT **result, Client
                                        throw(MAL, "generator.table", 
SQLSTATE(22003) "overflow in calculation");
                                }
                        }
+                       n = c;
                        bn->tsorted = s > 0 || n <= 1;
                        bn->trevsorted = s < 0 || n <= 1;
                } else if (tpe == TYPE_date) { /* days */
@@ -282,7 +284,8 @@ VLTgenerator_table_(BAT **result, Client
                        if (bn == NULL)
                                throw(MAL, "generator.table", SQLSTATE(HY013) 
MAL_MALLOC_FAIL);
                        v = (date *) Tloc(bn, 0);
-                       for (BUN c = 0; c < n && f < l; c++) {
+                       BUN c;
+                       for (c = 0; c < n && f < l; c++) {
                                *v++ = f;
                                f = date_add_day(f, (int) s);
                                if (is_date_nil(f)) {
@@ -290,6 +293,7 @@ VLTgenerator_table_(BAT **result, Client
                                        throw(MAL, "generator.table", 
SQLSTATE(22003) "overflow in calculation");
                                }
                        }
+                       n = c;
                        bn->tsorted = s > 0 || n <= 1;
                        bn->trevsorted = s < 0 || n <= 1;
                } else if (tpe == TYPE_timestamp) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org