This is an automated email from the ASF dual-hosted git repository. zghao pushed a commit to branch HBASE-14850 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit c150440c9d52df136ea272bfe7d147f4044f385b Author: Enis Soztutar <[email protected]> AuthorDate: Mon Mar 6 19:27:20 2017 -0800 HBASE-17741 [C++] rename some files to use (dash) instead of _ --- hbase-native-client/core/BUCK | 30 +++++++++++----------- .../core/async-rpc-retrying-test.cc | 4 +-- hbase-native-client/core/client-test.cc | 2 +- hbase-native-client/core/client.h | 2 +- hbase-native-client/core/get.h | 2 +- ...ion_loader.cc => hbase-configuration-loader.cc} | 2 +- ...ation_loader.h => hbase-configuration-loader.h} | 0 ...uration-test.cc => hbase-configuration-test.cc} | 2 +- .../core/{hbase_macros.h => hbase-macros.h} | 0 hbase-native-client/core/meta-utils.cc | 2 +- ...converter-test.cc => request-converter-test.cc} | 2 +- .../{request_converter.cc => request-converter.cc} | 2 +- .../{request_converter.h => request-converter.h} | 0 ...response_converter.cc => response-converter.cc} | 2 +- .../{response_converter.h => response-converter.h} | 0 hbase-native-client/core/scan.h | 2 +- hbase-native-client/core/table.cc | 4 +-- .../{time_range-test.cc => time-range-test.cc} | 2 +- .../core/{time_range.cc => time-range.cc} | 2 +- .../core/{time_range.h => time-range.h} | 0 hbase-native-client/test-util/mini-cluster.cc | 10 ++------ hbase-native-client/test-util/mini-cluster.h | 10 ++------ 22 files changed, 35 insertions(+), 47 deletions(-) diff --git a/hbase-native-client/core/BUCK b/hbase-native-client/core/BUCK index 95fb8b5..e40236f 100644 --- a/hbase-native-client/core/BUCK +++ b/hbase-native-client/core/BUCK @@ -21,7 +21,7 @@ cxx_library( exported_headers=[ "client.h", "cell.h", - "hbase_macros.h", + "hbase-macros.h", "filter.h", "query.h", "keyvalue-codec.h", @@ -32,13 +32,13 @@ cxx_library( # Once meta lookup works "meta-utils.h", "get.h", - "time_range.h", + "time-range.h", "configuration.h", - "hbase_configuration_loader.h", + "hbase-configuration-loader.h", "scan.h", "result.h", - "request_converter.h", - "response_converter.h", + "request-converter.h", + "response-converter.h", "table.h", "async-rpc-retrying-caller-factory.h", "async-rpc-retrying-caller.h", @@ -51,13 +51,13 @@ cxx_library( "location-cache.cc", "meta-utils.cc", "get.cc", - "time_range.cc", + "time-range.cc", "configuration.cc", - "hbase_configuration_loader.cc", + "hbase-configuration-loader.cc", "scan.cc", "result.cc", - "request_converter.cc", - "response_converter.cc", + "request-converter.cc", + "response-converter.cc", "table.cc", ], deps=[ @@ -120,8 +120,8 @@ cxx_test( ], run_test_separately=True,) cxx_test( - name="time_range-test", - srcs=["time_range-test.cc",], + name="time-range-test", + srcs=["time-range-test.cc",], deps=[":core",], run_test_separately=True,) cxx_test( @@ -130,8 +130,8 @@ cxx_test( deps=[":core",], run_test_separately=True,) cxx_test( - name="hbase_configuration-test", - srcs=["hbase_configuration-test.cc",], + name="hbase-configuration-test", + srcs=["hbase-configuration-test.cc",], deps=[":core",], run_test_separately=True,) cxx_test( @@ -145,8 +145,8 @@ cxx_test( deps=[":core",], run_test_separately=True,) cxx_test( - name="request_converter-test", - srcs=["request_converter-test.cc",], + name="request-converter-test", + srcs=["request-converter-test.cc",], deps=[ ":core", "//connection:connection", diff --git a/hbase-native-client/core/async-rpc-retrying-test.cc b/hbase-native-client/core/async-rpc-retrying-test.cc index d2435b9..f2a79a1 100644 --- a/hbase-native-client/core/async-rpc-retrying-test.cc +++ b/hbase-native-client/core/async-rpc-retrying-test.cc @@ -36,8 +36,8 @@ #include "core/hbase-rpc-controller.h" #include "core/keyvalue-codec.h" #include "core/region-location.h" -#include "core/request_converter.h" -#include "core/response_converter.h" +#include "core/request-converter.h" +#include "core/response-converter.h" #include "core/result.h" #include "exceptions/exception.h" #include "if/Client.pb.h" diff --git a/hbase-native-client/core/client-test.cc b/hbase-native-client/core/client-test.cc index afca847..6f74e9c 100644 --- a/hbase-native-client/core/client-test.cc +++ b/hbase-native-client/core/client-test.cc @@ -21,7 +21,7 @@ #include <gtest/gtest.h> #include "core/configuration.h" #include "core/get.h" -#include "core/hbase_configuration_loader.h" +#include "core/hbase-configuration-loader.h" #include "core/result.h" #include "core/table.h" #include "serde/table-name.h" diff --git a/hbase-native-client/core/client.h b/hbase-native-client/core/client.h index e73ab70..6e3c889 100644 --- a/hbase-native-client/core/client.h +++ b/hbase-native-client/core/client.h @@ -30,7 +30,7 @@ #include "connection/rpc-client.h" #include "core/configuration.h" #include "core/connection-configuration.h" -#include "core/hbase_configuration_loader.h" +#include "core/hbase-configuration-loader.h" #include "core/keyvalue-codec.h" #include "core/location-cache.h" #include "core/table.h" diff --git a/hbase-native-client/core/get.h b/hbase-native-client/core/get.h index 92d1fee..5492f21 100644 --- a/hbase-native-client/core/get.h +++ b/hbase-native-client/core/get.h @@ -25,7 +25,7 @@ #include <string> #include <vector> #include "core/query.h" -#include "core/time_range.h" +#include "core/time-range.h" #include "if/Client.pb.h" namespace hbase { diff --git a/hbase-native-client/core/hbase_configuration_loader.cc b/hbase-native-client/core/hbase-configuration-loader.cc similarity index 99% rename from hbase-native-client/core/hbase_configuration_loader.cc rename to hbase-native-client/core/hbase-configuration-loader.cc index 38a617b..4d6a3e9 100644 --- a/hbase-native-client/core/hbase_configuration_loader.cc +++ b/hbase-native-client/core/hbase-configuration-loader.cc @@ -17,7 +17,7 @@ * */ -#include "core/hbase_configuration_loader.h" +#include "core/hbase-configuration-loader.h" #include <glog/logging.h> #include <boost/foreach.hpp> diff --git a/hbase-native-client/core/hbase_configuration_loader.h b/hbase-native-client/core/hbase-configuration-loader.h similarity index 100% rename from hbase-native-client/core/hbase_configuration_loader.h rename to hbase-native-client/core/hbase-configuration-loader.h diff --git a/hbase-native-client/core/hbase_configuration-test.cc b/hbase-native-client/core/hbase-configuration-test.cc similarity index 99% rename from hbase-native-client/core/hbase_configuration-test.cc rename to hbase-native-client/core/hbase-configuration-test.cc index 07a6358..ebf0817 100644 --- a/hbase-native-client/core/hbase_configuration-test.cc +++ b/hbase-native-client/core/hbase-configuration-test.cc @@ -24,7 +24,7 @@ #include <gtest/gtest.h> #include <boost/filesystem.hpp> #include "core/configuration.h" -#include "core/hbase_configuration_loader.h" +#include "core/hbase-configuration-loader.h" using namespace hbase; diff --git a/hbase-native-client/core/hbase_macros.h b/hbase-native-client/core/hbase-macros.h similarity index 100% rename from hbase-native-client/core/hbase_macros.h rename to hbase-native-client/core/hbase-macros.h diff --git a/hbase-native-client/core/meta-utils.cc b/hbase-native-client/core/meta-utils.cc index bd26607..24a0360 100644 --- a/hbase-native-client/core/meta-utils.cc +++ b/hbase-native-client/core/meta-utils.cc @@ -24,7 +24,7 @@ #include "connection/request.h" #include "connection/response.h" -#include "core/response_converter.h" +#include "core/response-converter.h" #include "if/Client.pb.h" #include "serde/region-info.h" #include "serde/server-name.h" diff --git a/hbase-native-client/core/request_converter-test.cc b/hbase-native-client/core/request-converter-test.cc similarity index 99% rename from hbase-native-client/core/request_converter-test.cc rename to hbase-native-client/core/request-converter-test.cc index 84d5e8b..c01f16c 100644 --- a/hbase-native-client/core/request_converter-test.cc +++ b/hbase-native-client/core/request-converter-test.cc @@ -17,7 +17,7 @@ * */ -#include "core/request_converter.h" +#include "core/request-converter.h" #include <gtest/gtest.h> #include <limits> diff --git a/hbase-native-client/core/request_converter.cc b/hbase-native-client/core/request-converter.cc similarity index 99% rename from hbase-native-client/core/request_converter.cc rename to hbase-native-client/core/request-converter.cc index 149202e..227e04a 100644 --- a/hbase-native-client/core/request_converter.cc +++ b/hbase-native-client/core/request-converter.cc @@ -17,7 +17,7 @@ * */ -#include "core/request_converter.h" +#include "core/request-converter.h" #include <utility> #include "if/Client.pb.h" diff --git a/hbase-native-client/core/request_converter.h b/hbase-native-client/core/request-converter.h similarity index 100% rename from hbase-native-client/core/request_converter.h rename to hbase-native-client/core/request-converter.h diff --git a/hbase-native-client/core/response_converter.cc b/hbase-native-client/core/response-converter.cc similarity index 99% rename from hbase-native-client/core/response_converter.cc rename to hbase-native-client/core/response-converter.cc index 2497306..7bb5e5d 100644 --- a/hbase-native-client/core/response_converter.cc +++ b/hbase-native-client/core/response-converter.cc @@ -17,7 +17,7 @@ * */ -#include "core/response_converter.h" +#include "core/response-converter.h" #include <string> #include <vector> diff --git a/hbase-native-client/core/response_converter.h b/hbase-native-client/core/response-converter.h similarity index 100% rename from hbase-native-client/core/response_converter.h rename to hbase-native-client/core/response-converter.h diff --git a/hbase-native-client/core/scan.h b/hbase-native-client/core/scan.h index 7e8c7bd..cedbe0a 100644 --- a/hbase-native-client/core/scan.h +++ b/hbase-native-client/core/scan.h @@ -25,7 +25,7 @@ #include <string> #include <vector> #include "core/get.h" -#include "core/time_range.h" +#include "core/time-range.h" #include "if/Client.pb.h" namespace hbase { diff --git a/hbase-native-client/core/table.cc b/hbase-native-client/core/table.cc index ba4dc29..2ce8fcd 100644 --- a/hbase-native-client/core/table.cc +++ b/hbase-native-client/core/table.cc @@ -25,8 +25,8 @@ #include <utility> #include <vector> -#include "core/request_converter.h" -#include "core/response_converter.h" +#include "core/request-converter.h" +#include "core/response-converter.h" #include "if/Client.pb.h" #include "security/user.h" #include "serde/server-name.h" diff --git a/hbase-native-client/core/time_range-test.cc b/hbase-native-client/core/time-range-test.cc similarity index 98% rename from hbase-native-client/core/time_range-test.cc rename to hbase-native-client/core/time-range-test.cc index 49cb359..136ab54 100644 --- a/hbase-native-client/core/time_range-test.cc +++ b/hbase-native-client/core/time-range-test.cc @@ -17,7 +17,7 @@ * */ -#include "core/time_range.h" +#include "core/time-range.h" #include <glog/logging.h> #include <gtest/gtest.h> diff --git a/hbase-native-client/core/time_range.cc b/hbase-native-client/core/time-range.cc similarity index 98% rename from hbase-native-client/core/time_range.cc rename to hbase-native-client/core/time-range.cc index 04b70ec..e6b789b 100644 --- a/hbase-native-client/core/time_range.cc +++ b/hbase-native-client/core/time-range.cc @@ -17,7 +17,7 @@ * */ -#include "core/time_range.h" +#include "core/time-range.h" #include <limits> #include <stdexcept> #include <string> diff --git a/hbase-native-client/core/time_range.h b/hbase-native-client/core/time-range.h similarity index 100% rename from hbase-native-client/core/time_range.h rename to hbase-native-client/core/time-range.h diff --git a/hbase-native-client/test-util/mini-cluster.cc b/hbase-native-client/test-util/mini-cluster.cc index b40b689..88a091c 100644 --- a/hbase-native-client/test-util/mini-cluster.cc +++ b/hbase-native-client/test-util/mini-cluster.cc @@ -19,17 +19,11 @@ #include "test-util/mini-cluster.h" #include <glog/logging.h> -#include <gtest/gtest.h> +#include <fcntl.h> #include <boost/filesystem/operations.hpp> #include <boost/filesystem/fstream.hpp> #include <fstream> -#include "core/client.h" -#include "core/configuration.h" -#include "core/get.h" -#include "core/hbase_configuration_loader.h" -#include "core/result.h" -#include "core/table.h" -#include "serde/table-name.h" + using hbase::MiniCluster; diff --git a/hbase-native-client/test-util/mini-cluster.h b/hbase-native-client/test-util/mini-cluster.h index 9b8ca92..54842e1 100644 --- a/hbase-native-client/test-util/mini-cluster.h +++ b/hbase-native-client/test-util/mini-cluster.h @@ -18,17 +18,11 @@ */ #pragma once -#include <gtest/gtest.h> #include <string> -#include "core/client.h" -#include "core/configuration.h" -#include "core/get.h" -#include "core/hbase_configuration_loader.h" -#include "core/result.h" -#include "core/table.h" #include "jni.h" -#include "serde/table-name.h" + namespace hbase { + class MiniCluster { public: jobject StartCluster(int numRegionServers, std::string conf_path);
