Changeset: 0961989c9bcf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0961989c9bcf
Modified Files:
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
sql/backends/monet5/sql_upgrades.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/storage/store.c
Branch: mangled
Log Message:
Merge with default.
diffs (truncated from 256425 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -830,3 +830,5 @@ 34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74
9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_5
34d6df33e954fe8fbee1cb3d4e2bde0bbd903d74 Jan2022_release
9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
+9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
+9fbec5dab8167d2189582fbe75e5f9c8bef82380 Jan2022_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -884,8 +884,8 @@ fi
* Thu Jan 6 2022 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
- 11.43.3-20220111
- merovingian: Disabled logging into merovingian.log of next info message
types:
- - proxying client <host>:<port> for database '<dbname>' to <url>
- - target connection is on local UNIX domain socket, passing on
filedescriptor instead of proxying
+ "proxying client <host>:<port> for database '<dbname>' to <url>" and
+ "target connection is on local UNIX domain socket, passing on filedescriptor
instead of proxying".
These messages were written to the log file at each connection. In most
cases this information is not used. The disabling reduces the log file size.
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
@@ -906,7 +906,7 @@ const char *comment_onRef;
const char *commitRef;
str compileString(Symbol *fcn, Client c, str s);
const char *compressRef;
-char *concatErrors(char *err1, const char *err2) __attribute__((__nonnull__(1,
2))) __attribute__((__returns_nonnull__));
+char *concatErrors(char *err1, const char *err2)
__attribute__((__nonnull__(1))) __attribute__((__nonnull__(2)))
__attribute__((__returns_nonnull__));
const char *connectRef;
const char *contextRef;
str convertConstant(malType type, ValPtr vr);
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -204,7 +204,7 @@ comment_on(stream *toConsole, const char
return 0;
}
-static char *actions[] = {
+static const char *actions[] = {
0,
"CASCADE",
"RESTRICT",
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2967,7 +2967,7 @@ struct privdata {
#define READSIZE (1 << 16)
//#define READSIZE (1 << 20)
-static char alpha[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+static const char alpha[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz";
static char *
@@ -3177,7 +3177,7 @@ main(int argc, char **argv)
bool autocommit = true; /* autocommit mode default on */
bool user_set_as_flag = false;
bool passwd_set_as_flag = false;
- static struct option long_options[] = {
+ static const struct option long_options[] = {
{"autocommit", 0, 0, 'a'},
{"database", 1, 0, 'd'},
{"dump", 0, 0, 'D'},
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1080,7 +1080,7 @@ static char nomem[] = "Memory allocation
static void
mapi_clrError(Mapi mid)
- __attribute__((__nonnull__));
+ __attribute__((__nonnull__(1)));
static void
mapi_clrError(Mapi mid)
@@ -1095,7 +1095,7 @@ mapi_clrError(Mapi mid)
static MapiMsg
mapi_setError(Mapi mid, const char *msg, const char *action, MapiMsg error)
- __attribute__((__nonnull__(2, 3)));
+ __attribute__((__nonnull__(2))) __attribute__((__nonnull__(3)));
static MapiMsg
mapi_setError(Mapi mid, const char *msg, const char *action, MapiMsg error)
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,8 +54,8 @@ monetdb (11.43.3) unstable; urgency=low
monetdb (11.43.3) unstable; urgency=low
* merovingian: Disabled logging into merovingian.log of next info message
types:
- - proxying client <host>:<port> for database '<dbname>' to <url>
- - target connection is on local UNIX domain socket, passing on
filedescriptor instead of proxying
+ "proxying client <host>:<port> for database '<dbname>' to <url>" and
+ "target connection is on local UNIX domain socket, passing on
filedescriptor instead of proxying".
These messages were written to the log file at each connection. In most
cases this information is not used. The disabling reduces the log file
size.
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -14,7 +14,8 @@
* specific attributes that we use are known */
#ifndef __has_attribute
#ifndef __GNUC__
-#define __has_attribute(attr) 0
+/* we can define __has_attribute as 1 since we define __attribute__ as empty */
+#define __has_attribute(attr) 1
#ifndef __attribute__
#define __attribute__(attr) /* empty */
#endif
@@ -23,50 +24,60 @@
* attributes that we use are known */
#define __has_attribute__alloc_size__ 1
#define __has_attribute__cold__ 1
+#define __has_attribute__const__ 1
+#define __has_attribute__constructor__ 1
+#define __has_attribute__designated_init__ 0
#define __has_attribute__format__ 1
-#define __has_attribute__designated_init__ 0
#define __has_attribute__malloc__ 1
+#define __has_attribute__nonnull__ 1
#define __has_attribute__nonstring__ 0
-#define __has_attribute__noreturn__ 1
-#define __has_attribute__pure__ 0
+#define __has_attribute__pure__ 1
#define __has_attribute__returns_nonnull__ 0
#define __has_attribute__visibility__ 1
#define __has_attribute__warn_unused_result__ 1
#define __has_attribute(attr) __has_attribute##attr
#endif
#endif
-#if !__has_attribute(__warn_unused_result__)
-#define __warn_unused_result__
-#endif
-#if !__has_attribute(__malloc__)
-#define __malloc__
-#endif
#if !__has_attribute(__alloc_size__)
#define __alloc_size__(a)
#endif
+#if !__has_attribute(__cold__)
+#define __cold__
+#endif
+#if !__has_attribute(__const__)
+#define __const__
+#endif
+#if !__has_attribute(__constructor__)
+#define __constructor__
+#endif
+#if !__has_attribute(__designated_init__)
+#define __designated_init__
+#endif
#if !__has_attribute(__format__)
#define __format__(a,b,c)
#endif
+#if !__has_attribute(__malloc__)
+#define __malloc__
+#endif
+#if !__has_attribute(__nonnull__)
+#define __nonnull__(a)
+#endif
#if !__has_attribute(__nonstring__)
#define __nonstring__
#endif
-#if !__has_attribute(__noreturn__)
-#define __noreturn__
-#endif
#if !__has_attribute(__pure__)
#define __pure__
#endif
-#if !__has_attribute(__designated_init__)
-#define __designated_init__
+#if !__has_attribute(__returns_nonnull__)
+#define __returns_nonnull__
#endif
-/* these are used in some *private.h files */
#if !__has_attribute(__visibility__)
#define __visibility__(a)
#elif defined(__CYGWIN__)
#define __visibility__(a)
#endif
-#if !__has_attribute(__cold__)
-#define __cold__
+#if !__has_attribute(__warn_unused_result__)
+#define __warn_unused_result__
#endif
/* also see gdk.h for these */
diff --git a/misc/packages/deb/changelog b/misc/packages/deb/changelog
--- a/misc/packages/deb/changelog
+++ b/misc/packages/deb/changelog
@@ -54,8 +54,8 @@ monetdb (11.43.3) unstable; urgency=low
monetdb (11.43.3) unstable; urgency=low
* merovingian: Disabled logging into merovingian.log of next info message
types:
- - proxying client <host>:<port> for database '<dbname>' to <url>
- - target connection is on local UNIX domain socket, passing on
filedescriptor instead of proxying
+ "proxying client <host>:<port> for database '<dbname>' to <url>" and
+ "target connection is on local UNIX domain socket, passing on
filedescriptor instead of proxying".
These messages were written to the log file at each connection. In most
cases this information is not used. The disabling reduces the log file
size.
diff --git a/misc/packages/rpm/changelog b/misc/packages/rpm/changelog
--- a/misc/packages/rpm/changelog
+++ b/misc/packages/rpm/changelog
@@ -32,8 +32,8 @@
* Thu Jan 6 2022 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
- 11.43.3-20220111
- merovingian: Disabled logging into merovingian.log of next info message
types:
- - proxying client <host>:<port> for database '<dbname>' to <url>
- - target connection is on local UNIX domain socket, passing on
filedescriptor instead of proxying
+ "proxying client <host>:<port> for database '<dbname>' to <url>" and
+ "target connection is on local UNIX domain socket, passing on filedescriptor
instead of proxying".
These messages were written to the log file at each connection. In most
cases this information is not used. The disabling reduces the log file size.
diff --git a/monetdb5/mal/mal_exception.c b/monetdb5/mal/mal_exception.c
--- a/monetdb5/mal/mal_exception.c
+++ b/monetdb5/mal/mal_exception.c
@@ -14,7 +14,7 @@
#include "mal_exception.h"
#include "mal_private.h"
-static char *exceptionNames[] = {
+static const char *exceptionNames[] = {
/* 0 */ "MALException",
/* 1 */ "IllegalArgumentException",
/* 2 */ "OutOfBoundsException",
diff --git a/monetdb5/mal/mal_exception.h b/monetdb5/mal/mal_exception.h
--- a/monetdb5/mal/mal_exception.h
+++ b/monetdb5/mal/mal_exception.h
@@ -51,7 +51,7 @@ mal_export str createMalException(MalBlk
__attribute__((__format__(__printf__, 4, 5)))
__attribute__((__returns_nonnull__));
mal_export char *concatErrors(char *err1, const char *err2)
- __attribute__((__nonnull__(1, 2)))
+ __attribute__((__nonnull__(1))) __attribute__((__nonnull__(2)))
__attribute__((__returns_nonnull__));
mal_export bool isExceptionVariable(const char *nme);
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -59,7 +59,7 @@ blobsize(size_t nitems)
return (var_t) (offsetof(blob, data) + nitems);
}
-static char hexit[] = "0123456789ABCDEF";
+static const char hexit[] = "0123456789ABCDEF";
/*
* @- Wrapping section
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -61,7 +61,7 @@ typedef struct _inet {
#endif
#define in_setnil(i) (i)->q1 = (i)->q2 = (i)->q3 = (i)->q4 = (i)->mask =
(i)->filler1 = (i)->filler2 = 0; (i)->isnil = 1
-static inet inet_nil = {{{0,0,0,0,0,0,0,1}}};
+static const inet inet_nil = {{{0,0,0,0,0,0,0,1}}};
/**
* Creates a new inet from the given string.
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/mal_io.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/mal_io.c
@@ -210,9 +210,9 @@ IOprint_val(Client cntxt, MalBlkPtr mb,
}
-static char toofew_error[80] = OPERATION_FAILED " At least %d parameter(s)
expected.\n";
-static char format_error[80] = OPERATION_FAILED " Error in format before param
%d.\n";
-static char type_error[80] = OPERATION_FAILED " Illegal type in param %d.\n";
+static const char toofew_error[80] = OPERATION_FAILED " At least %d
parameter(s) expected.\n";
+static const char format_error[80] = OPERATION_FAILED " Error in format before
param %d.\n";
+static const char type_error[80] = OPERATION_FAILED " Illegal type in param
%d.\n";
#define return_error(x)
\
do {
\
@@ -221,7 +221,7 @@ static char type_error[80] = OPERATION_F
throw(MAL,"io.printf", x,argc); \
} while (0)
-static char niltext[4] = "nil";
+static const char niltext[4] = "nil";
static str
IOprintf_(str *res, str format, ...)
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -88,7 +88,7 @@
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
