Moved some storage-related constants.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/6fa7be6b Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/6fa7be6b Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/6fa7be6b Branch: refs/heads/exact-filter Commit: 6fa7be6bab6f64fd534b1a7cd56f3a2250f9d330 Parents: 787a325 Author: Zuyu Zhang <zu...@apache.org> Authored: Mon Nov 14 22:24:55 2016 -0800 Committer: Zuyu Zhang <zu...@apache.org> Committed: Tue Nov 15 17:55:44 2016 -0800 ---------------------------------------------------------------------- CMakeLists.txt | 1 + cli/QuickstepCli.cpp | 12 +++--------- storage/StorageConstants.hpp | 10 ++++++++++ 3 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/6fa7be6b/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 487aaf9..6191de0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -769,6 +769,7 @@ target_link_libraries(quickstep_cli_shell quickstep_queryoptimizer_QueryPlan quickstep_queryoptimizer_QueryProcessor quickstep_storage_PreloaderThread + quickstep_storage_StorageConstants quickstep_threading_ThreadIDBasedMap quickstep_utility_ExecutionDAGVisualizer quickstep_utility_Macros http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/6fa7be6b/cli/QuickstepCli.cpp ---------------------------------------------------------------------- diff --git a/cli/QuickstepCli.cpp b/cli/QuickstepCli.cpp index 8269197..31d9834 100644 --- a/cli/QuickstepCli.cpp +++ b/cli/QuickstepCli.cpp @@ -29,6 +29,8 @@ #include <vector> #include <fstream> +#include "cli/CliConfig.h" // For QUICKSTEP_USE_LINENOISE, QUICKSTEP_ENABLE_GOOGLE_PROFILER, and QUICKSTEP_OS_WINDOWS. + // TODO(jmp): If filesystem shows up in C++-17, we can switch to just using that. #ifdef QUICKSTEP_OS_WINDOWS #include <filesystem> @@ -36,7 +38,6 @@ #include <stdlib.h> #endif -#include "cli/CliConfig.h" // For QUICKSTEP_USE_LINENOISE, QUICKSTEP_ENABLE_GOOGLE_PROFILER. #include "cli/CommandExecutor.hpp" #include "cli/DropRelation.hpp" @@ -74,6 +75,7 @@ typedef quickstep::LineReaderDumb LineReaderImpl; #endif #include "storage/PreloaderThread.hpp" +#include "storage/StorageConstants.hpp" #include "threading/ThreadIDBasedMap.hpp" #include "utility/ExecutionDAGVisualizer.hpp" #include "utility/Macros.hpp" @@ -130,14 +132,6 @@ using tmb::client_id; namespace quickstep { -#ifdef QUICKSTEP_OS_WINDOWS -static constexpr char kPathSeparator = '\\'; -static constexpr char kDefaultStoragePath[] = "qsstor\\"; -#else -static constexpr char kPathSeparator = '/'; -static constexpr char kDefaultStoragePath[] = "qsstor/"; -#endif - DEFINE_bool(profile_and_report_workorder_perf, false, "If true, Quickstep will record the exceution time of all the individual " "normal work orders and report it at the end of query execution."); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/6fa7be6b/storage/StorageConstants.hpp ---------------------------------------------------------------------- diff --git a/storage/StorageConstants.hpp b/storage/StorageConstants.hpp index 90028db..34a714d 100644 --- a/storage/StorageConstants.hpp +++ b/storage/StorageConstants.hpp @@ -23,12 +23,22 @@ #include <cstddef> #include <cstdint> +#include "cli/CliConfig.h" // For QUICKSTEP_OS_WINDOWS. + namespace quickstep { /** \addtogroup Storage * @{ */ +#ifdef QUICKSTEP_OS_WINDOWS +constexpr char kPathSeparator = '\\'; +constexpr char kDefaultStoragePath[] = "qsstor\\"; +#else +constexpr char kPathSeparator = '/'; +constexpr char kDefaultStoragePath[] = "qsstor/"; +#endif + // Size of a memory slot managed by the StorageManager. This is the smallest // quantum of allocation for StorageBlocks and StorageBlobs. 2 MB is the large // page size on x86.
