Changeset: 37c9ad0ea488 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/37c9ad0ea488
Removed Files:
gdk/gdk_storage.h
Modified Files:
gdk/CMakeLists.txt
gdk/gdk_bbp.c
gdk/gdk_storage.c
Branch: Jul2021
Log Message:
No need for include file gdk_storage.h.
diffs (87 lines):
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -53,7 +53,7 @@ target_sources(bat
gdk_string.c
gdk_qsort.c
gdk_qsort_impl.h
- gdk_storage.c gdk_storage.h
+ gdk_storage.c
gdk_bat.c
gdk_delta.c gdk_delta.h
gdk_cross.c
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -73,7 +73,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_storage.h"
#include "mutils.h"
#ifndef F_OK
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -26,7 +26,6 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
-#include "gdk_storage.h"
#include "mutils.h"
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
@@ -620,6 +619,16 @@ GDKload(int farmid, const char *nme, con
* merely copies the data into place. Failure to read or write the
* BAT results in a NULL, otherwise it returns the BAT pointer.
*/
+static void
+DESCclean(BAT *b)
+{
+ b->batDirtyflushed = DELTAdirty(b);
+ b->batDirtydesc = false;
+ b->theap->dirty = false;
+ if (b->tvheap)
+ b->tvheap->dirty = false;
+}
+
static BAT *
DESCload(int i)
{
@@ -649,16 +658,6 @@ DESCload(int i)
return b;
}
-void
-DESCclean(BAT *b)
-{
- b->batDirtyflushed = DELTAdirty(b);
- b->batDirtydesc = false;
- b->theap->dirty = false;
- if (b->tvheap)
- b->tvheap->dirty = false;
-}
-
/* spawning the background msync should be done carefully
* because there is a (small) chance that the BAT has been
* deleted by the time you issue the msync.
diff --git a/gdk/gdk_storage.h b/gdk/gdk_storage.h
deleted file mode 100644
--- a/gdk/gdk_storage.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V.
- */
-
-#ifndef _GDK_STORAGE_H_
-#define _GDK_STORAGE_H_
-
-extern void DESCclean(BAT *);
-
-#endif /* _GDK_STORAGE_H_ */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
