Mercurial > lbo > hg > localmr

changeset 110:d4e87988c65b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix tests
author Lewin Bormann <lbo@spheniscida.de>
date Wed, 15 Jun 2016 21:03:01 +0200
parents d676299a0a2d
children 7924ba557e6c
files src/formats/lines.rs src/phases/map.rs src/phases/reduce.rs src/shard_merge.rs
diffstat 4 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/formats/lines.rs	Wed Jun 15 19:58:21 2016 +0200
+++ b/src/formats/lines.rs	Wed Jun 15 21:03:01 2016 +0200
@@ -128,7 +128,7 @@
 #[cfg(test)]
 mod test {
     use formats::lines;
-    use formats::util::SinkGenerator;
+    use phases::output::SinkGenerator;
     use std::fs;
     use std::io::Write;
 
--- a/src/phases/map.rs	Wed Jun 15 19:58:21 2016 +0200
+++ b/src/phases/map.rs	Wed Jun 15 21:03:01 2016 +0200
@@ -158,7 +158,7 @@
     use closure_mr::ClosureMapReducer;
     use formats::util::PosRecordIterator;
     use formats::lines::LinesSinkGenerator;
-    use map::MapPartition;
+    use phases::map::MapPartition;
     use record_types::{MEmitter, REmitter, Record, MultiRecord};
     use parameters::MRParameters;
     use std::collections::LinkedList;
@@ -204,6 +204,7 @@
                                                             String::from("testdata/result_")),
                                     get_input().into_iter(),
                                     get_mr(),
+                                    get_mr(),
                                     get_output());
         mp._run();
 
--- a/src/phases/reduce.rs	Wed Jun 15 19:58:21 2016 +0200
+++ b/src/phases/reduce.rs	Wed Jun 15 21:03:01 2016 +0200
@@ -132,7 +132,7 @@
 
     use closure_mr::ClosureMapReducer;
     use formats::lines::LinesSinkGenerator;
-    use formats::util::SinkGenerator;
+    use phases::output::SinkGenerator;
     use parameters::MRParameters;
     use record_types::*;
 
--- a/src/shard_merge.rs	Wed Jun 15 19:58:21 2016 +0200
+++ b/src/shard_merge.rs	Wed Jun 15 21:03:01 2016 +0200
@@ -69,9 +69,7 @@
             right: Box::new(iter::empty()),
             left_peeked: None,
             right_peeked: None,
-            // map output is sorted in dictionary order (Aa, aa, Ba) instead of numeric (Aa, Ba,
-            // aa)
-            comparer: sort::dict_string_compare,
+            comparer: sort::default_generic_compare,
         }
     }