bench working

src/collector/facet_collector.rs

@@ -505,8 +505,8 @@ mod tests {
     use query::AllQuery;
     use super::{FacetCollector, FacetCounts};
     use std::iter;
-    use schema::Field;
     use rand::{thread_rng, Rng};
+    use schema::Field;
 
     #[test]
     fn test_facet_collector_drilldown() {
@@ -627,6 +627,13 @@ mod tests {
 mod bench {
 
     use test::Bencher;
+    use schema::SchemaBuilder;
+    use Index;
+    use collector::FacetCollector;
+    use schema::Facet;
+    use query::AllQuery;
+    use rand::{thread_rng, Rng};
+
 
     #[bench]
     fn bench_facet_collector(b: &mut Bencher) {

src/collector/mod.rs

@@ -190,8 +190,8 @@ pub mod tests {
 
 #[cfg(all(test, feature="unstable"))]
 mod bench {
-
     use test::Bencher;
+    use collector::{Collector, CountCollector};
 
     #[bench]
     fn build_collector(b: &mut Bencher) {

src/compression/mod.rs

@@ -269,6 +269,7 @@ mod bench {
 
     use super::*;
     use test::Bencher;
+    use tests;
 
     #[bench]
     fn bench_compress(b: &mut Bencher) {

src/datastruct/stacker/expull.rs

@@ -102,9 +102,6 @@ mod tests {
     use super::*;
     use super::super::heap::Heap;
 
-    const NUM_STACK: usize = 10_000;
-    const STACK_SIZE: u32 = 1000;
-
     #[test]
     fn test_stack() {
         let heap = Heap::with_capacity(1_000_000);
@@ -129,6 +126,11 @@ mod tests {
 #[cfg(all(test, feature="unstable"))]
 mod bench {
     use test::Bencher;
+    use super::Heap;
+    use super::ExpUnrolledLinkedList;
+
+    const NUM_STACK: usize = 10_000;
+    const STACK_SIZE: u32 = 1000;
 
     #[bench]
     fn bench_push_vec(bench: &mut Bencher) {

src/fastfield/mod.rs

@@ -136,12 +136,12 @@ mod tests {
     use super::*;
 
     lazy_static! {
-        static ref SCHEMA: Schema = {
+        pub static ref SCHEMA: Schema = {
             let mut schema_builder = SchemaBuilder::default();
             schema_builder.add_u64_field("field", FAST);
             schema_builder.build()
         };
-        static ref FIELD: Field = {
+        pub static ref FIELD: Field = {
             SCHEMA.get_field("field").unwrap()
         };
     }
@@ -367,7 +367,7 @@ mod tests {
         }
     }
 
-    fn generate_permutation() -> Vec<u64> {
+    pub fn generate_permutation() -> Vec<u64> {
         let seed: &[u32; 4] = &[1, 2, 3, 4];
         let mut rng = XorShiftRng::from_seed(*seed);
         let mut permutation: Vec<u64> = (0u64..1_000_000u64).collect();
@@ -411,9 +411,15 @@ mod tests {
 
 #[cfg(all(test, feature="unstable"))]
 mod bench {
-
-
+    use super::tests::{SCHEMA, generate_permutation};
     use test::{self, Bencher};
+    use super::tests::FIELD;
+    use common::CompositeFile;
+    use directory::{Directory, RAMDirectory, WritePtr};
+    use fastfield::FastFieldReader;
+    use std::collections::HashMap;
+    use std::path::Path;
+    use super::*;
 
     #[bench]
     fn bench_intfastfield_linear_veclookup(b: &mut Bencher) {
@@ -421,7 +427,7 @@ mod bench {
         b.iter(|| {
             let n = test::black_box(7000u32);
             let mut a = 0u64;
-            for i in Iterator::step_by(0u32..n, 7) {
+            for i in (0u32..n / 7).map(|v| v * 7) {
                 a ^= permutation[i as usize];
             }
             a
@@ -467,7 +473,7 @@ mod bench {
             b.iter(|| {
                 let n = test::black_box(7000u32);
                 let mut a = 0u64;
-                for i in Iterator::step_by(0u32..n, 7) {
+                for i in (0u32..n / 7).map(|val| val * 7) {
                     a ^= fast_field_reader.get(i);
                 }
                 a

src/lib.rs

@@ -293,7 +293,7 @@ mod tests {
     pub fn nearly_equals(a: f32, b: f32) -> bool {
         (a - b).abs() < 0.0005 * (a + b).abs()
     }
-
+    
     fn generate_array_with_seed(n: usize, ratio: f32, seed_val: u32) -> Vec<u32> {
         let seed: &[u32; 4] = &[1, 2, 3, seed_val];
         let mut rng: XorShiftRng = XorShiftRng::from_seed(*seed);

src/postings/mod.rs

@@ -41,7 +41,6 @@ pub mod tests {
     use docset::{DocSet, SkipResult};
     use DocId;
     use Score;
-    use query::Intersection;
     use query::Scorer;
     use schema::{Document, SchemaBuilder, Term, INT_INDEXED, STRING, TEXT};
     use core::SegmentComponent;
@@ -53,7 +52,6 @@ pub mod tests {
     use datastruct::stacker::Heap;
     use schema::Field;
     use indexer::operation::AddOperation;
-    use tests;
     use rand::{Rng, SeedableRng, XorShiftRng};
     use fieldnorm::FieldNormReader;
 
@@ -478,23 +476,23 @@ pub mod tests {
     }
 
     lazy_static! {
-        static ref TERM_A: Term = {
+        pub static ref TERM_A: Term = {
             let field = Field(0);
             Term::from_field_text(field, "a")
         };
-        static ref TERM_B: Term = {
+        pub static ref TERM_B: Term = {
             let field = Field(0);
             Term::from_field_text(field, "b")
         };
-        static ref TERM_C: Term = {
+        pub static ref TERM_C: Term = {
             let field = Field(0);
             Term::from_field_text(field, "c")
         };
-        static ref TERM_D: Term = {
+        pub static ref TERM_D: Term = {
             let field = Field(0);
             Term::from_field_text(field, "d")
         };
-        static ref INDEX: Index = {
+        pub static ref INDEX: Index = {
             let mut schema_builder = SchemaBuilder::default();
             let text_field = schema_builder.add_text_field("text", STRING);
             let schema = schema_builder.build();
@@ -602,6 +600,12 @@ pub mod tests {
 mod bench {
 
     use test::{self, Bencher};
+    use schema::IndexRecordOption;
+    use tests;
+    use super::tests::*;
+    use docset::SkipResult;
+    use DocSet;
+    use query::Intersection;
 
     #[bench]
     fn bench_segment_postings(b: &mut Bencher) {

src/query/bitset/mod.rs

@@ -124,7 +124,7 @@ mod tests {
     use common::BitSet;
     use docset::{DocSet, SkipResult};
     use super::BitSetDocSet;
-    
+
     fn create_docbitset(docs: &[DocId], max_doc: DocId) -> BitSetDocSet {
         let mut docset = BitSet::with_max_value(max_doc);
         for &doc in docs {
@@ -224,8 +224,10 @@ mod tests {
 mod bench {
 
     use tests;
-    use test::{self, Bencher};
+    use test;
     use super::BitSet;
+    use super::BitSetDocSet;
+    use DocSet;
 
     #[bench]
     fn bench_bitset_1pct_insert(b: &mut test::Bencher) {

src/query/union.rs

@@ -411,8 +411,15 @@ mod tests {
 
 #[cfg(all(test, feature="unstable"))]
 mod bench {
-    use test::Bencher;
 
+    use test::Bencher;
+    use tests;
+    use query::score_combiner::DoNothingCombiner;
+    use DocId;
+    use query::ConstScorer;
+    use query::Union;
+    use query::VecDocSet;
+    use DocSet;
 
     #[bench]
     fn bench_union_3_high(bench: &mut Bencher) {

src/store/mod.rs

@@ -39,7 +39,7 @@ pub use self::reader::StoreReader;
 pub use self::writer::StoreWriter;
 
 #[cfg(test)]
-mod tests {
+pub mod tests {
 
     use super::*;
     use std::path::Path;
@@ -49,7 +49,7 @@ mod tests {
     use schema::Document;
     use directory::{Directory, RAMDirectory, WritePtr};
 
-    fn write_lorem_ipsum_store(writer: WritePtr, num_docs: usize) -> Schema {
+    pub fn write_lorem_ipsum_store(writer: WritePtr, num_docs: usize) -> Schema {
         let mut schema_builder = SchemaBuilder::default();
         let field_body = schema_builder.add_text_field("body", TextOptions::default().set_stored());
         let field_title =
@@ -110,6 +110,11 @@ mod tests {
 mod bench {
 
     use test::Bencher;
+    use directory::RAMDirectory;
+    use std::path::Path;
+    use store::StoreReader;
+    use directory::Directory;
+    use super::tests::write_lorem_ipsum_store;
 
     #[bench]
     #[cfg(feature="mmap")]