Changeset: 5933a8ca8f7a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5933a8ca8f7a
Modified Files:
monetdb5/modules/atoms/batxml.c
monetdb5/modules/mal/bbp.c
Branch: default
Log Message:
minor headless step
diffs (34 lines):
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -78,13 +78,13 @@ batxml_export str AGGRsubxml(bat *retval
#define prepareResult(X,Y,tpe,Z) \
- (X) = BATnew((Y)->htype, (tpe), BATcount(Y)); \
+ assert((Y)->htype == TYPE_void); \
+ (X) = BATnew(TYPE_void, (tpe), BATcount(Y)); \
if ((X) == NULL) {
\
BBPreleaseref((Y)->batCacheid); \
throw(MAL, "xml." Z, MAL_MALLOC_FAIL); \
}
\
- if ((Y)->htype == TYPE_void) \
- BATseqbase((X), (Y)->hseqbase); \
+ BATseqbase((X), (Y)->hseqbase); \
(X)->hsorted = (Y)->hsorted; \
(X)->hrevsorted = (Y)->hrevsorted; \
(X)->tsorted = 0;
\
diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c
--- a/monetdb5/modules/mal/bbp.c
+++ b/monetdb5/modules/mal/bbp.c
@@ -431,8 +431,8 @@ CMDbbpdecompress(int *ret, int *bid, str
if (b == 0)
throw(MAL, "bbp.decompress", INTERNAL_BAT_ACCESS);
if (BATcount(b) ){
-
- bn = BATnew(b->htype,b->ttype,0);
+ assert(b->htype == TYPE_void);
+ bn = BATnew(TYPE_void,b->ttype,0);
/* copy the properties of the source */
bn->hsorted = b->hsorted;
bn->hrevsorted = b->hrevsorted;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
