Changeset: f42f981376fa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f42f981376fa
Modified Files:
monetdb5/modules/mal/pp_algebra.c
monetdb5/modules/mal/pp_mat.c
Branch: pp_hashjoin
Log Message:
no hacks yet
diffs (28 lines):
diff --git a/monetdb5/modules/mal/pp_algebra.c
b/monetdb5/modules/mal/pp_algebra.c
--- a/monetdb5/modules/mal/pp_algebra.c
+++ b/monetdb5/modules/mal/pp_algebra.c
@@ -2530,9 +2530,9 @@ LALGproject(Client ctx, bat *rid, bat *g
aproject_(str)
} else {
aproject(str,1,uint8_t)
- aproject(str,2,uint16_t)
- aproject(str,4,uint32_t)
- aproject(str,8,var_t)
+ aproject(str,2,uint16_t)
+ aproject(str,4,uint32_t)
+ aproject(str,8,var_t)
}
TIMEOUT_CHECK(qry_ctx, err = createException(SQL, "pp
algebra.projection", RUNTIME_QRY_TIMEOUT));
}
diff --git a/monetdb5/modules/mal/pp_mat.c b/monetdb5/modules/mal/pp_mat.c
--- a/monetdb5/modules/mal/pp_mat.c
+++ b/monetdb5/modules/mal/pp_mat.c
@@ -311,7 +311,7 @@ PARTpartition(Client ctx, bat *pos, cons
}
\
if (BATcount(mt->bat[i]) < (BUN)(curpos[i]+lp[i]))
\
BATsetcount(mt->bat[i], curpos[i]+lp[i]);
\
- mt->bat[i]->ttype = TYPE_fstr; \
+ /*mt->bat[i]->ttype = TYPE_fstr;*/ \
}
\
if (err == NULL) {
\
BATiter di = bat_iterator(d); \
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
