Changeset: 83f625b0126a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/83f625b0126a
Modified Files:
gdk/gdk_logger.c
gdk/gdk_logger.h
sql/storage/bat/bat_storage.c
sql/storage/store.c
Branch: pax-log
Log Message:
Prevent using the term 'table' in gdk_logger.
diffs (132 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -34,7 +34,7 @@ static gdk_return log_del_bat(logger *lg
#define LOG_DESTROY 6
#define LOG_SEQ 7
#define LOG_CLEAR 8
-#define LOG_TABLE 9
+#define LOG_BAT_GROUP 9
#ifdef NATIVE_WIN32
#define getfilepos _ftelli64
@@ -60,7 +60,7 @@ static const char *log_commands[] = {
"LOG_DESTROY",
"LOG_SEQ",
"LOG_CLEAR",
- "LOG_TABLE",
+ "LOG_BAT_GROUP",
};
typedef struct logaction {
@@ -1172,7 +1172,7 @@ log_read_transaction(logger *lg)
if (!lg->flushing)
GDKdebug &= ~CHECKMASK;
- BAT* cands = NULL; // used in case of LOG_TABLE
+ BAT* cands = NULL; // used in case of LOG_BAT_GROUP
while (err == LOG_OK && (ok=log_read_format(lg, &l))) {
if (l.flag == 0 && l.id == 0) {
@@ -1246,18 +1246,18 @@ log_read_transaction(logger *lg)
else
err = log_read_clear(lg, tr, l.id);
break;
- case LOG_TABLE:
+ case LOG_BAT_GROUP:
if (tr == NULL)
err = LOG_EOF;
else {
if (l.id > 0) {
- // START OF LOG_TABLE
+ // START OF LOG_BAT_GROUP
cands = COLnew(0, TYPE_void, 0,
TRANSIENT);
if (!cands)
err = LOG_ERR;
}
else {
- // END OF LOG_TABLE
+ // END OF LOG_BAT_GROUP
BBPunfix(cands->batCacheid);
cands = NULL;
}
@@ -2686,13 +2686,13 @@ log_bat_transient(logger *lg, log_id id)
}
static gdk_return
-log_table(logger *lg, log_id id)
+log_bat_group(logger *lg, log_id id)
{
if (LOG_DISABLED(lg))
return GDK_SUCCEED;
logformat l;
- l.flag = LOG_TABLE;
+ l.flag = LOG_BAT_GROUP;
l.id = id;
log_lock(lg);
gdk_return r = log_write_format(lg, &l);
@@ -2701,15 +2701,15 @@ log_table(logger *lg, log_id id)
}
gdk_return
-log_table_start(logger *lg, log_id id) {
+log_bat_group_start(logger *lg, log_id id) {
/*positive table id represent start of logged table*/
- return log_table(lg, id);
+ return log_bat_group(lg, id);
}
gdk_return
-log_table_end(logger *lg, log_id id) {
+log_bat_group_end(logger *lg, log_id id) {
/*negative table id represent end of logged table*/
- return log_table(lg, -id);
+ return log_bat_group(lg, -id);
}
gdk_return
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -63,8 +63,8 @@ gdk_export gdk_return log_bat_persists(l
gdk_export gdk_return log_bat_transient(logger *lg, log_id id);
gdk_export gdk_return log_delta(logger *lg, BAT *uid, BAT *uval, log_id id);
-gdk_export gdk_return log_table_start(logger *lg, log_id id);
-gdk_export gdk_return log_table_end(logger *lg, log_id id);
+gdk_export gdk_return log_bat_group_start(logger *lg, log_id id);
+gdk_export gdk_return log_bat_group_end(logger *lg, log_id id);
/* insert/clear groups of bats */
//gdk_export gdk_return log_batgroup(logger *lg, char tpe, oid id, bool
cleared, lng nr_inserted, lng offset_inserted, lng nr_deleted, lng
offset_deleted);
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -3908,13 +3908,13 @@ tr_log_cs( sql_trans *tr, sql_table *t,
static inline int
tr_log_table_start(sql_trans *tr, sql_table *t) {
sqlstore *store = tr->store;
- return log_table_start(store->logger, t->base.id) == GDK_SUCCEED?
LOG_OK: LOG_ERR;
+ return log_bat_group_start(store->logger, t->base.id) == GDK_SUCCEED?
LOG_OK: LOG_ERR;
}
static inline int
tr_log_table_end(sql_trans *tr, sql_table *t) {
sqlstore *store = tr->store;
- return log_table_end(store->logger, t->base.id) == GDK_SUCCEED? LOG_OK:
LOG_ERR;
+ return log_bat_group_end(store->logger, t->base.id) == GDK_SUCCEED?
LOG_OK: LOG_ERR;
}
static int
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -2136,6 +2136,7 @@ store_init(int debug, store_type store_t
store_exit(store);
return NULL;
}
+ exit(0);
return store;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
