Author: omalley
Date: Tue Dec 16 22:13:53 2008
New Revision: 727294
URL: http://svn.apache.org/viewvc?rev=727294&view=rev
Log:
HADOOP-4874. Remove LZO codec because of licensing issues. (omalley)
Removed:
hadoop/core/trunk/src/core/org/apache/hadoop/io/compress/LzoCodec.java
hadoop/core/trunk/src/core/org/apache/hadoop/io/compress/LzopCodec.java
hadoop/core/trunk/src/core/org/apache/hadoop/io/compress/lzo/
hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/LzoTextInputFormat.java
hadoop/core/trunk/src/native/src/org/apache/hadoop/io/compress/lzo/
hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestLzoTextInputFormat.java
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/native_libraries.xml
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/site.xml
hadoop/core/trunk/src/native/Makefile.am
hadoop/core/trunk/src/native/Makefile.in
hadoop/core/trunk/src/native/aclocal.m4
hadoop/core/trunk/src/native/config.h.in
hadoop/core/trunk/src/native/configure
hadoop/core/trunk/src/native/configure.ac
hadoop/core/trunk/src/native/lib/Makefile.in
hadoop/core/trunk/src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in
hadoop/core/trunk/src/test/org/apache/hadoop/io/FileBench.java
hadoop/core/trunk/src/test/org/apache/hadoop/io/TestSequenceFile.java
hadoop/core/trunk/src/test/org/apache/hadoop/io/compress/TestCodec.java
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=727294&r1=727293&r2=727294&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Dec 16 22:13:53 2008
@@ -74,6 +74,8 @@
pipes, utils, and libhdfs are now all in c++/<os_osarch_jvmdatamodel>/lib.
(Giridharan Kesavan via nigel)
+ HADOOP-4874. Remove LZO codec because of licensing issues. (omalley)
+
NEW FEATURES
HADOOP-4575. Add a proxy service for relaying HsftpFileSystem requests.
Modified:
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=727294&r1=727293&r2=727294&view=diff
==============================================================================
---
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
(original)
+++
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
Tue Dec 16 22:13:53 2008
@@ -1514,8 +1514,8 @@
TextInputFormat</a> is the default <code>InputFormat</code>.</p>
<p>If <code>TextInputFormat</code> is the <code>InputFormat</code> for
a
- given job, the framework detects input-files with the <em>.gz</em> and
- <em>.lzo</em> extensions and automatically decompresses them using the
+ given job, the framework detects input-files with the <em>.gz</em>
+ extensions and automatically decompresses them using the
appropriate <code>CompressionCodec</code>. However, it must be noted
that
compressed files with the above extensions cannot be <em>split</em>
and
each compressed file is processed in its entirety by a single
mapper.</p>
@@ -1963,14 +1963,14 @@
specify compression for both intermediate map-outputs and the
job-outputs i.e. output of the reduces. It also comes bundled with
<a href="ext:api/org/apache/hadoop/io/compress/compressioncodec">
- CompressionCodec</a> implementations for the
- <a href="ext:zlib">zlib</a> and <a href="ext:lzo">lzo</a>
compression
- algorithms. The <a href="ext:gzip">gzip</a> file format is also
+ CompressionCodec</a> implementation for the
+ <a href="ext:zlib">zlib</a> compression
+ algorithm. The <a href="ext:gzip">gzip</a> file format is also
supported.</p>
<p>Hadoop also provides native implementations of the above
compression
codecs for reasons of both performance (zlib) and non-availability of
- Java libraries (lzo). More details on their usage and availability
are
+ Java libraries. More details on their usage and availability are
available <a href="native_libraries.html">here</a>.</p>
<section>
Modified:
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/native_libraries.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/docs/src/documentation/content/xdocs/native_libraries.xml?rev=727294&r1=727293&r2=727294&view=diff
==============================================================================
---
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/native_libraries.xml
(original)
+++
hadoop/core/trunk/src/docs/src/documentation/content/xdocs/native_libraries.xml
Tue Dec 16 22:13:53 2008
@@ -44,12 +44,11 @@
<ul>
<li><a href="ext:zlib">zlib</a></li>
<li><a href="ext:gzip">gzip</a></li>
- <li><a href="ext:lzo">lzo</a></li>
<li><a href="ext:bzip">bzip2</a></li>
</ul>
<p>Of the above, the availability of native hadoop libraries is
imperative
- for the lzo, gzip and bzip2 compression codecs to work.</p>
+ for the gzip and bzip2 compression codecs to work.</p>
</section>
<section>
@@ -70,8 +69,8 @@
</li>
<li>
Make sure you have any of or all of <strong>>zlib-1.2</strong>,
- <strong>>gzip-1.2</strong>, <strong>>bzip2-1.0</strong> and
- <strong>>lzo2.0</strong> packages for your platform installed;
+ <strong>>gzip-1.2</strong>, and <strong>>bzip2-1.0</strong>
+ packages for your platform installed;
depending on your needs.
</li>
</ul>
@@ -147,9 +146,6 @@
<li>
zlib-development package (stable version >= 1.2.0)
</li>
- <li>
- lzo-development package (stable version >= 2.0)
- </li>
</ul>
<p>Once you have the pre-requisites use the standard
<code>build.xml</code>
@@ -175,13 +171,13 @@
<ul>
<li>
It is <strong>mandatory</strong> to have the
- zlib, gzip, bzip2 and lzo
+ zlib, gzip, and bzip2
development packages on the target platform for building the
native hadoop library; however for deployment it is sufficient to
install one of them if you wish to use only one of them.
</li>
<li>
- It is necessary to have the correct 32/64 libraries of both
zlib/lzo
+ It is necessary to have the correct 32/64 libraries of both zlib
depending on the 32/64 bit jvm for the target platform for
building/deployment of the native hadoop library.
</li>
Modified: hadoop/core/trunk/src/docs/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/docs/src/documentation/content/xdocs/site.xml?rev=727294&r1=727293&r2=727294&view=diff
==============================================================================
--- hadoop/core/trunk/src/docs/src/documentation/content/xdocs/site.xml
(original)
+++ hadoop/core/trunk/src/docs/src/documentation/content/xdocs/site.xml Tue Dec
16 22:13:53 2008
@@ -73,7 +73,6 @@
<faq href="http://wiki.apache.org/hadoop/FAQ"; />
<hadoop-default
href="http://hadoop.apache.org/core/docs/current/hadoop-default.html"; />
<zlib href="http://www.zlib.net/"; />
- <lzo href="http://www.oberhumer.com/opensource/lzo/"; />
<gzip href="http://www.gzip.org/"; />
<bzip href="http://www.bzip.org/"; />
<cygwin href="http://www.cygwin.com/"; />
Modified: hadoop/core/trunk/src/native/Makefile.am
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/native/Makefile.am?rev=727294&r1=727293&r2=727294&view=diff
==============================================================================
--- hadoop/core/trunk/src/native/Makefile.am (original)
+++ hadoop/core/trunk/src/native/Makefile.am Tue Dec 16 22:13:53 2008
@@ -36,7 +36,7 @@
export PLATFORM = $(shell echo $$OS_NAME | tr [A-Z] [a-z])
# List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib
src/org/apache/hadoop/io/compress/lzo lib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib
# The following export is needed to build libhadoop.so in the 'lib' directory
export SUBDIRS
Modified: hadoop/core/trunk/src/native/Makefile.in
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/native/Makefile.in?rev=727294&r1=727293&r2=727294&view=diff
==============================================================================
--- hadoop/core/trunk/src/native/Makefile.in (original)
+++ hadoop/core/trunk/src/native/Makefile.in Tue Dec 16 22:13: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.
@@ -67,7 +67,6 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = @build@
host_triplet = @host@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -207,7 +206,7 @@
target_alias = @target_alias@
# List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib
src/org/apache/hadoop/io/compress/lzo lib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -280,13 +279,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -298,7 +291,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -306,13 +299,7 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -333,7 +320,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
