Changeset: d546ec70563a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d546ec70563a
Branch: txtsim
Log Message:
Merge with default.
diffs (184 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3578,7 +3578,6 @@ main(int argc, char **argv)
} else {
if (mode == SQL) {
setFormatter("sql");
- mapi_set_size_header(mid, false);
} else {
setFormatter("raw");
mapi_set_size_header(mid, true);
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -546,17 +546,19 @@ runMALsequence(Client cntxt, MalBlkPtr m
ret= createException(MAL, "mal.interpreter",
"prematurely stopped client");
break;
}
+
+ if (stk->status) {
+ while (stk->status == 'p')
+ MT_sleep_ms(50);
+ continue;
+ if (stk->status == 'q') {
+ stkpc = mb->stop;
+ ret = createException(MAL, "mal.interpreter",
"Prematurely stopped client");
+ }
+ }
+
#ifndef NDEBUG
- if (cntxt->itrace || stk->status) {
- if (stk->status == 'p'){
- // execution is paused
- while (stk->status == 'p')
- MT_sleep_ms(50);
- continue;
- }
- if (stk->status == 'q')
- stk->cmd = 'x';
-
+ if (cntxt->itrace) {
if (stk->cmd == 0)
stk->cmd = cntxt->itrace;
mdbStep(cntxt, mb, stk, stkpc);
diff --git a/monetdb5/modules/kernel/CMakeLists.txt
b/monetdb5/modules/kernel/CMakeLists.txt
--- a/monetdb5/modules/kernel/CMakeLists.txt
+++ b/monetdb5/modules/kernel/CMakeLists.txt
@@ -18,7 +18,7 @@ target_sources(kernel
bat5.c
algebra.c algebra.h
group.c group.h
- aggr.c
+ aggr.c aggr.h
batmmath.c
batstr.c
batcolor.c
diff --git a/monetdb5/modules/kernel/aggr.c b/monetdb5/modules/kernel/aggr.c
--- a/monetdb5/modules/kernel/aggr.c
+++ b/monetdb5/modules/kernel/aggr.c
@@ -11,6 +11,7 @@
#include "monetdb_config.h"
#include "mal.h"
#include "mal_exception.h"
+#include "aggr.h"
/*
* grouped aggregates
@@ -24,7 +25,7 @@ AGGRgrouped(bat *retval1, bat *retval2,
const bat *quantile,
const char *malfunc)
{
- BAT *b, *g, *e, *s, *bn = NULL, *cnts, *q = NULL;
+ BAT *b, *g, *e, *s, *bn = NULL, *cnts = NULL, *q = NULL;
double qvalue;
/* exactly one of grpfunc1, grpfunc2 and quantilefunc is non-NULL */
@@ -124,7 +125,7 @@ AGGRsum3_int(bat *retval, const bat *bid
BATgroupsum, NULL, NULL, NULL,
"aggr.sum");
}
-static str
+str
AGGRsum3_lng(bat *retval, const bat *bid, const bat *gid, const bat *eid)
{
return AGGRgrouped(retval, NULL, bid, gid, eid, NULL, true, 0, TYPE_lng,
@@ -132,7 +133,7 @@ AGGRsum3_lng(bat *retval, const bat *bid
}
#ifdef HAVE_HGE
-static str
+str
AGGRsum3_hge(bat *retval, const bat *bid, const bat *gid, const bat *eid)
{
return AGGRgrouped(retval, NULL, bid, gid, eid, NULL, true, 0, TYPE_hge,
diff --git a/monetdb5/modules/kernel/aggr.h b/monetdb5/modules/kernel/aggr.h
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/kernel/aggr.h
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
+ */
+
+#ifndef _AGGR_H_
+#define _AGGR_H_
+
+extern str AGGRsum3_lng(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
+extern str AGGRsum3_hge(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
+
+#endif /* _AGGR_H_ */
diff --git a/monetdb5/modules/kernel/group.c b/monetdb5/modules/kernel/group.c
--- a/monetdb5/modules/kernel/group.c
+++ b/monetdb5/modules/kernel/group.c
@@ -92,7 +92,7 @@ GRPsubgroup3(bat *ngid, bat *next, bat *
return GRPsubgroup5(ngid, next, nhis, bid, sid, gid, NULL, NULL);
}
-static str
+str
GRPsubgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *gid)
{
return GRPsubgroup5(ngid, next, nhis, bid, NULL, gid, NULL, NULL);
@@ -104,7 +104,7 @@ GRPgroup4(bat *ngid, bat *next, const ba
return GRPsubgroup5(ngid, next, NULL, bid, sid, NULL, NULL, NULL);
}
-static str
+str
GRPgroup3(bat *ngid, bat *next, const bat *bid)
{
return GRPsubgroup5(ngid, next, NULL, bid, NULL, NULL, NULL, NULL);
diff --git a/monetdb5/modules/kernel/group.h b/monetdb5/modules/kernel/group.h
--- a/monetdb5/modules/kernel/group.h
+++ b/monetdb5/modules/kernel/group.h
@@ -17,4 +17,6 @@ mal_export str GRPsubgroup5(bat *ngid, b
const bat *bid, const
bat *sid,
const bat *gid, const
bat *eid, const bat *hid);
+extern str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const
bat *gid);
+extern str GRPgroup3(bat *ngid, bat *next, const bat *bid);
#endif /* _GROUP_H_ */
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -4380,7 +4380,7 @@ sql_insert_check_null(backend *be, sql_t
{
mvc *sql = be->mvc;
node *m, *n;
- sql_subfunc *cnt = sql_bind_func(sql, "sys", "count",
sql_bind_localtype("void"), NULL, F_AGGR, true);
+ sql_subfunc *cnt = NULL;
for (n = ol_first_node(t->columns), m = inserts->h; n && m;
n = n->next, m = m->next) {
@@ -4393,6 +4393,8 @@ sql_insert_check_null(backend *be, sql_t
if (!(s->key && s->nrcols == 0)) {
s = stmt_selectnil(be, column(be, i));
+ if (!cnt)
+ cnt = sql_bind_func(sql, "sys",
"count", sql_bind_localtype("void"), NULL, F_AGGR, true);
s = stmt_aggr(be, s, NULL, NULL, cnt, 1, 0, 1);
} else {
sql_subfunc *isnil = sql_bind_func(sql, "sys",
"isnull", &c->type, NULL, F_FUNC, true);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3805,10 +3805,11 @@ def main(argv) :
# fix up URLPREFIX
if REV:
URLPREFIX += '%s/' % REV.split()[0].rstrip('+')
- os.environ['REVISION'] = REV
else:
# if no revision known, can't refer to repository
URLPREFIX = None
+ if REV:
+ os.environ['REVISION'] = REV
global SOCK, HOST
try: # try/finally to clean up sockdir
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
