Changeset: 9b6bd3693183 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9b6bd3693183
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
sql/server/sql_parser.y
sql/test/miscellaneous/Tests/groupby_error.test
Branch: optimizer-testing
Log Message:
merged with Jun2023
diffs (truncated from 4553 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -799,3 +799,5 @@ bb95192134c0d8ef8fea525204eefcd0de099a54
24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33
05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33
05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_SP10_release
+ed34ab4283cbfcc57fb9d7387bc9d781c91902b1 Jan2022_27
+ed34ab4283cbfcc57fb9d7387bc9d781c91902b1 Jan2022_SP7_release
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -121,7 +121,7 @@ SQLhelp sqlhelp1[] = {
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/export_data/"},
{"COPY INTO BINARY",
"Write query result data to binary files",
- "COPY query_expression INTO [{{BIG | LITTLE | NATIVE}} ENDIAN] BINARY
string_commalist [ON { CLIENT | SERVER }]",
+ "COPY query_expression INTO [{BIG | LITTLE | NATIVE} ENDIAN] BINARY
string_commalist [ON { CLIENT | SERVER }]",
"query_expression",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/export_data/"},
{"COPY INTO FROM",
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -150,6 +150,7 @@ macro(monetdb_macro_variables)
set(RHOME "${LIBR_HOME}")
set(HAVE_GEOM ${GEOS_FOUND})
set(HAVE_SHP ${GDAL_FOUND})
+ set(SANITIZER ${SANITIZER})
if(PY3INTEGRATION)
set(HAVE_LIBPY3 "${Python3_NumPy_FOUND}")
diff --git a/gdk/ChangeLog.Sep2022 b/gdk/ChangeLog.Sep2022
--- a/gdk/ChangeLog.Sep2022
+++ b/gdk/ChangeLog.Sep2022
@@ -1,6 +1,11 @@
# ChangeLog file for GDK
# This file is updated with Maddlog
+* Tue May 16 2023 Sjoerd Mullender <[email protected]>
+- Warnings and informational messages are now sent to stdout instead of
+ stderr, which means that monetdbd will now log them with the tag MSG
+ instead of ERR.
+
* Tue Apr 25 2023 Sjoerd Mullender <[email protected]>
- Fixed parsing of the BBP.dir file when BAT ids grow larger than 2**24
(i.e. 100000000 in octal).
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -363,9 +363,9 @@ recover_dir(int farmid, bool direxists)
if (direxists) {
/* just try; don't care about these non-vital files */
if (GDKunlink(farmid, BATDIR, "BBP", "bak") != GDK_SUCCEED)
- TRC_WARNING(GDK, "unlink of BBP.bak failed\n");
+ GDKwarning("unlink of BBP.bak failed\n");
if (GDKmove(farmid, BATDIR, "BBP", "dir", BATDIR, "BBP", "bak",
false) != GDK_SUCCEED)
- TRC_WARNING(GDK, "rename of BBP.dir to BBP.bak
failed\n");
+ GDKwarning("rename of BBP.dir to BBP.bak failed\n");
}
return GDKmove(farmid, BAKDIR, "BBP", "dir", BATDIR, "BBP", "dir",
true);
}
@@ -486,7 +486,7 @@ heapinit(BAT *b, const char *buf,
}
if (strcmp(type, "wkba") == 0)
- TRC_WARNING(GDK, "type wkba (SQL name: GeometryA) is
deprecated\n");
+ GDKwarning("type wkba (SQL name: GeometryA) is deprecated\n");
if (properties & ~0x0F81) {
TRC_CRITICAL(GDK, "unknown properties are set: incompatible
database on line %d of BBP.dir\n", lineno);
@@ -1442,7 +1442,7 @@ movestrbats(void)
GDKerror("both %s and %s exist
with %s unexpectedly newer: manual intervention required\n", oldpath, newpath,
oldpath);
ret = -1;
} else {
- TRC_WARNING(GDK, "both %s and
%s exist, removing %s\n", oldpath, newpath, oldpath);
+ GDKwarning("both %s and %s
exist, removing %s\n", oldpath, newpath, oldpath);
ret = MT_remove(oldpath);
}
} else {
@@ -3250,8 +3250,8 @@ BBPquickdesc(bat bid)
const char *aname = ATOMunknown_name(b->ttype);
int tt = ATOMindex(aname);
if (tt < 0) {
- TRC_WARNING(GDK, "atom '%s' unknown in bat '%s'.\n",
- aname, BBP_physical(bid));
+ GDKwarning("atom '%s' unknown in bat '%s'.\n",
+ aname, BBP_physical(bid));
} else {
b->ttype = tt;
}
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -754,8 +754,7 @@ la_bat_destroy(logger *lg, logaction *la
if (bid < 0)
return GDK_FAIL;
if (!bid) {
- GDKerror("la_bat_destroy failed to find bid for object %d
(issue ignored)\n", la->cid);
- GDKclrerr();
+ GDKwarning("failed to find bid for object %d\n", la->cid);
return GDK_SUCCEED;
}
if (bid && log_del_bat(lg, bid) != GDK_SUCCEED)
@@ -1530,7 +1529,7 @@ cleanup_and_swap(logger *lg, int *r, con
if ((lb = BATdescriptor(bids[pos])) == NULL ||
BATmode(lb, true/*transient*/) != GDK_SUCCEED) {
- TRC_WARNING(GDK, "Failed to set bat(%d)
transient\n", bids[pos]);
+ GDKwarning("Failed to set bat(%d) transient\n",
bids[pos]);
}
logbat_destroy(lb);
}
@@ -1820,8 +1819,8 @@ log_cleanup(logger *lg, lng id)
return GDK_FAIL;
}
if (GDKunlink(0, lg->dir, LOGFILE, log_id) != GDK_SUCCEED) {
- TRC_WARNING(GDK, "#log_cleanup: failed to remove old WAL
%s.%s\n", LOGFILE, log_id);
- GDKclrerr();
+ GDKwarning("failed to remove old WAL %s.%s\n", LOGFILE, log_id);
+ GDKclrerr(); /* clear error from unlink */
}
return GDK_SUCCEED;
}
@@ -3079,7 +3078,7 @@ bm_commit(logger *lg)
assert(bid);
if ((lb = BATdescriptor(bid)) == NULL ||
BATmode(lb, false) != GDK_SUCCEED) {
- TRC_WARNING(GDK, "Failed to set bat (%d%s)
persistent\n", bid, !lb?" gone":"");
+ GDKwarning("Failed to set bat (%d%s) persistent\n",
bid, !lb?" gone":"");
logbat_destroy(lb);
log_unlock(lg);
return GDK_FAIL;
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -396,7 +396,7 @@ MT_mremap(const char *path, int mode, vo
return old_address;
}
if (path && truncate(path, *new_size) < 0)
- TRC_WARNING(GDK, "MT_mremap(%s): truncate failed: %s\n",
+ GDKwarning("truncate of %s failed: %s\n",
path, GDKstrerror(errno, (char[64]){0},
64));
#endif /* !__COVERITY__ */
return old_address;
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -176,6 +176,9 @@ gdk_return GDKtracer_init(const char *db
__attribute__((__visibility__("hidden")));
gdk_return GDKunlink(int farmid, const char *dir, const char *nme, const char
*extension)
__attribute__((__visibility__("hidden")));
+#define GDKwarning(format, ...) \
+ GDKtracer_log(__FILE__, __func__, __LINE__, M_WARNING, \
+ GDK, NULL, format, ##__VA_ARGS__)
BUN HASHappend(BAT *b, BUN i, const void *v)
__attribute__((__visibility__("hidden")));
void HASHappend_locked(BAT *b, BUN i, const void *v)
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -78,7 +78,7 @@ epilogue(int cnt, bat *subcommit, bool l
/* check mmap modes */
MT_lock_set(&b->theaplock);
if (BATcheckmodes(b, true) != GDK_SUCCEED)
- TRC_WARNING(GDK, "BATcheckmodes
failed\n");
+ GDKwarning("BATcheckmodes failed\n");
MT_lock_unset(&b->theaplock);
}
}
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -580,7 +580,8 @@ GDKtracer_log(const char *file, const ch
reinit();
if (level <= M_WARNING || (ATOMIC_GET(&GDKdebug) & FORCEMITOMASK)) {
- fprintf(stderr, "#%s%s%s: %s: %s: %s%s%s\n",
+ fprintf(level <= M_ERROR ? stderr : stdout,
+ "#%s%s%s: %s: %s: %s%s%s\n",
add_ts ? ts : "",
add_ts ? ": " : "",
MT_thread_getname(), func, level_str[level] + 2,
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -124,7 +124,7 @@ OPTmultiplexInline(Client cntxt, MalBlkP
MalBlkPtr mq;
InstrPtr q = NULL, sig;
char buf[1024];
- int i,j,k,m, actions=0;
+ int i,j,k,m;
int refbat=0, retc = p->retc;
bit *upgrade;
str msg;
@@ -279,7 +279,6 @@ OPTmultiplexInline(Client cntxt, MalBlkP
typeChecker(cntxt->usermodule,mq,q,i,TRUE);
if( q->typechk== TYPE_UNKNOWN)
goto terminateMX;
- actions++;
break;
}
/* handle simple upgraded assignments as well */
@@ -296,7 +295,6 @@ OPTmultiplexInline(Client cntxt, MalBlkP
typeChecker(cntxt->usermodule,mq,q,i,TRUE);
if( q->typechk== TYPE_UNKNOWN)
goto terminateMX;
- actions++;
break;
}
}
diff --git a/sql/ChangeLog.Sep2022 b/sql/ChangeLog.Sep2022
--- a/sql/ChangeLog.Sep2022
+++ b/sql/ChangeLog.Sep2022
@@ -7,7 +7,7 @@
* Fri Mar 24 2023 Sjoerd Mullender <[email protected]>
- Increased the size of a variable counting the number of changes made
- to the database (e.g. in case more than a 2 billion rows are added to
+ to the database (e.g. in case more than 2 billion rows are added to
a table).
- Improved cleanup after failures such as failed memory allocations.
diff --git a/sql/odbc/tests/Tests/All b/sql/odbc/tests/Tests/All
--- a/sql/odbc/tests/Tests/All
+++ b/sql/odbc/tests/Tests/All
@@ -2,4 +2,4 @@ HAVE_ODBC?ODBCgetInfo
HAVE_ODBC?ODBCmetadata
HAVE_ODBC?ODBCStmtAttr
HAVE_ODBC?ODBCtester
-HAVE_PYODBC?pyodbc-test
+HAVE_PYODBC&!SANITIZER?pyodbc-test
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -31,7 +31,7 @@ makeAtomNode(mvc *m, const char* type, c
#include <unistd.h>
#include <string.h>
-#define SA m->sa
+#define SA m->sa
#define _symbol_create(t,d) symbol_create( SA, t, d)
#define _symbol_create_list(t,d) symbol_create_list( SA, t, d)
#define _symbol_create_int(t,d) symbol_create_int( SA, t, d)
@@ -53,7 +53,7 @@ makeAtomNode(mvc *m, const char* type, c
#define Malloc(sz) ma_alloc(m->ta,sz)
#define YYMALLOC Malloc
-#define YYFREE ma_free
+#define YYFREE ma_free
#define YY_parse_LSP_NEEDED /* needed for bison++ 1.21.11-3 */
@@ -230,7 +230,7 @@ int yydebug=1;
default
default_value
delete_stmt
- domain_constraint_type
+ domain_constraint_type
drop_statement
drop_table_element
exec
@@ -431,9 +431,8 @@ int yydebug=1;
XML_element_name
XML_namespace_prefix
XML_PI_target
- opt_optimizer
- opt_default_role
-
+ opt_optimizer
+ opt_default_role
%type <l>
argument_list
@@ -535,8 +534,8 @@ int yydebug=1;
XML_element_content_and_option
XML_element_content_list
XML_value_expression_list
- opt_schema_details_list
- opt_qname
+ opt_schema_details_list
+ opt_qname
%type <i_val>
_transaction_mode_list
@@ -561,7 +560,7 @@ int yydebug=1;
opt_endianness
opt_for_each
opt_from_grantor
- opt_grantor
+ opt_grantor
opt_index_type
opt_match
opt_match_type
@@ -593,14 +592,14 @@ int yydebug=1;
with_or_without_data
XML_content_option
XML_whitespace_option
- opt_max_workers
+ opt_max_workers
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
