Author: cutting
Date: Fri Apr 7 16:36:08 2006
New Revision: 392455
URL: http://svn.apache.org/viewcvs?rev=392455&view=rev
Log:
Merge -r 390737:392453 from trunk, preparing for 0.1.1 release.
Added:
lucene/hadoop/branches/branch-0.1/CHANGES.txt
Modified:
lucene/hadoop/branches/branch-0.1/LICENSE.txt
lucene/hadoop/branches/branch-0.1/build.xml
lucene/hadoop/branches/branch-0.1/site/about.html
lucene/hadoop/branches/branch-0.1/site/credits.html
lucene/hadoop/branches/branch-0.1/site/doap.rdf
lucene/hadoop/branches/branch-0.1/site/index.html
lucene/hadoop/branches/branch-0.1/site/index.pdf
lucene/hadoop/branches/branch-0.1/site/issue_tracking.html
lucene/hadoop/branches/branch-0.1/site/linkmap.html
lucene/hadoop/branches/branch-0.1/site/mailing_lists.html
lucene/hadoop/branches/branch-0.1/site/version_control.html
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/fs/LocalFileSystem.java
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobConf.java
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobInProgress.java
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/MapReduceBase.java
lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/index.xml
lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/site.xml
lucene/hadoop/branches/branch-0.1/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
Added: lucene/hadoop/branches/branch-0.1/CHANGES.txt
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/CHANGES.txt?rev=392455&view=auto
==============================================================================
--- lucene/hadoop/branches/branch-0.1/CHANGES.txt (added)
+++ lucene/hadoop/branches/branch-0.1/CHANGES.txt Fri Apr 7 16:36:08 2006
@@ -0,0 +1,25 @@
+Hadoop Change Log
+
+
+Release 0.1.1 - 2006-04-08
+
+ 1. Added CHANGES.txt, logging all significant changes to Hadoop. (cutting)
+
+ 2. Fix MapReduceBase.close() to throw IOException, as declared in the
+ Closeable interface. This permits subclasses which override this
+ method to throw that exception. (cutting)
+
+ 3. Fix HADOOP-117. Pathnames were mistakenly transposed in
+ JobConf.getLocalFile() causing many mapred temporary files to not
+ be removed. (Raghavendra Prabhu via cutting)
+
+ 4. Fix HADOOP-116. Clean up job submission files when jobs complete.
+ (cutting)
+
+ 5. Fix HADOOP-125. Fix handling of absolute paths on Windows (cutting)
+
+
+Release 0.1.0 - 2006-04-01
+
+ 1. The first release of Hadoop.
+
Modified: lucene/hadoop/branches/branch-0.1/LICENSE.txt
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/LICENSE.txt?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/LICENSE.txt (original)
+++ lucene/hadoop/branches/branch-0.1/LICENSE.txt Fri Apr 7 16:36:08 2006
@@ -1,5 +1,5 @@
/**
- * Copyright 2004 The Apache Software Foundation
+ * Copyright 2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Modified: lucene/hadoop/branches/branch-0.1/build.xml
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/build.xml?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/build.xml (original)
+++ lucene/hadoop/branches/branch-0.1/build.xml Fri Apr 7 16:36:08 2006
@@ -9,7 +9,7 @@
<property name="Name" value="Hadoop"/>
<property name="name" value="hadoop"/>
- <property name="version" value="0.1.1-dev"/>
+ <property name="version" value="0.1.2-dev"/>
<property name="final.name" value="${name}-${version}"/>
<property name="year" value="2006"/>
Modified: lucene/hadoop/branches/branch-0.1/site/about.html
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/site/about.html?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/site/about.html (original)
+++ lucene/hadoop/branches/branch-0.1/site/about.html Fri Apr 7 16:36:08 2006
@@ -78,7 +78,7 @@
<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title"
class="menutitle">Resources</div>
<div id="menu_1.3" class="menuitemgroup">
<div class="menuitem">
-<a href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>Download</a>
+<a href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>Download</a>
</div>
<div class="menuitem">
<a href="mailing_lists.html">Mailing Lists</a>
Modified: lucene/hadoop/branches/branch-0.1/site/credits.html
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/site/credits.html?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/site/credits.html (original)
+++ lucene/hadoop/branches/branch-0.1/site/credits.html Fri Apr 7 16:36:08 2006
@@ -78,7 +78,7 @@
<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title"
class="menutitle">Resources</div>
<div id="menu_1.3" class="menuitemgroup">
<div class="menuitem">
-<a href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>Download</a>
+<a href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>Download</a>
</div>
<div class="menuitem">
<a href="mailing_lists.html">Mailing Lists</a>
Modified: lucene/hadoop/branches/branch-0.1/site/doap.rdf
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/site/doap.rdf?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/site/doap.rdf (original)
+++ lucene/hadoop/branches/branch-0.1/site/doap.rdf Fri Apr 7 16:36:08 2006
@@ -23,9 +23,17 @@
<description>Hadoop is a Lucene sub-project that contains the distributed
computing platform that was formerly a part of Nutch. This includes the Hadoop
Distributed Filesystem (HDFS) and an implementation of MapReduce.</description>
<bug-database rdf:resource="http://nagoya.apache.org/jira/browse/HADOOP"; />
<mailing-list
rdf:resource="http://lucene.apache.org/hadoop/mailing_lists.html"; />
- <download-page
rdf:resource="http://cvs.apache.org/dist/lucene/hadoop/nightly/"; />
+ <download-page
rdf:resource="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/"; />
<programming-language>Java</programming-language>
<category rdf:resource="http://projects.apache.org/category/database"; />
+ <release>
+ <Version>
+ <branch>branch-0.1</branch>
+ <name>nutch-0.1.1</name>
+ <created>2006-04-07</created>
+ <revision>0.1.1</revision>
+ </Version>
+ </release>
<repository>
<SVNRepository>
<location
rdf:resource="http://svn.apache.org/repos/asf/lucene/hadoop/"/>
Modified: lucene/hadoop/branches/branch-0.1/site/index.html
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/site/index.html?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/site/index.html (original)
+++ lucene/hadoop/branches/branch-0.1/site/index.html Fri Apr 7 16:36:08 2006
@@ -78,7 +78,7 @@
<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title"
class="menutitle">Resources</div>
<div id="menu_1.3" class="menuitemgroup">
<div class="menuitem">
-<a href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>Download</a>
+<a href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>Download</a>
</div>
<div class="menuitem">
<a href="mailing_lists.html">Mailing Lists</a>
@@ -119,6 +119,9 @@
<a href="#News">News</a>
<ul class="minitoc">
<li>
+<a href="#2+April%2C+2006%3A+release+0.1.0+available">2 April, 2006: release
0.1.0 available</a>
+</li>
+<li>
<a href="#6+February%2C+2006%3A+nightly+builds">6 February, 2006: nightly
builds</a>
</li>
<li>
@@ -136,19 +139,24 @@
<a name="N1000C"></a><a name="News"></a>
<h2 class="h3">News</h2>
<div class="section">
-<a name="N10012"></a><a name="6+February%2C+2006%3A+nightly+builds"></a>
+<a name="N10012"></a><a name="2+April%2C+2006%3A+release+0.1.0+available"></a>
+<h3 class="h4">2 April, 2006: release 0.1.0 available</h3>
+<p>This is the first Hadoop release. The release is available
+ <a href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>
+ here</a>.</p>
+<a name="N10020"></a><a name="6+February%2C+2006%3A+nightly+builds"></a>
<h3 class="h4">6 February, 2006: nightly builds</h3>
<p>Hadoop now has nightly builds. This automatically creates a
<a href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>downloadable
version of Hadoop every
night</a>. All unit tests must pass, or a message is sent to
the developers mailing list and no new version is created. This
also updates the <a href="docs/api/">javadoc</a>.</p>
-<a name="N10024"></a><a
name="3+February%2C+2006%3A+Hadoop+code+moved+out+of+Nutch"></a>
+<a name="N10032"></a><a
name="3+February%2C+2006%3A+Hadoop+code+moved+out+of+Nutch"></a>
<h3 class="h4">3 February, 2006: Hadoop code moved out of Nutch</h3>
<p>The Hadoop code has now been moved into its own Subversion
tree, renamed into packages under <span
class="codefrag">org.apache.hadoop</span>.
All unit tests pass, but little else has yet been tested.</p>
-<a name="N10031"></a><a name="30+March%2C+2006%3A+Hadoop+project+approved"></a>
+<a name="N1003F"></a><a name="30+March%2C+2006%3A+Hadoop+project+approved"></a>
<h3 class="h4">30 March, 2006: Hadoop project approved</h3>
<p>The Lucene PMC has elected to split the Nutch MapReduce and
distributed filesytem code into a new project named Hadoop.</p>
Modified: lucene/hadoop/branches/branch-0.1/site/index.pdf
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/site/index.pdf?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/site/index.pdf (original)
+++ lucene/hadoop/branches/branch-0.1/site/index.pdf Fri Apr 7 16:36:08 2006
@@ -5,10 +5,10 @@
/Producer (FOP 0.20.5) >>
endobj
5 0 obj
-<< /Length 545 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 610 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gaua;9i&Y\%#46L([EMAIL PROTECTED];K,[0O#RMbE,[EMAIL
PROTECTED])CJ*26mGF,7A'#;9"p0o.)EZ66plXT6jID5JU+TgfAId;+`5--P&;8S(:oJf6Mh--SMWX,Bn0!TVcG^?c:d7d7K1;=*<LcZa*=^CPMQW5QO2tLO99B#j#kNAY.%V-D*7mgcR@/=Eb=7`@@\^sU_:s8=;_?&s\:1VOltH5E]%_*mhhn7nmnSN8+"DDe\fWOCd%-#/ig_`r+,Rn\e0tL6([EMAIL
PROTECTED];\6^0p(WG#g1M/Y:k"W*9N_);_dQ^-t:LY:R-UB`M%10V<KGDhI6_^c(]1>l$I-:&[EMAIL
PROTECTED]&F*^H7"RL(gDWjBjTu6TPZ/Z][f=m+-,X7en<[EMAIL
PROTECTED]:!nY\N3'l<[EMAIL
PROTECTED]<1<[%>S=5I$I]U#n3&n>+j*MF%3_CdLA#A!VK`92*f#=KH<XWU9`p$+feVFT7cBT:QuN&.4EtR;/S87o.!LOqd*mZ19N4T=LMcZ2`"[EMAIL
PROTECTED]@L=ITGGbg1n,~>
+Gaua<hf%6l&BE],=0T/5g91?-f\'Ij/Xe#gdPOUDB_Oc.dWctU,Bg-cpB*K5V!=DUl88EH%Nf&*+7A'm8Br"[d1e8a<XJK'1;W04+UG]8TXc-X.0_,><,BqSm(:]Bfr-_!Nb5j!39s9%J!-'Om@,p(!u7H!G)"(Eq`p6U*!d4Q?m1k_OQ6>hbcF.G1ejm:DEI*&7.?lk_:/j5!bjRXOk?-en/eIIhH0"!aUbGgs)0N3LO*bcRaEJbpV](%5lUrs:PMU^n,n.Y5[Un,eo-180c'51BpD_>)f62l!]ZS<:=aaH``FPP<Zs:=Tq"N(E53,!HCROe01&2;[C!WS]>[EMAIL
PROTECTED])[EMAIL PROTECTED](k&nBJ4AQqU6Z8$R'[EMAIL
PROTECTED]:+S-I8WV>Wr)o9]?_f:*VmC*>q5MLBJSa/[EMAIL
PROTECTED],f43E4-9I0YnW;/umkX0Mme26EB0_Ep<#q3^LZFdk'V.Ps@<a\_q/hW9eeW0^[0^EX4V?%HSj;%LN_IZ&YuJMcQ.KrQVFTHYK7;L$>(!G-u$,R\k3]L:[EMAIL
PROTECTED])o%?L[52Z~>
endstream
endobj
6 0 obj
@@ -26,6 +26,7 @@
10 0 R
12 0 R
14 0 R
+16 0 R
]
endobj
8 0 obj
@@ -41,7 +42,7 @@
10 0 obj
<< /Type /Annot
/Subtype /Link
-/Rect [ 108.0 541.466 278.504 529.466 ]
+/Rect [ 108.0 541.466 300.8 529.466 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
/A 11 0 R
@@ -51,7 +52,7 @@
12 0 obj
<< /Type /Annot
/Subtype /Link
-/Rect [ 108.0 523.266 375.128 511.266 ]
+/Rect [ 108.0 523.266 278.504 511.266 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
/A 13 0 R
@@ -61,7 +62,7 @@
14 0 obj
<< /Type /Annot
/Subtype /Link
-/Rect [ 108.0 505.066 328.124 493.066 ]
+/Rect [ 108.0 505.066 375.128 493.066 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
/A 15 0 R
@@ -69,32 +70,54 @@
>>
endobj
16 0 obj
-<< /Length 1318 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 108.0 486.866 328.124 474.866 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A 17 0 R
+/H /I
+>>
+endobj
+18 0 obj
+<< /Length 1455 /Filter [ /ASCII85Decode /FlateDecode ]
>>
stream
-Gat=+997gc&AJ$CYdXaK=HXjsWOF/:VC7lWbo5f>m6R%O>H'0RHE?(ThpIW4flETl0,cHU^2Mm#]C"a9-V_+HN,85-7LgA4)[EMAIL
PROTECTED]"m%8%IfHm>:c:MUU2<NDT$<X5D.3H;4AcgKuj'D)_KH<ic%)dqa5l#/3lDGP@))5#j'XV'3Iqn!eM'VUo>'n[P5q#9t9Zo\J\ofp,92?G:VRJhd9q-g'[P=D&FoY\VZ<\\jd8A+#>8V5F6NXs--tR]ZuXQ!F'*IuY.W$cKlQST'[EMAIL
PROTECTED]<KM=):j[<'@d<E_uB<cala1FirpLsQit!Z$D;b2r:G\)aU"Ymdc=)nH^>!)nj"[EMAIL
PROTECTED])Ad*U>eY7EbdB?8h9+sTV6RC;XN3&R"@f9cY.^f'jiIu,6"6I..=!e[i-__HJaP[*9P:@bmpFBMG1=Vbu%YY9b_ba#SX!iU,cuGJ=mnK1G>sRu5IAAA,$O&5XTZs;13a&A<p_l]_AW?,p119qE51Z!UK`[VI'_T!9!8U3]dHu7/TSpjlZ\gB18anX]SC$>2m3Loo)Kl(ZWR*kfW2e3l[,l*t9KK&NU4[FjGjJBVa(Q6:+-B.sRE01F/VWO\BpRn:_;[EMAIL
PROTECTED]/jc;C1knVOsh)PpC(hW!>:`+4:\AehW+'Zk`SG)kCMTdlk3%nZFWfG&[EMAIL
PROTECTED])cV%_O'HiH8!!0*"E$UVo-L(-)s'r\PV<!'dspU[k,qg6Ao]4dXJJT#,TL$.$<o,[EMAIL
PROTECTED])rsA5(];hq`m2IR0#mdYk?AelkFF@'Wc)U3Ma,0T#OB\BcctmX3:#!0']RR%d:qE[&]Oc85?9]^LG>euVjfe'j\uNE<LC:(e8*YW<jLh<[EMAIL
PROTECTED]<q@)s#$,YPA#^Z,tmPb6O>MN[?dtRWRoSK!d6_V^FuC;\ZEd&(EVuPk.X&LAUJm<.uMc(0eo8/"WV[
XZVpDCLX7gTX[OmS#b-G'./I;?f]5U&o^VlP&5<@.EV\SQX,:_Z7LV"nZ&;KLfd$R01;"9flX^F&``W*p1Y&<[Ve(3]f=LU%b"#h%/V:[EMAIL
PROTECTED]:hHZ0K&jY5LOJU:&dQZ&T4C!P&p)bW>mAY.?epaQG0ue#BHc+acpVrn&[EMAIL
PROTECTED];S*;J>534L7Tb^IIk2i7"p&-Tlrbi,&[EMAIL
PROTECTED]@+-M:88r/HjEk*9b5NC_p4>1PIgO)b"Jr8k1t5V\]^=j9PFq6V5"?n[H*T,gi)bf\.8oKP6n`Z7'p;:&aqr[?&A.rBQ_d&?~>
+Gat=+99Yi7&AII39Q##R11=JtjL05CSP$jMa/c3[OrP$l,TO`6*im`(GDk'0+Elk20(atfY9.+q&[EMAIL
PROTECTED]'UZNhg"[EMAIL PROTECTED],G>?T^(ce<T57<aY;_ES,sQ?k4b*([EMAIL
PROTECTED]@jZWk3)-o5L?uVIb8aG6IN[DM/;&Q'hneM8SQ7`o>g!!O"[EMAIL
PROTECTED]'P3_]O8e]4s!K1[-8SM1gjo]b4=<VE;49qcbcD'-5laT;!AHS-?4l[Jl+IEAPtZDYDi\Vo0_'447)&';ZDsJj99`O_/7LnjfOF5:W#4]0S=R:Qo*;Q5^.1O=XodcH\:#PF?rR<GG`iZ"#"k(8H0R`b[EAXi,Bm0bn4-CeW0gN/5'iRh0<UI)q4P^W5RNO7iOd-#ZR_ND]WC]K:CkK,]=<[EMAIL
PROTECTED],[EMAIL PROTECTED]&e!o87WGrmZlDU2';7b+Qb9aX*6DH#:g<[EMAIL
PROTECTED];/PfLCW-ee'qQ[C">g7*:MlUcG:.SLJ$=NW:@(!eCm;Rt]fFXY?+c-11a2!.!dIUjh8J7EW/A9;2J&0-I*LW<D*S15^PK<P0iL%DjhZc^mVmDI`=CZ$MQ\$0\Y?Z(@9h88jQ"[EMAIL
PROTECTED];'4u+uOG*?`d_`pr!DL;3n>1Ng=f7/T2,M67R_(B!J-D/&7BD3"R0&`]'G\j,_qe0)\_HiUNA9\!U6j7QGfVWf1jOuP#P<J)])U:<j\eKHKuTl>-Y$W80i\r/<d%)HEf=U3[TW`taD:l/L$ZZ79(PCln!%oJp[o)2Q=?J]4Mg%k4W?4Ma6((sF#Obrohh/XaDOp%dg=_4G'etDYcWt<7A*gJLeq"k\<FO:k\(,Gi<q4*`5]90kQl`GIs$N=(t=-!_[[D0)<+kDk^9)C2F1n=fk5r[AK+UilaRjOO%gW:=8/[EMAIL
PROTECTED](,&o>jZSN'qN,d<L>/'*fBMN<[EMAIL PROTECTED]&h\EdQ&3T6sj/_F3m`h4<<-BCp
f[YlR5([EMAIL PROTECTED]@kl%Aqf,g0pjhBjGAM5UNP_b&oH3>.LedD:?8J([EMAIL
PROTECTED]'`/T>^)*UN$I([3GMUHr.0cjg.*4>]I,<Z-J-,5`;+q1EJJfCNcXbfc4jA-lTY9X^o+lXEh&!O1HZ:Pog7,Q!:8&],)!:7l#:11;m.?k`\mF09YQeItlmCD;h#iMb"[EMAIL
PROTECTED]'+O#2]VilD-B%8j%9(.b8GdeUfdM#u^RHj96W\$bBrY0?C&$%Qf0\q]6F431f0KrAC_B),](b,]^S"(ZN^@,[7hf&g>YBc((()ChY6ZD:n\0G/gYu+S(D3kf>dNu[=3O6$FlfEjA"E,9c4)-cfmS:/8p'W;@48s)MTmSJlc)[EMAIL
PROTECTED]<~>
endstream
endobj
-17 0 obj
+19 0 obj
<< /Type /Page
/Parent 1 0 R
/MediaBox [ 0 0 612 792 ]
/Resources 3 0 R
-/Contents 16 0 R
-/Annots 18 0 R
+/Contents 18 0 R
+/Annots 20 0 R
>>
endobj
-18 0 obj
+20 0 obj
[
-19 0 R
-20 0 R
21 0 R
+22 0 R
+23 0 R
+24 0 R
]
endobj
-19 0 obj
+21 0 obj
<< /Type /Annot
/Subtype /Link
-/Rect [ 383.304 599.613 501.948 587.613 ]
+/Rect [ 360.936 599.613 381.588 587.613 ]
+/C [ 0 0 0 ]
+/Border [ 0 0 0 ]
+/A << /URI (http://www.apache.org/dyn/closer.cgi/lucene/hadoop/)
+/S /URI >>
+/H /I
+>>
+endobj
+22 0 obj
+<< /Type /Annot
+/Subtype /Link
+/Rect [ 383.304 548.36 501.948 536.36 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
/A << /URI (http://cvs.apache.org/dist/lucene/hadoop/nightly/)
@@ -102,10 +125,10 @@
/H /I
>>
endobj
-20 0 obj
+23 0 obj
<< /Type /Annot
/Subtype /Link
-/Rect [ 90.0 586.413 185.316 574.413 ]
+/Rect [ 90.0 535.16 185.316 523.16 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
/A << /URI (http://cvs.apache.org/dist/lucene/hadoop/nightly/)
@@ -113,10 +136,10 @@
/H /I
>>
endobj
-21 0 obj
+24 0 obj
<< /Type /Annot
/Subtype /Link
-/Rect [ 359.964 573.213 397.284 561.213 ]
+/Rect [ 359.964 521.96 397.284 509.96 ]
/C [ 0 0 0 ]
/Border [ 0 0 0 ]
/A << /URI (docs/api/)
@@ -124,73 +147,81 @@
/H /I
>>
endobj
-23 0 obj
+26 0 obj
<<
/Title (\376\377\0\61\0\40\0\116\0\145\0\167\0\163)
- /Parent 22 0 R
- /First 24 0 R
- /Last 26 0 R
- /Count -3
+ /Parent 25 0 R
+ /First 27 0 R
+ /Last 30 0 R
+ /Count -4
/A 9 0 R
>> endobj
-24 0 obj
+27 0 obj
<<
- /Title
(\376\377\0\61\0\56\0\61\0\40\0\66\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\54\0\40\0\62\0\60\0\60\0\66\0\72\0\40\0\156\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\142\0\165\0\151\0\154\0\144\0\163)
- /Parent 23 0 R
- /Next 25 0 R
+ /Title
(\376\377\0\61\0\56\0\61\0\40\0\62\0\40\0\101\0\160\0\162\0\151\0\154\0\54\0\40\0\62\0\60\0\60\0\66\0\72\0\40\0\162\0\145\0\154\0\145\0\141\0\163\0\145\0\40\0\60\0\56\0\61\0\56\0\60\0\40\0\141\0\166\0\141\0\151\0\154\0\141\0\142\0\154\0\145)
+ /Parent 26 0 R
+ /Next 28 0 R
/A 11 0 R
>> endobj
-25 0 obj
+28 0 obj
<<
- /Title
(\376\377\0\61\0\56\0\62\0\40\0\63\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\54\0\40\0\62\0\60\0\60\0\66\0\72\0\40\0\110\0\141\0\144\0\157\0\157\0\160\0\40\0\143\0\157\0\144\0\145\0\40\0\155\0\157\0\166\0\145\0\144\0\40\0\157\0\165\0\164\0\40\0\157\0\146\0\40\0\116\0\165\0\164\0\143\0\150)
- /Parent 23 0 R
- /Prev 24 0 R
- /Next 26 0 R
+ /Title
(\376\377\0\61\0\56\0\62\0\40\0\66\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\54\0\40\0\62\0\60\0\60\0\66\0\72\0\40\0\156\0\151\0\147\0\150\0\164\0\154\0\171\0\40\0\142\0\165\0\151\0\154\0\144\0\163)
+ /Parent 26 0 R
+ /Prev 27 0 R
+ /Next 29 0 R
/A 13 0 R
>> endobj
-26 0 obj
+29 0 obj
<<
- /Title
(\376\377\0\61\0\56\0\63\0\40\0\63\0\60\0\40\0\115\0\141\0\162\0\143\0\150\0\54\0\40\0\62\0\60\0\60\0\66\0\72\0\40\0\110\0\141\0\144\0\157\0\157\0\160\0\40\0\160\0\162\0\157\0\152\0\145\0\143\0\164\0\40\0\141\0\160\0\160\0\162\0\157\0\166\0\145\0\144)
- /Parent 23 0 R
- /Prev 25 0 R
+ /Title
(\376\377\0\61\0\56\0\63\0\40\0\63\0\40\0\106\0\145\0\142\0\162\0\165\0\141\0\162\0\171\0\54\0\40\0\62\0\60\0\60\0\66\0\72\0\40\0\110\0\141\0\144\0\157\0\157\0\160\0\40\0\143\0\157\0\144\0\145\0\40\0\155\0\157\0\166\0\145\0\144\0\40\0\157\0\165\0\164\0\40\0\157\0\146\0\40\0\116\0\165\0\164\0\143\0\150)
+ /Parent 26 0 R
+ /Prev 28 0 R
+ /Next 30 0 R
/A 15 0 R
>> endobj
-27 0 obj
+30 0 obj
+<<
+ /Title
(\376\377\0\61\0\56\0\64\0\40\0\63\0\60\0\40\0\115\0\141\0\162\0\143\0\150\0\54\0\40\0\62\0\60\0\60\0\66\0\72\0\40\0\110\0\141\0\144\0\157\0\157\0\160\0\40\0\160\0\162\0\157\0\152\0\145\0\143\0\164\0\40\0\141\0\160\0\160\0\162\0\157\0\166\0\145\0\144)
+ /Parent 26 0 R
+ /Prev 29 0 R
+ /A 17 0 R
+>> endobj
+31 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F3
/BaseFont /Helvetica-Bold
/Encoding /WinAnsiEncoding >>
endobj
-28 0 obj
+32 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F5
/BaseFont /Times-Roman
/Encoding /WinAnsiEncoding >>
endobj
-29 0 obj
+33 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F1
/BaseFont /Helvetica
/Encoding /WinAnsiEncoding >>
endobj
-30 0 obj
+34 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F9
/BaseFont /Courier
/Encoding /WinAnsiEncoding >>
endobj
-31 0 obj
+35 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F2
/BaseFont /Helvetica-Oblique
/Encoding /WinAnsiEncoding >>
endobj
-32 0 obj
+36 0 obj
<< /Type /Font
/Subtype /Type1
/Name /F7
@@ -200,90 +231,100 @@
1 0 obj
<< /Type /Pages
/Count 2
-/Kids [6 0 R 17 0 R ] >>
+/Kids [6 0 R 19 0 R ] >>
endobj
2 0 obj
<< /Type /Catalog
/Pages 1 0 R
- /Outlines 22 0 R
+ /Outlines 25 0 R
/PageMode /UseOutlines
>>
endobj
3 0 obj
<<
-/Font << /F3 27 0 R /F5 28 0 R /F1 29 0 R /F9 30 0 R /F2 31 0 R /F7 32 0 R >>
+/Font << /F3 31 0 R /F5 32 0 R /F1 33 0 R /F9 34 0 R /F2 35 0 R /F7 36 0 R >>
/ProcSet [ /PDF /ImageC /Text ] >>
endobj
9 0 obj
<<
/S /GoTo
-/D [17 0 R /XYZ 85.0 659.0 null]
+/D [19 0 R /XYZ 85.0 659.0 null]
>>
endobj
11 0 obj
<<
/S /GoTo
-/D [17 0 R /XYZ 85.0 627.866 null]
+/D [19 0 R /XYZ 85.0 627.866 null]
>>
endobj
13 0 obj
<<
/S /GoTo
-/D [17 0 R /XYZ 85.0 550.213 null]
+/D [19 0 R /XYZ 85.0 576.613 null]
>>
endobj
15 0 obj
<<
/S /GoTo
-/D [17 0 R /XYZ 85.0 485.76 null]
+/D [19 0 R /XYZ 85.0 498.96 null]
>>
endobj
-22 0 obj
+17 0 obj
<<
- /First 23 0 R
- /Last 23 0 R
+/S /GoTo
+/D [19 0 R /XYZ 85.0 434.507 null]
+>>
+endobj
+25 0 obj
+<<
+ /First 26 0 R
+ /Last 26 0 R
>> endobj
xref
-0 33
+0 37
0000000000 65535 f
-0000005358 00000 n
-0000005423 00000 n
-0000005515 00000 n
+0000006235 00000 n
+0000006300 00000 n
+0000006392 00000 n
0000000015 00000 n
0000000071 00000 n
-0000000707 00000 n
-0000000827 00000 n
-0000000873 00000 n
-0000005649 00000 n
-0000001008 00000 n
-0000005712 00000 n
-0000001145 00000 n
-0000005778 00000 n
-0000001282 00000 n
-0000005844 00000 n
-0000001419 00000 n
-0000002830 00000 n
-0000002953 00000 n
-0000002994 00000 n
-0000003197 00000 n
-0000003397 00000 n
-0000005909 00000 n
-0000003560 00000 n
-0000003701 00000 n
-0000003984 00000 n
-0000004373 00000 n
-0000004696 00000 n
-0000004809 00000 n
-0000004919 00000 n
-0000005027 00000 n
-0000005133 00000 n
-0000005249 00000 n
+0000000772 00000 n
+0000000892 00000 n
+0000000945 00000 n
+0000006526 00000 n
+0000001080 00000 n
+0000006589 00000 n
+0000001215 00000 n
+0000006655 00000 n
+0000001352 00000 n
+0000006721 00000 n
+0000001489 00000 n
+0000006786 00000 n
+0000001626 00000 n
+0000003174 00000 n
+0000003297 00000 n
+0000003345 00000 n
+0000003550 00000 n
+0000003751 00000 n
+0000003949 00000 n
+0000006852 00000 n
+0000004110 00000 n
+0000004251 00000 n
+0000004564 00000 n
+0000004861 00000 n
+0000005250 00000 n
+0000005573 00000 n
+0000005686 00000 n
+0000005796 00000 n
+0000005904 00000 n
+0000006010 00000 n
+0000006126 00000 n
trailer
<<
-/Size 33
+/Size 37
/Root 2 0 R
/Info 4 0 R
>>
startxref
-5960
+6903
%%EOF
Modified: lucene/hadoop/branches/branch-0.1/site/issue_tracking.html
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/site/issue_tracking.html?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/site/issue_tracking.html (original)
+++ lucene/hadoop/branches/branch-0.1/site/issue_tracking.html Fri Apr 7
16:36:08 2006
@@ -78,7 +78,7 @@
<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')"
id="menu_selected_1.3Title" class="menutitle" style="background-image:
url('skin/images/chapter_open.gif');">Resources</div>
<div id="menu_selected_1.3" class="selectedmenuitemgroup" style="display:
block;">
<div class="menuitem">
-<a href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>Download</a>
+<a href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>Download</a>
</div>
<div class="menuitem">
<a href="mailing_lists.html">Mailing Lists</a>
Modified: lucene/hadoop/branches/branch-0.1/site/linkmap.html
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/site/linkmap.html?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/site/linkmap.html (original)
+++ lucene/hadoop/branches/branch-0.1/site/linkmap.html Fri Apr 7 16:36:08 2006
@@ -78,7 +78,7 @@
<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title"
class="menutitle">Resources</div>
<div id="menu_1.3" class="menuitemgroup">
<div class="menuitem">
-<a href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>Download</a>
+<a href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>Download</a>
</div>
<div class="menuitem">
<a href="mailing_lists.html">Mailing Lists</a>
@@ -185,7 +185,7 @@
<ul>
<li>
-<a
href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>Download</a> _________________________ <em>download</em>
+<a
href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>Download</a> _________________________ <em>download</em>
</li>
</ul>
Modified: lucene/hadoop/branches/branch-0.1/site/mailing_lists.html
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/site/mailing_lists.html?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/site/mailing_lists.html (original)
+++ lucene/hadoop/branches/branch-0.1/site/mailing_lists.html Fri Apr 7
16:36:08 2006
@@ -78,7 +78,7 @@
<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')"
id="menu_selected_1.3Title" class="menutitle" style="background-image:
url('skin/images/chapter_open.gif');">Resources</div>
<div id="menu_selected_1.3" class="selectedmenuitemgroup" style="display:
block;">
<div class="menuitem">
-<a href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>Download</a>
+<a href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>Download</a>
</div>
<div class="menupage">
<div class="menupagetitle">Mailing Lists</div>
Modified: lucene/hadoop/branches/branch-0.1/site/version_control.html
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/site/version_control.html?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.1/site/version_control.html (original)
+++ lucene/hadoop/branches/branch-0.1/site/version_control.html Fri Apr 7
16:36:08 2006
@@ -78,7 +78,7 @@
<div onclick="SwitchMenu('menu_selected_1.3', 'skin/')"
id="menu_selected_1.3Title" class="menutitle" style="background-image:
url('skin/images/chapter_open.gif');">Resources</div>
<div id="menu_selected_1.3" class="selectedmenuitemgroup" style="display:
block;">
<div class="menuitem">
-<a href="http://cvs.apache.org/dist/lucene/hadoop/nightly/";>Download</a>
+<a href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>Download</a>
</div>
<div class="menuitem">
<a href="mailing_lists.html">Mailing Lists</a>
Modified:
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/fs/LocalFileSystem.java
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/fs/LocalFileSystem.java?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
---
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/fs/LocalFileSystem.java
(original)
+++
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/fs/LocalFileSystem.java
Fri Apr 7 16:36:08 2006
@@ -29,7 +29,8 @@
* @author Mike Cafarella
*****************************************************************/
public class LocalFileSystem extends FileSystem {
- private File workingDir = new File(System.getProperty("user.dir"));
+ private File workingDir
+ = new File(System.getProperty("user.dir")).getAbsoluteFile();
TreeMap sharedLockDataSet = new TreeMap();
TreeMap nonsharedLockDataSet = new TreeMap();
TreeMap lockObjSet = new TreeMap();
@@ -156,7 +157,7 @@
if (isAbsolute(f)) {
return f;
} else {
- return new File(workingDir, f.toString());
+ return new File(workingDir, f.toString()).getAbsoluteFile();
}
}
@@ -200,7 +201,9 @@
}
public boolean isAbsolute(File f) {
- return f.isAbsolute();
+ return f.isAbsolute() ||
+ f.getPath().startsWith("/") ||
+ f.getPath().startsWith("\\");
}
public long getLength(File f) throws IOException {
@@ -226,7 +229,6 @@
*/
public void setWorkingDirectory(File new_dir) {
workingDir = makeAbsolute(new_dir);
- System.setProperty("user.dir", workingDir.toString());
}
public File getWorkingDirectory() {
Modified:
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobConf.java
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobConf.java?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
---
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobConf.java
(original)
+++
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobConf.java
Fri Apr 7 16:36:08 2006
@@ -124,7 +124,7 @@
/** Constructs a local file name. Files are distributed among configured
* local directories.*/
public File getLocalFile(String subdir, String name) throws IOException {
- return getFile("mapred.local.dir", name + File.separator + subdir);
+ return getFile("mapred.local.dir", subdir + File.separator + name);
}
public void setInputDir(File dir) { set("mapred.input.dir", dir); }
Modified:
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobInProgress.java
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobInProgress.java?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
---
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobInProgress.java
(original)
+++
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/JobInProgress.java
Fri Apr 7 16:36:08 2006
@@ -48,7 +48,6 @@
long startTime;
long finishTime;
- String deleteUponCompletion = null;
private JobConf conf;
boolean tasksInited = false;
@@ -84,15 +83,6 @@
this.numMapTasks = conf.getNumMapTasks();
this.numReduceTasks = conf.getNumReduceTasks();
-
- //
- // If a jobFile is in the systemDir, we can delete it (and
- // its JAR) upon completion
- //
- File systemDir = conf.getSystemDir();
- if (jobFile.startsWith(systemDir.getPath())) {
- this.deleteUponCompletion = jobFile;
- }
}
/**
@@ -423,6 +413,7 @@
if (status.getRunState() == JobStatus.RUNNING && allDone) {
this.status = new JobStatus(status.getJobId(), 1.0f, 1.0f,
JobStatus.SUCCEEDED);
this.finishTime = System.currentTimeMillis();
+ garbageCollect();
}
}
@@ -443,6 +434,8 @@
for (int i = 0; i < reduces.length; i++) {
reduces[i].kill();
}
+
+ garbageCollect();
}
}
@@ -475,32 +468,26 @@
* from all tables. Be sure to remove all of this job's tasks
* from the various tables.
*/
- public synchronized void garbageCollect() throws IOException {
- //
- // Remove this job from all tables
- //
-
+ synchronized void garbageCollect() {
+ try {
// Definitely remove the local-disk copy of the job file
+ FileSystem localFs = FileSystem.getNamed("local", conf);
if (localJobFile != null) {
- localJobFile.delete();
+ localFs.delete(localJobFile);
localJobFile = null;
}
if (localJarFile != null) {
- localJarFile.delete();
+ localFs.delete(localJarFile);
localJarFile = null;
}
- //
- // If the job file was in the temporary system directory,
- // we should delete it upon garbage collect.
- //
- if (deleteUponCompletion != null) {
- JobConf jd = new JobConf(deleteUponCompletion);
- FileSystem fs = FileSystem.get(conf);
- fs.delete(new File(jd.getJar()));
- fs.delete(new File(deleteUponCompletion));
- deleteUponCompletion = null;
- }
+ // JobClient always creates a new directory with job files
+ // so we remove that directory to cleanup
+ FileSystem fs = FileSystem.get(conf);
+ fs.delete(new File(profile.getJobFile()).getParentFile());
+
+ } catch (IOException e) {
+ LOG.warning("Error cleaning up "+profile.getJobId()+": "+e);
+ }
}
}
-
Modified:
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/LocalJobRunner.java?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
---
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
(original)
+++
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
Fri Apr 7 16:36:08 2006
@@ -45,6 +45,8 @@
private ArrayList mapIds = new ArrayList();
private MapOutputFile mapoutputFile;
private JobProfile profile;
+ private File localFile;
+ private FileSystem localFs;
public Job(String file, Configuration conf) throws IOException {
this.file = file;
@@ -52,7 +54,9 @@
this.mapoutputFile = new MapOutputFile();
this.mapoutputFile.setConf(conf);
- File localFile = new JobConf(conf).getLocalFile("localRunner",
id+".xml");
+ this.localFile = new JobConf(conf).getLocalFile("localRunner",
id+".xml");
+ this.localFs = FileSystem.getNamed("local", conf);
+
fs.copyToLocalFile(new File(file), localFile);
this.job = new JobConf(localFile);
profile = new JobProfile(job.getUser(), id, file,
@@ -88,7 +92,6 @@
job.setNumReduceTasks(1); // force a single reduce task
for (int i = 0; i < splits.length; i++) {
mapIds.add("map_" + newId());
- setWorkingDirectory(job, fs);
MapTask map = new MapTask(file, (String)mapIds.get(i), splits[i]);
map.setConf(job);
map_tasks += 1;
@@ -103,7 +106,7 @@
File mapOut = this.mapoutputFile.getOutputFile(mapId, 0);
File reduceIn = this.mapoutputFile.getInputFile(mapId, reduceId);
reduceIn.getParentFile().mkdirs();
- if (!FileSystem.getNamed("local", this.job).rename(mapOut, reduceIn))
+ if (!localFs.rename(mapOut, reduceIn))
throw new IOException("Couldn't rename " + mapOut);
this.mapoutputFile.removeAll(mapId);
}
@@ -126,7 +129,15 @@
} catch (Throwable t) {
this.status.runState = JobStatus.FAILED;
- t.printStackTrace();
+ LOG.log(Level.WARNING, id, t);
+
+ } finally {
+ try {
+ fs.delete(new File(file).getParentFile()); // delete submit dir
+ localFs.delete(localFile); // delete local copy
+ } catch (IOException e) {
+ LOG.warning("Error cleaning up "+id+": "+e);
+ }
}
}
Modified:
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/MapReduceBase.java
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/MapReduceBase.java?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
---
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/MapReduceBase.java
(original)
+++
lucene/hadoop/branches/branch-0.1/src/java/org/apache/hadoop/mapred/MapReduceBase.java
Fri Apr 7 16:36:08 2006
@@ -1,17 +1,38 @@
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.hadoop.mapred;
+import java.io.IOException;
+
import org.apache.hadoop.io.Closeable;
import org.apache.hadoop.mapred.JobConfigurable;
-/**
- * A class to implement the trivial close and configure methods.
+/** Base class for [EMAIL PROTECTED] Mapper} and [EMAIL PROTECTED] Reducer}
implementations.
+ * Provides default implementations for a few methods.
+ *
* @author Owen O'Malley
*/
public class MapReduceBase implements Closeable, JobConfigurable {
- public void close() {
+ /** Default implementation that does nothing. */
+ public void close() throws IOException {
}
+ /** Default implementation that does nothing. */
public void configure(JobConf job) {
}
Modified:
lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/index.xml
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/index.xml?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
---
lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/index.xml
(original)
+++
lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/index.xml
Fri Apr 7 16:36:08 2006
@@ -15,6 +15,13 @@
<title>News</title>
<section>
+ <title>2 April, 2006: release 0.1.0 available</title>
+ <p>This is the first Hadoop release. The release is available
+ <a href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/";>
+ here</a>.</p>
+ </section>
+
+ <section>
<title>6 February, 2006: nightly builds</title>
<p>Hadoop now has nightly builds. This automatically creates a
<a href="ext:nightly">downloadable version of Hadoop every
Modified:
lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/site.xml
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/site.xml?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
---
lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/site.xml
(original)
+++
lucene/hadoop/branches/branch-0.1/src/site/src/documentation/content/xdocs/site.xml
Fri Apr 7 16:36:08 2006
@@ -28,7 +28,7 @@
</docs>
<resources label="Resources">
- <download label="Download" href="ext:nightly" />
+ <download label="Download" href="ext:releases" />
<contact label="Mailing Lists" href="mailing_lists.html" />
<issues label="Issue Tracking" href="issue_tracking.html" />
<vcs label="Version Control" href="version_control.html" />
@@ -44,6 +44,7 @@
<nutch href="http://lucene.apache.org/nutch/"; />
<wiki href="http://wiki.apache.org/lucene-hadoop/"; />
<nightly href="http://cvs.apache.org/dist/lucene/hadoop/nightly/"; />
+ <releases href="http://www.apache.org/dyn/closer.cgi/lucene/hadoop/"; />
</external-refs>
</site>
Modified:
lucene/hadoop/branches/branch-0.1/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
URL:
http://svn.apache.org/viewcvs/lucene/hadoop/branches/branch-0.1/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java?rev=392455&r1=392454&r2=392455&view=diff
==============================================================================
---
lucene/hadoop/branches/branch-0.1/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
(original)
+++
lucene/hadoop/branches/branch-0.1/src/test/org/apache/hadoop/fs/TestLocalFileSystem.java
Fri Apr 7 16:36:08 2006
@@ -42,7 +42,7 @@
// create a directory and check for it
File dir1 = new File("dir1");
- File dir1Absolute = dir1.getAbsoluteFile();
+ File dir1Absolute = new File(subdirAbsolute, dir1.getPath());
fileSys.mkdirs(dir1);
assertTrue(fileSys.isDirectory(dir1));
assertTrue(fileSys.isDirectory(dir1Absolute));
@@ -55,8 +55,7 @@
// create files and manipulate them.
File file1 = new File("file1");
File file2 = new File("sub/file2");
- File file2_abs = file2.getAbsoluteFile();
- assertEquals(file2_abs, new File(subdirAbsolute, file2.getPath()));
+ File file2_abs = new File(subdirAbsolute, file2.getPath());
writeFile(fileSys, file1);
fileSys.copyFromLocalFile(file1, file2);
assertTrue(fileSys.exists(file1));
