Changeset: 32c5f0536815 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32c5f0536815
Modified Files:
clients/R/Tests/dbi.stable.err
clients/Tests/exports.stable.out
monetdb5/mal/mal_interpreter.c
Branch: default
Log Message:
Add signatures
diffs (46 lines):
diff --git a/clients/R/Tests/dbi.stable.err b/clients/R/Tests/dbi.stable.err
--- a/clients/R/Tests/dbi.stable.err
+++ b/clients/R/Tests/dbi.stable.err
@@ -30,6 +30,8 @@ stderr of test 'dbi` in directory 'clien
# 12:27:25 > "R" "--vanilla" "--slave" "--args" "31728"
# 12:27:25 >
+Warning message:
+S3 methods ‘[.fun_list’, ‘[.grouped_df’, ‘all.equal.tbl_df’,
‘anti_join.data.frame’, ‘anti_join.tbl_df’, ‘arrange.data.frame’,
‘arrange.default’, ‘arrange.grouped_df’, ‘arrange.tbl_df’,
‘arrange_.data.frame’, ‘arrange_.tbl_df’, ‘as.data.frame.grouped_df’,
‘as.data.frame.rowwise_df’, ‘as.data.frame.tbl_cube’, ‘as.table.tbl_cube’,
‘as.tbl.data.frame’, ‘as.tbl.tbl’, ‘as.tbl_cube.array’,
‘as.tbl_cube.data.frame’, ‘as.tbl_cube.matrix’, ‘as.tbl_cube.table’,
‘as_tibble.grouped_df’, ‘as_tibble.tbl_cube’, ‘auto_copy.tbl_cube’,
‘auto_copy.tbl_df’, ‘cbind.grouped_df’, ‘collapse.data.frame’,
‘collect.data.frame’, ‘common_by.NULL’, ‘common_by.character’,
‘common_by.default’, ‘common_by.list’, ‘compute.data.frame’,
‘copy_to.DBIConnection’, ‘copy_to.src_local’, ‘default_missing.data.frame’,
‘default_missing.default’, ‘dim.tbl_cube’, ‘distinct.data.f [... truncated]
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Warning message:
'MonetDBLite::isIdCurrent' is deprecated.
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
@@ -1368,7 +1368,7 @@ str MALparser(Client c);
str MALpass(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MALpipeline(Client c);
str MALreader(Client c);
-void MALresourceFairness(lng usec);
+void MALresourceFairness(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, lng usec);
size_t MALrunningThreads(void);
str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
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
@@ -506,7 +506,7 @@ str runMALsequence(Client cntxt, MalBlkP
runtimeProfileInit(cntxt, mb, stk);
runtimeProfileBegin(cntxt, mb, stk, getInstrPtr(mb,0),
&runtimeProfileFunction);
mb->starttime = GDKusec();
- if (cntxt->stimeout && cntxt->session && GDKusec()-
cntxt->session > cntxt->stimeout) {
+ if (cntxt->stimeout && mb->starttime - cntxt->session >
cntxt->stimeout) {
if ( backup != backups) GDKfree(backup);
if ( garbage != garbages) GDKfree(garbage);
throw(MAL, "mal.interpreter", SQLSTATE(HYT00)
RUNTIME_SESSION_TIMEOUT);
@@ -559,7 +559,8 @@ str runMALsequence(Client cntxt, MalBlkP
lastcheck = runtimeProfile.ticks;
}
- if (cntxt->qtimeout && mb->starttime && GDKusec() -
mb->starttime > cntxt->qtimeout) {
+ // runtimeProfileBegin already sets the time in the instruction
+ if (cntxt->qtimeout && runtimeProfile.ticks - mb->starttime >
cntxt->qtimeout) {
freeException(ret); /* in case it's set */
ret = createException(MAL, "mal.interpreter",
SQLSTATE(HYT00) RUNTIME_QRY_TIMEOUT);
break;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
