Changeset: 61e01b20e11a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/61e01b20e11a Removed Files: gdk/gdk_geomlogger.h Modified Files: clients/Tests/exports.stable.out gdk/gdk_logger_old.c geom/monetdb5/geom.c sql/common/sql_types.c Branch: default Log Message:
Removed some old and unused stuff. diffs (137 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 @@ -522,12 +522,6 @@ ssize_t fltToStr(str *dst, size_t *len, const flt flt_nil; gdk_return gdk_add_callback(char *name, gdk_callback_func *f, int argc, void *argv[], int interval); gdk_return gdk_remove_callback(char *, gdk_callback_func *f); -geomcatalogfix_fptr geomcatalogfix_get(void); -void geomcatalogfix_set(geomcatalogfix_fptr); -geomsqlfix_fptr geomsqlfix_get(void); -void geomsqlfix_set(geomsqlfix_fptr); -bool geomversion_get(void); -void geomversion_set(void); lng getBBPlogno(void); bat getBBPsize(void); lng getBBPtransid(void); diff --git a/gdk/gdk_geomlogger.h b/gdk/gdk_geomlogger.h deleted file mode 100644 --- a/gdk/gdk_geomlogger.h +++ /dev/null @@ -1,23 +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 - 2022 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_old.c b/gdk/gdk_logger_old.c --- a/gdk/gdk_logger_old.c +++ b/gdk/gdk_logger_old.c @@ -158,13 +158,6 @@ 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 bool geomisoldversion; - static gdk_return tr_grow(trans *tr); static BUN @@ -1608,9 +1601,6 @@ logger_load(const char *fn, char filenam goto error; BBPretain(lg->lg->dcatalog->batCacheid); - /* done reading the log, revert to "normal" behavior */ - geomisoldversion = false; - return GDK_SUCCEED; error: if (fp) @@ -1983,42 +1973,3 @@ logger_del_bat(old_logger *lg, log_bid b return BUNappend(lg->dcatalog, &pos, false); /*assert(BBP_lrefs(bid) == 0);*/ } - -static geomcatalogfix_fptr geomcatalogfix = NULL; -static geomsqlfix_fptr geomsqlfix = NULL; - -void -geomcatalogfix_set(geomcatalogfix_fptr f) -{ - geomcatalogfix = f; -} - -geomcatalogfix_fptr -geomcatalogfix_get(void) -{ - return geomcatalogfix; -} - -void -geomsqlfix_set(geomsqlfix_fptr f) -{ - geomsqlfix = f; -} - -geomsqlfix_fptr -geomsqlfix_get(void) -{ - return geomsqlfix; -} - -void -geomversion_set(void) -{ - geomisoldversion = true; -} - -bool -geomversion_get(void) -{ - return geomisoldversion; -} diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c --- a/geom/monetdb5/geom.c +++ b/geom/monetdb5/geom.c @@ -2083,8 +2083,6 @@ 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/sql/common/sql_types.c b/sql/common/sql_types.c --- a/sql/common/sql_types.c +++ b/sql/common/sql_types.c @@ -20,7 +20,6 @@ #include "monetdb_config.h" #include "sql_types.h" #include "sql_keyword.h" /* for keyword_exists(), keywords_insert(), init_keywords(), exit_keywords() */ -#include "gdk_geomlogger.h" /* for geomcatalogfix_get */ list *aliases = NULL; list *types = NULL; _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
