Changeset: b63b9a448933 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b63b9a448933
Modified Files:
monetdb5/extras/jaql/json.c
Branch: Oct2012
Log Message:
loadbat: properly (fully) load the BAT
When a BAT comes from disk, quickdesc isn't enough to load it, and we
will get crashes lateron due to things not being loaded (null-pointers).
diffs (16 lines):
diff --git a/monetdb5/extras/jaql/json.c b/monetdb5/extras/jaql/json.c
--- a/monetdb5/extras/jaql/json.c
+++ b/monetdb5/extras/jaql/json.c
@@ -470,10 +470,9 @@ parse_json_array(jsonbat *jb, oid *id, c
}
#define loadbat(name) \
- jb.name = BBPquickdesc(ABS(*name), FALSE); \
+ jb.name = BATdescriptor(ABS(*name)); \
if (*name < 0) \
- jb.name = BATmirror(jb.name); \
- BBPfix(*name);
+ jb.name = BATmirror(jb.name);
#define loadbats() \
loadbat(kind); \
loadbat(string); \
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
