Changeset: 0f3228d505e4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0f3228d505e4
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/storage/store.c
sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (truncated from 538 to 300 lines):
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/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/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -100,6 +100,7 @@ CLIENTprintinfo(void)
struct tm tm;
MT_lock_set(&mal_contextLock);
+ printf("Clients:\n");
for (Client c = mal_clients; c < mal_clients + MAL_MAXCLIENTS; c++) {
switch (c->mode) {
case RUNCLIENT:
@@ -112,6 +113,9 @@ CLIENTprintinfo(void)
if (c->idle) {
localtime_r(&c->idle, &tm);
strftime(tmbuf, sizeof(tmbuf), ", idle since %F
%H:%M:%S%z", &tm);
+ } else if (c->lastcmd) {
+ localtime_r(&c->lastcmd, &tm);
+ strftime(tmbuf, sizeof(tmbuf), ", busy since %F
%H:%M:%S%z", &tm);
} else
tmbuf[0] = 0;
if (c->sqlcontext && ((backend *) c->sqlcontext)->mvc
&& ((backend *) c->sqlcontext)->mvc->session && ((backend *)
c->sqlcontext)->mvc->session->tr && ((backend *)
c->sqlcontext)->mvc->session->tr->active)
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -3293,9 +3293,10 @@ sql_update_jan2022(Client c, mvc *sql)
printf("Running database upgrade
commands:\n%s\n", query);
fflush(stdout);
err = SQLstatementIntern(c, query, "update",
true, false, NULL);
+ } else {
+ sql->session->status = 0; /* if the function
was not found clean the error */
+ sql->errstr[0] = '\0';
}
- sql->session->status = 0; /* if the function was not
found clean the error */
- sql->errstr[0] = '\0';
}
sa_destroy(sql->sa);
if (err)
@@ -5575,9 +5576,10 @@ sql_update_jun2023(Client c, mvc *sql, s
printf("Running database upgrade commands:\n%s\n", query);
fflush(stdout);
err = SQLstatementIntern(c, query, "update", true, false, NULL);
+ } else {
+ sql->session->status = 0; /* if the function was not found
clean the error */
+ sql->errstr[0] = '\0';
}
- sql->session->status = 0; /* if the function was not found clean the
error */
- sql->errstr[0] = '\0';
if (!sql_bind_func(sql, "sys", "jarowinkler", &t2, &t2, F_FUNC, true,
true)) {
sql->session->status = 0; /* if the function was not found
clean the error */
@@ -5828,9 +5830,10 @@ sql_update_dec2023_geom(Client c, mvc *s
if (sql_bind_func(sql, s->base.name, "shpattach", &tp, NULL, F_PROC,
true, true)) {
if ((err = sql_drop_shp(c)) != NULL)
return err;
+ } else {
+ sql->session->status = 0; /* if the shpattach function was not
found clean the error */
+ sql->errstr[0] = '\0';
}
- sql->session->status = 0; /* if the shpattach function was not found
clean the error */
- sql->errstr[0] = '\0';
#ifdef HAVE_GEOM
if (backend_has_module(&(int){0}, "geom")) {
#ifdef HAVE_SHP
@@ -7246,10 +7249,8 @@ sql_update_aug2024(Client c, mvc *sql, s
}
if (err == MAL_SUCCEED) {
sql_subtype tp;
- sql_find_subtype(&tp, "clob", 0, 0);
- if (!sql_bind_func(sql, s->base.name,
"gzcompress", &tp, &tp, F_PROC, true, true)) {
- sql->session->status = 0;
- sql->errstr[0] = '\0';
+ sql_find_subtype(&tp, "varchar", 0, 0);
+ if (sql_bind_func(sql, s->base.name,
"gzcompress", &tp, &tp, F_PROC, true, true)) {
const char query[] =
"drop procedure if exists
sys.gzcompress(string, string);\n"
"drop procedure if exists
sys.gzdecompress(string, string);\n"
@@ -7258,14 +7259,15 @@ sql_update_aug2024(Client c, mvc *sql, s
printf("Running database upgrade
commands:\n%s\n", query);
fflush(stdout);
err = SQLstatementIntern(c, query,
"update", true, false, NULL);
+ } else {
+ sql->session->status = 0;
+ sql->errstr[0] = '\0';
}
}
if (err == MAL_SUCCEED) {
sql_subtype tp;
- sql_find_subtype(&tp, "clob", 0, 0);
- if (!sql_bind_func(sql, s->base.name,
"newdictionary", &tp, &tp, F_PROC, true, true)) {
- sql->session->status = 0;
- sql->errstr[0] = '\0';
+ sql_find_subtype(&tp, "varchar", 0, 0);
+ if (sql_bind_func(sql, s->base.name,
"newdictionary", &tp, &tp, F_PROC, true, true)) {
const char query[] =
"drop procedure if exists
sys.newdictionary(string, string);\n"
"drop procedure if exists
sys.dropdictionary(string, string);\n"
@@ -7273,6 +7275,9 @@ sql_update_aug2024(Client c, mvc *sql, s
printf("Running database upgrade
commands:\n%s\n", query);
fflush(stdout);
err = SQLstatementIntern(c, query,
"update", true, false, NULL);
+ } else {
+ sql->session->status = 0;
+ sql->errstr[0] = '\0';
}
}
}
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -7480,6 +7480,7 @@ void
store_printinfo(sqlstore *store)
{
MT_lock_set(&store->commit);
+ printf("WAL:\n");
printf("SQL store oldest pending "ULLFMT"\n", store->oldest_pending);
log_printinfo(store->logger);
MT_lock_unset(&store->commit);
diff --git
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
---
a/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++
b/sql/test/emptydb-previous-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -1126,17 +1126,6 @@ UPDATE sys._tables SET system = true whe
and name in ('check_constraints','table_constraints');
Running database upgrade commands:
-drop procedure if exists sys.gzcompress(string, string);
-drop procedure if exists sys.gzdecompress(string, string);
-drop procedure if exists sys.gztruncate(string, string);
-drop procedure if exists sys.gzexpand(string, string);
-
-Running database upgrade commands:
-drop procedure if exists sys.newdictionary(string, string);
-drop procedure if exists sys.dropdictionary(string, string);
-drop procedure if exists sys.initializedictionary();
-
-Running database upgrade commands:
create procedure sys.vacuum(sname string, tname string)
external name sql.vacuum;
create procedure sys.vacuum(sname string, tname string, interval int)
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -1112,17 +1112,6 @@ UPDATE sys._tables SET system = true whe
and name in ('check_constraints','table_constraints');
Running database upgrade commands:
-drop procedure if exists sys.gzcompress(string, string);
-drop procedure if exists sys.gzdecompress(string, string);
-drop procedure if exists sys.gztruncate(string, string);
-drop procedure if exists sys.gzexpand(string, string);
-
-Running database upgrade commands:
-drop procedure if exists sys.newdictionary(string, string);
-drop procedure if exists sys.dropdictionary(string, string);
-drop procedure if exists sys.initializedictionary();
-
-Running database upgrade commands:
create procedure sys.vacuum(sname string, tname string)
external name sql.vacuum;
create procedure sys.vacuum(sname string, tname string, interval int)
diff --git
a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -1195,17 +1195,6 @@ UPDATE sys._tables SET system = true whe
and name in ('check_constraints','table_constraints');
Running database upgrade commands:
-drop procedure if exists sys.gzcompress(string, string);
-drop procedure if exists sys.gzdecompress(string, string);
-drop procedure if exists sys.gztruncate(string, string);
-drop procedure if exists sys.gzexpand(string, string);
-
-Running database upgrade commands:
-drop procedure if exists sys.newdictionary(string, string);
-drop procedure if exists sys.dropdictionary(string, string);
-drop procedure if exists sys.initializedictionary();
-
-Running database upgrade commands:
create procedure sys.vacuum(sname string, tname string)
external name sql.vacuum;
create procedure sys.vacuum(sname string, tname string, interval int)
diff --git
a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -1126,17 +1126,6 @@ UPDATE sys._tables SET system = true whe
and name in ('check_constraints','table_constraints');
Running database upgrade commands:
-drop procedure if exists sys.gzcompress(string, string);
-drop procedure if exists sys.gzdecompress(string, string);
-drop procedure if exists sys.gztruncate(string, string);
-drop procedure if exists sys.gzexpand(string, string);
-
-Running database upgrade commands:
-drop procedure if exists sys.newdictionary(string, string);
-drop procedure if exists sys.dropdictionary(string, string);
-drop procedure if exists sys.initializedictionary();
-
-Running database upgrade commands:
create procedure sys.vacuum(sname string, tname string)
external name sql.vacuum;
create procedure sys.vacuum(sname string, tname string, interval int)
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -1112,17 +1112,6 @@ UPDATE sys._tables SET system = true whe
and name in ('check_constraints','table_constraints');
Running database upgrade commands:
-drop procedure if exists sys.gzcompress(string, string);
-drop procedure if exists sys.gzdecompress(string, string);
-drop procedure if exists sys.gztruncate(string, string);
-drop procedure if exists sys.gzexpand(string, string);
-
-Running database upgrade commands:
-drop procedure if exists sys.newdictionary(string, string);
-drop procedure if exists sys.dropdictionary(string, string);
-drop procedure if exists sys.initializedictionary();
-
-Running database upgrade commands:
create procedure sys.vacuum(sname string, tname string)
external name sql.vacuum;
create procedure sys.vacuum(sname string, tname string, interval int)
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out.int128
@@ -1195,17 +1195,6 @@ UPDATE sys._tables SET system = true whe
and name in ('check_constraints','table_constraints');
Running database upgrade commands:
-drop procedure if exists sys.gzcompress(string, string);
-drop procedure if exists sys.gzdecompress(string, string);
-drop procedure if exists sys.gztruncate(string, string);
-drop procedure if exists sys.gzexpand(string, string);
-
-Running database upgrade commands:
-drop procedure if exists sys.newdictionary(string, string);
-drop procedure if exists sys.dropdictionary(string, string);
-drop procedure if exists sys.initializedictionary();
-
-Running database upgrade commands:
create procedure sys.vacuum(sname string, tname string)
external name sql.vacuum;
create procedure sys.vacuum(sname string, tname string, interval int)
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -504,17 +504,6 @@ UPDATE sys._tables SET system = true whe
and name in ('check_constraints','table_constraints');
Running database upgrade commands:
-drop procedure if exists sys.gzcompress(string, string);
-drop procedure if exists sys.gzdecompress(string, string);
-drop procedure if exists sys.gztruncate(string, string);
-drop procedure if exists sys.gzexpand(string, string);
-
-Running database upgrade commands:
-drop procedure if exists sys.newdictionary(string, string);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
