From d002698008d26848531c6d1f4bfac51263ef1af5 Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Mon, 27 Feb 2023 12:26:34 +0900 Subject: [PATCH] Re-export of query grammar. (#1908) --- Cargo.toml | 2 +- src/lib.rs | 7 ++----- src/query/disjunction_max_query.rs | 4 +--- src/query/mod.rs | 2 +- src/query/query_parser/query_parser.rs | 4 ++-- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index aa9ef5f57..49c5474e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,7 +58,7 @@ arc-swap = "1.5.0" columnar = { version="0.1", path="./columnar", package ="tantivy-columnar" } sstable = { version="0.1", path="./sstable", package ="tantivy-sstable", optional = true } stacker = { version="0.1", path="./stacker", package ="tantivy-stacker" } -tantivy-query-grammar = { version= "0.19.0", path="./query-grammar" } +query-grammar = { version= "0.19.0", path="./query-grammar", package = "tantivy-query-grammar" } tantivy-bitpacker = { version= "0.3", path="./bitpacker" } common = { version= "0.5", path = "./common/", package = "tantivy-common" } tokenizer-api = { version="0.1", path="./tokenizer-api", package="tantivy-tokenizer-api" } diff --git a/src/lib.rs b/src/lib.rs index 9eaac652e..ac3c8e2b7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -123,12 +123,9 @@ mod functional_test; mod macros; mod future_result; -pub use columnar; +// Re-exports pub use common::DateTime; -/// Re-export of the `time` crate -/// -/// Tantivy uses [`time`](https://crates.io/crates/time) for dates. -pub use time; +pub use {columnar, query_grammar, time}; pub use crate::error::TantivyError; pub use crate::future_result::FutureResult; diff --git a/src/query/disjunction_max_query.rs b/src/query/disjunction_max_query.rs index 89c4f97f6..b3a9279e0 100644 --- a/src/query/disjunction_max_query.rs +++ b/src/query/disjunction_max_query.rs @@ -1,6 +1,4 @@ -use tantivy_query_grammar::Occur; - -use crate::query::{BooleanWeight, DisjunctionMaxCombiner, EnableScoring, Query, Weight}; +use crate::query::{BooleanWeight, DisjunctionMaxCombiner, EnableScoring, Occur, Query, Weight}; use crate::{Score, Term}; /// The disjunction max query returns documents matching one or more wrapped queries, diff --git a/src/query/mod.rs b/src/query/mod.rs index aea485456..152f703d6 100644 --- a/src/query/mod.rs +++ b/src/query/mod.rs @@ -29,7 +29,7 @@ mod weight; mod vec_docset; pub(crate) mod score_combiner; -pub use tantivy_query_grammar::Occur; +pub use query_grammar::Occur; pub use self::all_query::{AllQuery, AllScorer, AllWeight}; pub use self::automaton_weight::AutomatonWeight; diff --git a/src/query/query_parser/query_parser.rs b/src/query/query_parser/query_parser.rs index 51d158801..55e238246 100644 --- a/src/query/query_parser/query_parser.rs +++ b/src/query/query_parser/query_parser.rs @@ -5,8 +5,8 @@ use std::str::{FromStr, ParseBoolError}; use base64::engine::general_purpose::STANDARD as BASE64; use base64::Engine; +use query_grammar::{UserInputAst, UserInputBound, UserInputLeaf, UserInputLiteral}; use rustc_hash::FxHashMap; -use tantivy_query_grammar::{UserInputAst, UserInputBound, UserInputLeaf, UserInputLiteral}; use super::logical_ast::*; use crate::core::Index; @@ -316,7 +316,7 @@ impl QueryParser { /// Parse the user query into an AST. fn parse_query_to_logical_ast(&self, query: &str) -> Result { - let user_input_ast = tantivy_query_grammar::parse_query(query) + let user_input_ast = query_grammar::parse_query(query) .map_err(|_| QueryParserError::SyntaxError(query.to_string()))?; self.compute_logical_ast(user_input_ast) }