Changeset: 34a11d2bc555 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/34a11d2bc555
Modified Files:
monetdb5/mal/mal_interpreter.c
Branch: Aug2024
Log Message:
Produce correct error message when there is a timeout.
diffs (25 lines):
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
@@ -593,9 +593,18 @@ runMALsequence(Client cntxt, MalBlkPtr m
if (cntxt->fdin && TIMEOUT_TEST(&cntxt->qryctx)) {
if (cntxt->qryctx.endtime != QRY_INTERRUPT &&
cntxt->qryctx.endtime != QRY_TIMEOUT)
cntxt->mode = FINISHCLIENT;
- stkpc = stoppc;
- ret = createException(MAL, "mal.interpreter",
"%s",
-
TIMEOUT_MESSAGE(&cntxt->qryctx));
+ switch (cntxt->qryctx.endtime) {
+ case QRY_TIMEOUT:
+ ret = createException(MAL,
"mal.interpreter", SQLSTATE(HYT00) RUNTIME_QRY_TIMEOUT);
+ break;
+ case QRY_INTERRUPT:
+ ret = createException(MAL,
"mal.interpreter", SQLSTATE(HYT00) RUNTIME_QRY_INTERRUPT);
+ break;
+ default:
+ ret = createException(MAL,
"mal.interpreter", SQLSTATE(HYT00) "Client disconnected");
+ cntxt->mode = FINISHCLIENT;
+ break;
+ }
break;
}
lastcheck = runtimeProfile.ticks;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
