#3043 merge changes from code review to main refs[t:3043]

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

newbrt/ule.c

@@ -1672,37 +1672,37 @@ ule_add_placeholders(ULE ule, XIDS xids) {
     }
 }
 
-int 
+uint64_t
 ule_num_uxrs(ULE ule) {
     return ule->num_cuxrs + ule->num_puxrs;
 }
 
 UXR 
-ule_get_uxr(ULE ule, int ith) {
-    invariant(0 <= ith && ith < ule_num_uxrs(ule));
+ule_get_uxr(ULE ule, uint64_t ith) {
+    invariant(ith < ule_num_uxrs(ule));
     return &ule->uxrs[ith];
 }
 
-int 
+uint32_t
 ule_get_num_committed(ULE ule) {
     return ule->num_cuxrs;
 }
 
-int 
+uint32_t
 ule_get_num_provisional(ULE ule) {
     return ule->num_puxrs;
 }
 
 int 
-ule_is_committed(ULE ule, int ith) {
-    invariant(0 <= ith && ith < ule_num_uxrs(ule));
-    return ith < (int) ule->num_cuxrs;
+ule_is_committed(ULE ule, uint64_t  ith) {
+    invariant(ith < ule_num_uxrs(ule));
+    return ith < ule->num_cuxrs;
 }
 
 int 
-ule_is_provisional(ULE ule, int ith) {
-    invariant(0 <= ith && ith < ule_num_uxrs(ule));
-    return ith >= (int) ule->num_cuxrs;
+ule_is_provisional(ULE ule, uint64_t ith) {
+    invariant(ith < ule_num_uxrs(ule));
+    return ith >= ule->num_cuxrs;
 }
 
 void *

newbrt/ule.h

@@ -24,12 +24,12 @@ ULEHANDLE toku_ule_create(void * le_p);
 
 void toku_ule_free(ULEHANDLE ule_p);
 
-int ule_num_uxrs(ULEHANDLE ule);
-int ule_get_num_committed(ULEHANDLE ule);
-int ule_get_num_provisional(ULEHANDLE ule);
-UXRHANDLE ule_get_uxr(ULEHANDLE ule, int ith);
-int ule_is_committed(ULEHANDLE ule, int ith);
-int ule_is_provisional(ULEHANDLE ule, int ith);
+uint64_t ule_num_uxrs(ULEHANDLE ule);
+uint32_t ule_get_num_committed(ULEHANDLE ule);
+uint32_t ule_get_num_provisional(ULEHANDLE ule);
+UXRHANDLE ule_get_uxr(ULEHANDLE ule, uint64_t ith);
+int ule_is_committed(ULEHANDLE ule, uint64_t ith);
+int ule_is_provisional(ULEHANDLE ule, uint64_t ith);
 void *ule_get_key(ULEHANDLE ule);
 uint32_t ule_get_keylen(ULEHANDLE ule);
 

src/tests/hotindexer-undo-do-test.c

@@ -168,18 +168,19 @@ put_callback(DB *dest_db, DB *src_db, DBT *dest_key, DBT *dest_data, const DBT *
         lazy_assert(0);
     }
 
-    switch (dest_data->flags) {
-    case 0:
-        lazy_assert(0);
-        break;
-    case DB_DBT_REALLOC:
-        dest_data->data = toku_realloc(dest_data->data, src_key->size);
-        memcpy(dest_data->data, src_key->data, src_key->size);
-        dest_data->size = src_key->size;
-        break;
-    default:
-        lazy_assert(0);
-    }
+    if (dest_data)
+        switch (dest_data->flags) {
+        case 0:
+            lazy_assert(0);
+            break;
+        case DB_DBT_REALLOC:
+            dest_data->data = toku_realloc(dest_data->data, src_key->size);
+            memcpy(dest_data->data, src_key->data, src_key->size);
+            dest_data->size = src_key->size;
+            break;
+        default:
+            lazy_assert(0);
+        }
 
     return 0;
 }