diff --git a/examples-disabled/aggregation.rs b/examples/aggregation.rs similarity index 97% rename from examples-disabled/aggregation.rs rename to examples/aggregation.rs index 1cc7c0e96..39648ed15 100644 --- a/examples-disabled/aggregation.rs +++ b/examples/aggregation.rs @@ -24,8 +24,7 @@ fn main() -> tantivy::Result<()> { ) .set_stored(); let text_field = schema_builder.add_text_field("text", text_fieldtype); - let score_fieldtype = - crate::schema::NumericOptions::default().set_fast(); + let score_fieldtype = crate::schema::NumericOptions::default().set_fast(); let highscore_field = schema_builder.add_f64_field("highscore", score_fieldtype.clone()); let price_field = schema_builder.add_f64_field("price", score_fieldtype); diff --git a/examples-disabled/basic_search.rs b/examples/basic_search.rs similarity index 100% rename from examples-disabled/basic_search.rs rename to examples/basic_search.rs diff --git a/examples-disabled/custom_collector.rs b/examples/custom_collector.rs similarity index 98% rename from examples-disabled/custom_collector.rs rename to examples/custom_collector.rs index 9378fb1e0..4c1d7e455 100644 --- a/examples-disabled/custom_collector.rs +++ b/examples/custom_collector.rs @@ -9,7 +9,7 @@ use std::sync::Arc; -use fastfield_codecs::Column; +use columnar::column_values::ColumnValues; // --- // Importing tantivy... use tantivy::collector::{Collector, SegmentCollector}; @@ -97,7 +97,7 @@ impl Collector for StatsCollector { } struct StatsSegmentCollector { - fast_field_reader: Arc>, + fast_field_reader: Arc, stats: Stats, } diff --git a/examples-disabled/custom_tokenizer.rs b/examples/custom_tokenizer.rs similarity index 100% rename from examples-disabled/custom_tokenizer.rs rename to examples/custom_tokenizer.rs diff --git a/examples-disabled/date_time_field.rs b/examples/date_time_field.rs similarity index 100% rename from examples-disabled/date_time_field.rs rename to examples/date_time_field.rs diff --git a/examples-disabled/deleting_updating_documents.rs b/examples/deleting_updating_documents.rs similarity index 100% rename from examples-disabled/deleting_updating_documents.rs rename to examples/deleting_updating_documents.rs diff --git a/examples-disabled/faceted_search.rs b/examples/faceted_search.rs similarity index 96% rename from examples-disabled/faceted_search.rs rename to examples/faceted_search.rs index e38364890..7324d25fe 100644 --- a/examples-disabled/faceted_search.rs +++ b/examples/faceted_search.rs @@ -71,7 +71,7 @@ fn main() -> tantivy::Result<()> { let reader = index.reader()?; let searcher = reader.searcher(); { - let mut facet_collector = FacetCollector::for_field(classification); + let mut facet_collector = FacetCollector::for_field("classification"); facet_collector.add_facet("/Felidae"); let facet_counts = searcher.search(&AllQuery, &facet_collector)?; // This lists all of the facet counts, right below "/Felidae". @@ -97,7 +97,7 @@ fn main() -> tantivy::Result<()> { let facet = Facet::from("/Felidae/Pantherinae"); let facet_term = Term::from_facet(classification, &facet); let facet_term_query = TermQuery::new(facet_term, IndexRecordOption::Basic); - let mut facet_collector = FacetCollector::for_field(classification); + let mut facet_collector = FacetCollector::for_field("classification"); facet_collector.add_facet("/Felidae/Pantherinae"); let facet_counts = searcher.search(&facet_term_query, &facet_collector)?; let facets: Vec<(&Facet, u64)> = facet_counts.get("/Felidae/Pantherinae").collect(); diff --git a/examples-disabled/faceted_search_with_tweaked_score.rs b/examples/faceted_search_with_tweaked_score.rs similarity index 92% rename from examples-disabled/faceted_search_with_tweaked_score.rs rename to examples/faceted_search_with_tweaked_score.rs index 07cea50c5..d05addaf4 100644 --- a/examples-disabled/faceted_search_with_tweaked_score.rs +++ b/examples/faceted_search_with_tweaked_score.rs @@ -56,7 +56,7 @@ fn main() -> tantivy::Result<()> { ); let top_docs_by_custom_score = TopDocs::with_limit(2).tweak_score(move |segment_reader: &SegmentReader| { - let ingredient_reader = segment_reader.facet_reader(ingredient).unwrap(); + let ingredient_reader = segment_reader.facet_reader("ingredient").unwrap(); let facet_dict = ingredient_reader.facet_dict(); let query_ords: HashSet = facets @@ -64,12 +64,9 @@ fn main() -> tantivy::Result<()> { .filter_map(|key| facet_dict.term_ord(key.encoded_str()).unwrap()) .collect(); - let mut facet_ords_buffer: Vec = Vec::with_capacity(20); - move |doc: DocId, original_score: Score| { - ingredient_reader.facet_ords(doc, &mut facet_ords_buffer); - let missing_ingredients = facet_ords_buffer - .iter() + let missing_ingredients = ingredient_reader + .facet_ords(doc) .filter(|ord| !query_ords.contains(ord)) .count(); let tweak = 1.0 / 4_f32.powi(missing_ingredients as i32); diff --git a/examples-disabled/integer_range_search.rs b/examples/integer_range_search.rs similarity index 100% rename from examples-disabled/integer_range_search.rs rename to examples/integer_range_search.rs diff --git a/examples-disabled/ip_field.rs b/examples/ip_field.rs similarity index 100% rename from examples-disabled/ip_field.rs rename to examples/ip_field.rs diff --git a/examples-disabled/iterating_docs_and_positions.rs b/examples/iterating_docs_and_positions.rs similarity index 100% rename from examples-disabled/iterating_docs_and_positions.rs rename to examples/iterating_docs_and_positions.rs diff --git a/examples-disabled/json_field.rs b/examples/json_field.rs similarity index 100% rename from examples-disabled/json_field.rs rename to examples/json_field.rs diff --git a/examples-disabled/multiple_producer.rs b/examples/multiple_producer.rs similarity index 100% rename from examples-disabled/multiple_producer.rs rename to examples/multiple_producer.rs diff --git a/examples-disabled/pre_tokenized_text.rs b/examples/pre_tokenized_text.rs similarity index 100% rename from examples-disabled/pre_tokenized_text.rs rename to examples/pre_tokenized_text.rs diff --git a/examples-disabled/snippet.rs b/examples/snippet.rs similarity index 100% rename from examples-disabled/snippet.rs rename to examples/snippet.rs diff --git a/examples-disabled/stop_words.rs b/examples/stop_words.rs similarity index 100% rename from examples-disabled/stop_words.rs rename to examples/stop_words.rs diff --git a/examples-disabled/warmer.rs b/examples/warmer.rs similarity index 100% rename from examples-disabled/warmer.rs rename to examples/warmer.rs diff --git a/examples-disabled/working_with_json.rs b/examples/working_with_json.rs similarity index 100% rename from examples-disabled/working_with_json.rs rename to examples/working_with_json.rs