Changeset: bc1cbf8ce07d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc1cbf8ce07d
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_bbp.c
gdk/gdk_bbp.h
monetdb5/modules/kernel/status.c
Branch: Apr2019
Log Message:
Remove some unused variables (BBPin and BBPout).
diffs (92 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
@@ -186,12 +186,10 @@ void BBPaddfarm(const char *dirname, int
void BBPclear(bat bid);
BAT *BBPdescriptor(bat b);
int BBPfix(bat b);
-int BBPin;
bat BBPindex(const char *nme);
void BBPkeepref(bat i);
bat BBPlimit;
void BBPlock(void);
-int BBPout;
BAT *BBPquickdesc(bat b, bool delaccess);
int BBPreclaim(BAT *b);
int BBPrelease(bat b);
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -159,12 +159,6 @@ getBBPsize(void)
/*
- * other globals
- */
-int BBPin = 0; /* bats loaded statistic */
-int BBPout = 0; /* bats saved statistic */
-
-/*
* @+ BBP Consistency and Concurrency
* While GDK provides the basic building blocks for an ACID system, in
* itself it is not such a system, as we this would entail too much
@@ -2392,7 +2386,6 @@ getBBPdescriptor(bat i, bool lock)
IODEBUG fprintf(stderr, "#load %s\n", BBPname(i));
b = BATload_intern(i, lock);
- BBPin++;
/* clearing bits can be done without the lock */
BBP_status_off(i, BBPLOADING, "BBPdescriptor");
@@ -2454,7 +2447,6 @@ BBPsave(BAT *b)
if (BBP_status(bid) & BBPEXISTING)
ret = BBPbackup(b, false);
if (ret == GDK_SUCCEED) {
- BBPout++;
ret = BATsave(b);
}
/* clearing bits can be done without the lock */
@@ -2577,7 +2569,6 @@ BBPquickdesc(bat bid, bool delaccess)
if (b == NULL ||
complexatom(b->ttype, delaccess)) {
b = BATload_intern(bid, true);
- BBPin++;
}
return b;
}
@@ -3425,9 +3416,6 @@ gdk_bbp_reset(void)
BBP_hash = 0;
BBP_mask = 0;
- BBPin = 0;
- BBPout = 0;
-
locked_by = 0;
BBPunloadCnt = 0;
backup_files = 0;
diff --git a/gdk/gdk_bbp.h b/gdk/gdk_bbp.h
--- a/gdk/gdk_bbp.h
+++ b/gdk/gdk_bbp.h
@@ -53,8 +53,6 @@
#define BBPTRIM_ALL (((size_t)1) << (sizeof(size_t)*8 - 2)) /* very large
positive size_t */
-gdk_export int BBPin; /* BATs swapped into BBP */
-gdk_export int BBPout; /* BATs swapped out of BBP */
gdk_export bat getBBPsize(void); /* current occupied size of BBP array */
/* global calls */
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
@@ -604,10 +604,6 @@ SYSgdkEnv(bat *ret, bat *ret2)
BUNappend(b, &per, false) != GDK_SUCCEED ||
BUNappend(bn, "ondisk", false) != GDK_SUCCEED ||
BUNappend(b, &pdisk, false) != GDK_SUCCEED ||
- BUNappend(bn, "todisk", false) != GDK_SUCCEED ||
- BUNappend(b, &BBPout, false) != GDK_SUCCEED ||
- BUNappend(bn, "fromdisk", false) != GDK_SUCCEED ||
- BUNappend(b, &BBPin, false) != GDK_SUCCEED ||
pseudo(ret,ret2, bn,b)) {
BBPunfix(b->batCacheid);
BBPunfix(bn->batCacheid);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
