Make fdb_estimate_space_used work in bottom-up mode (couchbase#12)

Author: greensky00

src/forestdb.cc

@@ -2288,6 +2288,7 @@ fdb_status _fdb_open(fdb_kvs_handle *handle,
         handle->bottom_up_build_entries = (struct list*)malloc(sizeof(struct list));
         list_init(handle->bottom_up_build_entries);
         handle->num_bottom_up_build_entries = 0;
+        handle->space_used_for_bottom_up_build = 0;
     } else {
         handle->bottom_up_build_entries = NULL;
     }
@@ -4273,6 +4274,7 @@ fdb_status fdb_set(fdb_kvs_handle *handle, fdb_doc *doc)
         fdb_kvs_handle* root_handle = handle->fhandle->root;
         list_push_back(root_handle->bottom_up_build_entries, &bub_entry->le);
         root_handle->num_bottom_up_build_entries++;
+        root_handle->space_used_for_bottom_up_build += doc->size_ondisk;
 
     } else {
         if (handle->kvs) {
@@ -4763,7 +4765,7 @@ fdb_status _fdb_bottom_up_index_build(fdb_kvs_handle *handle)
     struct kvs_stat stat_dst;
     stat_dst.ndocs = num_entries;
     stat_dst.ndeletes = 0;
-    stat_dst.datasize = handle->file->wal->datasize;
+    stat_dst.datasize = handle->space_used_for_bottom_up_build;
     stat_dst.nlivenodes = handle->bhandle->nlivenodes;
     stat_dst.deltasize = 0;
     _kvs_stat_set(handle->file, 0, stat_dst);
@@ -8393,6 +8395,10 @@ size_t fdb_estimate_space_used(fdb_file_handle *fhandle)
     ret += nlivenodes * handle->config.blocksize;
     ret += wal_get_datasize(handle->file);
 
+    if (handle->config.bottom_up_index_build) {
+        ret += handle->fhandle->root->space_used_for_bottom_up_build;
+    }
+
     return ret;
 }
 

src/internal_types.h

@@ -443,6 +443,10 @@ struct _fdb_kvs_handle {
      * The number of entries in `bottom_up_build_entries`.
      */
     uint64_t num_bottom_up_build_entries;
+    /**
+     * The amount of data appended in bottom-up mode.
+     */
+    uint64_t space_used_for_bottom_up_build;
 };
 
 struct bottom_up_build_entry {

tests/functional/fdb_functional_test.cc

@@ -5253,6 +5253,9 @@ void bottom_up_build_test()
         s = fdb_set_kv(default_db, key, strlen(key), value, value_len);
         TEST_CHK(s == FDB_RESULT_SUCCESS);
     }
+    size_t space_used = fdb_estimate_space_used(dbfile);
+    TEST_CHK(space_used > 0);
+
     s = fdb_commit(dbfile, FDB_COMMIT_MANUAL_WAL_FLUSH);
 
     s = fdb_kvs_close(default_db);

tools/dump_common.cc

@@ -144,7 +144,7 @@ void print_header(fdb_kvs_handle *db)
             datasize_wal = wal_get_datasize(db->file);
 
             printf("    # documents in the main index: %" _F64
-                   ", %" _F64 "deleted / "
+                   ", %" _F64 " deleted / "
                    "in WAL: %" _F64 " (insert), %" _F64 " (remove)\n",
                    ndocs, ndeletes, ndocs_wal_inserted, ndocs_wal_deleted);
             printf("    # live index nodes: %" _F64 " (%" _F64 " bytes)\n",
@@ -188,7 +188,7 @@ void print_header(fdb_kvs_handle *db)
                 }
 
                 printf("      # documents in the main index: %" _F64
-                       ", %" _F64 "deleted / "
+                       ", %" _F64 " deleted / "
                        "in WAL: %" _F64 " (insert), %" _F64 " (remove)\n",
                        ndocs, ndeletes, ndocs_wal_inserted, ndocs_wal_deleted);
                 printf("      # live index nodes: %" _F64 " (%" _F64 " bytes)\n",