Changeset: ef1ea8d5eb1c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef1ea8d5eb1c
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_storage.c
monetdb5/modules/kernel/bat5.c
Branch: default
Log Message:
Removed persistence==SESSION: it's not used anymore.
diffs (100 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -807,8 +807,8 @@ typedef struct {
descdirty:1, /* bat descriptor dirty marker */
set:1, /* real set semantics */
restricted:2, /* access priviliges */
- persistence:2, /* should the BAT persist on disk? */
- unused:21; /* value=0 for now */
+ persistence:1, /* should the BAT persist on disk? */
+ unused:23; /* value=0 for now */
int sharecnt; /* incoming view count */
char map_head; /* mmap mode for head bun heap */
char map_tail; /* mmap mode for tail bun heap */
@@ -1449,13 +1449,11 @@ bat_iterator(BAT *b)
* dimensions.
*
* The persistency indicator tells the retention period of BATs. The
- * system support three modes: PERSISTENT, TRANSIENT, and SESSION.
+ * system support three modes: PERSISTENT and TRANSIENT.
* The PERSISTENT BATs are automatically saved upon session boundary
* or transaction commit. TRANSIENT BATs are removed upon transaction
- * boundary. SESSION BATs are removed at the end of a session. They
- * are normally used to maintain temporary results. All BATs are
- * initially TRANSIENT unless their mode is changed using the routine
- * BATmode.
+ * boundary. All BATs are initially TRANSIENT unless their mode is
+ * changed using the routine BATmode.
*
* The BAT properties may be changed at any time using BATkey, BATset,
* and BATmode.
@@ -1491,8 +1489,7 @@ gdk_export int BATgetaccess(BAT *b);
((b)->H->vheap?(b)->H->vheap->dirty:0) || \
((b)->T->vheap?(b)->T->vheap->dirty:0))
-#define PERSISTENT 3
-#define SESSION 2
+#define PERSISTENT 0
#define TRANSIENT 1
#define BAT_WRITE 0 /* all kinds of access allowed */
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -2765,13 +2765,6 @@ BATmode(BAT *b, int mode)
}
BBPdirty(1);
- /* a SESSION bat is a TRANSIENT with one logical
- * reference added */
- if (mode == SESSION) {
- BBPincref(bid, TRUE);
- } else if (b->batPersistence == SESSION) {
- BBPdecref(bid, TRUE);
- }
if (mode == PERSISTENT && isVIEW(b)) {
VIEWreset(b);
}
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -442,7 +442,7 @@ DESCload(int i)
/* reconstruct mode from BBP status (BATmode doesn't flush
* descriptor, so loaded mode may be stale) */
- b->batPersistence = (BBP_status(b->batCacheid) & BBPTMP) ? TRANSIENT :
(BBP_status(b->batCacheid) & (BBPNEW | BBPPERSISTENT)) ? PERSISTENT : SESSION;
+ b->batPersistence = (BBP_status(b->batCacheid) & BBPPERSISTENT) ?
PERSISTENT : TRANSIENT;
b->batCopiedtodisk = 1;
DESCclean(b);
return bs;
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
@@ -192,8 +192,6 @@ CMDinfo(BAT **ret1, BAT **ret2, BAT *b)
if (b->batPersistence == PERSISTENT) {
mode = "persistent";
- } else if (b->batPersistence == SESSION) {
- mode = "session";
} else if (b->batPersistence == TRANSIENT) {
mode = "transient";
} else {
@@ -467,8 +465,6 @@ CMDunload(bit *res, str input)
BBPfix(bid);
b = BBP_cache(bid);
if (b) {
- if (b->batPersistence == SESSION)
- BATmode(b, TRANSIENT);
BBPcold(bid); /* will trigger unload of also
persistent bats */
}
*res = BBPunfix(bid) == 0;
@@ -1429,7 +1425,7 @@ BKCpersists(int *r, int *bid, bit *flg)
if ((b = BATdescriptor(*bid)) == NULL) {
throw(MAL, "bat.setPersistence", RUNTIME_OBJECT_MISSING);
}
- BATmode(b, (*flg == TRUE) ? PERSISTENT : (*flg ==FALSE) ? TRANSIENT :
SESSION);
+ BATmode(b, (*flg == TRUE) ? PERSISTENT : TRANSIENT);
BBPreleaseref(b->batCacheid);
*r = 0;
return MAL_SUCCEED;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
