Commit 6c722feb authored by Christian Rober's avatar Christian Rober Committed by Yoni Fogel

refs #5086 added function declarations to fix clang errors.

git-svn-id: file:///svn/toku/tokudb@47064 c7de825b-a66e-492c-adef-691d508d4ae1
parent 486b2868
...@@ -2720,14 +2720,14 @@ int toku_cachetable_unpin_and_remove ( ...@@ -2720,14 +2720,14 @@ int toku_cachetable_unpin_and_remove (
return r; return r;
} }
static int int set_filenum_in_array(const FT &ft, const uint32_t index, FILENUM *const array);
set_filenum_in_array(const FT &ft, const uint32_t index, FILENUM *const array) { int set_filenum_in_array(const FT &ft, const uint32_t index, FILENUM *const array) {
array[index] = toku_cachefile_filenum(ft->cf); array[index] = toku_cachefile_filenum(ft->cf);
return 0; return 0;
} }
static int int log_open_txn (const TOKUTXN &txn, const uint32_t UU(index), CACHETABLE *const ctp);
log_open_txn (const TOKUTXN &txn, const uint32_t UU(index), CACHETABLE *const ctp) { int log_open_txn (const TOKUTXN &txn, const uint32_t UU(index), CACHETABLE *const ctp) {
int r; int r;
CACHETABLE ct = *ctp; CACHETABLE ct = *ctp;
TOKULOGGER logger = txn->logger; TOKULOGGER logger = txn->logger;
...@@ -3041,7 +3041,7 @@ int toku_cleaner_thread (void *cleaner_v) { ...@@ -3041,7 +3041,7 @@ int toku_cleaner_thread (void *cleaner_v) {
// //
// cleaner methods // cleaner methods
// //
static_assert(std::is_pod<cleaner>::value, "cleaner isn't POD"); ENSURE_POD(cleaner);
void cleaner::init(uint32_t _cleaner_iterations, pair_list* _pl, CACHETABLE _ct) { void cleaner::init(uint32_t _cleaner_iterations, pair_list* _pl, CACHETABLE _ct) {
// default is no cleaner, for now // default is no cleaner, for now
...@@ -3542,7 +3542,7 @@ void pair_list::write_pending_cheap_unlock() { ...@@ -3542,7 +3542,7 @@ void pair_list::write_pending_cheap_unlock() {
} }
static_assert(std::is_pod<evictor>::value, "evictor isn't POD"); ENSURE_POD(evictor);
// //
// This is the function that runs eviction on its own thread. // This is the function that runs eviction on its own thread.
...@@ -4142,7 +4142,7 @@ void evictor::fill_engine_status() { ...@@ -4142,7 +4142,7 @@ void evictor::fill_engine_status() {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static_assert(std::is_pod<checkpointer>::value, "checkpointer isn't POD"); ENSURE_POD(checkpointer);
// //
// Sets the cachetable reference in this checkpointer class, this is temporary. // Sets the cachetable reference in this checkpointer class, this is temporary.
......
...@@ -128,7 +128,8 @@ done: ...@@ -128,7 +128,8 @@ done:
return 0; return 0;
} }
static int find_ft_from_filenum (const FT &h, const FILENUM &filenum) { int find_ft_from_filenum (const FT &h, const FILENUM &filenum);
int find_ft_from_filenum (const FT &h, const FILENUM &filenum) {
FILENUM thisfnum = toku_cachefile_filenum(h->cf); FILENUM thisfnum = toku_cachefile_filenum(h->cf);
if (thisfnum.fileid<filenum.fileid) return -1; if (thisfnum.fileid<filenum.fileid) return -1;
if (thisfnum.fileid>filenum.fileid) return +1; if (thisfnum.fileid>filenum.fileid) return +1;
......
...@@ -40,7 +40,9 @@ int toku_abort_rollback_item (TOKUTXN txn, struct roll_entry *item, LSN lsn) { ...@@ -40,7 +40,9 @@ int toku_abort_rollback_item (TOKUTXN txn, struct roll_entry *item, LSN lsn) {
return r; return r;
} }
static int int
note_ft_used_in_txns_parent(const FT &ft, uint32_t UU(index), TOKUTXN const child);
int
note_ft_used_in_txns_parent(const FT &ft, uint32_t UU(index), TOKUTXN const child) { note_ft_used_in_txns_parent(const FT &ft, uint32_t UU(index), TOKUTXN const child) {
TOKUTXN parent = child->parent; TOKUTXN parent = child->parent;
toku_txn_maybe_note_ft(parent, ft); toku_txn_maybe_note_ft(parent, ft);
......
...@@ -137,7 +137,8 @@ void toku_maybe_spill_rollbacks(TOKUTXN txn, ROLLBACK_LOG_NODE log) { ...@@ -137,7 +137,8 @@ void toku_maybe_spill_rollbacks(TOKUTXN txn, ROLLBACK_LOG_NODE log) {
} }
} }
static int find_filenum (const FT &h, const FT &hfind) { int find_filenum (const FT &h, const FT &hfind);
int find_filenum (const FT &h, const FT &hfind) {
FILENUM fnum = toku_cachefile_filenum(h->cf); FILENUM fnum = toku_cachefile_filenum(h->cf);
FILENUM fnumfind = toku_cachefile_filenum(hfind->cf); FILENUM fnumfind = toku_cachefile_filenum(hfind->cf);
if (fnum.fileid<fnumfind.fileid) return -1; if (fnum.fileid<fnumfind.fileid) return -1;
......
...@@ -398,7 +398,8 @@ void toku_txn_close_txn(TOKUTXN txn) { ...@@ -398,7 +398,8 @@ void toku_txn_close_txn(TOKUTXN txn) {
toku_txn_destroy_txn(txn); toku_txn_destroy_txn(txn);
} }
static int remove_txn (const FT &h, const uint32_t UU(idx), TOKUTXN const txn) int remove_txn (const FT &h, const uint32_t UU(idx), TOKUTXN const txn);
int remove_txn (const FT &h, const uint32_t UU(idx), TOKUTXN const txn)
// Effect: This function is called on every open FT that a transaction used. // Effect: This function is called on every open FT that a transaction used.
// This function removes the transaction from that FT. // This function removes the transaction from that FT.
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment