Changeset: d2ed0b0ca65b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2ed0b0ca65b
Modified Files:
gdk/gdk.h
gdk/gdk_bbp.c
Branch: default
Log Message:
Removed upgrade code for GDKLIBRARY_INSERTED.
diffs (51 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -797,7 +797,6 @@ typedef struct {
/* assert that atom width is power of 2, i.e., width == 1<<shift */
#define assert_shift_width(shift,width) assert(((shift) == 0 && (width) == 0)
|| ((unsigned)1<<(shift)) == (unsigned)(width))
-#define GDKLIBRARY_INSERTED 061032U /* inserted and deleted in BBP.dir */
#define GDKLIBRARY_HEADED 061033U /* head properties are stored */
#define GDKLIBRARY_NOKEY 061034U /* nokey values can't be trusted */
#define GDKLIBRARY_BADEMPTY 061035U /* possibility of duplicate empty str */
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1034,7 +1034,7 @@ BBPreadEntries(FILE *fp, unsigned bbpver
int nread;
char *s, *options = NULL;
char logical[1024];
- lng inserted = 0, deleted = 0, first = 0, count, capacity, base
= 0;
+ lng first = 0, count, capacity, base = 0;
#ifdef GDKLIBRARY_HEADED
/* these variables are not used in later versions */
char tailname[129];
@@ -1050,16 +1050,7 @@ BBPreadEntries(FILE *fp, unsigned bbpver
*s = 0;
}
- if (bbpversion <= GDKLIBRARY_INSERTED ?
- sscanf(buf,
- LLFMT" %hu %128s %128s %23s %d %u "LLFMT" "LLFMT"
"LLFMT" "LLFMT" "LLFMT" %hu %hu %hu %hu"
- "%n",
- &batid, &status, headname, tailname, filename,
- &lastused, &properties, &inserted, &deleted, &first,
- &count, &capacity, &map_head, &map_tail, &map_hheap,
- &map_theap,
- &nread) < 16 :
- bbpversion <= GDKLIBRARY_HEADED ?
+ if (bbpversion <= GDKLIBRARY_HEADED ?
sscanf(buf,
LLFMT" %hu %128s %128s %23s %d %u "LLFMT" "LLFMT"
"LLFMT" %hu %hu %hu %hu"
"%n",
@@ -1197,8 +1188,7 @@ BBPheader(FILE *fp)
bbpversion != GDKLIBRARY_TALIGN &&
bbpversion != GDKLIBRARY_BADEMPTY &&
bbpversion != GDKLIBRARY_NOKEY &&
- bbpversion != GDKLIBRARY_HEADED &&
- bbpversion != GDKLIBRARY_INSERTED) {
+ bbpversion != GDKLIBRARY_HEADED) {
GDKfatal("BBPinit: incompatible BBP version: expected 0%o, got
0%o.\n"
"This database was probably created by %s version of
MonetDB.",
GDKLIBRARY, bbpversion,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
