From 54f9f75a443d7d167a7aa7d04a87e3f5af049887 Mon Sep 17 00:00:00 2001 From: Takanobu Asanuma Date: Fri, 14 Jun 2019 10:17:25 +0900 Subject: [PATCH] HADOOP-16369. Fix zstandard shortname misspelled as zts. Contributed by Jonathan Eagles. --- hadoop-common-project/hadoop-common/pom.xml | 4 ++-- .../org/apache/hadoop/io/compress/zstd/ZStandardCompressor.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 5b600538d6..b507b8b155 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -741,7 +741,7 @@ - false + false true @@ -844,7 +844,7 @@ /p:CustomZstdPrefix=${zstd.prefix} /p:CustomZstdLib=${zstd.lib} /p:CustomZstdInclude=${zstd.include} - /p:RequireZstd=${require.ztsd} + /p:RequireZstd=${require.zstd} /p:CustomOpensslPrefix=${openssl.prefix} /p:CustomOpensslLib=${openssl.lib} /p:CustomOpensslInclude=${openssl.include} diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zstd/ZStandardCompressor.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zstd/ZStandardCompressor.c index 289554b4cf..41eb9e2c85 100644 --- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/zstd/ZStandardCompressor.c +++ b/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; #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) { #ifdef UNIX // Load libzstd.so