Browse Source

HADOOP-16369. Fix zstandard shortname misspelled as zts. Contributed by Jonathan Eagles.

Takanobu Asanuma 5 years ago
parent
commit
54f9f75a44

+ 2 - 2
hadoop-common-project/hadoop-common/pom.xml

@@ -741,7 +741,7 @@
         <zstd.prefix></zstd.prefix>
         <zstd.prefix></zstd.prefix>
         <zstd.lib></zstd.lib>
         <zstd.lib></zstd.lib>
         <zstd.include></zstd.include>
         <zstd.include></zstd.include>
-        <require.ztsd>false</require.ztsd>
+        <require.zstd>false</require.zstd>
         <bundle.zstd.in.bin>true</bundle.zstd.in.bin>
         <bundle.zstd.in.bin>true</bundle.zstd.in.bin>
         <openssl.prefix></openssl.prefix>
         <openssl.prefix></openssl.prefix>
         <openssl.lib></openssl.lib>
         <openssl.lib></openssl.lib>
@@ -844,7 +844,7 @@
                     <argument>/p:CustomZstdPrefix=${zstd.prefix}</argument>
                     <argument>/p:CustomZstdPrefix=${zstd.prefix}</argument>
                     <argument>/p:CustomZstdLib=${zstd.lib}</argument>
                     <argument>/p:CustomZstdLib=${zstd.lib}</argument>
                     <argument>/p:CustomZstdInclude=${zstd.include}</argument>
                     <argument>/p:CustomZstdInclude=${zstd.include}</argument>
-                    <argument>/p:RequireZstd=${require.ztsd}</argument>
+                    <argument>/p:RequireZstd=${require.zstd}</argument>
                     <argument>/p:CustomOpensslPrefix=${openssl.prefix}</argument>
                     <argument>/p:CustomOpensslPrefix=${openssl.prefix}</argument>
                     <argument>/p:CustomOpensslLib=${openssl.lib}</argument>
                     <argument>/p:CustomOpensslLib=${openssl.lib}</argument>
                     <argument>/p:CustomOpensslInclude=${openssl.include}</argument>
                     <argument>/p:CustomOpensslInclude=${openssl.include}</argument>

+ 1 - 1
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zstd/ZStandardCompressor.c

@@ -78,7 +78,7 @@ static __dlsym_ZSTD_isError dlsym_ZSTD_isError;
 static __dlsym_ZSTD_getErrorName dlsym_ZSTD_getErrorName;
 static __dlsym_ZSTD_getErrorName dlsym_ZSTD_getErrorName;
 #endif
 #endif
 
 
-// Load the libztsd.so from disk
+// Load the libzstd.so from disk
 JNIEXPORT void JNICALL Java_org_apache_hadoop_io_compress_zstd_ZStandardCompressor_initIDs (JNIEnv *env, jclass clazz) {
 JNIEXPORT void JNICALL Java_org_apache_hadoop_io_compress_zstd_ZStandardCompressor_initIDs (JNIEnv *env, jclass clazz) {
 #ifdef UNIX
 #ifdef UNIX
     // Load libzstd.so
     // Load libzstd.so