Merge branch 'issues/65' into tantivy-imhotep

Conflicts:
	src/core/segment_reader.rs
	src/fastfield/reader.rs

src/query/boolean_query/mod.rs

@@ -23,7 +23,7 @@ mod tests {
     use collector::tests::TestCollector;
     use Index;
     use schema::*;
-    use fastfield::{U32FastFieldReader};
+    use fastfield::{U64FastFieldReader};
     use postings::SegmentPostingsOption;
 
     fn abs_diff(left: f32, right: f32) -> f32 {
@@ -111,7 +111,7 @@ mod tests {
         let occurs = vec!(Occur::Should, Occur::Should);
         let occur_filter = OccurFilter::new(&occurs);
        
-        let left_fieldnorms = U32FastFieldReader::from(vec!(100,200,300));
+        let left_fieldnorms = U64FastFieldReader::from(vec!(100,200,300));
         
         let left = VecPostings::from(vec!(1, 2, 3));
         let left_scorer = TermScorer {
@@ -120,7 +120,7 @@ mod tests {
             postings: left,
         };
         
-        let right_fieldnorms = U32FastFieldReader::from(vec!(15,25,35));
+        let right_fieldnorms = U64FastFieldReader::from(vec!(15,25,35));
         let right = VecPostings::from(vec!(1, 3, 8));
         
         let right_scorer = TermScorer {

src/query/query_parser/query_parser.rs

@@ -22,10 +22,9 @@ pub enum QueryParserError {
     /// `FieldDoesNotExist(field_name: String)`
     /// The query references a field that is not in the schema
     FieldDoesNotExist(String),
-    /// `ExpectedU32(field_name: String, field_value: String)`
-    /// The query contains a term for a `u32`-field, but the value
-    /// is not a u32.
-    ExpectedU32(String, String),
+    /// The query contains a term for a `u64`-field, but the value
+    /// is not a u64.
+    ExpectedU64(String, String),
     /// It is forbidden queries that are only "excluding". (e.g. -title:pop)
     AllButQueryForbidden,
     /// If no default field is declared, running a query without any
@@ -138,7 +137,7 @@ impl QueryParser {
         loop {
             if let Some(token) = token_iter.next() {
                 let text = token.to_string();
-                // TODO Handle u32
+                // TODO Handle u64
                 let term = Term::from_field_text(field, &text);
                 tokens.push(term);
             } else {

src/query/term_query/mod.rs

@@ -14,7 +14,7 @@ mod tests {
     use query::Scorer;
     use query::term_query::TermScorer;
     use query::Query;
-    use fastfield::U32FastFieldReader;
+    use fastfield::U64FastFieldReader;
     use query::TermQuery;
     use Index;
     use schema::*;
@@ -55,7 +55,7 @@ mod tests {
        
     #[test]
     pub fn test_term_scorer() {
-        let left_fieldnorms = U32FastFieldReader::from(vec!(10, 4));
+        let left_fieldnorms = U64FastFieldReader::from(vec!(10, 4));
         assert_eq!(left_fieldnorms.get(0), 10);
         assert_eq!(left_fieldnorms.get(1), 4);
         let left = VecPostings::from(vec!(1));

src/query/term_query/term_scorer.rs

@@ -1,13 +1,13 @@
 use Score;
 use DocId;
-use fastfield::U32FastFieldReader;
+use fastfield::U64FastFieldReader;
 use postings::DocSet;
 use query::Scorer;
 use postings::Postings;
 
 pub struct TermScorer<TPostings> where TPostings: Postings {
     pub idf: Score,
-    pub fieldnorm_reader_opt: Option<U32FastFieldReader>,
+    pub fieldnorm_reader_opt: Option<U64FastFieldReader>,
     pub postings: TPostings,
 }