Commit 9a64a896 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:3266], rename toku_change_descriptor to toku_brt_change_descriptor, per CR comments

git-svn-id: file:///svn/toku/tokudb@29158 c7de825b-a66e-492c-adef-691d508d4ae1
parent ef9804b8
...@@ -3261,7 +3261,7 @@ update_descriptor_in_memory(BRT t, const DBT* new_descriptor) { ...@@ -3261,7 +3261,7 @@ update_descriptor_in_memory(BRT t, const DBT* new_descriptor) {
} }
int int
toku_change_descriptor( toku_brt_change_descriptor(
BRT t, BRT t,
const DBT* old_descriptor, const DBT* old_descriptor,
const DBT* new_descriptor, const DBT* new_descriptor,
......
...@@ -29,7 +29,7 @@ C_BEGIN ...@@ -29,7 +29,7 @@ C_BEGIN
typedef int(*BRT_GET_CALLBACK_FUNCTION)(ITEMLEN, bytevec, ITEMLEN, bytevec, void*); typedef int(*BRT_GET_CALLBACK_FUNCTION)(ITEMLEN, bytevec, ITEMLEN, bytevec, void*);
int toku_open_brt (const char *fname, int is_create, BRT *, int nodesize, CACHETABLE, TOKUTXN, int(*)(DB*,const DBT*,const DBT*), DB*) __attribute__ ((warn_unused_result)); int toku_open_brt (const char *fname, int is_create, BRT *, int nodesize, CACHETABLE, TOKUTXN, int(*)(DB*,const DBT*,const DBT*), DB*) __attribute__ ((warn_unused_result));
int toku_change_descriptor(BRT t, const DBT* old_descriptor, const DBT* new_descriptor, BOOL do_log, TOKUTXN txn); int toku_brt_change_descriptor(BRT t, const DBT* old_descriptor, const DBT* new_descriptor, BOOL do_log, TOKUTXN txn);
int toku_write_descriptor_to_disk(struct brt_header * h, DESCRIPTOR d, int fd); int toku_write_descriptor_to_disk(struct brt_header * h, DESCRIPTOR d, int fd);
void update_descriptor_in_memory(BRT t, const DBT* new_descriptor); void update_descriptor_in_memory(BRT t, const DBT* new_descriptor);
......
...@@ -702,7 +702,7 @@ static int toku_recover_change_fdescriptor (struct logtype_change_fdescriptor *l ...@@ -702,7 +702,7 @@ static int toku_recover_change_fdescriptor (struct logtype_change_fdescriptor *l
l->new_descriptor.data, l->new_descriptor.data,
l->new_descriptor.len l->new_descriptor.len
); );
r = toku_change_descriptor( r = toku_brt_change_descriptor(
tuple->brt, tuple->brt,
&old_descriptor, &old_descriptor,
&new_descriptor, &new_descriptor,
......
...@@ -5428,7 +5428,7 @@ toku_db_change_descriptor(DB *db, DB_TXN* txn, const DBT* descriptor, u_int32_t ...@@ -5428,7 +5428,7 @@ toku_db_change_descriptor(DB *db, DB_TXN* txn, const DBT* descriptor, u_int32_t
old_descriptor.size = db->descriptor->dbt.size; old_descriptor.size = db->descriptor->dbt.size;
old_descriptor.data = toku_memdup(db->descriptor->dbt.data, db->descriptor->dbt.size); old_descriptor.data = toku_memdup(db->descriptor->dbt.data, db->descriptor->dbt.size);
r = toku_change_descriptor(db->i->brt, &old_descriptor, descriptor, TRUE, ttxn); r = toku_brt_change_descriptor(db->i->brt, &old_descriptor, descriptor, TRUE, ttxn);
cleanup: cleanup:
if (old_descriptor.data) toku_free(old_descriptor.data); if (old_descriptor.data) toku_free(old_descriptor.data);
return r; return r;
......
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