Changeset: 47434cc5450e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/47434cc5450e
Modified Files:
gdk/gdk_bbp.c
Branch: Jan2022
Log Message:
Cleanup some unused code.
diffs (51 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -917,7 +917,6 @@ BBPcheckbats(unsigned bbpversion)
path = GDKfilepath(0, BATDIR, b->theap->filename, NULL);
if (path == NULL)
return GDK_FAIL;
-#if 1
/* first check string offset heap with width,
* then without */
if (MT_stat(path, &statb) < 0) {
@@ -942,39 +941,6 @@ BBPcheckbats(unsigned bbpversion)
return GDK_FAIL;
}
}
-#else
- /* first check string offset heap without width,
- * then with */
-#ifdef GDKLIBRARY_TAILN
- /* if bbpversion > GDKLIBRARY_TAILN, the offset heap can
- * exist with either name .tail1 (etc) or .tail, if <=
- * GDKLIBRARY_TAILN, only with .tail */
- char tailsave = 0;
- size_t taillen = 0;
- if (b->ttype == TYPE_str &&
- b->twidth < SIZEOF_VAR_T) {
- /* old version: .tail, not .tail1, .tail2,
.tail4 */
- taillen = strlen(path) - 1;
- tailsave = path[taillen];
- path[taillen] = 0;
- }
-#endif
- if (MT_stat(path, &statb) < 0
-#ifdef GDKLIBRARY_TAILN
- && bbpversion > GDKLIBRARY_TAILN
- && b->ttype == TYPE_str
- && b->twidth < SIZEOF_VAR_T
- && (path[taillen] = tailsave) != 0
- && MT_stat(path, &statb) < 0
-#endif
- ) {
-
- GDKsyserror("cannot stat file %s (expected size
%zu)\n",
- path, b->theap->free);
- GDKfree(path);
- return GDK_FAIL;
- }
-#endif
if ((size_t) statb.st_size < b->theap->free) {
GDKerror("file %s too small (expected %zu,
actual %zu)\n", path, b->theap->free, (size_t) statb.st_size);
GDKfree(path);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
