Modified: hadoop/core/branches/branch-0.20/src/native/configure.ac URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/native/configure.ac?rev=727434&r1=727433&r2=727434&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/native/configure.ac (original) +++ hadoop/core/branches/branch-0.20/src/native/configure.ac Wed Dec 17 08:50:53 2008 @@ -86,9 +86,6 @@ dnl Check for zlib headers AC_CHECK_HEADERS([zlib.h zconf.h], AC_COMPUTE_NEEDED_DSO(z,HADOOP_ZLIB_LIBRARY), AC_MSG_ERROR(Zlib headers were not found... native-hadoop library needs zlib to build. Please install the requisite zlib development package.)) -dnl Check for lzo headers -AC_CHECK_HEADERS([lzo/lzo1.h lzo/lzo1a.h lzo/lzo1b.h lzo/lzo1c.h lzo/lzo1f.h lzo/lzo1x.h lzo/lzo1y.h lzo/lzo1z.h lzo/lzo2a.h lzo/lzo_asm.h], AC_COMPUTE_NEEDED_DSO(lzo2,HADOOP_LZO_LIBRARY), AC_MSG_ERROR(lzo headers were not found... native-hadoop library needs lzo to build. Please install the requisite lzo development package.)) - # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -97,7 +94,6 @@ AC_CONFIG_FILES([Makefile src/org/apache/hadoop/io/compress/zlib/Makefile - src/org/apache/hadoop/io/compress/lzo/Makefile lib/Makefile]) AC_OUTPUT
Modified: hadoop/core/branches/branch-0.20/src/native/lib/Makefile.in URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/native/lib/Makefile.in?rev=727434&r1=727433&r2=727434&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/native/lib/Makefile.in (original) +++ hadoop/core/branches/branch-0.20/src/native/lib/Makefile.in Wed Dec 17 08:50:53 2008 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -46,6 +46,8 @@ # All these are setup by build.xml and/or the top-level makefile. # +SOURCES = $(libhadoop_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -66,7 +68,6 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ host_triplet = @host@ subdir = lib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -95,11 +96,11 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libhadoop_la_SOURCES) DIST_SOURCES = $(libhadoop_la_SOURCES) Modified: hadoop/core/branches/branch-0.20/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in?rev=727434&r1=727433&r2=727434&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in (original) +++ hadoop/core/branches/branch-0.20/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in Wed Dec 17 08:50:53 2008 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.9 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -50,6 +50,8 @@ # assumed to be in $(HADOOP_HOME)/build/native/src/org/apache/hadoop/io/compress/zlib. # +SOURCES = $(libnativezlib_la_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -70,7 +72,6 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = @build@ host_triplet = @host@ subdir = src/org/apache/hadoop/io/compress/zlib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -91,11 +92,11 @@ am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ +LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libnativezlib_la_SOURCES) DIST_SOURCES = $(libnativezlib_la_SOURCES) Modified: hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/FileBench.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/FileBench.java?rev=727434&r1=727433&r2=727434&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/FileBench.java (original) +++ hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/FileBench.java Wed Dec 17 08:50:53 2008 @@ -32,7 +32,6 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.compress.CompressionCodec; -import org.apache.hadoop.io.compress.LzoCodec; import org.apache.hadoop.io.compress.GzipCodec; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.*; @@ -46,12 +45,12 @@ System.out.println( "Usage: Task list: -[no]r -[no]w\n" + " Format: -[no]seq -[no]txt\n" + -" CompressionCodec: -[no]lzo -[no]zip -[no]pln\n" + +" CompressionCodec: -[no]zip -[no]pln\n" + " CompressionType: -[no]blk -[no]rec\n" + " Required: -dir <working dir>\n" + "All valid combinations are implicitly enabled, unless an option is enabled\n" + -"explicitly. For example, specifying \"-lzo\" excludes -zip and -pln,\n" + -"unless they are also explicitly included, as in \"-lzo -zip\"\n" + +"explicitly. For example, specifying \"-zip\", excludes -pln,\n" + +"unless they are also explicitly included, as in \"-pln -zip\"\n" + "Note that CompressionType params only apply to SequenceFiles\n\n" + "Useful options to set:\n" + "-D fs.default.name=\"file:///\" \\\n" + @@ -243,7 +242,7 @@ // overwrought argument processing and wordlist follow enum CCodec { - lzo(LzoCodec.class, ".lzo"), zip(GzipCodec.class, ".gz"), pln(null, ""); + zip(GzipCodec.class, ".gz"), pln(null, ""); Class<? extends CompressionCodec> inf; String ext; Modified: hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/TestSequenceFile.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/TestSequenceFile.java?rev=727434&r1=727433&r2=727434&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/TestSequenceFile.java (original) +++ hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/TestSequenceFile.java Wed Dec 17 08:50:53 2008 @@ -28,7 +28,6 @@ import org.apache.hadoop.io.SequenceFile.CompressionType; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.io.compress.DefaultCodec; -import org.apache.hadoop.io.compress.LzoCodec; import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.conf.*; @@ -48,22 +47,6 @@ LOG.info("Successfully tested SequenceFile with DefaultCodec"); } - public void testLzoSequenceFile() throws Exception { - if (LzoCodec.isNativeLzoLoaded(conf)) { - LOG.info("Testing SequenceFile with LzoCodec"); - CompressionCodec lzoCodec = null; - try { - lzoCodec = (CompressionCodec) ReflectionUtils.newInstance( - conf.getClassByName(LzoCodec.class.getName()), conf); - } catch (ClassNotFoundException cnfe) { - throw new IOException("Cannot find LzoCodec!"); - } - - compressedSeqFileTest(lzoCodec); - LOG.info("Successfully tested SequenceFile with LzoCodec"); - } - } - public void compressedSeqFileTest(CompressionCodec codec) throws Exception { int count = 1024 * 10; int megabytes = 1; Modified: hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/compress/TestCodec.java URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/compress/TestCodec.java?rev=727434&r1=727433&r2=727434&view=diff ============================================================================== --- hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/compress/TestCodec.java (original) +++ hadoop/core/branches/branch-0.20/src/test/org/apache/hadoop/io/compress/TestCodec.java Wed Dec 17 08:50:53 2008 @@ -52,18 +52,6 @@ codecTest(conf, seed, count, "org.apache.hadoop.io.compress.GzipCodec"); } - public void testLzoCodec() throws IOException { - if (LzoCodec.isNativeLzoLoaded(conf)) { - codecTest(conf, seed, count, "org.apache.hadoop.io.compress.LzoCodec"); - } - } - - public void testLzopCodec() throws IOException { - if (LzopCodec.isNativeLzoLoaded(conf)) { - codecTest(conf, seed, count, "org.apache.hadoop.io.compress.LzopCodec"); - } - } - public void testBZip2Codec() throws IOException { codecTest(conf, seed, count, "org.apache.hadoop.io.compress.BZip2Codec"); }
