From dc335474a6592bac8298702494f78733c234a950 Mon Sep 17 00:00:00 2001
From: James <jhc@apache.org>
Date: Wed, 13 Jan 2016 11:03:29 -0500
Subject: [PATCH] HDFS-9636.  libhdfs++: for consistency, include files should
 be in hdfspp.  Contributed by Bob Hansen.

---
 .../src/main/native/libhdfspp/CMakeLists.txt                  | 4 ++--
 .../native/libhdfspp/include/{libhdfspp => hdfspp}/hdfs_ext.h | 0
 .../native/libhdfspp/include/{libhdfspp => hdfspp}/hdfspp.h   | 4 ++--
 .../native/libhdfspp/include/{libhdfspp => hdfspp}/options.h  | 0
 .../native/libhdfspp/include/{libhdfspp => hdfspp}/status.h   | 0
 .../src/main/native/libhdfspp/lib/bindings/c/hdfs.cc          | 2 +-
 .../src/main/native/libhdfspp/lib/common/continuation/asio.h  | 2 +-
 .../native/libhdfspp/lib/common/continuation/continuation.h   | 2 +-
 .../src/main/native/libhdfspp/lib/common/hdfs_configuration.h | 2 +-
 .../src/main/native/libhdfspp/lib/common/hdfs_public_api.h    | 2 +-
 .../src/main/native/libhdfspp/lib/common/options.cc           | 2 +-
 .../src/main/native/libhdfspp/lib/common/sasl_authenticator.h | 2 +-
 .../src/main/native/libhdfspp/lib/common/status.cc            | 2 +-
 .../src/main/native/libhdfspp/lib/common/util.h               | 2 +-
 .../src/main/native/libhdfspp/lib/fs/bad_datanode_tracker.h   | 4 ++--
 .../src/main/native/libhdfspp/lib/fs/filesystem.h             | 2 +-
 .../src/main/native/libhdfspp/lib/reader/block_reader.h       | 2 +-
 .../src/main/native/libhdfspp/lib/reader/datatransfer.cc      | 2 +-
 .../src/main/native/libhdfspp/lib/rpc/rpc_engine.h            | 4 ++--
 .../src/main/native/libhdfspp/tests/hdfspp_errors.cc          | 3 +--
 20 files changed, 21 insertions(+), 22 deletions(-)
 rename hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/{libhdfspp => hdfspp}/hdfs_ext.h (100%)
 rename hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/{libhdfspp => hdfspp}/hdfspp.h (98%)
 rename hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/{libhdfspp => hdfspp}/options.h (100%)
 rename hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/{libhdfspp => hdfspp}/status.h (100%)

diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
index d8e8c59fa00..847500082f1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
@@ -165,8 +165,8 @@ set_target_properties(hdfspp PROPERTIES
 # Can be installed to a particular location via "make DESTDIR=... install"
 file(GLOB_RECURSE LIBHDFSPP_HEADER_FILES "${CMAKE_CURRENT_LIST_DIR}/include/*.h*")
 file(GLOB_RECURSE LIBHDFS_HEADER_FILES "${HADOOP_IMPORT_DIR}/include/*.h*")
-install(FILES ${LIBHDFSPP_HEADER_FILES} DESTINATION /include/libhdfspp)
-install(FILES ${LIBHDFS_HEADER_FILES} DESTINATION /include/libhdfs)
+install(FILES ${LIBHDFSPP_HEADER_FILES} DESTINATION /include/hdfspp)
+install(FILES ${LIBHDFS_HEADER_FILES} DESTINATION /include/hdfs)
 
 install(TARGETS hdfspp_static ARCHIVE DESTINATION /lib)
 install(TARGETS hdfspp LIBRARY DESTINATION /lib)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/libhdfspp/hdfs_ext.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/hdfs_ext.h
similarity index 100%
rename from hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/libhdfspp/hdfs_ext.h
rename to hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/hdfs_ext.h
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/libhdfspp/hdfspp.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/hdfspp.h
similarity index 98%
rename from hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/libhdfspp/hdfspp.h
rename to hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/hdfspp.h
index ebcf2272d12..effdecb3618 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/libhdfspp/hdfspp.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/hdfspp.h
@@ -18,8 +18,8 @@
 #ifndef LIBHDFSPP_HDFSPP_H_
 #define LIBHDFSPP_HDFSPP_H_
 
-#include "libhdfspp/options.h"
-#include "libhdfspp/status.h"
+#include "hdfspp/options.h"
+#include "hdfspp/status.h"
 
 #include <functional>
 #include <memory>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/libhdfspp/options.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/options.h
similarity index 100%
rename from hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/libhdfspp/options.h
rename to hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/options.h
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/libhdfspp/status.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/status.h
similarity index 100%
rename from hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/libhdfspp/status.h
rename to hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/status.h
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/bindings/c/hdfs.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/bindings/c/hdfs.cc
index 0fc02b4bfa1..1d96d766625 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/bindings/c/hdfs.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/bindings/c/hdfs.cc
@@ -19,7 +19,7 @@
 #include "fs/filesystem.h"
 
 #include <hdfs/hdfs.h>
-#include <libhdfspp/hdfs_ext.h>
+#include <hdfspp/hdfs_ext.h>
 
 #include <string>
 #include <cstring>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/continuation/asio.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/continuation/asio.h
index a5a0446bca8..039daf787d3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/continuation/asio.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/continuation/asio.h
@@ -21,7 +21,7 @@
 #include "continuation.h"
 #include "common/util.h"
 
-#include "libhdfspp/status.h"
+#include "hdfspp/status.h"
 
 #include <asio/connect.hpp>
 #include <asio/read.hpp>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/continuation/continuation.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/continuation/continuation.h
index 0af04a8d59d..58a1b468ba2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/continuation/continuation.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/continuation/continuation.h
@@ -18,7 +18,7 @@
 #ifndef LIB_COMMON_CONTINUATION_CONTINUATION_H_
 #define LIB_COMMON_CONTINUATION_CONTINUATION_H_
 
-#include "libhdfspp/status.h"
+#include "hdfspp/status.h"
 
 #include <functional>
 #include <memory>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/hdfs_configuration.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/hdfs_configuration.h
index ce456d8a002..182cacdb8e6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/hdfs_configuration.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/hdfs_configuration.h
@@ -20,7 +20,7 @@
 #define COMMON_HDFS_CONFIGURATION_H_
 
 #include "common/configuration.h"
-#include "libhdfspp/options.h"
+#include "hdfspp/options.h"
 
 #include <string>
 #include <map>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/hdfs_public_api.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/hdfs_public_api.h
index acd96024e80..1620f62e25c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/hdfs_public_api.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/hdfs_public_api.h
@@ -19,7 +19,7 @@
 #ifndef COMMON_HDFS_PUBLIC_API_H_
 #define COMMON_HDFS_PUBLIC_API_H_
 
-#include "libhdfspp/hdfspp.h"
+#include "hdfspp/hdfspp.h"
 
 #include <asio/io_service.hpp>
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/options.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/options.cc
index 4e8dfbc8419..c7d418f8133 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/options.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/options.cc
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "libhdfspp/options.h"
+#include "hdfspp/options.h"
 
 namespace hdfs {
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/sasl_authenticator.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/sasl_authenticator.h
index 71fee7a92cf..78b2a557449 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/sasl_authenticator.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/sasl_authenticator.h
@@ -18,7 +18,7 @@
 #ifndef LIB_COMMON_SASL_AUTHENTICATOR_H_
 #define LIB_COMMON_SASL_AUTHENTICATOR_H_
 
-#include "libhdfspp/status.h"
+#include "hdfspp/status.h"
 
 namespace hdfs {
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/status.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/status.cc
index 66cfa1c406d..828f6aa23d7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/status.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/status.cc
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "libhdfspp/status.h"
+#include "hdfspp/status.h"
 
 #include <cassert>
 #include <cstring>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/util.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/util.h
index 391d4c794c5..60f70e54b47 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/util.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/common/util.h
@@ -18,7 +18,7 @@
 #ifndef LIB_COMMON_UTIL_H_
 #define LIB_COMMON_UTIL_H_
 
-#include "libhdfspp/status.h"
+#include "hdfspp/status.h"
 
 #include <sstream>
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/fs/bad_datanode_tracker.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/fs/bad_datanode_tracker.h
index 72855dc58d9..1d596ad543b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/fs/bad_datanode_tracker.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/fs/bad_datanode_tracker.h
@@ -25,8 +25,8 @@
 #include <string>
 #include <set>
 
-#include "libhdfspp/options.h"
-#include "libhdfspp/hdfspp.h"
+#include "hdfspp/options.h"
+#include "hdfspp/hdfspp.h"
 
 namespace hdfs {
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/fs/filesystem.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/fs/filesystem.h
index df618721abb..0ae032d86c2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/fs/filesystem.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/fs/filesystem.h
@@ -21,7 +21,7 @@
 #include "filehandle.h"
 #include "common/hdfs_public_api.h"
 #include "common/async_stream.h"
-#include "libhdfspp/hdfspp.h"
+#include "hdfspp/hdfspp.h"
 #include "fs/bad_datanode_tracker.h"
 #include "rpc/rpc_engine.h"
 #include "reader/block_reader.h"
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/block_reader.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/block_reader.h
index 140286b9fcd..7984c7ea0d2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/block_reader.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/block_reader.h
@@ -18,7 +18,7 @@
 #ifndef BLOCK_READER_H_
 #define BLOCK_READER_H_
 
-#include "libhdfspp/status.h"
+#include "hdfspp/status.h"
 #include "common/async_stream.h"
 #include "datatransfer.pb.h"
 #include "connection/datanodeconnection.h"
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/datatransfer.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/datatransfer.cc
index d936407d543..c3cbf7e3bba 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/datatransfer.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/reader/datatransfer.cc
@@ -18,7 +18,7 @@
 
 #include "datatransfer.h"
 
-#include "libhdfspp/status.h"
+#include "hdfspp/status.h"
 
 namespace hdfs {
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.h
index e6beef6f2e1..fb1844d0610 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.h
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/rpc/rpc_engine.h
@@ -18,8 +18,8 @@
 #ifndef LIB_RPC_RPC_ENGINE_H_
 #define LIB_RPC_RPC_ENGINE_H_
 
-#include "libhdfspp/options.h"
-#include "libhdfspp/status.h"
+#include "hdfspp/options.h"
+#include "hdfspp/status.h"
 
 #include "common/retry_policy.h"
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/hdfspp_errors.cc b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/hdfspp_errors.cc
index 0cb65455892..f49f5fab5d9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/hdfspp_errors.cc
+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/hdfspp_errors.cc
@@ -18,7 +18,7 @@
 
 
 #include <hdfs/hdfs.h>
-#include <libhdfspp/hdfs_ext.h>
+#include <hdfspp/hdfs_ext.h>
 
 #include <google/protobuf/io/coded_stream.h>
 #include <gmock/gmock.h>
@@ -114,4 +114,3 @@ int main(int argc, char *argv[]) {
 
   return exit_code;
 }
-