diff options
| author | Douglas Rumbaugh <dbr4@psu.edu> | 2024-05-10 18:35:30 -0400 |
|---|---|---|
| committer | Douglas Rumbaugh <dbr4@psu.edu> | 2024-05-10 18:35:30 -0400 |
| commit | ab0ab297959fcca370e80670e17f90a780607a80 (patch) | |
| tree | 3cef8050bee568b6a7c003fafe6bfa5c29accbd7 | |
| parent | 5401f2de7621db94971f23aecd9ee5110d7de268 (diff) | |
| download | dynamic-extension-ab0ab297959fcca370e80670e17f90a780607a80.tar.gz | |
MTree structure size
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | benchmarks/vldb/mtree_bench.cpp | 4 | ||||
| -rw-r--r-- | benchmarks/vldb/mtree_bench_alt.cpp | 4 | ||||
| m--------- | external/m-tree | 0 | ||||
| -rw-r--r-- | include/framework/DynamicExtension.h | 2 |
5 files changed, 13 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f2e782..9b65b8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -259,6 +259,12 @@ if (vldb_bench) target_include_directories(mtree_bench_alt PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include benchmarks/include external/psudb-common/cpp/include) target_link_options(mtree_bench_alt PUBLIC -mcx16) target_compile_options(mtree_bench_alt PUBLIC -fopenmp) + + add_executable(mtree_bench ${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/vldb/mtree_bench.cpp) + target_link_libraries(mtree_bench PUBLIC gsl pthread atomic gomp) + target_include_directories(mtree_bench PRIVATE include external external/m-tree/cpp external/PGM-index/include external/PLEX/include benchmarks/include external/psudb-common/cpp/include) + target_link_options(mtree_bench PUBLIC -mcx16) + target_compile_options(mtree_bench PUBLIC -fopenmp) endif() diff --git a/benchmarks/vldb/mtree_bench.cpp b/benchmarks/vldb/mtree_bench.cpp index 60425da..cc2f41f 100644 --- a/benchmarks/vldb/mtree_bench.cpp +++ b/benchmarks/vldb/mtree_bench.cpp @@ -71,7 +71,9 @@ int main(int argc, char **argv) { auto query_latency = TIMER_RESULT() / queries.size(); - fprintf(stdout, "%ld\t%ld\n", insert_throughput, query_latency); + auto size = mtree->size() - sizeof(Rec)*(data.size() - to_delete.size()); + + fprintf(stdout, "%ld\t%ld\t%ld\n", insert_throughput, query_latency, size); gsl_rng_free(rng); delete mtree; diff --git a/benchmarks/vldb/mtree_bench_alt.cpp b/benchmarks/vldb/mtree_bench_alt.cpp index 6b08df7..50c6117 100644 --- a/benchmarks/vldb/mtree_bench_alt.cpp +++ b/benchmarks/vldb/mtree_bench_alt.cpp @@ -71,7 +71,9 @@ int main(int argc, char **argv) { auto query_latency = TIMER_RESULT() / queries.size(); - fprintf(stdout, "%ld\t%ld\n", insert_throughput, query_latency); + auto size = mtree->size() - sizeof(Rec)*(data.size() - to_delete.size()); + + fprintf(stdout, "%ld\t%ld\t%ld\n", insert_throughput, query_latency, size); gsl_rng_free(rng); delete mtree; diff --git a/external/m-tree b/external/m-tree -Subproject 0f57b05f4c6bc3dc3e0b77d59aebccac4ab4a9c +Subproject 68fc861ecb92219e126d669b0e04fbcf85594c7 diff --git a/include/framework/DynamicExtension.h b/include/framework/DynamicExtension.h index 538ff25..e2e2784 100644 --- a/include/framework/DynamicExtension.h +++ b/include/framework/DynamicExtension.h @@ -218,7 +218,7 @@ public: */ size_t get_aux_memory_usage() { auto epoch = get_active_epoch(); - auto t = m_buffer->get_memory_usage() + epoch->get_structure()->get_aux_memory_usage(); + auto t = epoch->get_structure()->get_aux_memory_usage(); end_job(epoch); return t; |