Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename index-stats to emit-statistics for auto-scheduler #2292

Merged
merged 4 commits into from
Jul 1, 2022
Merged

Rename index-stats to emit-statistics for auto-scheduler #2292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da04320
Rename index-stats to emit-statistics
Jul 1, 2022
39ceacc
Fix typo
Jul 1, 2022
6adfee1
Fix another typo
Jul 1, 2022
89c831c
Clang-format main.cpp
Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ast/analysis/JoinSize.cpp
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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