Changeset: f56ffe312851 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f56ffe312851
Modified Files:
MonetDB/src/gdk/gdk_bat.mx
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (36 lines):
diff -r f7442c7b745e -r f56ffe312851 MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mx Thu Jan 13 17:54:05 2011 +0100
+++ b/MonetDB/src/gdk/gdk_bat.mx Thu Jan 13 17:55:03 2011 +0100
@@ -1498,7 +1498,7 @@
b->tseqbase = bm->hseqbase = *(oid *) t;
} else if (b->ttype == TYPE_void && b->tseqbase != oid_nil) {
if (*(oid *) t == oid_nil) {
- BATmaterializet(b);
+ b = BATmaterializet(b);
countonly = 0;
if (b == NULL)
return NULL;
@@ -2422,8 +2422,6 @@
GDKerror("BATrename: illegal temporary name: '%s'\n", nme);
} else if (ret == BBPRENAME_LONG) {
GDKerror("BATrename: name too long: '%s'\n", nme);
- } else if (b == NULL) {
- GDKerror("BATrename: BAT argument missing\n");
}
return BBPname(b->batCacheid);
}
@@ -3409,10 +3407,11 @@
BAT *bv = VIEWcreate(b, b);
Heap *hp = (Heap *) GDKzalloc(sizeof(Heap));
str nme = BBP_physical(bv->batCacheid);
-
- hp->filename = GDKmalloc(strlen(nme) + 12);
+ size_t nmelen = strlen(nme);
+
+ hp->filename = GDKmalloc(nmelen + 12);
if (hp->filename != NULL)
- sprintf(hp->filename, "%s.%chash", nme,
bv->batCacheid > 0 ? 'h' : 't');
+ snprintf(hp->filename, nmelen + 12,
"%s.%chash", nme, bv->batCacheid > 0 ? 'h' : 't');
if (hp->filename == NULL ||
(bv->H->hash = HASHnew(hp, tpe, yy + lim,
HASHmask(lim))) == NULL) {
GDKfree(hp->filename);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
