Repository: hadoop
Updated Branches:
  refs/heads/branch-2 6856a7183 -> 9df2e5416


HADOOP-12972. Lz4Compressor#getLibraryName returns the wrong version number 
(cmccabe)

(cherry picked from commit e3d15a2e236f93325c67f9e52fb16f645c44238a)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9df2e541
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9df2e541
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9df2e541

Branch: refs/heads/branch-2
Commit: 9df2e54160d3d959138857757d2d64d595b54093
Parents: 6856a71
Author: Colin Patrick Mccabe <[email protected]>
Authored: Tue Mar 29 17:13:52 2016 -0700
Committer: Colin Patrick Mccabe <[email protected]>
Committed: Tue Mar 29 17:14:36 2016 -0700

----------------------------------------------------------------------
 .../native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9df2e541/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c
----------------------------------------------------------------------
diff --git 
a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c
 
b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c
index f742384..2c8af1b 100644
--- 
a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c
+++ 
b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/lz4/Lz4Compressor.c
@@ -87,7 +87,9 @@ JNIEXPORT jstring JNICALL
 Java_org_apache_hadoop_io_compress_lz4_Lz4Compressor_getLibraryName(
  JNIEnv *env, jclass class
  ) {
-  return (*env)->NewStringUTF(env, "revision:99");
+  char version_buf[128];
+  snprintf(version_buf, sizeof(version_buf), "revision:%d", 
LZ4_versionNumber());
+  return (*env)->NewStringUTF(env, version_buf);
 }
 
 JNIEXPORT jint JNICALL 
Java_org_apache_hadoop_io_compress_lz4_Lz4Compressor_compressBytesDirectHC

Reply via email to