Branch: refs/heads/master
Home: https://github.com/mailru/tarantool
Commit: cd8b17540a8c33e2406bcd230f211865cfd2ff0c
https://github.com/mailru/tarantool/commit/cd8b17540a8c33e2406bcd230f211865cfd2ff0c
Author: Konstantin Osipov <[email protected]>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M include/log_io.h
M mod/box/box.m
M src/log_io.m
M src/replication.m
Log Message:
-----------
Remove dead code.
diff --git a/include/log_io.h b/include/log_io.h
index 6a0f731..b3f27b2 100644
--- a/include/log_io.h
+++ b/include/log_io.h
@@ -133,9 +133,6 @@ struct recovery_state {
struct wait_lsn wait_lsn;
bool finalize;
-
- /* Points to module-specific state */
- void *data;
};
struct recovery_state *recovery_state;
@@ -175,13 +172,11 @@ static inline struct row_v11 *row_v11(const struct tbuf
*t)
return (struct row_v11 *)t->data;
}
-struct tbuf *convert_to_v11(struct tbuf *orig, u16 tag, u64 cookie, i64 lsn);
-
void recovery_init(const char *snap_dirname, const char *xlog_dirname,
row_handler row_handler,
int rows_per_wal, const char *wal_mode,
double wal_fsync_delay,
- int flags, void *data);
+ int flags);
void recovery_update_mode(const char *wal_mode, double fsync_delay);
void recovery_update_io_rate_limit(double new_limit);
void recovery_free();
diff --git a/mod/box/box.m b/mod/box/box.m
index d90f1de..e7abf9b 100644
--- a/mod/box/box.m
+++ b/mod/box/box.m
@@ -2139,7 +2139,7 @@ void txn_assign_n(struct box_txn *txn, struct tbuf *data)
recovery_init(cfg.snap_dir, cfg.wal_dir,
recover_row, cfg.rows_per_wal, cfg.wal_mode,
cfg.wal_fsync_delay,
- init_storage ? RECOVER_READONLY : 0, NULL);
+ init_storage ? RECOVER_READONLY : 0);
recovery_update_io_rate_limit(cfg.snap_io_rate_limit);
recovery_setup_panic(recovery_state, cfg.panic_on_snap_error,
cfg.panic_on_wal_error);
diff --git a/src/log_io.m b/src/log_io.m
index 8d1809d..78d83b2 100644
--- a/src/log_io.m
+++ b/src/log_io.m
@@ -1670,8 +1670,7 @@
void
recovery_init(const char *snap_dirname, const char *wal_dirname,
row_handler row_handler, int rows_per_wal,
- const char *wal_mode, double wal_fsync_delay,
- int flags, void *data)
+ const char *wal_mode, double wal_fsync_delay, int flags)
{
assert(recovery_state == NULL);
recovery_state = p0alloc(eter_pool, sizeof(struct recovery_state));
@@ -1682,7 +1681,6 @@
r->wal_timer.data = r;
r->row_handler = row_handler;
- r->data = data;
r->remote_recovery = NULL;
r->snap_class = snapshot_class_create(snap_dirname);
diff --git a/src/replication.m b/src/replication.m
index c58c368..e6388b6 100644
--- a/src/replication.m
+++ b/src/replication.m
@@ -616,7 +616,7 @@ static void spawner_signal_handler(int signal)
/* Initialize the recovery process */
recovery_init(NULL, cfg.wal_dir, replication_relay_send_row,
INT32_MAX, "fsync_delay", 0,
- RECOVER_READONLY, false);
+ RECOVER_READONLY);
recover(recovery_state, lsn);
recovery_follow_local(recovery_state, 0.1);
================================================================
_______________________________________________
Mailing list: https://launchpad.net/~tarantool-developers
Post to : [email protected]
Unsubscribe : https://launchpad.net/~tarantool-developers
More help : https://help.launchpad.net/ListHelp
