Skip to content

M
MariaDB
Commit db6649c0 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul
Browse files
Options

Make all external symbols in brt-serialize.o start with toku_. Addresses #8 

git-svn-id: file:///svn/tokudb@675 c7de825b-a66e-492c-adef-691d508d4ae1
parent 6ac19c78
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 76 deletions
newbrt/brt-XY.c
View file @ db6649c0
...@@ -32,7 +32,7 @@ static int brt_root_put_cmd_XY (BRT brt, BRT_CMD *md, TOKUTXN txn) { ...@@ -32,7 +32,7 @@ static int brt_root_put_cmd_XY (BRT brt, BRT_CMD *md, TOKUTXN txn) {
} }
// Now the fanout is small enough. // Now the fanout is small enough.
// But the node could still be too large. // But the node could still be too large.
if (serialize_brtnode_size(node)>node->nodesize) { if (toku_serialize_brtnode_size(node)>node->nodesize) {
} }
......
newbrt/brt-internal.h
View file @ db6649c0
...@@ -96,15 +96,15 @@ struct brt { ...@@ -96,15 +96,15 @@ struct brt {
}; };
/* serialization code */ /* serialization code */
void serialize_brtnode_to(int fd, DISKOFF off, DISKOFF size, BRTNODE node); void toku_seralize_brtnode_to(int fd, DISKOFF off, DISKOFF size, BRTNODE node);
int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags, int nodesize, int (*bt_compare)(DB *, const DBT*, const DBT*), int (*dup_compare)(DB *, const DBT *, const DBT *)); int toku_deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags, int nodesize, int (*bt_compare)(DB *, const DBT*, const DBT*), int (*dup_compare)(DB *, const DBT *, const DBT *));
unsigned int serialize_brtnode_size(BRTNODE node); /* How much space will it take? */ unsigned int toku_serialize_brtnode_size(BRTNODE node); /* How much space will it take? */
int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len); int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len);
void verify_counts(BRTNODE); void toku_verify_counts(BRTNODE);
int serialize_brt_header_to (int fd, struct brt_header *h); int toku_serialize_brt_header_to (int fd, struct brt_header *h);
int deserialize_brtheader_from (int fd, DISKOFF off, struct brt_header **brth); int toku_deserialize_brtheader_from (int fd, DISKOFF off, struct brt_header **brth);
/* return the size of a tree node */ /* return the size of a tree node */
long brtnode_size (BRTNODE node); long brtnode_size (BRTNODE node);
......
newbrt/brt-serialize-test.c
View file @ db6649c0
...@@ -41,9 +41,9 @@ void test_serialize(void) { ...@@ -41,9 +41,9 @@ void test_serialize(void) {
r = toku_hash_insert(sn.u.n.htables[1], "x", 2, "xval", 5, BRT_NONE); assert(r==0); sn.local_fingerprint += randval*toku_calccrc32_cmd(BRT_NONE, "x", 2, "xval", 5); r = toku_hash_insert(sn.u.n.htables[1], "x", 2, "xval", 5, BRT_NONE); assert(r==0); sn.local_fingerprint += randval*toku_calccrc32_cmd(BRT_NONE, "x", 2, "xval", 5);
sn.u.n.n_bytes_in_hashtables = 3*(BRT_CMD_OVERHEAD+KEY_VALUE_OVERHEAD+2+5); sn.u.n.n_bytes_in_hashtables = 3*(BRT_CMD_OVERHEAD+KEY_VALUE_OVERHEAD+2+5);
serialize_brtnode_to(fd, sn.nodesize*20, sn.nodesize, &sn); assert(r==0); toku_seralize_brtnode_to(fd, sn.nodesize*20, sn.nodesize, &sn); assert(r==0);
r = deserialize_brtnode_from(fd, nodesize*20, &dn, 0, nodesize, 0, 0); r = toku_deserialize_brtnode_from(fd, nodesize*20, &dn, 0, nodesize, 0, 0);
assert(r==0); assert(r==0);
assert(dn->thisnodename==nodesize*20); assert(dn->thisnodename==nodesize*20);
......
newbrt/brt-serialize.c
View file @ db6649c0
...@@ -12,16 +12,16 @@ ...@@ -12,16 +12,16 @@
#include <arpa/inet.h> #include <arpa/inet.h>
const int brtnode_header_overhead = (8+ // magic "tokunode" or "tokuleaf" static const int brtnode_header_overhead = (8+ // magic "tokunode" or "tokuleaf"
8+ // checkpoint number 8+ // checkpoint number
4+ // block size 4+ // block size
4+ // data size 4+ // data size
4+ // height 4+ // height
4+ // random for fingerprint 4+ // random for fingerprint
4+ // localfingerprint 4+ // localfingerprint
4); // crc32 at the end 4); // crc32 at the end
static unsigned int serialize_brtnode_size_slow(BRTNODE node) { static unsigned int toku_serialize_brtnode_size_slow(BRTNODE node) {
unsigned int size=brtnode_header_overhead; unsigned int size=brtnode_header_overhead;
if (node->height>0) { if (node->height>0) {
unsigned int hsize=0; unsigned int hsize=0;
...@@ -63,7 +63,7 @@ static unsigned int serialize_brtnode_size_slow(BRTNODE node) { ...@@ -63,7 +63,7 @@ static unsigned int serialize_brtnode_size_slow(BRTNODE node) {
} }
} }
unsigned int serialize_brtnode_size (BRTNODE node) { unsigned int toku_serialize_brtnode_size (BRTNODE node) {
unsigned int result =brtnode_header_overhead; unsigned int result =brtnode_header_overhead;
assert(sizeof(off_t)==8); assert(sizeof(off_t)==8);
if (node->height>0) { if (node->height>0) {
...@@ -77,7 +77,7 @@ unsigned int serialize_brtnode_size (BRTNODE node) { ...@@ -77,7 +77,7 @@ unsigned int serialize_brtnode_size (BRTNODE node) {
result+=4; /* n_entries in buffer table. */ result+=4; /* n_entries in buffer table. */
result+=node->u.l.n_bytes_in_buffer; result+=node->u.l.n_bytes_in_buffer;
if (memory_check) { if (memory_check) {
unsigned int slowresult = serialize_brtnode_size_slow(node); unsigned int slowresult = toku_serialize_brtnode_size_slow(node);
if (result!=slowresult) printf("%s:%d result=%d slowresult=%d\n", __FILE__, __LINE__, result, slowresult); if (result!=slowresult) printf("%s:%d result=%d slowresult=%d\n", __FILE__, __LINE__, result, slowresult);
assert(result==slowresult); assert(result==slowresult);
} }
...@@ -85,11 +85,11 @@ unsigned int serialize_brtnode_size (BRTNODE node) { ...@@ -85,11 +85,11 @@ unsigned int serialize_brtnode_size (BRTNODE node) {
return result; return result;
} }
void serialize_brtnode_to(int fd, DISKOFF off, DISKOFF size, BRTNODE node) { void toku_seralize_brtnode_to(int fd, DISKOFF off, DISKOFF size, BRTNODE node) {
//printf("%s:%d serializing\n", __FILE__, __LINE__); //printf("%s:%d serializing\n", __FILE__, __LINE__);
struct wbuf w; struct wbuf w;
int i; int i;
unsigned int calculated_size = serialize_brtnode_size(node); unsigned int calculated_size = toku_serialize_brtnode_size(node);
//char buf[size]; //char buf[size];
char *MALLOC_N(size,buf); char *MALLOC_N(size,buf);
assert(size>0); assert(size>0);
...@@ -181,7 +181,7 @@ void serialize_brtnode_to(int fd, DISKOFF off, DISKOFF size, BRTNODE node) { ...@@ -181,7 +181,7 @@ void serialize_brtnode_to(int fd, DISKOFF off, DISKOFF size, BRTNODE node) {
toku_free(buf); toku_free(buf);
} }
int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags, int nodesize, int toku_deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags, int nodesize,
int (*bt_compare)(DB *, const DBT *, const DBT *), int (*bt_compare)(DB *, const DBT *, const DBT *),
int (*dup_compare)(DB *, const DBT *, const DBT *)) { int (*dup_compare)(DB *, const DBT *, const DBT *)) {
TAGMALLOC(BRTNODE, result); TAGMALLOC(BRTNODE, result);
...@@ -313,7 +313,7 @@ int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags, ...@@ -313,7 +313,7 @@ int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags,
int type; int type;
bytevec key; ITEMLEN keylen; bytevec key; ITEMLEN keylen;
bytevec val; ITEMLEN vallen; bytevec val; ITEMLEN vallen;
verify_counts(result); toku_verify_counts(result);
type = rbuf_char(&rc); type = rbuf_char(&rc);
rbuf_bytes(&rc, &key, &keylen); /* Returns a pointer into the rbuf. */ rbuf_bytes(&rc, &key, &keylen); /* Returns a pointer into the rbuf. */
rbuf_bytes(&rc, &val, &vallen); rbuf_bytes(&rc, &val, &vallen);
...@@ -357,7 +357,7 @@ int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags, ...@@ -357,7 +357,7 @@ int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags,
for (i=0; i<n_in_buf; i++) { for (i=0; i<n_in_buf; i++) {
bytevec key; ITEMLEN keylen; bytevec key; ITEMLEN keylen;
bytevec val; ITEMLEN vallen; bytevec val; ITEMLEN vallen;
verify_counts(result); toku_verify_counts(result);
rbuf_bytes(&rc, &key, &keylen); /* Returns a pointer into the rbuf. */ rbuf_bytes(&rc, &key, &keylen); /* Returns a pointer into the rbuf. */
fill_dbt(&keys[i], key, keylen); fill_dbt(&keys[i], key, keylen);
rbuf_bytes(&rc, &val, &vallen); rbuf_bytes(&rc, &val, &vallen);
...@@ -381,7 +381,7 @@ int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags, ...@@ -381,7 +381,7 @@ int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags,
for (i=0; i<n_in_buf; i++) { for (i=0; i<n_in_buf; i++) {
bytevec key; ITEMLEN keylen; bytevec key; ITEMLEN keylen;
bytevec val; ITEMLEN vallen; bytevec val; ITEMLEN vallen;
verify_counts(result); toku_verify_counts(result);
rbuf_bytes(&rc, &key, &keylen); /* Returns a pointer into the rbuf. */ rbuf_bytes(&rc, &key, &keylen); /* Returns a pointer into the rbuf. */
rbuf_bytes(&rc, &val, &vallen); rbuf_bytes(&rc, &val, &vallen);
{ {
...@@ -410,11 +410,11 @@ int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags, ...@@ -410,11 +410,11 @@ int deserialize_brtnode_from (int fd, DISKOFF off, BRTNODE *brtnode, int flags,
//printf("%s:%d Ok got %lld n_children=%d\n", __FILE__, __LINE__, result->thisnodename, result->n_children); //printf("%s:%d Ok got %lld n_children=%d\n", __FILE__, __LINE__, result->thisnodename, result->n_children);
toku_free(rc.buf); toku_free(rc.buf);
*brtnode = result; *brtnode = result;
verify_counts(result); toku_verify_counts(result);
return 0; return 0;
} }
void verify_counts (BRTNODE node) { void toku_verify_counts (BRTNODE node) {
/*foo*/ /*foo*/
if (node->height==0) { if (node->height==0) {
assert(node->u.l.buffer); assert(node->u.l.buffer);
...@@ -432,7 +432,7 @@ void verify_counts (BRTNODE node) { ...@@ -432,7 +432,7 @@ void verify_counts (BRTNODE node) {
} }
} }
int serialize_brt_header_to (int fd, struct brt_header *h) { int toku_serialize_brt_header_to (int fd, struct brt_header *h) {
struct wbuf w; struct wbuf w;
int i; int i;
unsigned int size=0; /* I don't want to mess around calculating it exactly. */ unsigned int size=0; /* I don't want to mess around calculating it exactly. */
...@@ -472,7 +472,7 @@ int serialize_brt_header_to (int fd, struct brt_header *h) { ...@@ -472,7 +472,7 @@ int serialize_brt_header_to (int fd, struct brt_header *h) {
return 0; return 0;
} }
int deserialize_brtheader_from (int fd, DISKOFF off, struct brt_header **brth) { int toku_deserialize_brtheader_from (int fd, DISKOFF off, struct brt_header **brth) {
//printf("%s:%d calling MALLOC\n", __FILE__, __LINE__); //printf("%s:%d calling MALLOC\n", __FILE__, __LINE__);
struct brt_header *MALLOC(h); struct brt_header *MALLOC(h);
struct rbuf rc; struct rbuf rc;
......
newbrt/brt.c
View file @ db6649c0
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7