From 3926fdc21993d7076f963476f7707cf033083e9d Mon Sep 17 00:00:00 2001 From: Tpt Date: Tue, 30 Jun 2020 14:17:38 +0200 Subject: [PATCH] Renames QueryResult::Bindings into QueryResult::Solutions --- js/src/store.rs | 2 +- lib/src/lib.rs | 2 +- lib/src/sparql/eval.rs | 2 +- lib/src/sparql/json_results.rs | 2 +- lib/src/sparql/model.rs | 6 +++--- lib/src/sparql/plan_builder.rs | 2 +- lib/src/sparql/xml_results.rs | 6 +++--- lib/src/store/memory.rs | 4 ++-- lib/src/store/rocksdb.rs | 2 +- lib/src/store/sled.rs | 2 +- lib/tests/service_test_cases.rs | 4 ++-- lib/tests/wasm.rs | 4 ++-- testsuite/src/sparql_evaluator.rs | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/js/src/store.rs b/js/src/store.rs index 86748841..c7f2f465 100644 --- a/js/src/store.rs +++ b/js/src/store.rs @@ -114,7 +114,7 @@ impl JsMemoryStore { .map_err(to_err)?; let results = query.exec().map_err(to_err)?; let output = match results { - QueryResult::Bindings(solutions) => { + QueryResult::Solutions(solutions) => { let results = Array::new(); for solution in solutions { let solution = solution.map_err(to_err)?; diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 7f3f0d34..77b60a00 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -33,7 +33,7 @@ //! //! // SPARQL query //! let prepared_query = store.prepare_query("SELECT ?s WHERE { ?s ?p ?o }", QueryOptions::default())?; -//! if let QueryResult::Bindings(mut solutions) = prepared_query.exec()? { +//! if let QueryResult::Solutions(mut solutions) = prepared_query.exec()? { //! assert_eq!(solutions.next().unwrap()?.get("s"), Some(&ex.into())); //! } //! # Result::Ok(()) diff --git a/lib/src/sparql/eval.rs b/lib/src/sparql/eval.rs index c4d1ed86..7fafd652 100644 --- a/lib/src/sparql/eval.rs +++ b/lib/src/sparql/eval.rs @@ -63,7 +63,7 @@ impl<'a, S: ReadableEncodedStore + 'a> SimpleEvaluator { 'a: 'b, { let iter = self.eval_plan(plan, EncodedTuple::with_capacity(variables.len())); - Ok(QueryResult::Bindings( + Ok(QueryResult::Solutions( self.decode_bindings(iter, variables.to_vec()), )) } diff --git a/lib/src/sparql/json_results.rs b/lib/src/sparql/json_results.rs index 6c5f2af5..3915a42a 100644 --- a/lib/src/sparql/json_results.rs +++ b/lib/src/sparql/json_results.rs @@ -13,7 +13,7 @@ pub fn write_json_results(results: QueryResult<'_>, mut sink: W) -> Re sink.write_all(if value { b"true" } else { b"false" })?; sink.write_all(b"}")?; } - QueryResult::Bindings(solutions) => { + QueryResult::Solutions(solutions) => { sink.write_all(b"{\"head\":{\"vars\":[")?; let mut start_vars = true; for variable in solutions.variables() { diff --git a/lib/src/sparql/model.rs b/lib/src/sparql/model.rs index b2d0709c..f8561ec9 100644 --- a/lib/src/sparql/model.rs +++ b/lib/src/sparql/model.rs @@ -14,7 +14,7 @@ use std::rc::Rc; /// Results of a [SPARQL query](https://www.w3.org/TR/sparql11-query/) pub enum QueryResult<'a> { /// Results of a [SELECT](https://www.w3.org/TR/sparql11-query/#select) query - Bindings(QuerySolutionsIterator<'a>), + Solutions(QuerySolutionsIterator<'a>), /// Result of a [ASK](https://www.w3.org/TR/sparql11-query/#ask) query Boolean(bool), /// Results of a [CONSTRUCT](https://www.w3.org/TR/sparql11-query/#construct) or [DESCRIBE](https://www.w3.org/TR/sparql11-query/#describe) query @@ -128,7 +128,7 @@ impl FileSyntax for QueryResultSyntax { /// /// let store = MemoryStore::new(); /// let prepared_query = store.prepare_query("SELECT ?s WHERE { ?s ?p ?o }", QueryOptions::default())?; -/// if let QueryResult::Bindings(solutions) = prepared_query.exec()? { +/// if let QueryResult::Solutions(solutions) = prepared_query.exec()? { /// for solution in solutions { /// println!("{:?}", solution?.get("s")); /// } @@ -159,7 +159,7 @@ impl<'a> QuerySolutionsIterator<'a> { /// /// let store = MemoryStore::new(); /// let prepared_query = store.prepare_query("SELECT ?s ?o WHERE { ?s ?p ?o }", QueryOptions::default())?; - /// if let QueryResult::Bindings(solutions) = prepared_query.exec()? { + /// if let QueryResult::Solutions(solutions) = prepared_query.exec()? { /// assert_eq!(solutions.variables(), &[Variable::new("s"), Variable::new("o")]); /// } /// # Result::Ok(()) diff --git a/lib/src/sparql/plan_builder.rs b/lib/src/sparql/plan_builder.rs index 7dfb6e4a..963bbc57 100644 --- a/lib/src/sparql/plan_builder.rs +++ b/lib/src/sparql/plan_builder.rs @@ -46,7 +46,7 @@ impl PlanBuilder { let left = self.build_for_graph_pattern(a, variables, graph_name)?; let right = self.build_for_graph_pattern(b, variables, graph_name)?; - let mut possible_problem_vars = ::new(); + let mut possible_problem_vars = BTreeSet::new(); self.add_left_join_problematic_variables(&right, &mut possible_problem_vars); //We add the extra filter if needed diff --git a/lib/src/sparql/xml_results.rs b/lib/src/sparql/xml_results.rs index a0097777..e70adb4c 100644 --- a/lib/src/sparql/xml_results.rs +++ b/lib/src/sparql/xml_results.rs @@ -35,7 +35,7 @@ pub fn write_xml_results(results: QueryResult<'_>, sink: W) -> Result< writer.write_event(Event::End(BytesEnd::borrowed(b"boolean")))?; writer.write_event(Event::End(BytesEnd::borrowed(b"sparql")))?; } - QueryResult::Bindings(solutions) => { + QueryResult::Solutions(solutions) => { writer.write_event(Event::Decl(BytesDecl::new(b"1.0", None, None)))?; let mut sparql_open = BytesStart::borrowed_name(b"sparql"); sparql_open.push_attribute(("xmlns", "http://www.w3.org/2005/sparql-results#")); @@ -170,7 +170,7 @@ pub fn read_xml_results<'a>(source: impl BufRead + 'a) -> Result for (i,var) in variables.iter().enumerate() { mapping.insert(var.as_bytes().to_vec(), i); } - return Ok(QueryResult::Bindings(QuerySolutionsIterator::new( + return Ok(QueryResult::Solutions(QuerySolutionsIterator::new( variables.into_iter().map(Variable::new).collect(), Box::new(ResultsIterator { reader, @@ -209,7 +209,7 @@ pub fn read_xml_results<'a>(source: impl BufRead + 'a) -> Result }, State::AfterHead => { if event.name() == b"results" { - return Ok(QueryResult::Bindings(QuerySolutionsIterator::new( + return Ok(QueryResult::Solutions(QuerySolutionsIterator::new( variables.into_iter().map(Variable::new).collect(), Box::new(empty()), ))) diff --git a/lib/src/store/memory.rs b/lib/src/store/memory.rs index 41fdc441..2b699ecd 100644 --- a/lib/src/store/memory.rs +++ b/lib/src/store/memory.rs @@ -37,7 +37,7 @@ use std::sync::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard}; /// /// // SPARQL query /// let prepared_query = store.prepare_query("SELECT ?s WHERE { ?s ?p ?o }", QueryOptions::default())?; -/// if let QueryResult::Bindings(mut solutions) = prepared_query.exec()? { +/// if let QueryResult::Solutions(mut solutions) = prepared_query.exec()? { /// assert_eq!(solutions.next().unwrap()?.get("s"), Some(&ex.into())); /// } /// # Result::Ok(()) @@ -95,7 +95,7 @@ impl MemoryStore { /// /// // SPARQL query /// let prepared_query = store.prepare_query("SELECT ?s WHERE { ?s ?p ?o }", QueryOptions::default())?; - /// if let QueryResult::Bindings(mut solutions) = prepared_query.exec()? { + /// if let QueryResult::Solutions(mut solutions) = prepared_query.exec()? { /// assert_eq!(solutions.next().unwrap()?.get("s"), Some(&ex.into())); /// } /// # Result::Ok(()) diff --git a/lib/src/store/rocksdb.rs b/lib/src/store/rocksdb.rs index a50991f0..92d537f2 100644 --- a/lib/src/store/rocksdb.rs +++ b/lib/src/store/rocksdb.rs @@ -39,7 +39,7 @@ use std::sync::Arc; /// // SPARQL query /// let prepared_query = store.prepare_query("SELECT ?s WHERE { ?s ?p ?o }", QueryOptions::default())?; /// let results = prepared_query.exec()?; -/// if let QueryResult::Bindings(mut solutions) = results { +/// if let QueryResult::Solutions(mut solutions) = results { /// assert_eq!(solutions.next().unwrap()?.get("s"), Some(&ex.into())); /// } /// # diff --git a/lib/src/store/sled.rs b/lib/src/store/sled.rs index 969920fb..94f74dd5 100644 --- a/lib/src/store/sled.rs +++ b/lib/src/store/sled.rs @@ -38,7 +38,7 @@ use std::str; /// /// // SPARQL query /// let prepared_query = store.prepare_query("SELECT ?s WHERE { ?s ?p ?o }", QueryOptions::default())?; -/// if let QueryResult::Bindings(mut solutions) = prepared_query.exec()? { +/// if let QueryResult::Solutions(mut solutions) = prepared_query.exec()? { /// assert_eq!(solutions.next().unwrap()?.get("s"), Some(&ex.into())); /// } /// # diff --git a/lib/tests/service_test_cases.rs b/lib/tests/service_test_cases.rs index 1fc78f84..ec1bfccd 100644 --- a/lib/tests/service_test_cases.rs +++ b/lib/tests/service_test_cases.rs @@ -205,7 +205,7 @@ fn query_store<'a>( options: QueryOptions<'a>, ) -> Result> { match store.prepare_query(&query, options)?.exec()? { - QueryResult::Bindings(iterator) => { + QueryResult::Solutions(iterator) => { let (variables, iter) = iterator.destruct(); let collected = iter.collect::>(); Ok(QuerySolutionsIterator::new( @@ -226,7 +226,7 @@ fn pattern_store<'a>( .prepare_query_from_pattern(&pattern, options)? .exec()? { - QueryResult::Bindings(iterator) => { + QueryResult::Solutions(iterator) => { let (varaibles, iter) = iterator.destruct(); let collected = iter.collect::>(); Ok(QuerySolutionsIterator::new( diff --git a/lib/tests/wasm.rs b/lib/tests/wasm.rs index b8469ff5..5a84f5e4 100644 --- a/lib/tests/wasm.rs +++ b/lib/tests/wasm.rs @@ -23,7 +23,7 @@ mod test { .prepare_query("SELECT ?s WHERE { ?s ?p ?o }", QueryOptions::default()) .unwrap(); let results = prepared_query.exec().unwrap(); - if let QueryResult::Bindings(mut solutions) = results { + if let QueryResult::Solutions(mut solutions) = results { assert_eq!( solutions.next().unwrap().unwrap().get("s"), Some(&ex.into()) @@ -41,7 +41,7 @@ mod test { ) .unwrap(); let results = prepared_query.exec().unwrap(); - if let QueryResult::Bindings(mut solutions) = results { + if let QueryResult::Solutions(mut solutions) = results { if let Some(Term::Literal(l)) = solutions.next().unwrap().unwrap().get(0) { let year = i64::from_str(l.value()).unwrap(); assert!(2020 <= year && year <= 2100); diff --git a/testsuite/src/sparql_evaluator.rs b/testsuite/src/sparql_evaluator.rs index b85a7ddf..1ec3235e 100644 --- a/testsuite/src/sparql_evaluator.rs +++ b/testsuite/src/sparql_evaluator.rs @@ -180,7 +180,7 @@ impl ServiceHandler for StaticServiceHandler { service_name: &NamedNode, graph_pattern: &'a GraphPattern, ) -> Result> { - if let QueryResult::Bindings(iterator) = self + if let QueryResult::Solutions(iterator) = self .services .get(service_name) .ok_or_else(|| Error::msg(format!("Service {} not found", service_name)))? @@ -223,7 +223,7 @@ fn to_dataset(result: QueryResult<'_>, with_order: bool) -> Result )); Ok(store) } - QueryResult::Bindings(solutions) => { + QueryResult::Solutions(solutions) => { let store = MemoryStore::new(); let result_set = BlankNode::default(); store.insert(Quad::new(