Changeset: 07a5057139ce for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/07a5057139ce
Modified Files:
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: properties
Log Message:
Merged with default
diffs (truncated from 1781 to 300 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
@@ -536,23 +536,23 @@ ssize_t lngFromStr(const char *src, size
ssize_t lngToStr(str *dst, size_t *len, const lng *src, bool external);
const lng lng_nil;
struct tm *localtime_r(const time_t *restrict, struct tm *restrict);
+gdk_return log_activate(logger *lg);
gdk_return log_bat(logger *lg, BAT *b, log_id id, lng offset, lng cnt);
gdk_return log_bat_clear(logger *lg, log_id id);
gdk_return log_bat_persists(logger *lg, BAT *b, log_id id);
gdk_return log_bat_transient(logger *lg, log_id id);
+lng log_changes(logger *lg);
gdk_return log_constant(logger *lg, int type, ptr val, log_id id, lng offset,
lng cnt);
+logger *log_create(int debug, const char *fn, const char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, void *funcdata);
gdk_return log_delta(logger *lg, BAT *uid, BAT *uval, log_id id);
-gdk_return log_sequence(logger *lg, int seq, lng id);
+void log_destroy(logger *lg);
+log_bid log_find_bat(logger *lg, log_id id);
+gdk_return log_flush(logger *lg, ulng saved_id);
+int log_sequence(logger *lg, int seq, lng *id);
gdk_return log_tend(logger *lg);
gdk_return log_tflush(logger *lg, ulng log_file_id, ulng commit_ts);
+gdk_return log_tsequence(logger *lg, int seq, lng id);
gdk_return log_tstart(logger *lg, bool flushnow, ulng *log_file_id);
-gdk_return logger_activate(logger *lg);
-lng logger_changes(logger *lg);
-logger *logger_create(int debug, const char *fn, const char *logdir, int
version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, void
*funcdata);
-void logger_destroy(logger *lg);
-log_bid logger_find_bat(logger *lg, log_id id);
-gdk_return logger_flush(logger *lg, ulng saved_id);
-int logger_sequence(logger *lg, int seq, lng *id);
log_level_t lvl_per_component[];
void *mdlopen(const char *library, int mode);
const char *mercurial_revision(void) __attribute__((__const__));
diff --git a/gdk/gdk_cand.c b/gdk/gdk_cand.c
--- a/gdk/gdk_cand.c
+++ b/gdk/gdk_cand.c
@@ -398,7 +398,7 @@ count_mask_bits(const struct canditer *c
return n;
}
-/* initialize a candidate iterator, return number of iterations */
+/* initialize a candidate iterator */
void
canditer_init(struct canditer *ci, BAT *b, BAT *s)
{
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -14,8 +14,8 @@
#include "mutils.h"
#include <string.h>
-static gdk_return logger_add_bat(logger *lg, BAT *b, log_id id, int tid);
-static gdk_return logger_del_bat(logger *lg, log_bid bid);
+static gdk_return log_add_bat(logger *lg, BAT *b, log_id id, int tid);
+static gdk_return log_del_bat(logger *lg, log_bid bid);
/*
* The logger uses a directory to store its log files. One master log
* file stores information about the version of the logger and the
@@ -96,13 +96,13 @@ static gdk_return bm_commit(logger *lg);
static gdk_return tr_grow(trans *tr);
static inline void
-logger_lock(logger *lg)
+log_lock(logger *lg)
{
MT_lock_set(&lg->lock);
}
static inline void
-logger_unlock(logger *lg)
+log_unlock(logger *lg)
{
MT_lock_unset(&lg->lock);
}
@@ -730,7 +730,7 @@ la_bat_destroy(logger *lg, logaction *la
{
log_bid bid = internal_find_bat(lg, la->cid, tid);
- if (bid && logger_del_bat(lg, bid) != GDK_SUCCEED)
+ if (bid && log_del_bat(lg, bid) != GDK_SUCCEED)
return GDK_FAIL;
return GDK_SUCCEED;
}
@@ -773,7 +773,7 @@ la_bat_create(logger *lg, logaction *la,
BATtseqbase(b, 0);
if ((b = BATsetaccess(b, BAT_READ)) == NULL ||
- logger_add_bat(lg, b, la->cid, tid) != GDK_SUCCEED) {
+ log_add_bat(lg, b, la->cid, tid) != GDK_SUCCEED) {
logbat_destroy(b);
return GDK_FAIL;
}
@@ -782,7 +782,7 @@ la_bat_create(logger *lg, logaction *la,
}
static gdk_return
-logger_write_new_types(logger *lg, FILE *fp, bool append)
+log_write_new_types(logger *lg, FILE *fp, bool append)
{
bte id = 0;
@@ -940,7 +940,7 @@ tr_commit(logger *lg, trans *tr)
}
static gdk_return
-logger_read_types_file(logger *lg, FILE *fp)
+log_read_types_file(logger *lg, FILE *fp)
{
int id = 0;
char atom_name[IDLENGTH];
@@ -961,7 +961,7 @@ logger_read_types_file(logger *lg, FILE
gdk_return
-logger_create_types_file(logger *lg, const char *filename, bool append)
+log_create_types_file(logger *lg, const char *filename, bool append)
{
FILE *fp;
@@ -976,7 +976,7 @@ logger_create_types_file(logger *lg, con
return GDK_FAIL;
}
- if (logger_write_new_types(lg, fp, append) != GDK_SUCCEED) {
+ if (log_write_new_types(lg, fp, append) != GDK_SUCCEED) {
fclose(fp);
MT_remove(filename);
GDKerror("writing log file %s failed", filename);
@@ -1005,7 +1005,7 @@ logger_create_types_file(logger *lg, con
}
static gdk_return
-logger_open_output(logger *lg)
+log_open_output(logger *lg)
{
logged_range *new_range =
(logged_range*)GDKmalloc(sizeof(logged_range));
@@ -1059,7 +1059,7 @@ logger_open_output(logger *lg)
}
static inline void
-logger_close_input(logger *lg)
+log_close_input(logger *lg)
{
if (!lg->inmemory)
close_stream(lg->input_log);
@@ -1067,7 +1067,7 @@ logger_close_input(logger *lg)
}
static inline void
-logger_close_output(logger *lg)
+log_close_output(logger *lg)
{
if (!LOG_DISABLED(lg))
close_stream(lg->output_log);
@@ -1075,30 +1075,30 @@ logger_close_output(logger *lg)
}
static gdk_return
-logger_open_input(logger *lg, char *filename, bool *filemissing)
+log_open_input(logger *lg, char *filename, bool *filemissing)
{
lg->input_log = open_rstream(filename);
/* if the file doesn't exist, there is nothing to be read back */
if (lg->input_log == NULL || mnstr_errnr(lg->input_log)) {
- logger_close_input(lg);
+ log_close_input(lg);
*filemissing = true;
return GDK_SUCCEED;
}
short byteorder;
switch (mnstr_read(lg->input_log, &byteorder, sizeof(byteorder), 1)) {
case -1:
- logger_close_input(lg);
+ log_close_input(lg);
return GDK_FAIL;
case 0:
/* empty file is ok */
- logger_close_input(lg);
+ log_close_input(lg);
return GDK_SUCCEED;
case 1:
/* if not empty, must start with correct byte order mark */
if (byteorder != 1234) {
TRC_CRITICAL(GDK, "incorrect byte order word in file
%s\n", filename);
- logger_close_input(lg);
+ log_close_input(lg);
return GDK_FAIL;
}
break;
@@ -1107,7 +1107,7 @@ logger_open_input(logger *lg, char *file
}
static log_return
-logger_read_transaction(logger *lg)
+log_read_transaction(logger *lg)
{
logformat l;
trans *tr = NULL;
@@ -1125,7 +1125,7 @@ logger_read_transaction(logger *lg)
}
if (lg->debug & 1) {
- fprintf(stderr, "#logger_readlog: ");
+ fprintf(stderr, "#log_readlog: ");
if (l.flag > 0 &&
l.flag < (bte) (sizeof(log_commands) /
sizeof(log_commands[0])))
fprintf(stderr, "%s", log_commands[(int)
l.flag]);
@@ -1208,7 +1208,7 @@ logger_read_transaction(logger *lg)
}
static gdk_return
-logger_readlog(logger *lg, char *filename, bool *filemissing)
+log_readlog(logger *lg, char *filename, bool *filemissing)
{
log_return err = LOG_OK;
time_t t0, t1;
@@ -1217,18 +1217,18 @@ logger_readlog(logger *lg, char *filenam
assert(!lg->inmemory);
if (lg->debug & 1) {
- fprintf(stderr, "#logger_readlog opening %s\n", filename);
+ fprintf(stderr, "#log_readlog opening %s\n", filename);
}
- gdk_return res = logger_open_input(lg, filename, filemissing);
+ gdk_return res = log_open_input(lg, filename, filemissing);
if (!lg->input_log)
return res;
int fd;
if ((fd = getFileNo(lg->input_log)) < 0 || fstat(fd, &sb) < 0) {
if (lg->debug & 1) {
- fprintf(stderr, "!ERROR: logger_readlog: fstat on
opened file %s failed\n", filename);
+ fprintf(stderr, "!ERROR: log_readlog: fstat on opened
file %s failed\n", filename);
}
- logger_close_input(lg);
+ log_close_input(lg);
/* If the file could be opened, but fstat fails,
* something weird is going on */
return GDK_FAIL;
@@ -1250,9 +1250,9 @@ logger_readlog(logger *lg, char *filenam
fflush(stdout);
}
}
- err = logger_read_transaction(lg);
+ err = log_read_transaction(lg);
}
- logger_close_input(lg);
+ log_close_input(lg);
lg->input_log = NULL;
/* remaining transactions are not committed, ie abort */
@@ -1272,13 +1272,13 @@ logger_readlog(logger *lg, char *filenam
* processed in the same sequence.
*/
static gdk_return
-logger_readlogs(logger *lg, char *filename)
+log_readlogs(logger *lg, char *filename)
{
gdk_return res = GDK_SUCCEED;
assert(!lg->inmemory);
if (lg->debug & 1)
- fprintf(stderr, "#logger_readlogs logger id is " LLFMT " last
logger id is " LLFMT "\n", lg->id, lg->saved_id);
+ fprintf(stderr, "#log_readlogs logger id is " LLFMT " last
logger id is " LLFMT "\n", lg->id, lg->saved_id);
char log_filename[FILENAME_MAX];
if (lg->saved_id >= lg->id) {
@@ -1290,7 +1290,7 @@ logger_readlogs(logger *lg, char *filena
GDKerror("Logger filename path is too large\n");
return GDK_FAIL;
}
- res = logger_readlog(lg, log_filename, &filemissing);
+ res = log_readlog(lg, log_filename, &filemissing);
if (!filemissing) {
lg->saved_id++;
lg->id++;
@@ -1301,10 +1301,10 @@ logger_readlogs(logger *lg, char *filena
}
static gdk_return
-logger_commit(logger *lg)
+log_commit(logger *lg)
{
if (lg->debug & 1)
- fprintf(stderr, "#logger_commit\n");
+ fprintf(stderr, "#log_commit\n");
return bm_commit(lg);
}
@@ -1362,7 +1362,7 @@ check_version(logger *lg, FILE *fp, cons
fclose(fp);
return GDK_FAIL;
}
- if (logger_read_types_file(lg, fp) != GDK_SUCCEED) {
+ if (log_read_types_file(lg, fp) != GDK_SUCCEED) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
