You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by df...@apache.org on 2013/06/09 20:50:05 UTC
svn commit: r1491265 [2/2] - in /mahout/trunk: ./
core/src/main/java/org/apache/mahout/cf/taste/hadoop/als/
core/src/main/java/org/apache/mahout/cf/taste/impl/recommender/svd/
core/src/main/java/org/apache/mahout/cf/taste/impl/similarity/precompute/
co...
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/email/MailToPrefsDriver.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,12 @@
package org.apache.mahout.cf.taste.example.email;
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
import org.apache.hadoop.conf.Configuration;
@@ -47,12 +53,6 @@ import org.apache.mahout.math.VarIntWrit
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.IOException;
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
/**
* Convert the Mail archives (see {@link org.apache.mahout.text.SequenceFilesFromMailArchives}) to a preference
* file that can be consumed by the {@link org.apache.mahout.cf.taste.hadoop.pseudo.RecommenderJob}.
@@ -252,7 +252,7 @@ public final class MailToPrefsDriver ext
for (Pair<Writable, Writable> record
: new SequenceFileDirIterable<Writable, Writable>(filesPattern, PathType.GLOB, null, null, true, conf)) {
if (currentChunkSize > chunkSizeLimit) {
- Closeables.close(dictWriter, true);
+ Closeables.close(dictWriter, false);
chunkIndex++;
chunkPath = new Path(dictionaryPathBase, name + chunkIndex);
@@ -269,7 +269,7 @@ public final class MailToPrefsDriver ext
}
maxTermDimension[0] = i;
} finally {
- Closeables.close(dictWriter, true);
+ Closeables.close(dictWriter, false);
}
return chunkPaths;
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/grouplens/GroupLensDataModel.java Sun Jun 9 18:50:03 2013
@@ -74,7 +74,7 @@ public final class GroupLensDataModel ex
resultFile.delete();
throw ioe;
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
return resultFile;
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/ToCSV.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/ToCSV.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/ToCSV.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/ToCSV.java Sun Jun 9 18:50:03 2013
@@ -75,7 +75,7 @@ public final class ToCSV {
}
}
} finally {
- Closeables.close(outWriter, true);
+ Closeables.close(outWriter, false);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Runner.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Runner.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Runner.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/Track1Runner.java Sun Jun 9 18:50:03 2013
@@ -89,7 +89,7 @@ public final class Track1Runner {
}
}
} finally {
- Closeables.close(out, true);
+ Closeables.close(out, false);
}
end = System.currentTimeMillis();
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track1/svd/Track1SVDRunner.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,11 @@
package org.apache.mahout.cf.taste.example.kddcup.track1.svd;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+
import com.google.common.io.Closeables;
import org.apache.mahout.cf.taste.common.NoSuchItemException;
import org.apache.mahout.cf.taste.common.NoSuchUserException;
@@ -33,11 +38,6 @@ import org.apache.mahout.common.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-
/**
* run an SVD factorization of the KDD track1 data.
*
@@ -117,7 +117,7 @@ public final class Track1SVDRunner {
}
}
} finally {
- Closeables.close(out, true);
+ Closeables.close(out, false);
}
log.info("wrote estimates to {}, done.", resultFile.getAbsolutePath());
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track2/Track2Runner.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track2/Track2Runner.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track2/Track2Runner.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/example/kddcup/track2/Track2Runner.java Sun Jun 9 18:50:03 2013
@@ -94,7 +94,7 @@ public final class Track2Runner {
out.write(result.getResultBytes());
}
} finally {
- Closeables.close(out, true);
+ Closeables.close(out, false);
}
end = System.currentTimeMillis();
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/hadoop/example/als/netflix/NetflixDatasetConverter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/hadoop/example/als/netflix/NetflixDatasetConverter.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/hadoop/example/als/netflix/NetflixDatasetConverter.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/cf/taste/hadoop/example/als/netflix/NetflixDatasetConverter.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,13 @@
package org.apache.mahout.cf.taste.hadoop.example.als.netflix;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.util.List;
+import java.util.regex.Pattern;
+
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -32,13 +39,6 @@ import org.apache.mahout.common.iterator
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.List;
-import java.util.regex.Pattern;
-
/** converts the raw files provided by netflix to an appropriate input format */
public final class NetflixDatasetConverter {
@@ -103,7 +103,7 @@ public final class NetflixDatasetConvert
}
log.info("{} ratings processed. done.", ratingsProcessed);
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
log.info("Reading probes...");
@@ -142,7 +142,7 @@ public final class NetflixDatasetConvert
}
log.info("{} ratings processed. done.", ratingsProcessed);
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/classifier/sgd/TrainLogistic.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,19 @@
package org.apache.mahout.classifier.sgd;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.Locale;
+
import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
@@ -32,19 +45,6 @@ import org.apache.commons.cli2.util.Help
import org.apache.mahout.math.RandomAccessSparseVector;
import org.apache.mahout.math.Vector;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.List;
-import java.util.Locale;
-
/**
* Train a logistic regression for the examples from Chapter 13 of Mahout in Action
@@ -114,7 +114,7 @@ public final class TrainLogistic {
try {
lmp.saveTo(modelOutput);
} finally {
- Closeables.close(modelOutput, true);
+ Closeables.close(modelOutput, false);
}
output.println(lmp.getNumFeatures());
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplayClustering.java Sun Jun 9 18:50:03 2013
@@ -325,7 +325,7 @@ public class DisplayClustering extends F
writer.append(new Text("sample_" + i++), vw);
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplaySpectralKMeans.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplaySpectralKMeans.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplaySpectralKMeans.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/display/DisplaySpectralKMeans.java Sun Jun 9 18:50:03 2013
@@ -72,7 +72,7 @@ public class DisplaySpectralKMeans exten
}
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
int maxIter = 10;
double convergenceDelta = 0.001;
Modified: mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmDataConverter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmDataConverter.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmDataConverter.java (original)
+++ mahout/trunk/examples/src/main/java/org/apache/mahout/clustering/minhash/LastfmDataConverter.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,13 @@
package org.apache.mahout.clustering.minhash;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -31,13 +38,6 @@ import org.apache.mahout.math.Sequential
import org.apache.mahout.math.Vector;
import org.apache.mahout.math.VectorWritable;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
public final class LastfmDataConverter {
private static final Pattern TAB_PATTERN = Pattern.compile("\t");
@@ -183,7 +183,7 @@ public final class LastfmDataConverter {
}
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
return true;
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/SerializationBenchmark.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/SerializationBenchmark.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/SerializationBenchmark.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/benchmark/SerializationBenchmark.java Sun Jun 9 18:50:03 2013
@@ -1,11 +1,8 @@
package org.apache.mahout.benchmark;
-import static org.apache.mahout.benchmark.VectorBenchmarks.DENSE_VECTOR;
-import static org.apache.mahout.benchmark.VectorBenchmarks.RAND_SPARSE_VECTOR;
-import static org.apache.mahout.benchmark.VectorBenchmarks.SEQ_SPARSE_VECTOR;
-
import java.io.IOException;
+import com.google.common.io.Closeables;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -16,7 +13,9 @@ import org.apache.mahout.common.TimingSt
import org.apache.mahout.common.iterator.sequencefile.SequenceFileValueIterator;
import org.apache.mahout.math.VectorWritable;
-import com.google.common.io.Closeables;
+import static org.apache.mahout.benchmark.VectorBenchmarks.DENSE_VECTOR;
+import static org.apache.mahout.benchmark.VectorBenchmarks.RAND_SPARSE_VECTOR;
+import static org.apache.mahout.benchmark.VectorBenchmarks.SEQ_SPARSE_VECTOR;
public class SerializationBenchmark {
public static final String SERIALIZE = "Serialize";
@@ -52,7 +51,7 @@ public class SerializationBenchmark {
}
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
mark.printStats(stats, SERIALIZE, DENSE_VECTOR);
@@ -69,7 +68,7 @@ public class SerializationBenchmark {
}
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
mark.printStats(stats, SERIALIZE, RAND_SPARSE_VECTOR);
@@ -86,7 +85,7 @@ public class SerializationBenchmark {
}
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
mark.printStats(stats, SERIALIZE, SEQ_SPARSE_VECTOR);
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/clustering/lda/LDAPrintTopics.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,20 @@
package org.apache.mahout.clustering.lda;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.PriorityQueue;
+import java.util.Queue;
+
import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -40,20 +54,6 @@ import org.apache.mahout.common.iterator
import org.apache.mahout.common.iterator.sequencefile.SequenceFileDirIterable;
import org.apache.mahout.utils.vectors.VectorHelper;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.PriorityQueue;
-import java.util.Queue;
-
/**
* Class to print out the top K words for each topic.
*/
@@ -185,7 +185,7 @@ public final class LDAPrintTopics {
}
} finally {
if (!printingToSystemOut) {
- Closeables.close(out, true);
+ Closeables.close(out, false);
} else {
out.flush();
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorage.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorage.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorage.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromLuceneStorage.java Sun Jun 9 18:50:03 2013
@@ -16,6 +16,10 @@ package org.apache.mahout.text;
* limitations under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
import com.google.common.io.Closeables;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -35,10 +39,6 @@ import org.apache.lucene.store.FSDirecto
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
import static org.apache.commons.lang.StringUtils.isBlank;
/**
@@ -71,7 +71,7 @@ public class SequenceFilesFromLuceneStor
searcher.search(lucene2seqConf.getQuery(), writerCollector);
log.info("Wrote " + writerCollector.processedDocs + " documents in " + sequenceFilePath.toUri());
processedDocs = writerCollector.processedDocs;
- Closeables.close(sequenceFileWriter, true);
+ Closeables.close(sequenceFileWriter, false);
directory.close();
//searcher.close();
reader.close();
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/text/SequenceFilesFromMailArchives.java Sun Jun 9 18:50:03 2013
@@ -16,9 +16,17 @@
*/
package org.apache.mahout.text;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
-
import org.apache.commons.cli2.builder.ArgumentBuilder;
import org.apache.commons.cli2.builder.DefaultOptionBuilder;
import org.apache.hadoop.conf.Configuration;
@@ -32,15 +40,6 @@ import org.apache.mahout.utils.io.Chunke
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
/**
* Converts a directory of gzipped mail archives into SequenceFiles of specified
* chunkSize. This class is similar to {@link SequenceFilesFromDirectory} except
@@ -71,7 +70,7 @@ public final class SequenceFilesFromMail
log.info("Parsed {} messages from {} in time: {}", cnt, options.getInput().getAbsolutePath(), finish - start);
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaXmlSplitter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaXmlSplitter.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaXmlSplitter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/text/wikipedia/WikipediaXmlSplitter.java Sun Jun 9 18:50:03 2013
@@ -217,7 +217,7 @@ public final class WikipediaXmlSplitter
try {
chunkWriter.write(content.toString(), 0, content.length());
} finally {
- Closeables.close(chunkWriter, true);
+ Closeables.close(chunkWriter, false);
}
if (filenumber >= numChunks) {
break;
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/SequenceFileDumper.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,11 @@
package org.apache.mahout.utils;
+import java.io.File;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.List;
+
import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
import com.google.common.io.Closeables;
@@ -33,11 +38,6 @@ import org.apache.mahout.common.iterator
import org.apache.mahout.math.list.IntArrayList;
import org.apache.mahout.math.map.OpenObjectIntHashMap;
-import java.io.File;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.List;
-
public final class SequenceFileDumper extends AbstractJob {
public SequenceFileDumper() {
@@ -154,7 +154,7 @@ public final class SequenceFileDumper ex
} finally {
if (shouldClose) {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/clustering/ClusterDumper.java Sun Jun 9 18:50:03 2013
@@ -217,7 +217,7 @@ public final class ClusterDumper extends
log.info("Wrote {} clusters", numWritten);
} finally {
if (shouldClose) {
- Closeables.close(clusterWriter, true);
+ Closeables.close(clusterWriter, false);
} else {
if (clusterWriter instanceof GraphMLClusterWriter) {
clusterWriter.close();
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/RowIdJob.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/RowIdJob.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/RowIdJob.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/RowIdJob.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,9 @@
package org.apache.mahout.utils.vectors;
+import java.util.List;
+import java.util.Map;
+
import com.google.common.io.Closeables;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -27,7 +30,6 @@ import org.apache.hadoop.io.Text;
import org.apache.hadoop.util.ToolRunner;
import org.apache.mahout.common.AbstractJob;
import org.apache.mahout.common.Pair;
-import org.apache.mahout.common.commandline.DefaultOptionCreator;
import org.apache.mahout.common.iterator.sequencefile.PathFilters;
import org.apache.mahout.common.iterator.sequencefile.PathType;
import org.apache.mahout.common.iterator.sequencefile.SequenceFileDirIterable;
@@ -35,9 +37,6 @@ import org.apache.mahout.math.VectorWrit
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
-import java.util.Map;
-
/**
* Converts a vector representation of documents into a {@code document x terms} matrix.
* The input data is in {@code SequenceFile<Text,VectorWritable>} format (as generated by
@@ -98,8 +97,8 @@ public class RowIdJob extends AbstractJo
log.info("Wrote out matrix with {} rows and {} columns to {}", i, numCols, matrixPath);
return 0;
} finally {
- Closeables.close(indexWriter, true);
- Closeables.close(matrixWriter, true);
+ Closeables.close(indexWriter, false);
+ Closeables.close(matrixWriter, false);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/VectorDumper.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,13 @@
package org.apache.mahout.utils.vectors;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.Set;
+
import com.google.common.base.Charsets;
import com.google.common.collect.Sets;
import com.google.common.io.Closeables;
@@ -39,13 +46,6 @@ import org.apache.mahout.math.VectorWrit
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.Set;
-
/**
* Can read in a {@link org.apache.hadoop.io.SequenceFile} of {@link Vector}s and dump
* out the results using {@link Vector#asFormatString()} to either the console or to a
@@ -249,7 +249,7 @@ public final class VectorDumper extends
writer.flush();
} finally {
if (shouldClose) {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/arff/Driver.java Sun Jun 9 18:50:03 2013
@@ -21,18 +21,18 @@ import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.Writer;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.io.Closeables;
import com.google.common.io.Files;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
import org.apache.commons.cli2.CommandLine;
import org.apache.commons.cli2.Group;
import org.apache.commons.cli2.Option;
@@ -162,7 +162,7 @@ public final class Driver {
writeLabelBindings(writer, arffModel, delimiter);
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
@@ -251,7 +251,7 @@ public final class Driver {
writeLabelBindings(dictOut, model, delimiter, jsonDictonary);
log.info("Wrote: {} vectors", numDocs);
} finally {
- Closeables.close(vectorWriter, true);
+ Closeables.close(vectorWriter, false);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/DelimitedTermInfoWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/DelimitedTermInfoWriter.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/DelimitedTermInfoWriter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/DelimitedTermInfoWriter.java Sun Jun 9 18:50:03 2013
@@ -59,7 +59,7 @@ public class DelimitedTermInfoWriter imp
writer.write('\n');
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/SequenceFileVectorWriter.java Sun Jun 9 18:50:03 2013
@@ -66,7 +66,7 @@ public class SequenceFileVectorWriter im
@Override
public void close() throws IOException {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
public SequenceFile.Writer getWriter() {
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/TextualVectorWriter.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/TextualVectorWriter.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/TextualVectorWriter.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/io/TextualVectorWriter.java Sun Jun 9 18:50:03 2013
@@ -65,6 +65,6 @@ public class TextualVectorWriter impleme
@Override
public void close() throws IOException {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java (original)
+++ mahout/trunk/integration/src/main/java/org/apache/mahout/utils/vectors/lucene/ClusterLabels.java Sun Jun 9 18:50:03 2013
@@ -27,14 +27,13 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
-import com.google.common.collect.Sets;
-import org.apache.lucene.util.BytesRef;
import com.google.common.base.Charsets;
+import com.google.common.collect.Sets;
import com.google.common.io.Closeables;
import com.google.common.io.Files;
-import java.util.Set;
-import java.util.TreeSet;
import org.apache.commons.cli2.CommandLine;
import org.apache.commons.cli2.Group;
import org.apache.commons.cli2.Option;
@@ -45,16 +44,17 @@ import org.apache.commons.cli2.builder.G
import org.apache.commons.cli2.commandline.Parser;
import org.apache.hadoop.fs.Path;
import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.MultiFields;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.OpenBitSet;
import org.apache.mahout.clustering.classify.WeightedVectorWritable;
import org.apache.mahout.common.CommandLineUtil;
@@ -140,7 +140,7 @@ public class ClusterLabels {
}
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/clustering/TestClusterDumper.java Sun Jun 9 18:50:03 2013
@@ -121,7 +121,7 @@ public final class TestClusterDumper ext
writer.addDocument(doc);
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
IndexReader reader = DirectoryReader.open(directory);
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/SequenceFilesFromMailArchivesTest.java Sun Jun 9 18:50:03 2013
@@ -63,7 +63,7 @@ public final class SequenceFilesFromMail
gzOut.write(testMailMessages.getBytes("UTF-8"));
gzOut.finish();
} finally {
- Closeables.close(gzOut, true);
+ Closeables.close(gzOut, false);
}
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/text/TestSequenceFilesFromDirectory.java Sun Jun 9 18:50:03 2013
@@ -80,7 +80,7 @@ public final class TestSequenceFilesFrom
try {
writer.write(aData[1]);
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/SplitInputTest.java Sun Jun 9 18:50:03 2013
@@ -89,7 +89,7 @@ public final class SplitInputTest extend
for (String[] entry : ClassifierData.DATA) {
if (!entry[0].equals(currentLabel)) {
currentLabel = entry[0];
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
writer = new BufferedWriter(new OutputStreamWriter(fs.create(new Path(tempInputDirectory, currentLabel)),
Charsets.UTF_8));
@@ -98,7 +98,7 @@ public final class SplitInputTest extend
writer.write(currentLabel + '\t' + entry[1] + '\n');
}
}finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/csv/CSVVectorIteratorTest.java Sun Jun 9 18:50:03 2013
@@ -17,6 +17,11 @@
package org.apache.mahout.utils.vectors.csv;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.Iterator;
+
import com.google.common.io.Closeables;
import org.apache.mahout.math.Vector;
import org.apache.mahout.utils.MahoutTestCase;
@@ -25,11 +30,6 @@ import org.apache.mahout.utils.vectors.V
import org.apache.mahout.utils.vectors.io.TextualVectorWriter;
import org.junit.Test;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Iterator;
-
public class CSVVectorIteratorTest extends MahoutTestCase {
@Test
@@ -47,7 +47,7 @@ public class CSVVectorIteratorTest exten
Iterable<Vector> iter = new RandomVectorIterable(50);
writer.write(iter);
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
Iterator<Vector> csvIter = new CSVVectorIterator(new StringReader(sWriter.getBuffer().toString()));
int count = 0;
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/io/VectorWriterTest.java Sun Jun 9 18:50:03 2013
@@ -47,7 +47,7 @@ public final class VectorWriterTest exte
try {
writer.write(new RandomVectorIterable(50));
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
long count = HadoopUtil.countRecords(path, conf);
@@ -64,7 +64,7 @@ public final class VectorWriterTest exte
vectors.add(new DenseVector(new double[]{1.3, 1.5, 3.5}));
writer.write(vectors);
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
String buffer = strWriter.toString();
assertNotNull(buffer);
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/CachedTermInfoTest.java Sun Jun 9 18:50:03 2013
@@ -1,6 +1,8 @@
package org.apache.mahout.utils.vectors.lucene;
+import java.io.IOException;
+
import com.google.common.io.Closeables;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
@@ -15,8 +17,6 @@ import org.apache.lucene.util.Version;
import org.apache.mahout.utils.MahoutTestCase;
import org.junit.Test;
-import java.io.IOException;
-
/**
*
*
@@ -92,7 +92,7 @@ public class CachedTermInfoTest extends
writer.addDocument(doc);
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
return directory;
}
Modified: mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java
URL: http://svn.apache.org/viewvc/mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java?rev=1491265&r1=1491264&r2=1491265&view=diff
==============================================================================
--- mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java (original)
+++ mahout/trunk/integration/src/test/java/org/apache/mahout/utils/vectors/lucene/LuceneIterableTest.java Sun Jun 9 18:50:03 2013
@@ -17,9 +17,10 @@
package org.apache.mahout.utils.vectors.lucene;
-import com.google.common.io.Closeables;
import java.io.IOException;
import java.util.Iterator;
+
+import com.google.common.io.Closeables;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -179,7 +180,7 @@ public final class LuceneIterableTest ex
writer.addDocument(doc);
}
} finally {
- Closeables.close(writer, true);
+ Closeables.close(writer, false);
}
return directory;
}