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

HADOOP-9481. Merge r1481191 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489239 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-06-04 00:06:26 +00:00
parent 620c7fe36f
commit 198cb3ebdd
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -207,6 +207,9 @@ Release 2.1.0-beta - UNRELEASED
(which in turn throws SIGABRT) causing client crashes. (Colin Patrick (which in turn throws SIGABRT) causing client crashes. (Colin Patrick
McCabe via atm) McCabe via atm)
HADOOP-9481. Broken conditional logic with HADOOP_SNAPPY_LIBRARY. (Vadim
Bondarev via atm)
BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
HADOOP-8924. Hadoop Common creating package-info.java must not depend on HADOOP-8924. Hadoop Common creating package-info.java must not depend on

3
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c
View File

@ -17,6 +17,8 @@
*/ */
#include "org_apache_hadoop_io_compress_snappy.h"
#if defined HADOOP_SNAPPY_LIBRARY #if defined HADOOP_SNAPPY_LIBRARY
#include <stdio.h> #include <stdio.h>
@ -28,7 +30,6 @@
#include "config.h" #include "config.h"
#endif // UNIX #endif // UNIX
#include "org_apache_hadoop_io_compress_snappy.h"
#include "org_apache_hadoop_io_compress_snappy_SnappyCompressor.h" #include "org_apache_hadoop_io_compress_snappy_SnappyCompressor.h"
#define JINT_MAX 0x7fffffff #define JINT_MAX 0x7fffffff

4
hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c
View File

@ -16,6 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "org_apache_hadoop_io_compress_snappy.h"
#if defined HADOOP_SNAPPY_LIBRARY #if defined HADOOP_SNAPPY_LIBRARY
@ -24,11 +25,10 @@
#include <string.h> #include <string.h>
#ifdef UNIX #ifdef UNIX
#include "config.h"
#include <dlfcn.h> #include <dlfcn.h>
#include "config.h"
#endif #endif
#include "org_apache_hadoop_io_compress_snappy.h"
#include "org_apache_hadoop_io_compress_snappy_SnappyDecompressor.h" #include "org_apache_hadoop_io_compress_snappy_SnappyDecompressor.h"
static jfieldID SnappyDecompressor_clazz; static jfieldID SnappyDecompressor_clazz;