Changeset: 72c2aa087a01 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72c2aa087a01
Modified Files:
sql/server/rel_schema.c
sql/server/rel_select.c
Branch: sciql
Log Message:
use 'int' i.s.o. 'lng' to denote the repeats in array.series
'lng' is just toooo large
remove superfluous GDKfree after GDKmalloc has been replaced by SA_NEW_ARRAY
diffs (85 lines):
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -993,8 +993,8 @@ rel_create_table(mvc *sql, sql_schema *s
sql_rel *res = NULL, *joinl = NULL, *joinr = NULL;
list *rp = new_exp_list(sql->sa);
node *col = NULL;
- int i = 0, j = 0;
- lng cnt = 0, cntall = 1, *N = NULL, *M = NULL;
+ int i = 0, j = 0, cnt = 0, *N = NULL, *M = NULL;
+ lng cntall = 1;
for (n = columns->h; n; n = n->next) {
symbol *sym = n->data.sym;
@@ -1017,8 +1017,8 @@ rel_create_table(mvc *sql, sql_schema *s
assert(tt == tt_array && t->fixed);
/* To compute N (the #times each value is repeated), multiply
the size of dimensions defined after the current dimension. For the last
dimension, its N is 1. To compute M (the #times each value group is repeated),
multiply the size of dimensions defined before the current dimension. For the
first dimension, its M is 1. */
- N = SA_NEW_ARRAY(sql->sa, lng, t->ndims);
- M = SA_NEW_ARRAY(sql->sa, lng, t->ndims);
+ N = SA_NEW_ARRAY(sql->sa, int, t->ndims);
+ M = SA_NEW_ARRAY(sql->sa, int, t->ndims);
if(!N || !M) {
return sql_error(sql, 02, "CREATE ARRAY: failed to
allocate space");
}
@@ -1044,7 +1044,6 @@ rel_create_table(mvc *sql, sql_schema *s
case TYPE_lng:
cnt = ceil((*(lng
*)VALget(&a_sto->data) * 1.0 - *(lng *)VALget(&a_sta->data)) / *(lng
*)VALget(&a_ste->data)); break;
default: /* should not reach here */
- GDKfree(N); GDKfree(M);
return sql_error(sql, 02, "CREATE
ARRAY: unsupported data type \"%s\"", sc->type.type->sqlname);
}
for (j = 0; j < i; j++) N[j] = N[j] * cnt;
@@ -1054,7 +1053,6 @@ rel_create_table(mvc *sql, sql_schema *s
}
}
if (i != t->ndims) {
- GDKfree(N); GDKfree(M);
return sql_error(sql, 02, "CREATE ARRAY: expected
number of dimension columns (%d) does not match actual numbre of dimension
columns (%d)", t->ndims, i);
}
@@ -1071,8 +1069,8 @@ rel_create_table(mvc *sql, sql_schema *s
append(args, exp_atom(sql->sa,
atom_general(sql->sa, &sc->type, sc->dim->start)));
append(args, exp_atom(sql->sa,
atom_general(sql->sa, &sc->type, sc->dim->step)));
append(args, exp_atom(sql->sa,
atom_general(sql->sa, &sc->type, sc->dim->stop)));
- append(args, exp_atom_lng(sql->sa, N[i]));
- append(args, exp_atom_lng(sql->sa, M[i]));
+ append(args, exp_atom_int(sql->sa, N[i]));
+ append(args, exp_atom_int(sql->sa, M[i]));
sf = sql_bind_func_(sql->sa,
sql->session->schema, "array_series", exps_subtype(args), F_FUNC);
if (!sf)
return sql_error(sql, 02, "failed to
bind to the SQL function \"array_series\"");
@@ -1126,7 +1124,6 @@ rel_create_table(mvc *sql, sql_schema *s
}
if (i != t->ndims) {
- GDKfree(N); GDKfree(M);
return sql_error(sql, 02, "CREATE ARRAY: expected
number of dimension columns (%d) does not match actual numbre of dimension
columns (%d)", t->ndims, i);
}
res = rel_table(sql, DDL_CREATE_TABLE, sname, t, temp);
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -3907,8 +3907,8 @@ _rel_tiling_aggr(mvc *sql, sql_rel **rel
char *aggrstr2 = SA_NEW_ARRAY(sql->sa, char, strlen("array_t") +
strlen(aggrstr) + 1);
node *cn = NULL;
sql_table *t = (sql_table*)((sql_rel*)groupby->l)->l;
- int i = 0, j = 0;
- lng cnt = 0, *dsize = NULL, *nrep = NULL, *ngrp = NULL;
+ int i = 0, j = 0, cnt = 0, *nrep = NULL, *ngrp = NULL;
+ lng *dsize = NULL;
sql_column *sc = NULL;
(void)distinct;
@@ -3985,8 +3985,8 @@ _rel_tiling_aggr(mvc *sql, sql_rel **rel
}
/* compute the repeatings, see the formula in rel_schema.c */
- nrep = SA_NEW_ARRAY(sql->sa, lng, t->ndims);
- ngrp = SA_NEW_ARRAY(sql->sa, lng, t->ndims);
+ nrep = SA_NEW_ARRAY(sql->sa, int, t->ndims);
+ ngrp = SA_NEW_ARRAY(sql->sa, int, t->ndims);
if(!nrep || !ngrp) {
return sql_error(sql, 02, "SELECT: failed to allocate space");
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
