Changeset: cd46e79156dc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cd46e79156dc
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_logger.h
gdk/gdk_logger_internals.h
Branch: default
Log Message:
Backed out changeset 17147bc41df3: we need this on Windows.
diffs (53 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
@@ -563,6 +563,8 @@ void mo_free_options(opt *set, int setle
void mo_print_options(opt *set, int setlen);
int mo_system_config(opt **Set, int setlen);
const oid oid_nil;
+log_bid old_logger_find_bat(old_logger *lg, const char *name, char tpe, oid
id);
+gdk_return old_logger_load(logger *lg, const char *fn, const char *logdir,
FILE *fp, int version, const char *filename);
DIR *opendir(const char *dirname);
void print_trace(void);
ssize_t ptrFromStr(const char *src, size_t *len, ptr **dst, bool external);
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -42,6 +42,11 @@ typedef int log_id;
#define LOG_BATGROUP_ID 5
#define LOG_BATGROUP_END 6
+/* interface for the "old" logger */
+typedef struct old_logger old_logger;
+gdk_export gdk_return old_logger_load(logger *lg, const char *fn, const char
*logdir, FILE *fp, int version, const char *filename);
+gdk_export log_bid old_logger_find_bat(old_logger *lg, const char *name, char
tpe, oid id);
+
gdk_export logger *logger_create(int debug, const char *fn, const char
*logdir, int version, preversionfix_fptr prefuncp, postversionfix_fptr
postfuncp, void *funcdata);
gdk_export void logger_destroy(logger *lg);
gdk_export gdk_return logger_flush(logger *lg, ulng saved_id); /* try to flush
a part of the logs, including the passed saved_id transaction id */
diff --git a/gdk/gdk_logger_internals.h b/gdk/gdk_logger_internals.h
--- a/gdk/gdk_logger_internals.h
+++ b/gdk/gdk_logger_internals.h
@@ -65,7 +65,7 @@ struct logger {
size_t bufsize;
};
-typedef struct old_logger {
+struct old_logger {
logger *lg; /* the new logger instance */
const char *filename; /* name of log file */
lng changes;
@@ -94,12 +94,8 @@ typedef struct old_logger {
commit). */
BAT *add; /* bat ids of bats being added by upgrade */
BAT *del; /* bat ids of bats being deleted by upgrade */
-} old_logger;
+};
gdk_return logger_create_types_file(logger *lg, const char *filename, bool
append);
-/* interface for the "old" logger */
-gdk_return old_logger_load(logger *lg, const char *fn, const char *logdir,
FILE *fp, int version, const char *filename);
-log_bid old_logger_find_bat(old_logger *lg, const char *name, char tpe, oid
id);
-
#endif /* _LOGGER_INTERNALS_H_ */
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
