HDFS-9636. libhdfs++: for consistency, include files should be in hdfspp. Contributed by Bob Hansen.

This commit is contained in:
James 2016-01-13 11:03:29 -05:00 committed by James Clampffer
parent 11671c2bf6
commit dc335474a6
20 changed files with 21 additions and 22 deletions

View File

@ -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)

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -16,7 +16,7 @@
* limitations under the License.
*/
#include "libhdfspp/options.h"
#include "hdfspp/options.h"
namespace hdfs {

View File

@ -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 {

View File

@ -16,7 +16,7 @@
* limitations under the License.
*/
#include "libhdfspp/status.h"
#include "hdfspp/status.h"
#include <cassert>
#include <cstring>

View File

@ -18,7 +18,7 @@
#ifndef LIB_COMMON_UTIL_H_
#define LIB_COMMON_UTIL_H_
#include "libhdfspp/status.h"
#include "hdfspp/status.h"
#include <sstream>

View File

@ -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 {

View File

@ -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"

View File

@ -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"

View File

@ -18,7 +18,7 @@
#include "datatransfer.h"
#include "libhdfspp/status.h"
#include "hdfspp/status.h"
namespace hdfs {

View File

@ -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"

View File

@ -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;
}