Changeset: f556c1b9ead3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f556c1b9ead3
Modified Files:
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_bat.h
gdk/gdk_bbp.c
gdk/gdk_col.c
gdk/gdk_col.h
gdk/gdk_heap.c
gdk/gdk_scanselect.mx
Branch: headless
Log Message:
mv gdk_bat.c gdk_col.c; mv gdk_bat.h gdk_col.h
diffs (101 lines):
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -41,7 +41,7 @@
gdk_scanselect.mx gdk_batop.mx \
gdk_search.mx gdk_tm.c gdk_align.mx gdk_bbp.c \
gdk_heap.c gdk_setop.mx gdk_utils.c gdk_atoms.mx \
- gdk_qsort.c gdk_ssort.c gdk_storage.c gdk_bat.mx \
+ gdk_qsort.c gdk_ssort.c gdk_storage.c gdk_col.c \
gdk_delta.c gdk_relop.mx gdk_system.c gdk_value.mx \
gdk_rangejoin.mx \
gdk_posix.c gdk_logger.mx bat.feps bat1.feps bat2.feps \
@@ -53,4 +53,4 @@
$(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
}
-EXTRA_DIST = gdk.h gdk_bbp.h gdk_delta.h gdk_posix.h gdk_qsort_impl.h
gdk_ssort_impl.h gdk_storage.h gdk_system.h gdk_tm.h gdk_utils.h gdk_logger.h
+EXTRA_DIST = gdk.h gdk_bbp.h gdk_col.h gdk_delta.h gdk_logger.h gdk_posix.h
gdk_qsort_impl.h gdk_ssort_impl.h gdk_storage.h gdk_system.h gdk_tm.h
gdk_utils.h
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2311,7 +2311,7 @@
#include "gdk_atoms.h"
#include "gdk_bbp.h"
#include "gdk_utils.h"
-#include "gdk_bat.h"
+#include "gdk_col.h"
#ifdef NATIVE_WIN32
#ifdef _MSC_VER
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3096,7 +3096,7 @@
static int
heap_move(Heap *hp, const char *srcdir, const char *dstdir, const char *nme,
const char *ext)
{
- /* see doc at COLsetaccess()/gdk_bat.mx for an expose on mmap heap
modes */
+ /* see doc at COLsetaccess()/gdk_col.mx for an expose on mmap heap
modes */
if (file_exists(dstdir, nme, ext)) {
return 0; /* dont overwrite heap with the committed state
already in dstdir */
} else if (hp->filename && hp->newstorage == STORE_PRIV &&
!file_exists(srcdir, nme, ext)) {
diff --git a/gdk/gdk_bat.c b/gdk/gdk_col.c
rename from gdk/gdk_bat.c
rename to gdk/gdk_col.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_col.c
@@ -18,7 +18,7 @@
*/
/*
- * @f gdk_bat
+ * @f gdk_col
* @a M. L. Kersten, P. Boncz, N. Nes
* @* COL Module
* In this Chapter we describe the COL implementation in more detail.
diff --git a/gdk/gdk_bat.h b/gdk/gdk_col.h
rename from gdk/gdk_bat.h
rename to gdk/gdk_col.h
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -49,7 +49,7 @@
* allow to write into a file that has a mmap open on it (e.g. Windows).
* Such X.new files take preference over X files when opening them.
* @end table
- * Read also the discussion in COLsetaccess (gdk_bat.mx).
+ * Read also the discussion in COLsetaccess (gdk_col.mx).
*
* Todo: check DESCsetmodes/HEAPcheckmode (gdk_storage.mx).
*/
diff --git a/gdk/gdk_scanselect.mx b/gdk/gdk_scanselect.mx
--- a/gdk/gdk_scanselect.mx
+++ b/gdk/gdk_scanselect.mx
@@ -106,7 +106,7 @@
@- "Tools"
First, we need some tools. These are the type-expanded replacements
-for some generic macros from gdk.mx, gdk_bat.mx, and gdk_atom.mx.
+for some generic macros from gdk.mx, gdk_col.mx, and gdk_atom.mx.
Eventually, they should be moved there to be used in other places as well.
VOIDput & SIMPLEput should go to gdk_atoms where ATOMput is defined.
@@ -217,7 +217,7 @@
HT_bunfastins_nocheck_noinc, HT_bunfastins_nocheck & HT_bunfastins
should go to gdk.mx, and
HT_BUNfastins
-should go to gdk_bat.mx
+should go to gdk_col.mx
replacing their generic versions there.
@h
@= T_BUNfastins
@@ -277,7 +277,7 @@
@-
For backward compatibility:
-(also to be moved to gdk.mx and gdk_bat.mx, respectively)
+(also to be moved to gdk.mx and gdk_col.mx, respectively)
@h
COL *COL_scanselect(COL *b, COL *bn, ptr tl, ptr th, bit li, bit hi, int equi,
int nequi, int lval, int hval, int nocheck);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
