MonetDB: Jul2015 - Pass a bat instead of a lng.

[Sjoerd Mullender]

Changeset: 2716c5bd16d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2716c5bd16d9
Modified Files:
        gdk/gdk_bbp.c
Branch: Jul2015
Log Message:

Pass a bat instead of a lng.


diffs (41 lines):

diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -684,7 +684,7 @@ fixoidheap(void)
  * BBPdir file.
  */
 static int
-heapinit(COLrec *col, const char *buf, int *hashash, const char *HT, int 
oidsize, int bbpversion, lng batid)
+heapinit(COLrec *col, const char *buf, int *hashash, const char *HT, int 
oidsize, int bbpversion, bat bid)
 {
        int t;
        char type[11];
@@ -725,7 +725,7 @@ heapinit(COLrec *col, const char *buf, i
        if ((t = ATOMindex(type)) < 0)
                t = ATOMunknown_find(type);
        else if (var != (t == TYPE_void || BATatoms[t].atomPut != NULL))
-               GDKfatal("BBPinit: inconsistent entry in BBP.dir: %s.varsized 
mismatch for BAT " LLFMT "\n", HT, batid);
+               GDKfatal("BBPinit: inconsistent entry in BBP.dir: %s.varsized 
mismatch for BAT %d\n", HT, (int) bid);
        else if (var && t != 0 ?
                 ATOMsize(t) < width ||
                 (width != 1 && width != 2 && width != 4
@@ -738,7 +738,7 @@ heapinit(COLrec *col, const char *buf, i
                 && (t != TYPE_oid || oidsize == 0 || width != oidsize)
 #endif
                )
-               GDKfatal("BBPinit: inconsistent entry in BBP.dir: %s.size 
mismatch for BAT " LLFMT "\n", HT, batid);
+               GDKfatal("BBPinit: inconsistent entry in BBP.dir: %s.size 
mismatch for BAT %d\n", HT, (int) bid);
        col->type = t;
        col->width = width;
        col->varsized = var != 0;
@@ -890,8 +890,8 @@ BBPreadEntries(FILE *fp, int *min_stamp,
                bs->S.map_hheap = (char) map_hheap;
                bs->S.map_theap = (char) map_theap;
 
-               nread += heapinit(&bs->H, buf + nread, &Hhashash, "H", oidsize, 
bbpversion, batid);
-               nread += heapinit(&bs->T, buf + nread, &Thashash, "T", oidsize, 
bbpversion, batid);
+               nread += heapinit(&bs->H, buf + nread, &Hhashash, "H", oidsize, 
bbpversion, bid);
+               nread += heapinit(&bs->T, buf + nread, &Thashash, "T", oidsize, 
bbpversion, bid);
                nread += vheapinit(&bs->H, buf + nread, Hhashash, bid);
                nread += vheapinit(&bs->T, buf + nread, Thashash, bid);
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list