Changeset: df53092f117f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/df53092f117f
Modified Files:
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
debian/control
gdk/libbat.rc
monetdb5/modules/atoms/str.c
monetdb5/modules/mal/txtsim.c
monetdb5/tools/libmonetdb5.rc
sql/storage/bat/bat_storage.c
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (truncated from 1013 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -85,7 +85,7 @@ Name: %{name}
Version: %{version}
Release: %{release}
Summary: Monet Database Management System
-Vendor: MonetDB BV <i...@monetdb.org>
+Vendor: MonetDB Foundation <i...@monetdb.org>
Group: Applications/Databases
License: MPL-2.0
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -65,7 +65,7 @@ def main():
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
print(r' <Product Id="*" Language="1033" Manufacturer="MonetDB"
Name="MonetDB ODBC Driver" UpgradeCode="{}"
Version="{}">'.format(upgradecode[arch], sys.argv[1]))
- print(r' <Package Id="*" Comments="MonetDB ODBC Driver"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB SQL ODBC"
Languages="1033" Manufacturer="MonetDB BV" Platform="{}"/>'.format(arch))
+ print(r' <Package Id="*" Comments="MonetDB ODBC Driver"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB SQL ODBC"
Languages="1033" Manufacturer="MonetDB Foundation"
Platform="{}"/>'.format(arch))
print(r' <MajorUpgrade AllowDowngrades="no" DowngradeErrorMessage="A
later version of [ProductName] is already installed."
AllowSameVersionUpgrades="no"/>')
print(r' <WixVariable Id="WixUILicenseRtf" Value="share\license.rtf"/>')
print(r' <WixVariable Id="WixUIBannerBmp" Value="share\banner.bmp"/>')
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -76,7 +76,7 @@ def main():
print(r'<?xml version="1.0"?>')
print(r'<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>')
print(r' <Product Id="*" Language="1033" Manufacturer="MonetDB"
Name="MonetDB5" UpgradeCode="{}" Version="{}">'.format(upgradecode[arch],
sys.argv[1]))
- print(r' <Package Id="*" Comments="MonetDB5/SQL Server and Client"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB5 MonetDB SQL
Database" Languages="1033" Manufacturer="MonetDB BV"
Platform="{}"/>'.format(arch))
+ print(r' <Package Id="*" Comments="MonetDB5/SQL Server and Client"
Compressed="yes" InstallerVersion="301" Keywords="MonetDB5 MonetDB SQL
Database" Languages="1033" Manufacturer="MonetDB Foundation"
Platform="{}"/>'.format(arch))
print(r' <Upgrade Id="{}">'.format(geomupgradecode[arch]))
# up to and including 11.29.3, the geom module can not be
# uninstalled if MonetDB/SQL is not installed; this somehow also
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -19,7 +19,7 @@ BEGIN
BLOCK "040904b0" // US-English; Unicode
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "MonetDB B.V.\0"
+ VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
VALUE "FileVersion", sversion(11,50,0)
VALUE "InternalName", "Mapi\0"
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -19,7 +19,7 @@ BEGIN
BLOCK "040904b0" // US-English; Unicode
BEGIN
VALUE "Comments", "\0"
- VALUE "CompanyName", "MonetDB B.V.\0"
+ VALUE "CompanyName", "MonetDB Foundation\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
VALUE "FileVersion", sversion(11,50,0)
VALUE "InternalName", "MonetODBC\0"
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -81,7 +81,7 @@ BEGIN
BEGIN
BLOCK "040904e4"
BEGIN
- VALUE "CompanyName", "MonetDB B.V."
+ VALUE "CompanyName", "MonetDB Foundation"
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
VALUE "FileVersion", sversion(11,50,0)
VALUE "InternalName", "MonetODBCs.dll"
diff --git a/cmake/monetdb-deb-packages.cmake b/cmake/monetdb-deb-packages.cmake
--- a/cmake/monetdb-deb-packages.cmake
+++ b/cmake/monetdb-deb-packages.cmake
@@ -10,7 +10,7 @@
# Copyright 1997 - July 2008 CWI.
#]]
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "MonetDB BV <i...@monetdb.org>")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "MonetDB Foundation <i...@monetdb.org>")
set(CPACK_DEB_COMPONENT_INSTALL ON)
set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS OFF)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
diff --git a/cmake/monetdb-rpm-packages.cmake b/cmake/monetdb-rpm-packages.cmake
--- a/cmake/monetdb-rpm-packages.cmake
+++ b/cmake/monetdb-rpm-packages.cmake
@@ -19,7 +19,7 @@ endif()
set(CPACK_RPM_COMPONENT_INSTALL ON)
#set(CPACK_RPM_FILENAME RPM-DEFAULT)
set(CPACK_RPM_PACKAGE_SUMMARY "MonetDB - Monet Database Management System")
-set(CPACK_RPM_PACKAGE_VENDOR "MonetDB BV <i...@monetdb.org>")
+set(CPACK_RPM_PACKAGE_VENDOR "MonetDB Foundation <i...@monetdb.org>")
set(CPACK_RPM_PACKAGE_LICENSE "MPLv2.0")
set(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
set(CPACK_RPM_PACKAGE_URL "https://www.monetdb.org/";)
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
--- a/debian/compat
+++ /dev/null
@@ -1,1 +0,0 @@
-12
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,18 @@
Source: monetdb
Section: database
Priority: optional
-Maintainer: MonetDB BV <i...@monetdb.org>
+Maintainer: MonetDB Foundation <i...@monetdb.org>
Homepage: https://www.monetdb.org/
Vcs-Browser: https://dev.monetdb.org/hg/MonetDB/
Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/ -b default
-Build-Depends: debhelper (>= 12), cmake (>= 3.12), bison,
+Build-Depends: debhelper-compat (= 12), cmake (>= 3.12), bison,
libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.10.0),
libpcre3-dev, libreadline-dev, liblzma-dev, liblz4-dev (>= 1.8.0),
libxml2-dev, pkg-config,
python3, python3-dev, python3-numpy,
unixodbc-dev, zlib1g-dev, r-base-dev,
libcfitsio-dev, libssl-dev (>= 1.1.1)
-Standards-Version: 3.8.0
+Standards-Version: 4.6.2
Package: libmonetdb28
Architecture: any
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -214,12 +214,17 @@ logbat_new(int tt, BUN size, role_t role
return nb;
}
-static int
+static bool
log_read_format(logger *lg, logformat *data)
{
assert(!lg->inmemory);
- return mnstr_read(lg->input_log, &data->flag, 1, 1) == 1 &&
- mnstr_readInt(lg->input_log, &data->id) == 1;
+ if (mnstr_read(lg->input_log, &data->flag, 1, 1) == 1) {
+ if (mnstr_readInt(lg->input_log, &data->id) == 1)
+ return true;
+ /* could only read part, so complain */
+ TRC_CRITICAL(GDK, "read failed\n");
+ }
+ return false;
}
static gdk_return
@@ -254,17 +259,23 @@ log_read_seq(logger *lg, logformat *l)
if ((p = log_find(lg->seqs_id, lg->dseqs, seq)) != BUN_NONE &&
p >= lg->seqs_id->batInserted) {
assert(lg->seqs_val->hseqbase == 0);
- if (BUNreplace(lg->seqs_val, p, &val, true) != GDK_SUCCEED)
+ if (BUNreplace(lg->seqs_val, p, &val, true) != GDK_SUCCEED) {
+ TRC_CRITICAL(GDK, "replace of %s_seqs_val failed\n",
lg->fn);
return LOG_ERR;
+ }
} else {
if (p != BUN_NONE) {
oid pos = p;
- if (BUNappend(lg->dseqs, &pos, true) != GDK_SUCCEED)
+ if (BUNappend(lg->dseqs, &pos, true) != GDK_SUCCEED) {
+ TRC_CRITICAL(GDK, "append to %s_dseqs
failed\n", lg->fn);
return LOG_ERR;
+ }
}
if (BUNappend(lg->seqs_id, &seq, true) != GDK_SUCCEED ||
- BUNappend(lg->seqs_val, &val, true) != GDK_SUCCEED)
+ BUNappend(lg->seqs_val, &val, true) != GDK_SUCCEED) {
+ TRC_CRITICAL(GDK, "append to %s_seqs_val/id failed\n",
lg->fn);
return LOG_ERR;
+ }
}
return LOG_OK;
}
@@ -303,19 +314,25 @@ string_reader(logger *lg, BAT *b, lng nr
log_return res = LOG_OK;
while (nr && res == LOG_OK) {
- if (mnstr_readLng(lg->input_log, &SZ) != 1)
+ if (mnstr_readLng(lg->input_log, &SZ) != 1) {
+ TRC_CRITICAL(GDK, "read failed\n");
return LOG_EOF;
+ }
sz = (size_t) SZ;
char *buf = lg->rbuf;
if (lg->rbufsize < sz) {
- if (!(buf = GDKrealloc(lg->rbuf, sz)))
+ if (!(buf = GDKrealloc(lg->rbuf, sz))) {
+ TRC_CRITICAL(GDK, "couldn't grow string
buffer\n");
return LOG_ERR;
+ }
lg->rbuf = buf;
lg->rbufsize = sz;
}
- if (mnstr_read(lg->input_log, buf, sz, 1) != 1)
+ if (mnstr_read(lg->input_log, buf, sz, 1) != 1) {
+ TRC_CRITICAL(GDK, "read failed\n");
return LOG_EOF;
+ }
/* handle strings */
char *t = buf;
/* chunked */
@@ -327,8 +344,10 @@ string_reader(logger *lg, BAT *b, lng nr
strings[cur++] = t;
if (cur == CHUNK_SIZE &&
b &&
- BUNappendmulti(b, strings, cur, true) !=
GDK_SUCCEED)
+ BUNappendmulti(b, strings, cur, true) !=
GDK_SUCCEED) {
+ TRC_CRITICAL(GDK, "append to string bat
failed\n");
res = LOG_ERR;
+ }
if (cur == CHUNK_SIZE)
cur = 0;
/* find next */
@@ -338,8 +357,10 @@ string_reader(logger *lg, BAT *b, lng nr
}
if (cur &&
b &&
- BUNappendmulti(b, strings, cur, true) != GDK_SUCCEED)
+ BUNappendmulti(b, strings, cur, true) != GDK_SUCCEED) {
+ TRC_CRITICAL(GDK, "append to string bat failed\n");
res = LOG_ERR;
+ }
}
return res;
}
@@ -363,8 +384,10 @@ log_read_updates(logger *lg, trans *tr,
TRC_DEBUG(WAL, "found %d %s", id, l->flag == LOG_UPDATE ? "update" :
"update_buld");
if (mnstr_readLng(lg->input_log, &nr) != 1 ||
- mnstr_read(lg->input_log, &type_id, 1, 1) != 1)
- return LOG_ERR;
+ mnstr_read(lg->input_log, &type_id, 1, 1) != 1) {
+ TRC_CRITICAL(GDK, "read failed\n");
+ return LOG_EOF;
+ }
pnr = nr;
tpe = find_type_nr(lg, type_id);
@@ -378,13 +401,16 @@ log_read_updates(logger *lg, trans *tr,
if (!lg->flushing && l->flag == LOG_UPDATE) {
uid = COLnew(0, TYPE_oid, (BUN) nr, PERSISTENT);
if (uid == NULL) {
+ TRC_CRITICAL(GDK, "creating bat failed\n");
return LOG_ERR;
}
}
if (l->flag == LOG_UPDATE_CONST) {
- if (mnstr_readLng(lg->input_log, &offset) != 1)
- return LOG_ERR;
+ if (mnstr_readLng(lg->input_log, &offset) != 1) {
+ TRC_CRITICAL(GDK, "read failed\n");
+ return LOG_EOF;
+ }
if (cands) {
/* This const range actually represents a
segment of candidates corresponding to updated bat entries */
@@ -398,18 +424,23 @@ log_read_updates(logger *lg, trans *tr,
BAT *dense = BATdense(0, (oid) offset,
(BUN) nr);
BAT *newcands = NULL;
if (!dense) {
+ TRC_CRITICAL(GDK, "creating bat
failed\n");
res = LOG_ERR;
} else if ((*cands)->ttype ==
TYPE_void) {
if ((newcands =
BATmergecand(*cands, dense))) {
BBPreclaim(*cands);
*cands = newcands;
- } else
+ } else {
+ TRC_CRITICAL(GDK,
"creating bat failed\n");
res = LOG_ERR;
+ }
} else {
assert((*cands)->ttype ==
TYPE_oid);
assert(BATcount(*cands) > 0);
- if (BATappend(*cands, dense,
NULL, true) != GDK_SUCCEED)
+ if (BATappend(*cands, dense,
NULL, true) != GDK_SUCCEED) {
+ TRC_CRITICAL(GDK,
"appending to bat failed\n");
res = LOG_ERR;
+ }
}
BBPreclaim(dense);
}
@@ -418,7 +449,8 @@ log_read_updates(logger *lg, trans *tr,
size_t tlen = lg->rbufsize;
void *t = rt(lg->rbuf, &tlen, lg->input_log, 1);
if (t == NULL) {
- res = LOG_ERR;
+ TRC_CRITICAL(GDK, "read failed\n");
+ res = LOG_EOF;
}
return res;
}
@@ -437,14 +469,17 @@ log_read_updates(logger *lg, trans *tr,
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
