Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

(cherry picked from commit 54f9f75a44)
This commit is contained in:
Takanobu Asanuma 2019-06-14 10:17:25 +09:00
parent e9eaf21874
commit 64102e865f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/pom.xml
View File

@ -670,7 +670,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>
@ -777,7 +777,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>

2
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zstd/ZStandardCompressor.c
View File

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