This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch libhdfs3
in repository https://gitbox.apache.org/repos/asf/doris-thirdparty.git
The following commit(s) were added to refs/heads/libhdfs3 by this push:
new 0173fe1 [Enhancement] make libhdfs3 compatible with hdfs2 server (#15)
0173fe1 is described below
commit 0173fe17f5dff0ae85fae85b8e1dc7bd7a0d8677
Author: dujl <dujlm...@gmail.com>
AuthorDate: Tue Dec 6 21:57:21 2022 +0800
[Enhancement] make libhdfs3 compatible with hdfs2 server (#15)
When doris be getFileStatus from HDFS2 server, libhdfs3 will throw exception
because of the permissio code returned by hdfs2 server is greater than
1<<12.
The bit 12 of permissio code is aclBit which has been deprecated in hadoop3.
so we remove the check code in libhdfs3, same as hadoop3 java project.
---
CHANGELOG.md | 3 +++
src/CMakeLists.txt | 16 ++++++++--------
src/client/Permission.cpp | 6 ------
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3247a15..26031ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
# CHANGELOG
+## 2.3.4
+1. Support hadoop2 server
+
## v2.3.3
1. Support CRC32 checksum
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 75d4607..1548d3a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
SET(libhdfs3_VERSION_MAJOR 2)
SET(libhdfs3_VERSION_MINOR 3)
-SET(libhdfs3_VERSION_PATCH 3)
+SET(libhdfs3_VERSION_PATCH 4)
SET(libhdfs3_VERSION_STRING
"${libhdfs3_VERSION_MAJOR}.${libhdfs3_VERSION_MINOR}.${libhdfs3_VERSION_PATCH}")
SET(libhdfs3_VERSION_API 1)
SET(libhdfs3_ROOT_SOURCES_DIR ${CMAKE_SOURCE_DIR}/src)
@@ -32,7 +32,7 @@ SET(libhdfs3_PROTO_FILES ${libhdfs3_PROTO_FILES} PARENT_SCOPE)
PROTOBUF_GENERATE_CPP(libhdfs3_PROTO_SOURCES libhdfs3_PROTO_HEADERS
${libhdfs3_PROTO_FILES})
-SET(HEADER
+SET(HEADER
client/BlockLocation.h
client/DirectoryIterator.h
client/FileStatus.h
@@ -66,7 +66,7 @@ IF(BUILD_STATIC_LIBS)
)
TARGET_LINK_LIBRARIES(libhdfs3-static pthread)
-
+
IF(NEED_BOOST)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(libhdfs3-static boost_thread)
@@ -97,7 +97,7 @@ IF(BUILD_STATIC_LIBS)
ARCHIVE DESTINATION lib)
ENDIF(BUILD_STATIC_LIBS)
-IF(BUILD_SHARED_LIBS)
+IF(BUILD_SHARED_LIBS)
ADD_LIBRARY(libhdfs3-shared SHARED ${libhdfs3_SOURCES}
${libhdfs3_PROTO_SOURCES} ${libhdfs3_PROTO_HEADERS})
ADD_CUSTOM_COMMAND(
TARGET libhdfs3-shared
@@ -107,7 +107,7 @@ IF(BUILD_SHARED_LIBS)
)
TARGET_LINK_LIBRARIES(libhdfs3-shared pthread)
-
+
IF(NEED_BOOST)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(libhdfs3-shared boost_thread)
@@ -132,8 +132,8 @@ IF(BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES(libhdfs3-shared PROPERTIES LINK_FLAGS
"-L${Boost_LIBRARY_DIRS}")
ENDIF(NEED_BOOST)
- SET_TARGET_PROPERTIES(libhdfs3-shared PROPERTIES
- VERSION
${libhdfs3_VERSION_MAJOR}.${libhdfs3_VERSION_MINOR}.${libhdfs3_VERSION_PATCH}
+ SET_TARGET_PROPERTIES(libhdfs3-shared PROPERTIES
+ VERSION
${libhdfs3_VERSION_MAJOR}.${libhdfs3_VERSION_MINOR}.${libhdfs3_VERSION_PATCH}
SOVERSION ${libhdfs3_VERSION_API})
INSTALL(TARGETS libhdfs3-shared
@@ -145,7 +145,7 @@ ENDIF(BUILD_SHARED_LIBS)
INSTALL(FILES ${HEADER} DESTINATION include/hdfs)
INSTALL(FILES libhdfs3.pc DESTINATION lib/pkgconfig)
-
+
SET(libhdfs3_SOURCES ${libhdfs3_SOURCES} PARENT_SCOPE)
SET(libhdfs3_PLATFORM_HEADER_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
SET(libhdfs3_ROOT_SOURCES_DIR ${libhdfs3_ROOT_SOURCES_DIR} PARENT_SCOPE)
diff --git a/src/client/Permission.cpp b/src/client/Permission.cpp
index da5ec51..5d5d4b2 100644
--- a/src/client/Permission.cpp
+++ b/src/client/Permission.cpp
@@ -27,12 +27,6 @@
namespace Hdfs {
Permission::Permission(uint16_t mode) {
- if (mode >> 10) {
- THROW(InvalidParameter,
- "Invalid parameter: cannot convert %u to \"Permission\"",
- static_cast<unsigned int>(mode));
- }
-
userAction = (Action)((mode >> 6) & 7);
groupAction = (Action)((mode >> 3) & 7);
otherAction = (Action)(mode & 7);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
