Changeset: 731aca769697 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/731aca769697
Modified Files:
gdk/ChangeLog.Sep2022
gdk/gdk_bbp.c
Branch: Sep2022
Log Message:
Merge with Jan2022 branch.
diffs (34 lines):
diff --git a/gdk/ChangeLog.Sep2022 b/gdk/ChangeLog.Sep2022
--- a/gdk/ChangeLog.Sep2022
+++ b/gdk/ChangeLog.Sep2022
@@ -1,6 +1,10 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
+* Tue Apr 25 2023 Sjoerd Mullender <sjo...@acm.org>
+- Fixed parsing of the BBP.dir file when BAT ids grow larger than 2**24
+ (i.e. 100000000 in octal).
+
* Thu Apr 20 2023 Sjoerd Mullender <sjo...@acm.org>
- Fixed yet another occurrence of a missing .tailN file. This one could
happen if a string bat was appended to in stages so that between appends
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -677,14 +677,14 @@ BBPreadBBPline(FILE *fp, unsigned bbpver
if (bbpversion <= GDKLIBRARY_HSIZE ?
sscanf(buf,
- "%" SCNu64 " %u %128s %19s %u %" SCNu64
+ "%" SCNu64 " %u %128s %23s %u %" SCNu64
" %" SCNu64 " %" SCNu64
"%n",
&batid, &status, batname, filename,
&properties, &count, &capacity, &base,
&nread) < 8 :
sscanf(buf,
- "%" SCNu64 " %u %128s %19s %u %" SCNu64
+ "%" SCNu64 " %u %128s %23s %u %" SCNu64
" %" SCNu64
"%n",
&batid, &status, batname, filename,
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
