Changeset: 001bccecdc23 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/001bccecdc23
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
monetdb5/mal/mal_authorize.c
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/tokenizer.c
Branch: default
Log Message:
Require looking at result of TMsubcommit and TMsubcommit_list.
diffs (106 lines):
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
@@ -411,8 +411,8 @@ void *THRgetdata(int);
int THRgettid(void);
int THRhighwater(void);
void THRsetdata(int, void *);
-gdk_return TMsubcommit(BAT *bl);
-gdk_return TMsubcommit_list(bat *restrict subcommit, BUN *restrict sizes, int
cnt, lng logno, lng transid);
+gdk_return TMsubcommit(BAT *bl) __attribute__((__warn_unused_result__));
+gdk_return TMsubcommit_list(bat *restrict subcommit, BUN *restrict sizes, int
cnt, lng logno, lng transid) __attribute__((__warn_unused_result__));
void VALclear(ValPtr v);
int VALcmp(const ValRecord *p, const ValRecord *q);
void *VALconvert(int typ, ValPtr t);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2069,8 +2069,10 @@ BUNtoid(BAT *b, BUN p)
/*
* @+ Transaction Management
*/
-gdk_export gdk_return TMsubcommit(BAT *bl);
-gdk_export gdk_return TMsubcommit_list(bat *restrict subcommit, BUN *restrict
sizes, int cnt, lng logno, lng transid);
+gdk_export gdk_return TMsubcommit(BAT *bl)
+ __attribute__((__warn_unused_result__));
+gdk_export gdk_return TMsubcommit_list(bat *restrict subcommit, BUN *restrict
sizes, int cnt, lng logno, lng transid)
+ __attribute__((__warn_unused_result__));
/*
* @- Delta Management
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -84,7 +84,9 @@ AUTHcommit(void)
blist[4] = rt_hashedpwd->batCacheid;
assert(rt_deleted);
blist[5] = rt_deleted->batCacheid;
- TMsubcommit_list(blist, NULL, 6, getBBPlogno(), getBBPtransid());
+ if (TMsubcommit_list(blist, NULL, 6, getBBPlogno(), getBBPtransid()) !=
GDK_SUCCEED)
+ throw(MAL, "AUTHcommit", GDK_EXCEPTION);
+ return MAL_SUCCEED;
}
/*
diff --git a/monetdb5/modules/mal/querylog.c b/monetdb5/modules/mal/querylog.c
--- a/monetdb5/modules/mal/querylog.c
+++ b/monetdb5/modules/mal/querylog.c
@@ -254,7 +254,8 @@ static str
}
QLOG_init = true;
- TMsubcommit_list(commitlist, NULL, committop, getBBPlogno(),
getBBPtransid());
+ if (TMsubcommit_list(commitlist, NULL, committop, getBBPlogno(),
getBBPtransid()) != GDK_SUCCEED)
+ throw(MAL, "querylog.init", GDK_EXCEPTION);
return MAL_SUCCEED;
}
@@ -341,7 +342,8 @@ QLOGempty(void *ret)
BATclear(QLOG_calls_cpuload,true);
BATclear(QLOG_calls_iowait,true);
- TMsubcommit_list(commitlist, NULL, committop, getBBPlogno(),
getBBPtransid());
+ if (TMsubcommit_list(commitlist, NULL, committop, getBBPlogno(),
getBBPtransid()) != GDK_SUCCEED)
+ msg = createException(MAL, "querylog.empty", GDK_EXCEPTION);
MT_lock_unset(&QLOGlock);
return MAL_SUCCEED;
}
@@ -380,9 +382,10 @@ QLOGappend(Client cntxt, MalBlkPtr mb, M
throw(MAL, "querylog.append", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
}
- TMsubcommit_list(commitlist, NULL, committop, getBBPlogno(),
getBBPtransid());
+ if (TMsubcommit_list(commitlist, NULL, committop, getBBPlogno(),
getBBPtransid()) != GDK_SUCCEED)
+ msg = createException(MAL, "querylog", GDK_EXCEPTION);
MT_lock_unset(&QLOGlock);
- return MAL_SUCCEED;
+ return msg;
}
static str
@@ -441,9 +444,10 @@ QLOGcall(Client cntxt, MalBlkPtr mb, Mal
MT_lock_unset(&QLOGlock);
throw(MAL, "querylog.call", SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
- TMsubcommit_list(commitlist, NULL, committop, getBBPlogno(),
getBBPtransid());
+ if (TMsubcommit_list(commitlist, NULL, committop, getBBPlogno(),
getBBPtransid()) != GDK_SUCCEED)
+ msg = createException(MAL, "querylog", GDK_EXCEPTION);
MT_lock_unset(&QLOGlock);
- return MAL_SUCCEED;
+ return msg;
}
#include "mel.h"
diff --git a/monetdb5/modules/mal/tokenizer.c b/monetdb5/modules/mal/tokenizer.c
--- a/monetdb5/modules/mal/tokenizer.c
+++ b/monetdb5/modules/mal/tokenizer.c
@@ -200,7 +200,8 @@ TKNZRclose(void *r)
if (TRANS == NULL)
throw(MAL, "tokenizer", "no tokenizer store open");
- TMsubcommit(TRANS);
+ if (TMsubcommit(TRANS) != GDK_SUCCEED)
+ throw(MAL, "tokenizer", GDK_EXCEPTION);
for (i = 0; i < tokenDepth; i++) {
BBPunfix(tokenBAT[i].idx->batCacheid);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
