Changeset: 5ff355b9f72c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5ff355b9f72c
Modified Files:
tools/monetdbe/monetdbe.c
Branch: default
Log Message:
merged with dec2023
diffs (47 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1451,6 +1451,25 @@ def PerformDir(env, testdir, testlist, t
interrupted = True
finally:
if pSrvr is not None:
+ try:
+ dbh = pymonetdb.connect(username='monetdb',
+ password='monetdb',
+ hostname=HOST,
+ port=int(pSrvr.port),
+ database=TSTDB,
+ autocommit=True)
+ except KeyboardInterrupt:
+ interrupted = True
+ except:
+ pass
+ else:
+ crs = dbh.cursor()
+ crs.execute("select count(*), max(id) from sys.bbp()")
+ nbats, maxid = crs.fetchall()[0]
+ crs.close()
+ dbh.close()
+ if maxid > nbats and maxid - nbats > 10000:
+ pSrvr.outfile.write(f'Too many free bats. Max ID =
{maxid}, # used = {nbats}, diff = {maxid - nbats}.')
pSrvr.terminate()
pSrvr = None
if produce_html:
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -1743,8 +1743,13 @@ monetdbe_execute(monetdbe_statement *stm
goto cleanup;
}
- (*(monetdbe_result_internal**) result)->type = (b->results) ?
Q_TABLE : Q_UPDATE;
res_internal = *(monetdbe_result_internal**)result;
+ res_internal->type = (b->results) ? Q_TABLE : Q_UPDATE;
+ if (res_internal->monetdbe_resultset &&
res_internal->monetdbe_resultset->query_type == Q_TABLE) {
+ res_internal->type = Q_TABLE;
+ if (affected_rows)
+ *affected_rows =
res_internal->monetdbe_resultset->nr_rows;
+ }
}
cleanup:
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
