Repository: nutch Updated Branches: refs/heads/master 25e879afc -> f5e430e55
update tests to reflect change of reduce outputs by new API (part-nnnnn -> part-r-nnnnn): all unit tests pass now Project: http://git-wip-us.apache.org/repos/asf/nutch/repo Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/0baca7a9 Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/0baca7a9 Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/0baca7a9 Branch: refs/heads/master Commit: 0baca7a966dd1031c80caa5e8e4a3e855c1f358e Parents: 288dcee Author: Sebastian Nagel <[email protected]> Authored: Sun Jan 17 22:20:32 2016 +0100 Committer: Sebastian Nagel <[email protected]> Committed: Thu Feb 25 21:26:30 2016 +0100 ---------------------------------------------------------------------- src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java | 2 +- src/test/org/apache/nutch/crawl/TestCrawlDbFilter.java | 2 +- src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java | 2 +- src/test/org/apache/nutch/crawl/TestInjector.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nutch/blob/0baca7a9/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java b/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java index 86ba76c..56905e4 100644 --- a/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java +++ b/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java @@ -60,7 +60,7 @@ public class CrawlDBTestUtil { Option wKeyOpt = MapFile.Writer.keyClass(Text.class); org.apache.hadoop.io.SequenceFile.Writer.Option wValueOpt = SequenceFile.Writer.valueClass(CrawlDatum.class); MapFile.Writer writer = new MapFile.Writer(conf, new Path(dir, - "part-00000"), wKeyOpt, wValueOpt); + "part-r-00000"), wKeyOpt, wValueOpt); Iterator<URLCrawlDatum> it = init.iterator(); while (it.hasNext()) { URLCrawlDatum row = it.next(); http://git-wip-us.apache.org/repos/asf/nutch/blob/0baca7a9/src/test/org/apache/nutch/crawl/TestCrawlDbFilter.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/nutch/crawl/TestCrawlDbFilter.java b/src/test/org/apache/nutch/crawl/TestCrawlDbFilter.java index 38c38ed..5c38037 100644 --- a/src/test/org/apache/nutch/crawl/TestCrawlDbFilter.java +++ b/src/test/org/apache/nutch/crawl/TestCrawlDbFilter.java @@ -106,7 +106,7 @@ public class TestCrawlDbFilter { job.setOutputValueClass(CrawlDatum.class); JobClient.runJob(job); - Path fetchlist = new Path(new Path(newCrawlDb, "part-00000"), "data"); + Path fetchlist = new Path(new Path(newCrawlDb, "part-r-00000"), "data"); ArrayList<URLCrawlDatum> l = readContents(fetchlist); http://git-wip-us.apache.org/repos/asf/nutch/blob/0baca7a9/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java b/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java index c800610..b670551 100644 --- a/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java +++ b/src/test/org/apache/nutch/crawl/TestCrawlDbMerger.java @@ -149,7 +149,7 @@ public class TestCrawlDbMerger { org.apache.hadoop.io.SequenceFile.Writer.Option wValueOpt = SequenceFile.Writer.valueClass(CrawlDatum.class); MapFile.Writer writer = new MapFile.Writer(config, new Path(dir, - "part-00000"), wKeyOpt, wValueOpt); + "part-r-00000"), wKeyOpt, wValueOpt); Iterator<String> it = init.iterator(); while (it.hasNext()) { String key = it.next(); http://git-wip-us.apache.org/repos/asf/nutch/blob/0baca7a9/src/test/org/apache/nutch/crawl/TestInjector.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/nutch/crawl/TestInjector.java b/src/test/org/apache/nutch/crawl/TestInjector.java index 135f392..7293cbb 100644 --- a/src/test/org/apache/nutch/crawl/TestInjector.java +++ b/src/test/org/apache/nutch/crawl/TestInjector.java @@ -141,7 +141,7 @@ public class TestInjector { private List<String> readCrawldb() throws IOException { Path dbfile = new Path(crawldbPath, CrawlDb.CURRENT_NAME - + "/part-00000/data"); + + "/part-r-00000/data"); System.out.println("reading:" + dbfile); Option rFile = SequenceFile.Reader.file(dbfile); @SuppressWarnings("resource") @@ -161,7 +161,7 @@ public class TestInjector { private HashMap<String, CrawlDatum> readCrawldbRecords() throws IOException { Path dbfile = new Path(crawldbPath, CrawlDb.CURRENT_NAME - + "/part-00000/data"); + + "/part-r-00000/data"); System.out.println("reading:" + dbfile); Option rFile = SequenceFile.Reader.file(dbfile); @SuppressWarnings("resource")
