Changeset: 7be7749eebd8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7be7749eebd8
Modified Files:
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_type.c
Branch: default
Log Message:
Headless cleanup
diffs (30 lines):
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -565,7 +565,7 @@ AUTHgetUsers(BAT **ret1, BAT **ret2, Cli
*ret2 = BATproject(bn, user);
*ret1 = bn;
} else {
- *ret2 = BATcopy(user, user->htype, user->ttype, FALSE,
TRANSIENT);
+ *ret2 = BATcopy(user, TYPE_void, user->ttype, FALSE, TRANSIENT);
}
return(NULL);
}
diff --git a/monetdb5/mal/mal_type.c b/monetdb5/mal/mal_type.c
--- a/monetdb5/mal/mal_type.c
+++ b/monetdb5/mal/mal_type.c
@@ -41,13 +41,7 @@ getTypeName(malType tpe)
if (tpe == TYPE_any)
return GDKstrdup("any");
if (isaBatType(tpe)) {
- k = getHeadIndex(tpe);
- if (k)
- snprintf(buf, l, "bat[:any%c%d,", TMPMARKER, k);
- else if (getHeadType(tpe) == TYPE_any)
- snprintf(buf, l, "bat[:any,");
- else
- snprintf(buf, l, "bat[:%s,",
ATOMname(getHeadType(tpe)));
+ snprintf(buf, l, "bat[:oid,");
l -= strlen(buf);
s = buf + strlen(buf);
k = getColumnIndex(tpe);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
