Moved the init-db flag and fixed a bug regarding db-init.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/3047d89a Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/3047d89a Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/3047d89a Branch: refs/heads/min-max-stats Commit: 3047d89ab0e02bf0a30e914f55e6b49435c07e6a Parents: 1b27888 Author: Zuyu Zhang <zu...@apache.org> Authored: Mon Nov 21 23:44:13 2016 -0800 Committer: Zuyu Zhang <zu...@apache.org> Committed: Mon Nov 21 23:44:13 2016 -0800 ---------------------------------------------------------------------- cli/DefaultsConfigurator.cpp | 2 +- cli/Flags.cpp | 2 ++ cli/Flags.hpp | 3 +++ cli/QuickstepCli.cpp | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/3047d89a/cli/DefaultsConfigurator.cpp ---------------------------------------------------------------------- diff --git a/cli/DefaultsConfigurator.cpp b/cli/DefaultsConfigurator.cpp index 94280a7..21b0af6 100644 --- a/cli/DefaultsConfigurator.cpp +++ b/cli/DefaultsConfigurator.cpp @@ -55,7 +55,7 @@ void DefaultsConfigurator::InitializeDefaultDatabase(const string &storage_path, #else { const string path_name = "mkdir " + storage_path; - CHECK(std::system(path_name.c_str())) + CHECK(!std::system(path_name.c_str())) << "Failed when attempting to create the directory: " << storage_path; } #endif // QUICKSTEP_OS_WINDOWS http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/3047d89a/cli/Flags.cpp ---------------------------------------------------------------------- diff --git a/cli/Flags.cpp b/cli/Flags.cpp index 87f9f73..1e3ce1d 100644 --- a/cli/Flags.cpp +++ b/cli/Flags.cpp @@ -32,6 +32,8 @@ using std::fprintf; namespace quickstep { +DEFINE_bool(initialize_db, false, "If true, initialize a database."); + static bool ValidateNumWorkers(const char *flagname, int value) { if (value > 0) { return true; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/3047d89a/cli/Flags.hpp ---------------------------------------------------------------------- diff --git a/cli/Flags.hpp b/cli/Flags.hpp index b020a3e..70aee98 100644 --- a/cli/Flags.hpp +++ b/cli/Flags.hpp @@ -32,6 +32,9 @@ namespace quickstep { * @brief A collection of common flags shared by Quickstep CLIs in both the * single-node and the distributed version. **/ + +DECLARE_bool(initialize_db); + DECLARE_int32(num_workers); DECLARE_string(storage_path); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/3047d89a/cli/QuickstepCli.cpp ---------------------------------------------------------------------- diff --git a/cli/QuickstepCli.cpp b/cli/QuickstepCli.cpp index 656786a..f4816a8 100644 --- a/cli/QuickstepCli.cpp +++ b/cli/QuickstepCli.cpp @@ -128,7 +128,6 @@ DEFINE_string(worker_affinities, "", "the affinity mask of the Quickstep process, which typically " "means that they will all be runable on any CPU according to " "the kernel's own scheduling policy)."); -DEFINE_bool(initialize_db, false, "If true, initialize a database."); DEFINE_bool(print_query, false, "Print each input query statement. This is useful when running a " "large number of queries in a batch.");
