Changeset: de8dd7db16b9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de8dd7db16b9
Modified Files:
gdk/gdk.h
gdk/gdk_bbp.c
Branch: mosaic
Log Message:
Merge with default branch.
diffs (49 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -970,9 +970,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_PRE_VARWIDTH 061023 /* backward compatible version */
-#define GDKLIBRARY_CHR 061024 /* version that still had chr type */
-#define GDKLIBRARY_SORTED_BYTE 061025 /* version that still had byte-sized
sorted flag */
#define GDKLIBRARY_64_BIT_INT 061026 /* version that had no 128-bit integer
option, yet */
#define GDKLIBRARY 061027
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -713,18 +713,10 @@ heapinit(COLrec *col, const char *buf, i
int n;
(void) oidsize; /* only used when SIZEOF_OID==8 */
+ (void) bbpversion; /* could be used to implement compatibility */
norevsorted = 0; /* default for first case */
- if (bbpversion <= GDKLIBRARY_SORTED_BYTE ?
- sscanf(buf,
- " %10s %hu %hu %hu %lld %lld %lld %lld %lld %lld %lld %hu"
- "%n",
- type, &width, &var, &properties, &nokey0,
- &nokey1, &nosorted, &base, &align, &free,
- &size, &storage,
- &n) < 12
- :
- sscanf(buf,
+ if (sscanf(buf,
" %10s %hu %hu %hu %lld %lld %lld %lld %lld %lld %lld %lld
%hu"
"%n",
type, &width, &var, &properties, &nokey0,
@@ -965,10 +957,7 @@ BBPheader(FILE *fp, oid *BBPoid, int *OI
exit(1);
}
if (bbpversion != GDKLIBRARY &&
- bbpversion != GDKLIBRARY_64_BIT_INT &&
- bbpversion != GDKLIBRARY_SORTED_BYTE &&
- bbpversion != GDKLIBRARY_CHR &&
- bbpversion != GDKLIBRARY_PRE_VARWIDTH) {
+ bbpversion != GDKLIBRARY_64_BIT_INT) {
GDKfatal("BBPinit: incompatible BBP version: expected 0%o, got
0%o.", GDKLIBRARY, bbpversion);
}
if (fgets(buf, sizeof(buf), fp) == NULL) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
