Changeset: b833e2231d72 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b833e2231d72 Modified Files: gdk/gdk_utils.c monetdb5/modules/kernel/status.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/inspect.c monetdb5/modules/mal/mdb.c Branch: Dec2016 Log Message:
Do not use BATfakecommit, and do not call BATmode unnecessarily. BATfakecommit was perhaps useful in the time of global commits, but not any longer, and it can harm when decref unloads a BAT that it thinks is clean but isn't in reality (since loading it again in incref may then fail). diffs (74 lines): diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c --- a/gdk/gdk_utils.c +++ b/gdk/gdk_utils.c @@ -142,8 +142,6 @@ GDKsetenv(str name, str value) { BUNappend(GDKkey, name, FALSE); BUNappend(GDKval, value, FALSE); - BATfakeCommit(GDKkey); - BATfakeCommit(GDKval); } diff --git a/monetdb5/modules/kernel/status.c b/monetdb5/modules/kernel/status.c --- a/monetdb5/modules/kernel/status.c +++ b/monetdb5/modules/kernel/status.c @@ -39,10 +39,6 @@ static void pseudo(bat *ret, bat *ret2, BAT *bn, BAT *b) { - BATmode(bn,TRANSIENT); - BATmode(b,TRANSIENT); - BATfakeCommit(b); - BATfakeCommit(bn); *ret = bn->batCacheid; BBPkeepref(*ret); *ret2 = b->batCacheid; diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c --- a/monetdb5/modules/mal/bbp.c +++ b/monetdb5/modules/mal/bbp.c @@ -22,8 +22,6 @@ pseudo(bat *ret, BAT *b, str X1,str X2) if (BBPindex(buf) <= 0) BATname(b,buf); BATroles(b,X2); - BATmode(b,TRANSIENT); - BATfakeCommit(b); *ret = b->batCacheid; BBPkeepref(*ret); } diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c --- a/monetdb5/modules/mal/clients.c +++ b/monetdb5/modules/mal/clients.c @@ -34,8 +34,6 @@ pseudo(bat *ret, BAT *b, str X1,str X2) if (BBPindex(buf) <= 0) BATname(b,buf); BATroles(b,X2); - BATmode(b,TRANSIENT); - BATfakeCommit(b); *ret = b->batCacheid; BBPkeepref(*ret); } diff --git a/monetdb5/modules/mal/inspect.c b/monetdb5/modules/mal/inspect.c --- a/monetdb5/modules/mal/inspect.c +++ b/monetdb5/modules/mal/inspect.c @@ -29,8 +29,6 @@ pseudo(bat *ret, BAT *b, str X1,str X2, if (BBPindex(buf) <= 0) BATname(b,buf); BATroles(b,X2); - BATmode(b,TRANSIENT); - BATfakeCommit(b); *ret = b->batCacheid; BBPkeepref(*ret); } diff --git a/monetdb5/modules/mal/mdb.c b/monetdb5/modules/mal/mdb.c --- a/monetdb5/modules/mal/mdb.c +++ b/monetdb5/modules/mal/mdb.c @@ -53,8 +53,6 @@ pseudo(bat *ret, BAT *b, str X1,str X2, if (BBPindex(buf) <= 0) BATname(b,buf); BATroles(b,X2); - BATmode(b,TRANSIENT); - BATfakeCommit(b); *ret = b->batCacheid; BBPkeepref(*ret); } _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list