This is an automated email from the ASF dual-hosted git repository.
gavinchou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 50a829f6122 [fix](recycler) Fix recycler compilation issue with
libhdfs3 (#38485)
50a829f6122 is described below
commit 50a829f61220fa8b46b6582b731c0fc56cfeceeb
Author: Ganlin Zhao <[email protected]>
AuthorDate: Thu Aug 1 23:57:04 2024 +0800
[fix](recycler) Fix recycler compilation issue with libhdfs3 (#38485)
This PR fix compilation error for cloud recycler when the USE_LIBHDFS3
flag is enabled.
---
cloud/src/recycler/hdfs_accessor.cpp | 6 +++++-
cloud/src/recycler/hdfs_accessor.h | 4 ++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/cloud/src/recycler/hdfs_accessor.cpp
b/cloud/src/recycler/hdfs_accessor.cpp
index 5531243ef03..801f4df2b87 100644
--- a/cloud/src/recycler/hdfs_accessor.cpp
+++ b/cloud/src/recycler/hdfs_accessor.cpp
@@ -18,7 +18,11 @@
#include "recycler/hdfs_accessor.h"
#include <gen_cpp/cloud.pb.h>
-#include <hadoop_hdfs/hdfs.h>
+#ifdef USE_HADOOP_HDFS
+#include <hadoop_hdfs/hdfs.h> // IWYU pragma: export
+#else
+#include <hdfs/hdfs.h> // IWYU pragma: export
+#endif
#include <string_view>
diff --git a/cloud/src/recycler/hdfs_accessor.h
b/cloud/src/recycler/hdfs_accessor.h
index 57f29cc1ae1..bfbe02aadc9 100644
--- a/cloud/src/recycler/hdfs_accessor.h
+++ b/cloud/src/recycler/hdfs_accessor.h
@@ -29,7 +29,11 @@ namespace doris::cloud {
class HdfsVaultInfo;
+#ifdef USE_HADOOP_HDFS
using HdfsSPtr = std::shared_ptr<struct hdfs_internal>;
+#else
+using HdfsSPtr = std::shared_ptr<struct HdfsFileSystemInternalWrapper>;
+#endif
class HdfsAccessor final : public StorageVaultAccessor {
public:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
