Changeset: 7ca56dbae4e6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/7ca56dbae4e6 Modified Files: sql/backends/monet5/sql_scenario.c Branch: default Log Message:
Merge with Mar2025 branch. diffs (88 lines): diff --git a/clients/ChangeLog.Mar2025 b/clients/ChangeLog.Mar2025 --- a/clients/ChangeLog.Mar2025 +++ b/clients/ChangeLog.Mar2025 @@ -3,13 +3,15 @@ * Tue Jun 3 2025 Sjoerd Mullender <[email protected]> - When connecting to a database, if there are multiple monetdbd servers - running, mclient will try them all, and also both UNIX domain sockets - and then TCP, in order to find a server that accepts the connection. - However, when a server that handles the requested database does - exist but refuses the connection for some other reason, mclient would - continue searching. This has now been changed. If monetdbd reports - an error other than database unknown, mclient will now stop looking - and report the error. + running, mclient will try them all, and also both UNIX domain + sockets and then TCP, in order to find a server that accepts the + connection. However, when a server that handles the requested + database does exist but refuses the connection for some other + reason, mclient would continue searching. This has now been + changed. If monetdbd reports an error other than database unknown, + mclient will now stop looking and report the error. This is + actually a change in the "mapi" library, so any program using the + library gets the new behavior. - There is a new option --quiet (or just -q) in mclient. If used, the welcome message that is normally printed in an interactive invocation is suppressed. diff --git a/sql/backends/monet5/UDF/pyapi3/connection3.c b/sql/backends/monet5/UDF/pyapi3/connection3.c --- a/sql/backends/monet5/UDF/pyapi3/connection3.c +++ b/sql/backends/monet5/UDF/pyapi3/connection3.c @@ -97,7 +97,7 @@ static PyMethodDef _connectionObject_met }; PyTypeObject Py_ConnectionType = { - .ob_base.ob_base.ob_refcnt = 1, + PyVarObject_HEAD_INIT(NULL, 0) .tp_name = "monetdb._connection", .tp_basicsize = sizeof(Py_ConnectionObject), .tp_hash = (hashfunc)PyObject_HashNotImplemented, diff --git a/sql/backends/monet5/UDF/pyapi3/emit3.c b/sql/backends/monet5/UDF/pyapi3/emit3.c --- a/sql/backends/monet5/UDF/pyapi3/emit3.c +++ b/sql/backends/monet5/UDF/pyapi3/emit3.c @@ -418,7 +418,7 @@ static PyMethodDef _emitObject_methods[] }; PyTypeObject PyEmitType = { - .ob_base.ob_base.ob_refcnt = 1, + PyVarObject_HEAD_INIT(NULL, 0) .tp_name = "monetdb._emit", .tp_basicsize = sizeof(PyEmitObject), .tp_hash = (hashfunc)PyObject_HashNotImplemented, 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 @@ -92,7 +92,7 @@ static str master_password = NULL; static void CLIENTprintinfo(void) { - int nrun = 0, nfinish = 0, nblock = 0, i = 0; + int nrun = 0, nfinish = 0, nblock = 0; char mmbuf[64]; char tmbuf[64]; char trbuf[128]; @@ -133,10 +133,13 @@ CLIENTprintinfo(void) if (c->sqlcontext && ((backend *) c->sqlcontext)->mvc && ((backend *) c->sqlcontext)->mvc->session && ((backend *) c->sqlcontext)->mvc->session->tr) { + int i = 0; if (((backend *) c->sqlcontext)->mvc->session->tr->active) i = snprintf(trbuf, sizeof(trbuf), ", active transaction, ts: "ULLFMT, ((backend *) c->sqlcontext)->mvc->session->tr->ts); - i += snprintf(trbuf + i, sizeof(trbuf) - i, ", prepared queries: %d", qc_size(((backend *) c->sqlcontext)->mvc->qc)); - snprintf(trbuf + i, sizeof(trbuf) - i, ", open resultsets: %d", res_tables_count(((backend *) c->sqlcontext)->results)); + if (i < (int) sizeof(trbuf)) + i += snprintf(trbuf + i, sizeof(trbuf) - i, ", prepared queries: %d", qc_size(((backend *) c->sqlcontext)->mvc->qc)); + if (i < (int) sizeof(trbuf)) + snprintf(trbuf + i, sizeof(trbuf) - i, ", open resultsets: %d", res_tables_count(((backend *) c->sqlcontext)->results)); } else trbuf[0] = 0; diff --git a/testing/process.py b/testing/process.py --- a/testing/process.py +++ b/testing/process.py @@ -629,5 +629,5 @@ class server(Popen): if time.time() > starttime + 30: self.kill() self.wait() - raise TimeoutExpired + raise TimeoutExpired(cmd, 30) time.sleep(0.1) _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
