Changeset: e0f6b05012e7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0f6b05012e7
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_tm.c
monetdb5/modules/mal/transaction.c
Branch: default
Log Message:
Function does not return a useful value.
diffs (94 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
@@ -298,7 +298,7 @@ int THRhighwater(void);
Thread THRnew(const char *name);
int THRprintf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...) __attribute__((__format__(__printf__, 2, 3)));
void THRsetdata(int, ptr);
-gdk_return TMabort(void);
+void TMabort(void);
gdk_return TMcommit(void);
gdk_return TMsubcommit(BAT *bl);
gdk_return TMsubcommit_list(bat *subcommit, int cnt);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2628,7 +2628,7 @@ BATmirror(register BAT *b)
* needs the rollback mechanism).
*/
gdk_export gdk_return TMcommit(void);
-gdk_export gdk_return TMabort(void);
+gdk_export void TMabort(void);
gdk_export gdk_return TMsubcommit(BAT *bl);
gdk_export gdk_return TMsubcommit_list(bat *subcommit, int cnt);
diff --git a/gdk/gdk_tm.c b/gdk/gdk_tm.c
--- a/gdk/gdk_tm.c
+++ b/gdk/gdk_tm.c
@@ -77,7 +77,7 @@ prelude(int cnt, bat *subcommit)
* the previous checkpoint that were deleted now are physically
* destroyed.
*/
-static gdk_return
+static void
epilogue(int cnt, bat *subcommit)
{
int i = 0;
@@ -120,7 +120,7 @@ epilogue(int cnt, bat *subcommit)
}
BBP_status_off(bid, BBPDELETED | BBPSWAPPED | BBPNEW, subcommit
? "TMsubcommit" : "TMcommit");
}
- return GDK_SUCCEED;
+ GDKclrerr();
}
/*
@@ -137,7 +137,8 @@ TMcommit(void)
BBPlock("TMcommit");
if (prelude(getBBPsize(), NULL) == GDK_SUCCEED &&
BBPsync(getBBPsize(), NULL) == GDK_SUCCEED) {
- ret = epilogue(getBBPsize(), NULL);
+ epilogue(getBBPsize(), NULL);
+ ret = GDK_SUCCEED;
}
BBPunlock("TMcommit");
return ret;
@@ -188,7 +189,8 @@ TMsubcommit_list(bat *subcommit, int cnt
for (xx = 0; xx <= BBP_THREADMASK; xx++)
MT_lock_set(&GDKtrimLock(xx), "TMsubcommit");
if (BBPsync(cnt, subcommit) == GDK_SUCCEED) { /* write BBP.dir
(++) */
- ret = epilogue(cnt, subcommit);
+ epilogue(cnt, subcommit);
+ ret = GDK_SUCCEED;
}
for (xx = BBP_THREADMASK; xx >= 0; xx--)
MT_lock_unset(&GDKtrimLock(xx), "TMsubcommit");
@@ -233,7 +235,7 @@ TMsubcommit(BAT *b)
* swapped out. Persistent BATs that were made transient in this
* transaction become persistent again.
*/
-gdk_return
+void
TMabort(void)
{
int i;
@@ -291,5 +293,5 @@ TMabort(void)
BBP_status_off(i, BBPDELETED | BBPSWAPPED | BBPNEW, "TMabort");
}
BBPunlock("TMabort");
- return GDK_SUCCEED;
+ GDKclrerr();
}
diff --git a/monetdb5/modules/mal/transaction.c
b/monetdb5/modules/mal/transaction.c
--- a/monetdb5/modules/mal/transaction.c
+++ b/monetdb5/modules/mal/transaction.c
@@ -48,7 +48,8 @@ TRNglobal_sync(bit *ret)
str
TRNglobal_abort(bit *ret)
{
- *ret = TMabort() == GDK_SUCCEED;
+ TMabort();
+ *ret = TRUE;
return MAL_SUCCEED;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
