Merge pull request #50 from ClibMouse/HDFS_support_s390x

jsc0218 · web-flow · commit bdcb91354b1c · 2023-10-31T20:04:49.000-04:00
Changes to support the HDFS for s390x
diff --git a/src/client/LocalBlockReader.cpp b/src/client/LocalBlockReader.cpp
@@ -87,7 +87,7 @@ LocalBlockReader::LocalBlockReader(const shared_ptr<ReadShortCircuitInfo>& info,
 #if defined(__SSE4_2__) && defined(__LP64__)
             checksum = std::make_shared<IntelAsmCrc32c>();
 #else
-#if !((defined(__PPC64__) || defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+#if !(((defined(__PPC64__) || defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || (defined(__s390x__)))
             if (HWCrc32c::available()) {
                 checksum = shared_ptr<Checksum>(new HWCrc32c());
             } else
diff --git a/src/client/OutputStreamImpl.cpp b/src/client/OutputStreamImpl.cpp
@@ -55,7 +55,7 @@ OutputStreamImpl::OutputStreamImpl() :
 #if defined(__SSE4_2__) && defined(__LP64__)
     checksum = std::make_shared<IntelAsmCrc32c>();
 #else
-#if !((defined(__PPC64__) || defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+#if !(((defined(__PPC64__) || defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || (defined(__s390x__)))
     if (HWCrc32c::available()) {
         checksum = shared_ptr < Checksum > (new HWCrc32c());
     } else
diff --git a/src/client/RemoteBlockReader.cpp b/src/client/RemoteBlockReader.cpp
@@ -163,7 +163,7 @@ void RemoteBlockReader::checkResponse() {
 #if defined(__SSE4_2__) && defined(__LP64__)
         checksum = std::make_shared<IntelAsmCrc32c>();
 #else
-#if !((defined(__PPC64__) || defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+#if !(((defined(__PPC64__) || defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || (defined(__s390x__)))
         if (HWCrc32c::available()) {
             checksum = shared_ptr<Checksum>(new HWCrc32c());
         } else
diff --git a/src/common/HWCrc32c.cpp b/src/common/HWCrc32c.cpp
@@ -93,7 +93,7 @@ bool HWCrc32c::available() {
 #endif
 }
 
-#if !((defined(__ppc__) || defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
+#if !(((defined(__PPC64__) || defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) || (defined(__s390x__)))
 void HWCrc32c::update(const void * b, int len) {
     const char * p = static_cast<const char *>(b);
 #if defined(__LP64__)

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ bool HWCrc32c::available() {`
`93`	`93`	`#endif`
`94`	`94`	`}`
`95`	`95`
`96`		`-#if !((defined(__ppc__) \|\| defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))`
	`96`	`+#if !(((defined(__PPC64__) \|\| defined(__powerpc64__)) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) \|\| (defined(__s390x__)))`
`97`	`97`	`void HWCrc32c::update(const void * b, int len) {`
`98`	`98`	`const char * p = static_cast<const char *>(b);`
`99`	`99`	`#if defined(__LP64__)`