Make all external symbols in key.o start with toku_. Addresses #8

git-svn-id: file:///svn/tokudb@676 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/benchmark-test.c

@@ -31,7 +31,7 @@ void setup (void) {
     int r;
     unlink(fname);
     r = brt_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER);         assert(r==0);
-    r = open_brt(fname, 0, 1, &t, nodesize, ct, NULL_TXN, default_compare_fun); assert(r==0);
+    r = open_brt(fname, 0, 1, &t, nodesize, ct, NULL_TXN, toku_default_compare_fun); assert(r==0);
 }
 
 void shutdown (void) {

newbrt/brt-internal.h

@@ -99,7 +99,7 @@ struct brt {
 void toku_seralize_brtnode_to(int fd, DISKOFF off, DISKOFF size, BRTNODE node);
 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 toku_serialize_brtnode_size(BRTNODE node); /* How much space will it take? */
-int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len);
+int toku_keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len);
 
 void toku_verify_counts(BRTNODE);
 

newbrt/brt-verify.c

@@ -91,8 +91,8 @@ int verify_brtnode (BRT brt, DISKOFF off, bytevec lorange, ITEMLEN lolen, byteve
                                   unsigned int datalen __attribute__((__unused__)),
                                   int type __attribute__((__unused__)),
 				  void *ignore __attribute__((__unused__))) {
-		    if (thislorange) assert(keycompare(thislorange,thislolen,key,keylen)<0);
-		    if (thishirange && keycompare(key,keylen,thishirange,thishilen)>0) {
+		    if (thislorange) assert(toku_keycompare(thislorange,thislolen,key,keylen)<0);
+		    if (thishirange && toku_keycompare(key,keylen,thishirange,thishilen)>0) {
 			printf("%s:%d in buffer %d key %s is bigger than %s\n", __FILE__, __LINE__, i, (char*)key, (char*)thishirange);
 			result=1;
 		    }
@@ -102,8 +102,8 @@ int verify_brtnode (BRT brt, DISKOFF off, bytevec lorange, ITEMLEN lolen, byteve
 	}
 	for (i=0; i<node->u.n.n_children; i++) {
 	    if (i>0) {
-		if (lorange) assert(keycompare(lorange,lolen, node->u.n.childkeys[i-1], node->u.n.childkeylens[i-1])<0);
-		if (hirange) assert(keycompare(node->u.n.childkeys[i-1], node->u.n.childkeylens[i-1], hirange, hilen)<=0);
+		if (lorange) assert(toku_keycompare(lorange,lolen, node->u.n.childkeys[i-1], node->u.n.childkeylens[i-1])<0);
+		if (hirange) assert(toku_keycompare(node->u.n.childkeys[i-1], node->u.n.childkeylens[i-1], hirange, hilen)<=0);
 	    }
 	    if (recurse) {
 		result|=verify_brtnode(brt, node->u.n.children[i],

newbrt/brt.c

@@ -259,13 +259,15 @@ typedef struct kvpair {
     unsigned int vallen;
 } *KVPAIR;
 
+#if 0
 int kvpair_compare (const void *av, const void *bv) {
     const KVPAIR a = (const KVPAIR)av;
     const KVPAIR b = (const KVPAIR)bv;
-    int r = keycompare(a->key, a->keylen, b->key, b->keylen);
+    int r = toku_keycompare(a->key, a->keylen, b->key, b->keylen);
     //printf("keycompare(%s,\n           %s)-->%d\n", a->key, b->key, r);
     return r;
 }
+#endif
 
 /* Forgot to handle the case where there is something in the freelist. */
 static DISKOFF malloc_diskblock_header_is_in_memory (BRT brt, int size) {
@@ -1471,8 +1473,8 @@ int brt_create(BRT *brt_ptr) {
     memset(brt, 0, sizeof *brt);
     brt->flags = 0;
     brt->nodesize = BRT_DEFAULT_NODE_SIZE;
-    brt->compare_fun = default_compare_fun;
-    brt->dup_compare = default_compare_fun;
+    brt->compare_fun = toku_default_compare_fun;
+    brt->dup_compare = toku_default_compare_fun;
     *brt_ptr = brt;
     return 0;
 }

newbrt/hashtable.c

@@ -267,7 +267,7 @@ int hashtable_find_last(HASHTABLE h, bytevec *key, ITEMLEN *keylen, bytevec *dat
     ITEMLEN best_kl, best_dl;
     HASHTABLE_ITERATE(h, this_k, this_kl, this_d, this_dl,
 		      ({
-			  if (best_k==0 || keycompare(best_k, best_kl, this_k, this_kl)<0) {
+			  if (best_k==0 || toku_keycompare(best_k, best_kl, this_k, this_kl)<0) {
 			      best_k  = this_k;
 			      best_kl = this_kl;
 			      best_d  = this_d;

newbrt/key.c

@@ -3,7 +3,7 @@
 #include <string.h>
 
 #if 0
-int keycompare (bytevec key1b, ITEMLEN key1len, bytevec key2b, ITEMLEN key2len) {
+int toku_keycompare (bytevec key1b, ITEMLEN key1len, bytevec key2b, ITEMLEN key2len) {
     const unsigned char *key1 = key1b;
     const unsigned char *key2 = key2b;
     while (key1len > 0 && key2len > 0) {
@@ -20,7 +20,7 @@ int keycompare (bytevec key1b, ITEMLEN key1len, bytevec key2b, ITEMLEN key2len)
 }
 
 #elif 0
-int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
+int toku_keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
     if (key1len==key2len) {
 	return memcmp(key1,key2,key1len);
     } else if (key1len<key2len) {
@@ -28,12 +28,12 @@ int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
 	if (r<=0) return -1; /* If the keys are the same up to 1's length, then return -1, since key1 is shorter than key2. */
 	else return 1;
     } else {
-	return -keycompare(key2,key2len,key1,key1len);
+	return -toku_keycompare(key2,key2len,key1,key1len);
     }
 }
 #elif 0
 
-int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
+int toku_keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
     if (key1len==key2len) {
 	return memcmp(key1,key2,key1len);
     } else if (key1len<key2len) {
@@ -48,7 +48,7 @@ int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
 }
 #elif 0
 /* This one looks tighter, but it does use memcmp... */
-int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
+int toku_keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
     int comparelen = key1len<key2len ? key1len : key2len;
     const unsigned char *k1;
     const unsigned char *k2;
@@ -63,7 +63,7 @@ int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
 }
 #else
 /* unroll that one four times */
-int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
+int toku_keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
     int comparelen = key1len<key2len ? key1len : key2len;
     const unsigned char *k1;
     const unsigned char *k2;
@@ -87,18 +87,18 @@ int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len) {
 
 #endif
 
-void test_keycompare (void) {
-    assert(keycompare("a",1, "a",1)==0);
-    assert(keycompare("aa",2, "a",1)>0);
-    assert(keycompare("a",1, "aa",2)<0);
-    assert(keycompare("b",1, "aa",2)>0);
-    assert(keycompare("aa",2, "b",1)<0);
-    assert(keycompare("aaaba",5, "aaaba",5)==0);
-    assert(keycompare("aaaba",5, "aaaaa",5)>0);
-    assert(keycompare("aaaaa",5, "aaaba",5)<0);
-    assert(keycompare("aaaaa",3, "aaaba",3)==0);
+void toku_test_keycompare (void) {
+    assert(toku_keycompare("a",1, "a",1)==0);
+    assert(toku_keycompare("aa",2, "a",1)>0);
+    assert(toku_keycompare("a",1, "aa",2)<0);
+    assert(toku_keycompare("b",1, "aa",2)>0);
+    assert(toku_keycompare("aa",2, "b",1)<0);
+    assert(toku_keycompare("aaaba",5, "aaaba",5)==0);
+    assert(toku_keycompare("aaaba",5, "aaaaa",5)>0);
+    assert(toku_keycompare("aaaaa",5, "aaaba",5)<0);
+    assert(toku_keycompare("aaaaa",3, "aaaba",3)==0);
 }
 
-int default_compare_fun (DB *db __attribute__((__unused__)), const DBT *a, const DBT*b) {
-    return keycompare(a->data, a->size, b->data, b->size);
+int toku_default_compare_fun (DB *db __attribute__((__unused__)), const DBT *a, const DBT*b) {
+    return toku_keycompare(a->data, a->size, b->data, b->size);
 }

newbrt/key.h

 #include "ybt.h"
 #include "brttypes.h"
 
-int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len);
-void test_keycompare (void) ;
+int toku_keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len);
+void toku_test_keycompare (void) ;
 
-int default_compare_fun (DB *, const DBT *, const DBT*);
+int toku_default_compare_fun (DB *, const DBT *, const DBT*);

newbrt/mdict.h

@@ -6,7 +6,7 @@
 //#define USEPMA
 #define USEHASH
 
-int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len);
+int toku_keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len);
 
 #ifdef USEPMA
 

newbrt/pma.h

@@ -136,8 +136,6 @@ void pma_iterate (PMA, void(*)(bytevec,ITEMLEN,bytevec,ITEMLEN, void*), void*);
       body;                                                            \
 } } })
 
-int keycompare (bytevec key1, ITEMLEN key1len, bytevec key2, ITEMLEN key2len);
-
 void pma_verify_fingerprint (PMA pma, u_int32_t rand4fingerprint, u_int32_t fingerprint);
 
 #endif