Changeset: e04dfb7d47b5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e04dfb7d47b5
Branch: cmp-or-patterns
Log Message:
Merges default
diffs (truncated from 3547 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -829,3 +829,4 @@ 9a694c41042503a22d6c92aeab5bc4ca1912b62e
9a694c41042503a22d6c92aeab5bc4ca1912b62e Dec2023_SP3_release
e1e9e22bf3d734dc50b56151c657a57c18f56561 Aug2024_root
cde7d8f7c99540a8c95856df052a9f123b0c1643 Dec2023_11
+cde7d8f7c99540a8c95856df052a9f123b0c1643 Dec2023_SP4_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,6 +182,11 @@ install(FILES
DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT monetdbdev)
+install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/MonetDBConfigVersion.cmake
+ DESTINATION ${EXPORT_TARGET_PATH}
+ COMPONENT monetdbdev)
+
include(monetdb-packages)
include(CTest)
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,6 +1,6 @@
exports
-HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures-hge
-!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures
+HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&HAVE_CUDF?MAL-signatures-hge
+!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&HAVE_CUDF?MAL-signatures
NOT_WIN32?melcheck
mclient-uri
testcondvar
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -47519,6 +47519,16 @@ command mmath.log2arg(X_0:flt, X_1:flt):
MATHbinary_LOGflt;
The log(x) function returns the logarithm of x in the given base.
mmath
+nextafter
+command mmath.nextafter(X_0:dbl, X_1:dbl):dbl
+MATHbinary_NEXTAFTERdbl;
+The returns the next representable floating-point value of x in the direction
of y.
+mmath
+nextafter
+command mmath.nextafter(X_0:flt, X_1:flt):flt
+MATHbinary_NEXTAFTERflt;
+The returns the next representable floating-point value of x in the direction
of y.
+mmath
pi
command mmath.pi():dbl
MATHpi;
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -35989,6 +35989,16 @@ command mmath.log2arg(X_0:flt, X_1:flt):
MATHbinary_LOGflt;
The log(x) function returns the logarithm of x in the given base.
mmath
+nextafter
+command mmath.nextafter(X_0:dbl, X_1:dbl):dbl
+MATHbinary_NEXTAFTERdbl;
+The returns the next representable floating-point value of x in the direction
of y.
+mmath
+nextafter
+command mmath.nextafter(X_0:flt, X_1:flt):flt
+MATHbinary_NEXTAFTERflt;
+The returns the next representable floating-point value of x in the direction
of y.
+mmath
pi
command mmath.pi():dbl
MATHpi;
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
@@ -790,7 +790,6 @@ str AUTHunlockVault(const char *password
str AUTHverifyPassword(const char *passwd);
str BKCmirror(bat *ret, const bat *bid);
str BKCnewBAT(bat *res, const int *tt, const BUN *cap, role_t role);
-str CLTsessions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str COPYrejects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str COPYrejects_clear(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1022,6 +1021,7 @@ int getOidConstant(MalBlkPtr mb, oid val
int getPC(MalBlkPtr mb, InstrPtr p);
str getPipeCatalog(bat *nme, bat *def, bat *stat);
const char *getRef;
+str getScenarioLanguage(Client c);
int getShtConstant(MalBlkPtr mb, sht val);
int getStrConstant(MalBlkPtr mb, str val);
const char *getTraceRef;
@@ -1065,6 +1065,7 @@ const char *likeRef;
const char *likejoinRef;
const char *likeselectRef;
const char *likeuselectRef;
+const char *lngRef;
str loadLibrary(const char *modulename, int flag);
char *locate_file(const char *basename, const char *ext, bit recurse);
const char *lockRef;
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -721,9 +721,15 @@ msab_getSingleStatus(const char *pathbuf
};
/* store the database name */
- snprintf(buf, sizeof(buf), "%s/%s", pathbuf, dbname);
+ int dbnamestart;
+#ifdef _MSC_VER
+ dbnamestart = snprintf(buf, sizeof(buf), "%s/", pathbuf);
+ snprintf(buf + dbnamestart, sizeof(buf) - dbnamestart, "%s", dbname);
+#else
+ snprintf(buf, sizeof(buf), "%s/%n%s", pathbuf, &dbnamestart, dbname);
+#endif
sdb->path = strdup(buf);
- sdb->dbname = sdb->path + strlen(sdb->path) - strlen(dbname);
+ sdb->dbname = sdb->path + dbnamestart;
/* check the state of the server by looking at its gdk lock:
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -4912,6 +4912,7 @@ BBPprintinfo(void)
}
uint32_t nfree = BBP_nfree;
BBPtmunlock();
+ printf("BATs:\n");
if (bats[1][1][1][1][1].nr > 0)
printf("fix, dirty, persistent, loaded, hot: %d bats, %zu
virtual, %zu malloc\n", bats[1][1][1][1][1].nr, bats[1][1][1][1][1].vmsz,
bats[1][1][1][1][1].sz);
if (bats[1][1][1][1][0].nr > 0)
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -145,6 +145,7 @@ GDKlockstatistics(int what)
MT_Lock *l;
int n = 0;
+ printf("Locks:\n");
if (ATOMIC_TAS(&GDKlocklistlock) != 0) {
printf("GDKlocklistlock is set, so cannot access lock list\n");
return;
@@ -285,6 +286,8 @@ dump_threads(void)
{
char buf[1024];
thread_lock();
+ if (!GDK_TRACER_TEST(M_DEBUG, THRD))
+ printf("Threads:\n");
for (struct mtthread *t = mtthreads; t; t = t->next) {
MT_Lock *lk = t->lockwait;
MT_Sema *sm = t->semawait;
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -53,12 +53,6 @@ mal_version(void)
return MONETDB5_VERSION;
}
-static void
-MALprintinfo(void)
-{
- MCprintinfo();
-}
-
/*
* Initialization of the MAL context
*/
@@ -100,8 +94,6 @@ mal_init(char *modules[], bool embedded,
return -1;
initNamespace();
- GDKprintinforegister(MALprintinfo);
-
err = malBootstrap(modules, embedded, initpasswd);
if (err != MAL_SUCCEED) {
mal_client_reset();
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -616,40 +616,6 @@ MCvalid(Client tc)
}
void
-MCprintinfo(void)
-{
- int nrun = 0, nfinish = 0, nblock = 0;
-
- MT_lock_set(&mal_contextLock);
- for (Client c = mal_clients; c < mal_clients + MAL_MAXCLIENTS; c++) {
- switch (c->mode) {
- case RUNCLIENT:
- /* running */
- nrun++;
- if (c->idle)
- printf("client %d, user %s, using %"PRIu64"
bytes of transient space, idle since %s", c->idx, c->username, (uint64_t)
ATOMIC_GET(&c->qryctx.datasize), ctime(&c->idle));
- else
- printf("client %d, user %s, using %"PRIu64"
bytes of transient space\n", c->idx, c->username, (uint64_t)
ATOMIC_GET(&c->qryctx.datasize));
- break;
- case FINISHCLIENT:
- /* finishing */
- nfinish++;
- break;
- case BLOCKCLIENT:
- /* blocked */
- nblock++;
- break;
- case FREECLIENT:
- break;
- }
- }
- MT_lock_unset(&mal_contextLock);
- printf("%d active clients, %d finishing clients, %d blocked clients\n",
- nrun, nfinish, nblock);
-}
-
-
-void
MCsetClientInfo(Client c, const char *property, const char *value)
{
if (strlen(property) < 7)
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
--- a/monetdb5/mal/mal_private.h
+++ b/monetdb5/mal/mal_private.h
@@ -81,9 +81,6 @@ void mal_runtime_reset(void)
char *dupError(const char *err)
__attribute__((__visibility__("hidden"), __returns_nonnull__));
-void MCprintinfo(void)
- __attribute__((__visibility__("hidden")));
-
void
setPoly(mel_func *f, malType tpe)
__attribute__((__visibility__("hidden")));
diff --git a/monetdb5/mal/mal_scenario.h b/monetdb5/mal/mal_scenario.h
--- a/monetdb5/mal/mal_scenario.h
+++ b/monetdb5/mal/mal_scenario.h
@@ -37,11 +37,11 @@ typedef struct SCENARIO {
mal_export Scenario getFreeScenario(void);
mal_export Scenario findScenario(const char *nme);
+mal_export str getScenarioLanguage(Client c);
#ifdef LIBMONETDB5
extern str setScenario(Client c, const char *nme);
extern str runScenario(Client c);
-extern str getScenarioLanguage(Client c);
extern void showCurrentScenario(void);
extern void showScenarioByName(stream *f, const char *s);
diff --git a/monetdb5/modules/kernel/mmath.c b/monetdb5/modules/kernel/mmath.c
--- a/monetdb5/modules/kernel/mmath.c
+++ b/monetdb5/modules/kernel/mmath.c
@@ -200,6 +200,8 @@ unopM5(_ACOS, acos)
binopM5(_ATAN2, atan2)
binopM5(_POW, pow)
binopM5(_LOG, logbs)
+ binopM5(_NEXTAFTER, nextafter)
+
static str
MATHunary_FABSdbl(dbl *res, const dbl *a)
{
@@ -357,6 +359,8 @@ mel_func mmath_init_funcs[] = {
command("mmath", "log2", MATHunary_LOG2dbl, false, "The log2(x) function
returns the base-2 logarithm of x.", args(1,2, arg("",dbl),arg("x",dbl))),
command("mmath", "pow", MATHbinary_POWflt, false, "", args(1,3,
arg("",flt),arg("x",flt),arg("y",flt))),
command("mmath", "pow", MATHbinary_POWdbl, false, "The pow(x,y) function
returns the value of x raised to the power of y.", args(1,3,
arg("",dbl),arg("x",dbl),arg("y",dbl))),
+ command("mmath", "nextafter", MATHbinary_NEXTAFTERflt, false, "The returns
the next representable floating-point value of x in the direction of y.",
args(1,3, arg("",flt),arg("x",flt),arg("y",flt))),
+ command("mmath", "nextafter", MATHbinary_NEXTAFTERdbl, false, "The returns
the next representable floating-point value of x in the direction of y.",
args(1,3, arg("",dbl),arg("x",dbl),arg("y",dbl))),
command("mmath", "sqrt", MATHunary_SQRTflt, false, "", args(1,2,
arg("",flt),arg("y",flt))),
command("mmath", "sqrt", MATHunary_SQRTdbl, false, "The sqrt(x) function
returns the non-negative root of x.", args(1,2, arg("",dbl),arg("y",dbl))),
command("mmath", "cbrt", MATHunary_CBRTflt, false, "", args(1,2,
arg("",flt),arg("y",flt))),
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -773,214 +773,6 @@ CLTshutdown(Client cntxt, MalBlkPtr mb,
return MAL_SUCCEED;
}
-str
-CLTsessions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- BAT *id = NULL, *user = NULL, *login = NULL, *sessiontimeout = NULL,
- *querytimeout = NULL, *idle = NULL;
- BAT *opt = NULL, *wlimit = NULL, *mlimit = NULL;
- BAT *language = NULL, *peer = NULL, *hostname = NULL, *application =
NULL, *client = NULL, *clientpid = NULL, *remark = NULL;
- bat *idId = getArgReference_bat(stk, pci, 0);
- bat *userId = getArgReference_bat(stk, pci, 1);
- bat *loginId = getArgReference_bat(stk, pci, 2);
- bat *idleId = getArgReference_bat(stk, pci, 3);
- bat *optId = getArgReference_bat(stk, pci, 4);
- bat *sessiontimeoutId = getArgReference_bat(stk, pci, 5);
- bat *querytimeoutId = getArgReference_bat(stk, pci, 6);
- bat *wlimitId = getArgReference_bat(stk, pci, 7);
- bat *mlimitId = getArgReference_bat(stk, pci, 8);
- bat *languageId = getArgReference_bat(stk, pci, 9);
- bat *peerId = getArgReference_bat(stk, pci, 10);
- bat *hostnameId = getArgReference_bat(stk, pci, 11);
- bat *applicationId = getArgReference_bat(stk, pci, 12);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
