Move cantine_derive to tantivy 0.14

Id: 7b30b59997d55c5c1a80c278cd4e05fb149d3c1a
Author: Caio
Commit time: 2021-02-07T16:50:54+01:00

Modified cantine_derive/Cargo.toml

@@ -8,7 +8,7
[dependencies]
cantine_derive_internal = { path = "./internal" }
serde = { version = "1.0" }
-tantivy = "0.13"
+tantivy = "0.14"

[dev-dependencies]
serde = { version = "1.0", features = ["derive"] }

Modified cantine_derive/src/lib.rs

@@ -202,7 +202,7

use std::{convert::TryInto, ops::Range};

- use tantivy::{query::AllQuery, schema::SchemaBuilder, Document, Index};
+ use tantivy::{Document, Index, query::AllQuery, schema::{self, SchemaBuilder}};

// XXX Who will test the tests?
impl Aggregator<Vec<Range<i16>>, i16> for Vec<i16> {

@@ -232,7 +232,7
#[test]
fn pass() -> Result<()> {
let mut builder = SchemaBuilder::new();
- let bytes_field = builder.add_bytes_field("metadata_as_bytes");
+ let bytes_field = builder.add_bytes_field("metadata_as_bytes", schema::FAST);

let index = Index::create_in_ram(builder.build());
let mut writer = index.writer_with_num_threads(1, 3_000_000)?;

Modified cantine_derive/tests/aggregation_query.rs

@@ -115,7 +115,7
fn collector_integration() -> tantivy::Result<()> {
let mut builder = SchemaBuilder::new();

- let bytes_field = builder.add_bytes_field("bincode_feat");
+ let bytes_field = builder.add_bytes_field("bincode_feat", tantivy::schema::FAST);

let index = Index::create_in_ram(builder.build());
let mut writer = index.writer_with_num_threads(1, 3_000_000)?;

Modified cantine_derive/internal/src/lib.rs

@@ -125,8 +125,8

let from_decls = fields.iter().map(|field| {
let name = field.ident;
- let field_name = format_ident!("Filterable_field_{}", &name);
- let quoted = format!("\"{}\"", field_name);
+ let field_name = format_ident!("Filterable_field_{}", name);
+ let quoted = format!("{}", &field_name);

let method = match field.schema {
FieldType::UNSIGNED => quote!(add_u64_field),

@@ -143,7 +143,7
let name = field.ident;
let field_name = format_ident!("Filterable_field_{}", &name);
let err_msg = format!("Missing field for {} ({})", name, field_name);
- let quoted = format!("\"{}\"", field_name);
+ let quoted = format!("{}", field_name);
quote_spanned! { field.span()=>
#name: schema.get_field(#quoted).ok_or_else(
|| tantivy::TantivyError::SchemaError(#err_msg.to_string()))?