Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8F05C73F7 for ; Fri, 16 Sep 2011 18:53:00 +0000 (UTC) Received: (qmail 15217 invoked by uid 500); 16 Sep 2011 18:53:00 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 15193 invoked by uid 500); 16 Sep 2011 18:53:00 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 15186 invoked by uid 99); 16 Sep 2011 18:53:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Sep 2011 18:53:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Sep 2011 18:52:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EBC1D23888EA; Fri, 16 Sep 2011 18:52:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1171719 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java Date: Fri, 16 Sep 2011 18:52:38 -0000 To: common-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110916185238.EBC1D23888EA@eris.apache.org> Author: todd Date: Fri Sep 16 18:52:38 2011 New Revision: 1171719 URL: http://svn.apache.org/viewvc?rev=1171719&view=rev Log: HADOOP-7608. SnappyCodec check for Hadoop native lib is wrong. Contributed by Alejandro Abdelnur. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1171719&r1=1171718&r2=1171719&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri Sep 16 18:52:38 2011 @@ -591,6 +591,9 @@ Release 0.23.0 - Unreleased HADOOP-7629. Allow immutable FsPermission objects to be used as IPC parameters. (todd) + HADOOP-7608. SnappyCodec check for Hadoop native lib is wrong + (Alejandro Abdelnur via todd) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java?rev=1171719&r1=1171718&r2=1171719&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/SnappyCodec.java Fri Sep 16 18:52:38 2011 @@ -28,6 +28,7 @@ import org.apache.hadoop.io.compress.sna import org.apache.hadoop.io.compress.snappy.SnappyCompressor; import org.apache.hadoop.io.compress.snappy.SnappyDecompressor; import org.apache.hadoop.fs.CommonConfigurationKeys; +import org.apache.hadoop.util.NativeCodeLoader; /** * This class creates snappy compressors/decompressors. @@ -63,13 +64,10 @@ public class SnappyCodec implements Conf /** * Are the native snappy libraries loaded & initialized? * - * @param conf configuration * @return true if loaded & initialized, otherwise false */ - public static boolean isNativeSnappyLoaded(Configuration conf) { - return LoadSnappy.isLoaded() && conf.getBoolean( - CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_KEY, - CommonConfigurationKeys.IO_NATIVE_LIB_AVAILABLE_DEFAULT); + public static boolean isNativeCodeLoaded() { + return LoadSnappy.isLoaded() && NativeCodeLoader.isNativeCodeLoaded(); } /** @@ -99,7 +97,7 @@ public class SnappyCodec implements Conf public CompressionOutputStream createOutputStream(OutputStream out, Compressor compressor) throws IOException { - if (!isNativeSnappyLoaded(conf)) { + if (!isNativeCodeLoaded()) { throw new RuntimeException("native snappy library not available"); } int bufferSize = conf.getInt( @@ -119,7 +117,7 @@ public class SnappyCodec implements Conf */ @Override public Class getCompressorType() { - if (!isNativeSnappyLoaded(conf)) { + if (!isNativeCodeLoaded()) { throw new RuntimeException("native snappy library not available"); } @@ -133,7 +131,7 @@ public class SnappyCodec implements Conf */ @Override public Compressor createCompressor() { - if (!isNativeSnappyLoaded(conf)) { + if (!isNativeCodeLoaded()) { throw new RuntimeException("native snappy library not available"); } int bufferSize = conf.getInt( @@ -169,7 +167,7 @@ public class SnappyCodec implements Conf public CompressionInputStream createInputStream(InputStream in, Decompressor decompressor) throws IOException { - if (!isNativeSnappyLoaded(conf)) { + if (!isNativeCodeLoaded()) { throw new RuntimeException("native snappy library not available"); } @@ -185,7 +183,7 @@ public class SnappyCodec implements Conf */ @Override public Class getDecompressorType() { - if (!isNativeSnappyLoaded(conf)) { + if (!isNativeCodeLoaded()) { throw new RuntimeException("native snappy library not available"); } @@ -199,7 +197,7 @@ public class SnappyCodec implements Conf */ @Override public Decompressor createDecompressor() { - if (!isNativeSnappyLoaded(conf)) { + if (!isNativeCodeLoaded()) { throw new RuntimeException("native snappy library not available"); } int bufferSize = conf.getInt(