Changeset: 674895f8e497 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=674895f8e497
Added Files:
gdk/gdk_geomlogger.h
Modified Files:
gdk/Makefile.ag
gdk/gdk_logger.c
gdk/gdk_logger.h
geom/monetdb5/geom.c
geom/monetdb5/geom.h
geom/monetdb5/geom_upgrade.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
Branch: default
Log Message:
Move geom-specific logger declarations to separate include file.
diffs (163 lines):
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -29,6 +29,7 @@ lib_gdk = {
gdk_posix.c gdk_logger.c gdk_sample.c xoshiro256starstar.h \
gdk_private.h gdk_delta.h gdk_logger.h gdk_posix.h \
gdk_system.h gdk_system_private.h gdk_tm.h gdk_storage.h \
+ gdk_geomlogger.h \
gdk_group.c \
gdk_imprints.c gdk_imprints.h \
gdk_join.c gdk_project.c \
diff --git a/gdk/gdk_geomlogger.h b/gdk/gdk_geomlogger.h
new file mode 100644
--- /dev/null
+++ b/gdk/gdk_geomlogger.h
@@ -0,0 +1,23 @@
+/*
+ * 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 - 2020 MonetDB B.V.
+ */
+
+#ifndef _GEOMLOGGER_H_
+#define _GEOMLOGGER_H_
+
+typedef int (*geomcatalogfix_fptr)(void *, int);
+gdk_export void geomcatalogfix_set(geomcatalogfix_fptr);
+gdk_export geomcatalogfix_fptr geomcatalogfix_get(void);
+
+typedef str (*geomsqlfix_fptr)(int);
+gdk_export void geomsqlfix_set(geomsqlfix_fptr);
+gdk_export geomsqlfix_fptr geomsqlfix_get(void);
+
+gdk_export void geomversion_set(void);
+gdk_export bool geomversion_get(void);
+
+#endif /* _GEOMLOGGER_H_ */
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -126,10 +126,12 @@ typedef struct logformat_t {
typedef enum {LOG_OK, LOG_EOF, LOG_ERR} log_return;
+#include "gdk_geomlogger.h"
+
/* When reading an old format database, we may need to read the geom
* Well-known Binary (WKB) type differently. This variable is used to
* indicate that to the function wkbREAD during reading of the log. */
-static int geomisoldversion;
+static bool geomisoldversion;
static gdk_return bm_commit(logger *lg);
static gdk_return tr_grow(trans *tr);
@@ -2239,7 +2241,7 @@ logger_load(int debug, const char *fn, c
goto error;
/* done reading the log, revert to "normal" behavior */
- geomisoldversion = 0;
+ geomisoldversion = false;
}
return GDK_SUCCEED;
@@ -3314,9 +3316,11 @@ geomsqlfix_get(void)
void
geomversion_set(void)
{
- geomisoldversion = 1;
+ geomisoldversion = true;
}
-int geomversion_get(void)
+
+bool
+geomversion_get(void)
{
return geomisoldversion;
}
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -132,15 +132,4 @@ gdk_export log_bid logger_find_bat(logge
gdk_export gdk_return logger_upgrade_bat(logger *lg, const char *name, char
tpe, oid id)
__attribute__ ((__warn_unused_result__));
-typedef int (*geomcatalogfix_fptr)(void *, int);
-gdk_export void geomcatalogfix_set(geomcatalogfix_fptr);
-gdk_export geomcatalogfix_fptr geomcatalogfix_get(void);
-
-typedef str (*geomsqlfix_fptr)(int);
-gdk_export void geomsqlfix_set(geomsqlfix_fptr);
-gdk_export geomsqlfix_fptr geomsqlfix_get(void);
-
-gdk_export void geomversion_set(void);
-gdk_export int geomversion_get(void);
-
#endif /*_LOGGER_H_*/
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -12,6 +12,7 @@
*/
#include "geom.h"
+#include "gdk_logger.h"
#include "mal_exception.h"
int TYPE_mbr;
@@ -2064,6 +2065,8 @@ geoGetType(char **res, int *info, int *f
/* returns a pointer to a nil-mbr. */
static mbr mbrNIL; /* to be filled in */
+#include "gdk_geomlogger.h"
+
str
geom_prelude(void *ret)
{
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -23,8 +23,6 @@
#include <math.h>
#include <time.h>
-#include "gdk_logger.h"
-
#ifdef WIN32
#ifndef LIBGEOM
#define geom_export extern __declspec(dllimport)
diff --git a/geom/monetdb5/geom_upgrade.c b/geom/monetdb5/geom_upgrade.c
--- a/geom/monetdb5/geom_upgrade.c
+++ b/geom/monetdb5/geom_upgrade.c
@@ -12,6 +12,7 @@
#include "geom.h"
+#include "gdk_logger.h"
static char *
N(char *buf, const char *pre, const char *schema, const char *post)
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -21,6 +21,7 @@
#include "rel_semantic.h"
#include "rel_unnest.h"
#include "rel_optimizer.h"
+#include "gdk_geomlogger.h"
#include "rel_remote.h"
#include "mal_authorize.h"
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -23,6 +23,7 @@
#ifdef HAVE_HGE
#include "mal.h" /* for have_hge */
#endif
+#include "gdk_geomlogger.h" /* for geomcatalogfix_get */
list *aliases = NULL;
list *types = NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
