Skip to content

Commit

Permalink
Merge pull request #2292 from SamArch27/master
Browse files Browse the repository at this point in the history
Rename index-stats to emit-statistics for auto-scheduler
  • Loading branch information
b-scholz authored Jul 1, 2022
2 parents a1b949e + 89c831c commit ecee065
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/ast/analysis/JoinSize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ std::vector<analysis::StratumJoinSizeEstimates> JoinSizeAnalysis::computeJoinSiz
joinSizeStatements.resize(sccOrdering.size());

auto& config = Global::config();
if (!config.has("index-stats")) {
if (!config.has("emit-statistics")) {
return joinSizeStatements;
}

Expand Down
9 changes: 5 additions & 4 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,8 @@ int main(int argc, char** argv) {
{"dl-program", 'o', "FILE", "", false,
"Generate C++ source code, written to <FILE>, and compile this to a "
"binary executable (without executing it)."},
{"index-stats", '\x9', "", "", false, "Enable collection of index statistics"},
{"emit-statistics", '\x9', "", "", false,
"Enable collection of statistics for auto-scheduling"},
{"live-profile", '\1', "", "", false, "Enable live profiling."},
{"profile", 'p', "FILE", "", false, "Enable profiling, and write profile data to <FILE>."},
{"profile-frequency", '\2', "", "", false, "Enable the frequency counter in the profiler."},
Expand Down Expand Up @@ -562,10 +563,10 @@ int main(int argc, char** argv) {
Global::config().set("profile");
}

/* if index-stats is set then check that the profiler is also set */
if (Global::config().has("index-stats")) {
/* if emit-statistics is set then check that the profiler is also set */
if (Global::config().has("emit-statistics")) {
if (!Global::config().has("profile"))
throw std::runtime_error("must be profiling to collect index-stats");
throw std::runtime_error("must be profiling to use emit-statistics");
}

} catch (std::exception& e) {
Expand Down
2 changes: 1 addition & 1 deletion tests/scheduler/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function(SOUFFLE_ADD_SCHEDULER_TEST TEST_NAME)

set(QUALIFIED_TEST_NAME scheduler/${TEST_NAME}_stats_collection)
# Run stats collection
set(SOUFFLE_PARAMS "-p" "${OUTPUT_DIR}/${TEST_NAME}.prof" "--index-stats")
set(SOUFFLE_PARAMS "-p" "${OUTPUT_DIR}/${TEST_NAME}.prof" "--emit-statistics")
add_test(NAME ${QUALIFIED_TEST_NAME}
COMMAND
${Python3_EXECUTABLE} ${PROJECT_SOURCE_DIR}/cmake/redirect.py
Expand Down

0 comments on commit ecee065

Please sign in to comment.