Repository: orc Updated Branches: refs/heads/master bba3b5aed -> 377c63c9d
ORC-51 Rename the C++ tools for more clarity Signed-off-by: Owen O'Malley <[email protected]> Fixes #24 Signed-off-by: Owen O'Malley <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/377c63c9 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/377c63c9 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/377c63c9 Branch: refs/heads/master Commit: 377c63c9db370c6c24712c72bc43bf98f246be06 Parents: bba3b5a Author: Owen O'Malley <[email protected]> Authored: Thu May 19 09:11:10 2016 -0700 Committer: Owen O'Malley <[email protected]> Committed: Thu May 19 19:23:51 2016 -0700 ---------------------------------------------------------------------- CMakeLists.txt | 2 +- tools/src/CMakeLists.txt | 28 +++++++++++++--------------- tools/src/FileContents.cc | 2 +- tools/src/FileMemory.cc | 2 +- tools/src/FileMetadata.cc | 2 +- tools/src/FileScan.cc | 2 +- tools/src/FileStatistics.cc | 2 +- 7 files changed, 19 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/377c63c9/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9981c65..b10d416 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ project(ORC) # Version number of package SET(CPACK_PACKAGE_VERSION_MAJOR "1") -SET(CPACK_PACKAGE_VERSION_MINOR "0") +SET(CPACK_PACKAGE_VERSION_MINOR "1") SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(ORC_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") http://git-wip-us.apache.org/repos/asf/orc/blob/377c63c9/tools/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt index 33f294e..dbdab85 100644 --- a/tools/src/CMakeLists.txt +++ b/tools/src/CMakeLists.txt @@ -20,55 +20,53 @@ include_directories ( set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${CXX11_FLAGS} ${WARN_FLAGS}") -add_executable (file-contents +add_executable (orc-contents FileContents.cc ) -target_link_libraries (file-contents +target_link_libraries (orc-contents orc ${PROTOBUF_LIBRARIES} ) -add_executable (file-scan +add_executable (orc-scan FileScan.cc ) -target_link_libraries (file-scan +target_link_libraries (orc-scan orc ${PROTOBUF_LIBRARIES} ) -add_executable (file-metadata +add_executable (orc-metadata FileMetadata.cc ) -target_link_libraries (file-metadata +target_link_libraries (orc-metadata orc ${PROTOBUF_LIBRARIES} ) - add_executable (file-statistics + add_executable (orc-statistics FileStatistics.cc ) -target_link_libraries (file-statistics +target_link_libraries (orc-statistics orc ${PROTOBUF_LIBRARIES} ) -add_executable (file-memory +add_executable (orc-memory FileMemory.cc ) -target_link_libraries (file-memory +target_link_libraries (orc-memory orc ${PROTOBUF_LIBRARIES} ) install(TARGETS - file-contents - file-metadata - file-scan - file-statistics - file-memory + orc-contents + orc-metadata + orc-statistics DESTINATION bin) http://git-wip-us.apache.org/repos/asf/orc/blob/377c63c9/tools/src/FileContents.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileContents.cc b/tools/src/FileContents.cc index 25805e0..7d5d974 100644 --- a/tools/src/FileContents.cc +++ b/tools/src/FileContents.cc @@ -49,7 +49,7 @@ void printContents(const char* filename, const orc::ReaderOptions opts) { int main(int argc, char* argv[]) { if (argc < 2) { - std::cout << "Usage: file-contents <filename> [--columns=1,2,...]\n" + std::cout << "Usage: orc-contents <filename> [--columns=1,2,...]\n" << "Print contents of <filename>.\n" << "If columns are specified, only these top-level (logical) columns are printed.\n" ; return 1; http://git-wip-us.apache.org/repos/asf/orc/blob/377c63c9/tools/src/FileMemory.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileMemory.cc b/tools/src/FileMemory.cc index 696000f..cf8fbf2 100644 --- a/tools/src/FileMemory.cc +++ b/tools/src/FileMemory.cc @@ -92,7 +92,7 @@ void processFile(const char* filename, int main(int argc, char* argv[]) { if (argc < 2) { - std::cout << "Usage: file-memory [--columns=column1,column2,...] " + std::cout << "Usage: orc-memory [--columns=column1,column2,...] " << "[--batch=rows_in_batch] <filename> \n"; return 1; } http://git-wip-us.apache.org/repos/asf/orc/blob/377c63c9/tools/src/FileMetadata.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileMetadata.cc b/tools/src/FileMetadata.cc index db72342..c292ebd 100644 --- a/tools/src/FileMetadata.cc +++ b/tools/src/FileMetadata.cc @@ -160,7 +160,7 @@ int main(int argc, char* argv[]) { if (argc < 1 || helpFlag) { std::cerr - << "Usage: file-metadata [-h] [--help] [-v] [--verbose] <filename>\n"; + << "Usage: orc-metadata [-h] [--help] [-v] [--verbose] <filename>\n"; exit(1); } else { for(int i=0; i < argc; ++i) { http://git-wip-us.apache.org/repos/asf/orc/blob/377c63c9/tools/src/FileScan.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileScan.cc b/tools/src/FileScan.cc index 4683847..4447014 100644 --- a/tools/src/FileScan.cc +++ b/tools/src/FileScan.cc @@ -27,7 +27,7 @@ int main(int argc, char* argv[]) { if (argc < 2) { - std::cout << "Usage: file-scan <filename>\n"; + std::cout << "Usage: orc-scan <filename>\n"; } orc::ReaderOptions opts; http://git-wip-us.apache.org/repos/asf/orc/blob/377c63c9/tools/src/FileStatistics.cc ---------------------------------------------------------------------- diff --git a/tools/src/FileStatistics.cc b/tools/src/FileStatistics.cc index 98edcf8..010baaa 100644 --- a/tools/src/FileStatistics.cc +++ b/tools/src/FileStatistics.cc @@ -62,7 +62,7 @@ void printStatistics(const char *filename) { int main(int argc, char* argv[]) { if (argc < 2) { - std::cout << "Usage: file-metadata <filename>\n"; + std::cout << "Usage: orc-statistics <filename>\n"; } try {
