Changeset: a9fd53de9860 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a9fd53de9860
Modified Files:
monetdb5/modules/mal/heapn.c
monetdb5/modules/mal/pp_algebra.c
Branch: default
Log Message:
add missing projections for uuid, inet*
diffs (50 lines):
diff --git a/monetdb5/modules/mal/heapn.c b/monetdb5/modules/mal/heapn.c
--- a/monetdb5/modules/mal/heapn.c
+++ b/monetdb5/modules/mal/heapn.c
@@ -1373,7 +1373,8 @@ HEAPproject(Client ctx, bat *rid, bat *p
BATswap_heaps(r, b, p);
} else {
MT_lock_unset(&b->theaplock);
- local_storage = true;
+ if (ATOMvarsized(tt))
+ local_storage = true;
r = COLnew2(0, tt, size, TRANSIENT, b->twidth);
if (r == NULL) {
err = 1;
@@ -1405,12 +1406,15 @@ HEAPproject(Client ctx, bat *rid, bat *p
project(bte)
project(sht)
project(int)
+ project(inet4)
project(lng)
#ifdef HAVE_HGE
project(hge)
#endif
+ project(inet6)
project(flt)
project(dbl)
+ project(uuid)
if (local_storage) {
// aproject_(str)
if (ATOMstorage(tt) == TYPE_str) { \
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
@@ -2366,7 +2366,8 @@ LALGprojection(Client ctx, bat *rid, bat
BATswap_heaps(r, b, p);
} else {
MT_lock_unset(&b->theaplock);
- local_storage = true;
+ if (ATOMvarsized(tt))
+ local_storage = true;
r = COLnew2(0, tt, max, TRANSIENT, b->twidth);
if (r == NULL) {
err = createException(MAL,
"ialgebra.projection", SQLSTATE(HY013) MAL_MALLOC_FAIL);
@@ -2414,6 +2415,7 @@ LALGprojection(Client ctx, bat *rid, bat
project(inet6)
project(flt)
project(dbl)
+ project(uuid)
if (local_storage) {
if (!private)
pipeline_lock2(r);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
