Changeset: 61de592b2d72 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61de592b2d72 Modified Files: clients/Tests/exports.stable.out gdk/ChangeLog.Mar2018 gdk/gdk.h gdk/gdk_bat.c gdk/gdk_batop.c monetdb5/modules/kernel/bat5.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c Branch: Mar2018 Log Message:
Changed return type of function void_replace_bat from BUN to gdk_return. diffs (206 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 @@ -479,7 +479,7 @@ size_t strLen(const char *s); int strNil(const char *s); const char str_nil[2]; gdk_return void_inplace(BAT *b, oid id, const void *val, bit force) __attribute__((__warn_unused_result__)); -BUN void_replace_bat(BAT *b, BAT *p, BAT *u, bit force) __attribute__((__warn_unused_result__)); +gdk_return void_replace_bat(BAT *b, BAT *p, BAT *u, bit force) __attribute__((__warn_unused_result__)); int win_mkdir(const char *, const int mode); int win_rename(const char *, const char *); int win_rmdir(const char *); diff --git a/gdk/ChangeLog.Mar2018 b/gdk/ChangeLog.Mar2018 --- a/gdk/ChangeLog.Mar2018 +++ b/gdk/ChangeLog.Mar2018 @@ -2,6 +2,8 @@ # This file is updated with Maddlog * Fri Feb 16 2018 Sjoerd Mullender <[email protected]> +- Changed return type of function void_replace_bat from BUN to gdk_return: + it now only returns whether the operation succeeded or not. - Changed the return type of BATroles from void to gdk_return: it can fail due to malloc failure. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -2282,7 +2282,7 @@ gdk_export void GDKclrerr(void); #include "gdk_utils.h" /* functions defined in gdk_bat.c */ -gdk_export BUN void_replace_bat(BAT *b, BAT *p, BAT *u, bit force) +gdk_export gdk_return void_replace_bat(BAT *b, BAT *p, BAT *u, bit force) __attribute__ ((__warn_unused_result__)); gdk_export gdk_return void_inplace(BAT *b, oid id, const void *val, bit force) __attribute__ ((__warn_unused_result__)); diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -1268,10 +1268,9 @@ void_inplace(BAT *b, oid id, const void return BUNinplace(b, id - b->hseqbase, val, force); } -BUN +gdk_return void_replace_bat(BAT *b, BAT *p, BAT *u, bit force) { - BUN nr = 0; BUN r, s; BATiter uii = bat_iterator(p); BATiter uvi = bat_iterator(u); @@ -1281,10 +1280,9 @@ void_replace_bat(BAT *b, BAT *p, BAT *u, const void *val = BUNtail(uvi, r); if (void_inplace(b, updid, val, force) != GDK_SUCCEED) - return BUN_NONE; - nr++; + return GDK_FAIL; } - return nr; + return GDK_SUCCEED; } /* diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c --- a/gdk/gdk_batop.c +++ b/gdk/gdk_batop.c @@ -879,7 +879,7 @@ BATreplace(BAT *b, BAT *p, BAT *n, bit f if (b == NULL || p == NULL || n == NULL || BATcount(n) == 0) { return GDK_SUCCEED; } - if (void_replace_bat(b, p, n, force) == BUN_NONE) + if (void_replace_bat(b, p, n, force) != GDK_SUCCEED) return GDK_FAIL; return GDK_SUCCEED; } diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c --- a/monetdb5/modules/kernel/bat5.c +++ b/monetdb5/modules/kernel/bat5.c @@ -413,7 +413,7 @@ BKCbat_inplace_force(bat *r, const bat * BBPunfix(p->batCacheid); throw(MAL, "bat.inplace", SQLSTATE(HY002) RUNTIME_OBJECT_MISSING); } - if (void_replace_bat(b, p, u, *force) == BUN_NONE) { + if (void_replace_bat(b, p, u, *force) != GDK_SUCCEED) { BBPunfix(b->batCacheid); BBPunfix(p->batCacheid); BBPunfix(u->batCacheid); diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c --- a/sql/storage/bat/bat_storage.c +++ b/sql/storage/bat/bat_storage.c @@ -175,7 +175,7 @@ delta_bind_bat( sql_delta *bat, int acce bat_destroy(o); if (nui == NULL || nuv == NULL || - void_replace_bat(b, nui, nuv, TRUE) == BUN_NONE) { + void_replace_bat(b, nui, nuv, TRUE) != GDK_SUCCEED) { bat_destroy(nui); bat_destroy(nuv); bat_destroy(b); @@ -241,7 +241,7 @@ static int delta_update_bat( sql_delta *bat, BAT *tids, BAT *updates, int is_new) { BAT *b, *ui = NULL, *uv = NULL; - BUN cnt; + gdk_return ret; if (!BATcount(tids)) return LOG_OK; @@ -275,10 +275,10 @@ delta_update_bat( sql_delta *bat, BAT *t return LOG_ERR; } assert(BATcount(nui) == BATcount(nuv)); - cnt = void_replace_bat(ib, nui, nuv, TRUE); + ret = void_replace_bat(ib, nui, nuv, TRUE); bat_destroy(nui); bat_destroy(nuv); - if (cnt == BUN_NONE) { + if (ret != GDK_SUCCEED) { bat_destroy(ib); return LOG_ERR; } @@ -358,10 +358,10 @@ delta_update_bat( sql_delta *bat, BAT *t return LOG_ERR; } assert(BATcount(nui) == BATcount(nuv)); - cnt = void_replace_bat(ib, nui, nuv, TRUE); + ret = void_replace_bat(ib, nui, nuv, TRUE); bat_destroy(nui); bat_destroy(nuv); - if (cnt == BUN_NONE) { + if (ret != GDK_SUCCEED) { bat_destroy(b); bat_destroy(ib); return LOG_ERR; @@ -384,16 +384,16 @@ delta_update_bat( sql_delta *bat, BAT *t return LOG_ERR; } assert(BATcount(nui) == BATcount(nuv)); - cnt = void_replace_bat(b, nui, nuv, TRUE); + ret = void_replace_bat(b, nui, nuv, TRUE); bat_destroy(nui); bat_destroy(nuv); - if (cnt == BUN_NONE) { + if (ret != GDK_SUCCEED) { bat_destroy(b); bat_destroy(ib); return LOG_ERR; } } else { - if (void_replace_bat(b, tids, updates, TRUE) == BUN_NONE) { + if (void_replace_bat(b, tids, updates, TRUE) != GDK_SUCCEED) { bat_destroy(b); bat_destroy(ib); return LOG_ERR; @@ -405,9 +405,9 @@ delta_update_bat( sql_delta *bat, BAT *t b = temp_descriptor(bat->ibid); if (b == NULL) return LOG_ERR; - cnt = void_replace_bat(b, tids, updates, TRUE); + ret = void_replace_bat(b, tids, updates, TRUE); bat_destroy(b); - if (cnt == BUN_NONE) { + if (ret != GDK_SUCCEED) { return LOG_ERR; } } @@ -2174,7 +2174,7 @@ gtr_update_delta( sql_trans *tr, sql_del /* any updates */ if (BUNlast(ui) > 0) { (*changes)++; - if (void_replace_bat(cur, ui, uv, TRUE) == BUN_NONE) { + if (void_replace_bat(cur, ui, uv, TRUE) != GDK_SUCCEED) { bat_destroy(ui); bat_destroy(uv); bat_destroy(cur); @@ -2472,7 +2472,7 @@ tr_update_delta( sql_trans *tr, sql_delt /* any updates */ if (BUNlast(ui) > 0) { - if (void_replace_bat(cur, ui, uv, TRUE) == BUN_NONE) { + if (void_replace_bat(cur, ui, uv, TRUE) != GDK_SUCCEED) { bat_destroy(ui); bat_destroy(uv); bat_destroy(cur); @@ -2571,7 +2571,7 @@ tr_merge_delta( sql_trans *tr, sql_delta /* any updates */ if (BUNlast(ui) > 0) { - if (void_replace_bat(cur, ui, uv, TRUE) == BUN_NONE) { + if (void_replace_bat(cur, ui, uv, TRUE) != GDK_SUCCEED) { bat_destroy(ui); bat_destroy(uv); bat_destroy(cur); diff --git a/sql/storage/bat/bat_table.c b/sql/storage/bat/bat_table.c --- a/sql/storage/bat/bat_table.c +++ b/sql/storage/bat/bat_table.c @@ -105,7 +105,7 @@ delta_full_bat_( sql_column *c, sql_delt return NULL; } } - if (void_replace_bat(b, ui, uv, TRUE) == BUN_NONE) { + if (void_replace_bat(b, ui, uv, TRUE) != GDK_SUCCEED) { bat_destroy(ui); bat_destroy(uv); bat_destroy(b); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
