svn commit: r225312 - /lucene/nutch/trunk/src/plugin/build-plugin.xml

[ehatcher]

Author: ehatcher
Date: Tue Jul 26 07:01:07 2005
New Revision: 225312

URL: http://svn.apache.org/viewcvs?rev=225312view=rev
Log:
fix property reference typo

Modified:
lucene/nutch/trunk/src/plugin/build-plugin.xml

Modified: lucene/nutch/trunk/src/plugin/build-plugin.xml
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/build-plugin.xml?rev=225312r1=225311r2=225312view=diff
==
--- lucene/nutch/trunk/src/plugin/build-plugin.xml (original)
+++ lucene/nutch/trunk/src/plugin/build-plugin.xml Tue Jul 26 07:01:07 2005
@@ -9,7 +9,7 @@
 
   !-- Load all the default properties, and any the user wants--
   !-- to contribute (without having to type -D or edit this file --
-  property file=${user.home}/$(name}.build.properties /
+  property file=${user.home}/${name}.build.properties /
   property file=${root}/build.properties /
 
   property name=nutch.root location=${root}/../../..//

svn commit: r225344 - /lucene/nutch/branches/mapred/src/java/org/apache/nutch/io/SequenceFile.java

[cutting]

Author: cutting
Date: Tue Jul 26 09:40:00 2005
New Revision: 225344

URL: http://svn.apache.org/viewcvs?rev=225344view=rev
Log:
Fix bug with syncs in large merges.

Modified:
lucene/nutch/branches/mapred/src/java/org/apache/nutch/io/SequenceFile.java

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/io/SequenceFile.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/io/SequenceFile.java?rev=225344r1=225343r2=225344view=diff
==
--- lucene/nutch/branches/mapred/src/java/org/apache/nutch/io/SequenceFile.java 
(original)
+++ lucene/nutch/branches/mapred/src/java/org/apache/nutch/io/SequenceFile.java 
Tue Jul 26 09:40:00 2005
@@ -618,7 +618,8 @@
 this.pass = pass;
 this.last = last;
 
-this.queue = new MergeQueue(factor, last ? outFile : outFile+.+pass);
+this.queue =
+  new MergeQueue(factor, last ? outFile : outFile+.+pass, last);
 
 this.inName = outFile+.+(pass-1);
 this.in = new NFSDataInputStream(nfs.open(new File(inName)));
@@ -695,7 +696,7 @@
   private MergeQueue queue;
 
   public MergeFiles() throws IOException {
-this.queue = new MergeQueue(factor, outFile);
+this.queue = new MergeQueue(factor, outFile, true);
   }
 
   public void close() throws IOException {
@@ -741,12 +742,15 @@
 
 private class MergeQueue extends PriorityQueue {
   private NFSDataOutputStream out;
+  private boolean done;
 
-  public MergeQueue(int size, String outName) throws IOException {
+  public MergeQueue(int size, String outName, boolean done)
+throws IOException {
 initialize(size);
 this.out =
   new NFSDataOutputStream(nfs.create(new File(outName)),
   memory/(factor+1));
+this.done = done;
   }
 
   protected boolean lessThan(Object a, Object b) {
@@ -758,6 +762,9 @@
 
   public void merge() throws IOException {
 Writer writer = new Writer(out, keyClass, valClass);
+if (!done) {
+  writer.sync = null; // disable sync on temp files
+}
 
 while (size() != 0) {
   MergeStream ms = (MergeStream)top();