[hadoop] branch branch-3.1 updated: HADOOP-16369. Fix zstandard shortname misspelled as zts. Contributed by Jonathan Eagles.

[tasanuma]

This is an automated email from the ASF dual-hosted git repository.

tasanuma pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.1 by this push:
     new 94e66ba  HADOOP-16369. Fix zstandard shortname misspelled as zts. 
Contributed by Jonathan Eagles.
94e66ba is described below

commit 94e66ba3385588063a88c9bf2e6591ebb34614cd
Author: Takanobu Asanuma <tasan...@apache.org>
AuthorDate: Fri Jun 14 10:17:25 2019 +0900

    HADOOP-16369. Fix zstandard shortname misspelled as zts. Contributed by 
Jonathan Eagles.
    
    (cherry picked from commit 54f9f75a443d7d167a7aa7d04a87e3f5af049887)
---
 hadoop-common-project/hadoop-common/pom.xml                           | 4 ++--
 .../src/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 26d4aa5..8f75688 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -765,7 +765,7 @@
         <zstd.prefix></zstd.prefix>
         <zstd.lib></zstd.lib>
         <zstd.include></zstd.include>
-        <require.ztsd>false</require.ztsd>
+        <require.zstd>false</require.zstd>
         <bundle.zstd.in.bin>true</bundle.zstd.in.bin>
         <openssl.prefix></openssl.prefix>
         <openssl.lib></openssl.lib>
@@ -905,7 +905,7 @@
                     <argument>/p:CustomZstdPrefix=${zstd.prefix}</argument>
                     <argument>/p:CustomZstdLib=${zstd.lib}</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:CustomOpensslLib=${openssl.lib}</argument>
                     
<argument>/p:CustomOpensslInclude=${openssl.include}</argument>
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 289554b..41eb9e2 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


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org