# # # patch "ChangeLog" # from [f1165c3fb3d326cb44f2262ce71673abdf03d2a5] # to [cab9b153d0e93cd2bbcd664b00bb22240837405c] # # patch "database.cc" # from [9e4ab2b6779dab5af2a3fb39ac09db1cd7d1290d] # to [1424c6ec5a4f4a2a7b4b50b2b281f8d1defd6e7c] # ============================================================ --- ChangeLog f1165c3fb3d326cb44f2262ce71673abdf03d2a5 +++ ChangeLog cab9b153d0e93cd2bbcd664b00bb22240837405c @@ -1,3 +1,8 @@ +2006-05-05 Nathaniel Smith + + * database.cc (info): Include count of total nodes allocated in + this db in 'db info' output. + 2006-05-04 Nathaniel Smith * ChangeLog: fix whitespace. ============================================================ --- database.cc 9e4ab2b6779dab5af2a3fb39ac09db1cd7d1290d +++ database.cc 1424c6ec5a4f4a2a7b4b50b2b281f8d1defd6e7c @@ -534,6 +534,16 @@ unsigned long total = 0UL; + u64 num_nodes; + { + results res; + fetch(res, one_col, one_row, query("SELECT node FROM next_roster_node_number")); + if (res.empty()) + num_nodes = 0; + else + num_nodes = lexical_cast(res[0][0]) - 1; + } + #define SPACE_USAGE(TABLE, COLS) add(space_usage(TABLE, COLS), total) out << \ @@ -546,6 +556,7 @@ " revisions : %u\n" " ancestry edges : %u\n" " certs : %u\n" + " logical files : %u\n" "bytes:\n" " full rosters : %u\n" " roster deltas : %u\n" @@ -568,6 +579,7 @@ % count("revisions") % count("revision_ancestry") % count("revision_certs") + % num_nodes // bytes % SPACE_USAGE("rosters", "length(id) + length(data)") % SPACE_USAGE("roster_deltas", "length(id) + length(base) + length(delta)")