You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2013/06/04 02:06:26 UTC
svn commit: r1489239 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./
src/main/native/src/org/apache/hadoop/io/compress/snappy/
Author: suresh
Date: Tue Jun 4 00:06:26 2013
New Revision: 1489239
URL: http://svn.apache.org/r1489239
Log:
HADOOP-9481. Merge r1481191 from trunk
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489239&r1=1489238&r2=1489239&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 4 00:06:26 2013
@@ -207,6 +207,9 @@ Release 2.1.0-beta - UNRELEASED
(which in turn throws SIGABRT) causing client crashes. (Colin Patrick
McCabe via atm)
+ HADOOP-9481. Broken conditional logic with HADOOP_SNAPPY_LIBRARY. (Vadim
+ Bondarev via atm)
+
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c?rev=1489239&r1=1489238&r2=1489239&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c Tue Jun 4 00:06:26 2013
@@ -17,6 +17,8 @@
*/
+#include "org_apache_hadoop_io_compress_snappy.h"
+
#if defined HADOOP_SNAPPY_LIBRARY
#include <stdio.h>
@@ -28,7 +30,6 @@
#include "config.h"
#endif // UNIX
-#include "org_apache_hadoop_io_compress_snappy.h"
#include "org_apache_hadoop_io_compress_snappy_SnappyCompressor.h"
#define JINT_MAX 0x7fffffff
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c?rev=1489239&r1=1489238&r2=1489239&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c Tue Jun 4 00:06:26 2013
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+#include "org_apache_hadoop_io_compress_snappy.h"
#if defined HADOOP_SNAPPY_LIBRARY
@@ -24,11 +25,10 @@
#include <string.h>
#ifdef UNIX
-#include "config.h"
#include <dlfcn.h>
+#include "config.h"
#endif
-#include "org_apache_hadoop_io_compress_snappy.h"
#include "org_apache_hadoop_io_compress_snappy_SnappyDecompressor.h"
static jfieldID SnappyDecompressor_clazz;