Changeset: 46fbac346df8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/46fbac346df8
Modified Files:
monetdb_config.h.in
testing/Mtest.py.in
Branch: samloader
Log Message:
Merge with default branch.
diffs (truncated from 2515 to 300 lines):
diff --git a/.clang-format b/.clang-format
--- a/.clang-format
+++ b/.clang-format
@@ -22,7 +22,27 @@ AllowShortIfStatementsOnASingleLine: Nev
AllowShortLoopsOnASingleLine: false
# clang-format 23: AllowShortRecordOnASingleLine: Never
AlwaysBreakBeforeMultilineStrings: false
-AttributeMacros: [_In_z_, _Printf_format_string_]
+AttributeMacros:
+ - _Printf_format_string_
+ - ATTR_ACCESS
+ - ATTR_ALIGNED
+ - ATTR_ALLOC_SIZE
+ - ATTR_COLD
+ - ATTR_CONST
+ - ATTR_COUNTED_BY
+ - ATTR_DESIGNATED_INIT
+ - ATTR_FORMAT
+ - ATTR_MALLOC
+ - ATTR_MALLOC_ARGS
+ - ATTR_NOINLINE
+ - ATTR_NONNULL
+ - ATTR_NONNULL_IF_NONZERO
+ - ATTR_NONSTRING
+ - ATTR_PURE
+ - ATTR_RETURNS_NONNULL
+ - ATTR_SENTINEL
+ - ATTR_VISIBILITY_HIDDEN
+ - ATTR_WARN_UNUSED_RESULT
BinPackArguments: true
BinPackParameters: BinPack
BitFieldColonSpacing: None
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -448,6 +448,7 @@ Requires: %{name}-server%{?_isa} = %{ver
Obsoletes: MonetDB-geom-MonetDB5 < 11.50.0
Provides: %{name}-geom-MonetDB5 = %{version}-%{release}
Provides: %{name}-geom-MonetDB5%{?_isa} = %{version}-%{release}
+# BuildRequires: pkgconfig(geos) >= 3.10.0
BuildRequires: geos-devel >= 3.10.0
%description geom
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -102,10 +102,9 @@ The following packages are optional but
``readline-devel``, ``xz-devel``, ``zlib-devel``.
The following packages are optional:
-``cfitsio-devel``, ``gdal-devel``, ``geos-devel``, ``libasan``,
-``libcmocka-devel``, ``libcurl-devel``, ``libxml2-devel``,
-``netcdf-devel``, ``proj-devel``, ``unixODBC-devel``,
-``valgrind-devel``.
+``cfitsio-devel``, ``gdal-devel``, ``geos-devel``, ``libcmocka-devel``,
+``libcurl-devel``, ``libxml2-devel``, ``netcdf-devel``, ``proj-devel``,
+``unixODBC-devel``.
On Ubuntu and Debian the following packages are required:
``bison``, ``cmake``, ``gcc``, ``pkg-config``, ``python3``,
@@ -116,10 +115,9 @@ The following packages are optional but
``libreadline-dev``, ``libssl-dev``, ``zlib1g-dev``.
The following packages are optional:
-``libasan5``, ``libcfitsio-dev``, ``libcmocka-dev``,
-``libcurl4-gnutls-dev``, ``libgdal-dev``, ``libgeos-dev``,
-``libnetcdf-dev``, ``libproj-dev``, ``libxml2-dev``, ``unixodbc-dev``,
-``valgrind``.
+``libcfitsio-dev``, ``libcmocka-dev``, ``libcurl4-gnutls-dev``,
+``libgdal-dev``, ``libgeos-dev``, ``libnetcdf-dev``, ``libproj-dev``,
+``libxml2-dev``, ``unixodbc-dev``.
``cmake`` must be at least version 3.12, ``python`` must be at least
version 3.5.
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -287,7 +287,7 @@ gdk_return GDKcreatedir(const char *nme)
ATOMIC_TYPE GDKdebug;
bool GDKembedded(void);
bool GDKexiting(void);
-_Noreturn void GDKfatal(_In_z_ _Printf_format_string_ const char *format, ...);
+_Noreturn void GDKfatal(_Printf_format_string_ const char *format, ...);
jmp_buf GDKfataljump;
bool GDKfataljumpenable;
char *GDKfatalmsg;
@@ -337,7 +337,7 @@ gdk_return GDKtoupper(allocator *ma, cha
gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT *log_level);
gdk_return GDKtracer_flush_buffer(void);
const char *GDKtracer_get_component_level(const char *comp);
-void GDKtracer_log(const char *file, const char *func, int lineno, log_level_t
lvl, component_t comp, const char *syserr, _In_z_ _Printf_format_string_ const
char *format, ...);
+void GDKtracer_log(const char *file, const char *func, int lineno, log_level_t
lvl, component_t comp, const char *syserr, _Printf_format_string_ const char
*format, ...);
void GDKtracer_reinit_basic(int sig);
gdk_return GDKtracer_reset_adapter(void);
gdk_return GDKtracer_reset_component_level(const char *comp);
@@ -899,8 +899,8 @@ const char corrRef[];
const char countRef[];
const char count_no_nilRef[];
int cpyConstant(MalBlkPtr mb, VarPtr vr);
-str createException(enum malexception, const char *, _In_z_
_Printf_format_string_ const char *, ...);
-str createMalException(MalBlkPtr, int, enum malexception, _In_z_
_Printf_format_string_ const char *, ...);
+str createException(enum malexception, const char *, _Printf_format_string_
const char *, ...);
+str createMalException(MalBlkPtr, int, enum malexception,
_Printf_format_string_ const char *, ...);
const char create_functionRef[];
const char create_roleRef[];
const char create_schemaRef[];
@@ -1651,7 +1651,7 @@ sql_rel *rel_project(allocator *sa, sql_
list *rel_projections(mvc *sql, sql_rel *rel, const char *tname, int settname,
int intern);
void res_tables_destroy(res_table *results);
list *sa_list(allocator *sa);
-char *sa_message(allocator *sa, _In_z_ _Printf_format_string_ const char
*format, ...);
+char *sa_message(allocator *sa, _Printf_format_string_ const char *format,
...);
msettings *sa_msettings_create(allocator *sa);
char *sa_msettings_to_string(const msettings *mp, allocator *sa, size_t
size_hint);
sql_type *schema_bind_type(mvc *sql, sql_schema *s, const char *name);
@@ -1739,7 +1739,7 @@ int mnstr_isalive(const stream *s);
bool mnstr_isbinary(const stream *s);
const char *mnstr_name(const stream *s);
const char *mnstr_peek_error(const stream *s);
-int mnstr_printf(stream *restrict s, _In_z_ _Printf_format_string_ const char
*restrict format, ...);
+int mnstr_printf(stream *restrict s, _Printf_format_string_ const char
*restrict format, ...);
int mnstr_putoob(stream *s, char val);
ssize_t mnstr_read(stream *restrict s, void *restrict buf, size_t elmsize,
size_t cnt);
int mnstr_readBte(stream *restrict s, int8_t *restrict val);
@@ -1757,7 +1757,7 @@ int mnstr_readStr(stream *restrict s, ch
ssize_t mnstr_read_block(stream *restrict s, void *restrict buf, size_t
elmsize, size_t cnt);
ssize_t mnstr_readline(stream *restrict s, void *restrict buf, size_t maxcnt);
void mnstr_set_bigendian(stream *s, bool bigendian);
-void mnstr_set_error(stream *s, mnstr_error_kind kind, _In_z_
_Printf_format_string_ const char *fmt, ...);
+void mnstr_set_error(stream *s, mnstr_error_kind kind, _Printf_format_string_
const char *fmt, ...);
void mnstr_settimeout(stream *s, unsigned int ms, bool (*func)(void *), void
*data);
const char *mnstr_version(void);
ssize_t mnstr_write(stream *restrict s, const void *restrict buf, size_t
elmsize, size_t cnt);
diff --git a/clients/examples/C/bincopydata.h b/clients/examples/C/bincopydata.h
--- a/clients/examples/C/bincopydata.h
+++ b/clients/examples/C/bincopydata.h
@@ -12,7 +12,7 @@
#include "copybinary.h"
#include "copybinary_support.h"
-_Noreturn void croak(int status, _In_z_ _Printf_format_string_ const char
*msg, ...)
+_Noreturn void croak(int status, _Printf_format_string_ const char *msg, ...)
ATTR_FORMAT(__printf__, 2, 3);
void gen_decimal_tinyints(FILE *f, bool byteswap, long nrecs, char *arg);
diff --git a/clients/examples/C/streamcat.c b/clients/examples/C/streamcat.c
--- a/clients/examples/C/streamcat.c
+++ b/clients/examples/C/streamcat.c
@@ -80,7 +80,7 @@ static void copy_file_to_stream(FILE *in
*/
ATTR_FORMAT(__printf__, 2, 3)
_Noreturn static void
-croak(int status, _In_z_ _Printf_format_string_ const char *msg, ...)
+croak(int status, _Printf_format_string_ const char *msg, ...)
{
va_list ap;
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -24,9 +24,7 @@
#include "mutils.h" /* mercurial_revision */
#include "dotmonetdb.h"
-static _Noreturn void usage(const char *prog, int xit);
-
-static void
+static _Noreturn void
usage(const char *prog, int xit)
{
fprintf(stderr, "Usage: %s [ options ] [ dbname ]\n", prog);
diff --git a/clients/mapilib/mapi_intern.h b/clients/mapilib/mapi_intern.h
--- a/clients/mapilib/mapi_intern.h
+++ b/clients/mapilib/mapi_intern.h
@@ -269,12 +269,12 @@ void mapi_clrError(Mapi mid)
ATTR_NONNULL(1);
MapiMsg mapi_setError(Mapi mid, const char *msg, const char *action, MapiMsg
error)
ATTR_NONNULL(2, 3);
-MapiMsg mapi_printError(Mapi mid, const char *action, MapiMsg error, _In_z_
_Printf_format_string_ const char *fmt, ...)
+MapiMsg mapi_printError(Mapi mid, const char *action, MapiMsg error,
_Printf_format_string_ const char *fmt, ...)
ATTR_NONNULL(2)
ATTR_FORMAT(__printf__, 4, 5);
void mapi_impl_log_data(Mapi mid, const char *filename, long line, const char
*mark, const char *data, size_t len);
-void mapi_impl_log_record(Mapi mid, const char *filename, long line, const
char *mark, _In_z_ _Printf_format_string_ const char *fmt, ...)
+void mapi_impl_log_record(Mapi mid, const char *filename, long line, const
char *mark, _Printf_format_string_ const char *fmt, ...)
ATTR_FORMAT(__printf__, 5, 6);
#define mapi_log_data(mid, mark, start, len) do { if ((mid)->tracelog)
mapi_impl_log_data(mid, __func__, __LINE__, mark, start, len); } while (0)
#define mapi_log_record(mid, mark, ...) do { if ((mid)->tracelog)
mapi_impl_log_record(mid, __func__, __LINE__, mark, __VA_ARGS__); } while (0)
@@ -322,7 +322,7 @@ void close_connection(Mapi mid);
void set_uri(Mapi mid);
#ifdef HAVE_OPENSSL
-MapiMsg croak_openssl(Mapi mid, const char *action, _In_z_
_Printf_format_string_ const char *fmt, ...)
+MapiMsg croak_openssl(Mapi mid, const char *action, _Printf_format_string_
const char *fmt, ...)
ATTR_FORMAT(__printf__, 3, 4);
MapiMsg add_system_certificates(Mapi mid, SSL_CTX *ctx);
diff --git a/clients/mapilib/msettings_internal.h
b/clients/mapilib/msettings_internal.h
--- a/clients/mapilib/msettings_internal.h
+++ b/clients/mapilib/msettings_internal.h
@@ -77,7 +77,7 @@ struct msettings {
};
-const char *format_error(msettings *mp, _In_z_ _Printf_format_string_ const
char *fmt, ...)
+const char *format_error(msettings *mp, _Printf_format_string_ const char
*fmt, ...)
ATTR_FORMAT(__printf__, 2, 3);
// wrappers around mp->allocator
@@ -142,7 +142,7 @@ msettings_strdup(const msettings *mp, co
ATTR_FORMAT(__printf__, 2, 3)
static inline char*
msettings_allocprintf(const msettings *mp,
- _In_z_ _Printf_format_string_ const char *fmt, ...)
+ _Printf_format_string_ const char *fmt, ...)
{
char *buffer = NULL;
va_list ap, ap2;
diff --git a/clients/mapilib/parseurl.c b/clients/mapilib/parseurl.c
--- a/clients/mapilib/parseurl.c
+++ b/clients/mapilib/parseurl.c
@@ -68,7 +68,7 @@ advance(scanner *sc)
ATTR_FORMAT(printf, 2, 3)
static bool
-complain(scanner *sc, _In_z_ _Printf_format_string_ const char *fmt, ...)
+complain(scanner *sc, _Printf_format_string_ const char *fmt, ...)
{
// do not overwrite existing error message,
// the first one is usually the most informative.
diff --git a/clients/mapilib/writeurl.c b/clients/mapilib/writeurl.c
--- a/clients/mapilib/writeurl.c
+++ b/clients/mapilib/writeurl.c
@@ -79,7 +79,7 @@ ob_append_escaped(struct outbuf *ob, con
ATTR_FORMAT(__printf__, 2, 3)
static void
-ob_printf(struct outbuf *ob, _In_z_ _Printf_format_string_ const char *fmt,
...)
+ob_printf(struct outbuf *ob, _Printf_format_string_ const char *fmt, ...)
{
va_list ap;
size_t avail = ob->end - ob->pos;
diff --git a/clients/odbc/driver/ODBCGlobal.h b/clients/odbc/driver/ODBCGlobal.h
--- a/clients/odbc/driver/ODBCGlobal.h
+++ b/clients/odbc/driver/ODBCGlobal.h
@@ -100,7 +100,7 @@ extern void setODBCdebug(const char *fil
ATTR_FORMAT(__printf__, 1, 2)
static inline void
-ODBCLOG(_In_z_ _Printf_format_string_ const char *fmt, ...)
+ODBCLOG(_Printf_format_string_ const char *fmt, ...)
{
va_list ap;
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -86,7 +86,7 @@ stream_export const char* mnstr_peek_err
stream_export mnstr_error_kind mnstr_errnr(const stream *s);
stream_export const char *mnstr_error_kind_name(mnstr_error_kind k);
stream_export void mnstr_clearerr(stream *s);
-stream_export void mnstr_set_error(stream *s, mnstr_error_kind kind, _In_z_
_Printf_format_string_ const char *fmt, ...)
+stream_export void mnstr_set_error(stream *s, mnstr_error_kind kind,
_Printf_format_string_ const char *fmt, ...)
ATTR_FORMAT(__printf__, 3, 4);
@@ -130,7 +130,7 @@ stream_export int mnstr_writeLngArray(st
stream_export int mnstr_readHgeArray(stream *restrict s, int128_t *restrict
val, size_t cnt); // unused
stream_export int mnstr_writeHgeArray(stream *restrict s, const int128_t
*restrict val, size_t cnt); // unused
#endif
-stream_export int mnstr_printf(stream *restrict s, _In_z_
_Printf_format_string_ const char *restrict format, ...) // USED all over
+stream_export int mnstr_printf(stream *restrict s, _Printf_format_string_
const char *restrict format, ...) // USED all over
ATTR_FORMAT(__printf__, 2, 3);
stream_export ssize_t mnstr_read(stream *restrict s, void *restrict buf,
size_t elmsize, size_t cnt); // USED all over
stream_export ssize_t mnstr_readline(stream *restrict s, void *restrict buf,
size_t maxcnt); // used in mclient, sql.c/mvc_export_table_wrap, bat_logger.c
diff --git a/common/stream/stream_internal.h b/common/stream/stream_internal.h
--- a/common/stream/stream_internal.h
+++ b/common/stream/stream_internal.h
@@ -175,14 +175,14 @@ struct stream {
void mnstr_va_set_error(stream *s, mnstr_error_kind kind, const char *fmt,
va_list ap)
ATTR_VISIBILITY_HIDDEN;
-void mnstr_set_error_errno(stream *s, mnstr_error_kind kind, _In_z_
_Printf_format_string_ const char *fmt, ...)
+void mnstr_set_error_errno(stream *s, mnstr_error_kind kind,
_Printf_format_string_ const char *fmt, ...)
ATTR_FORMAT(__printf__, 3, 4)
ATTR_VISIBILITY_HIDDEN;
void mnstr_copy_error(stream *dst, stream *src)
ATTR_VISIBILITY_HIDDEN;
-void mnstr_set_open_error(const char *name, int errnr, _In_z_
_Printf_format_string_ const char *fmt, ...)
+void mnstr_set_open_error(const char *name, int errnr, _Printf_format_string_
const char *fmt, ...)
ATTR_FORMAT(__printf__, 3, 4)
ATTR_VISIBILITY_HIDDEN;
diff --git a/common/utils/mstring.h b/common/utils/mstring.h
--- a/common/utils/mstring.h
+++ b/common/utils/mstring.h
@@ -229,7 +229,7 @@ checkUTF8(const char *v, size_t *ncp)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
