Changeset: 35b96a5215df for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/35b96a5215df
Branch: default
Log Message:
Merge with Jun2023 branch.
diffs (70 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
@@ -647,14 +647,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,
diff --git a/sql/storage/bat/bat_utils.h b/sql/storage/bat/bat_utils.h
--- a/sql/storage/bat/bat_utils.h
+++ b/sql/storage/bat/bat_utils.h
@@ -17,7 +17,7 @@
/* when returning a log_bid, errors are reported using BID_NIL */
#define BID_NIL 0
-#define bat_set_access(b,access) b->batRestricted = access
+#define bat_set_access(b,access) do { if (b->batRestricted != access)
b->batRestricted = access; } while (0)
extern BAT *temp_descriptor(log_bid b);
extern BAT *quick_descriptor(log_bid b);
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -52,6 +52,9 @@ endif(HAVE_GEOM)
if (HAVE_HGE)
set(HAVE_HGE_FALSE "#")
endif(HAVE_HGE)
+if (HAVE_ICONV)
+ set(HAVE_ICONV_FALSE "#")
+endif(HAVE_ICONV)
if (HAVE_LIBBZ2)
set(HAVE_LIBBZ2_FALSE "#")
endif(HAVE_LIBBZ2)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -367,6 +367,7 @@ CONDITIONALS = {
'HAVE_FITS' : "@HAVE_FITS_FALSE@",
'HAVE_GEOM' : "@HAVE_GEOM_FALSE@",
'HAVE_HGE' : "@HAVE_HGE_FALSE@",
+ 'HAVE_ICONV' : "@HAVE_ICONV_FALSE@",
'HAVE_LIBBZ2' : "@HAVE_LIBBZ2_FALSE@",
'HAVE_LIBLZ4' : "@HAVE_LIBLZ4_FALSE@",
'HAVE_LIBLZMA' : "@HAVE_LIBLZMA_FALSE@",
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
