Considerable refactoring of the expr builder that takes ownership.

Author: tobixdev

lib/encoding/src/encoding.rs

@@ -166,7 +166,7 @@ pub trait TermDecoder<TEncoding: TermEncoding + ?Sized>: Debug + Sync + Send {
     /// The creation of the iterator cannot fail by itself, as the invariants of the encodings
     /// should have been checked while creating `array`. However, the iterator may return an error
     /// on every new value. This could be due to the value being incompatible with the decoder.
-    fn decode_terms(array: &TEncoding::Array) -> impl Iterator<Item=ThinResult<Self::Term<'_>>>;
+    fn decode_terms(array: &TEncoding::Array) -> impl Iterator<Item = ThinResult<Self::Term<'_>>>;
 
     /// Allows extracting an iterator over all RDF terms in `array` that are _compatible_ with this
     /// decoder (see [TermDecoder] for more information).

lib/encoding/src/plain_term/encoders/mod.rs

@@ -1,7 +1,7 @@
-mod simple;
 mod default;
+mod simple;
 mod typed_value;
 
-pub use simple::*;
 pub use default::DefaultPlainTermEncoder;
+pub use simple::*;
 pub use typed_value::TypedValueRefPlainTermEncoder;

lib/encoding/src/sortable_term/array.rs

@@ -1,9 +1,9 @@
 use crate::encoding::EncodingArray;
 use crate::sortable_term::SortableTermEncoding;
+use crate::TermEncoding;
 use datafusion::arrow::array::{Array, ArrayRef};
 use datafusion::common::exec_err;
 use datafusion::error::DataFusionError;
-use crate::TermEncoding;
 
 /// Represents an Arrow array with a [SortableTermArray].
 pub struct SortableTermArray {

lib/encoding/src/typed_value/encoding.rs

@@ -1,5 +1,6 @@
 use crate::encoding::TermEncoding;
 use crate::typed_value::array::TermValueArray;
+use crate::typed_value::encoders::TermRefTypedValueEncoder;
 use crate::typed_value::scalar::TermValueScalar;
 use crate::{DFResult, EncodingName, TermEncoder};
 use datafusion::arrow::array::ArrayRef;
@@ -9,7 +10,6 @@ use rdf_fusion_model::{Decimal, TermRef, ThinError};
 use std::clone::Clone;
 use std::fmt::{Display, Formatter};
 use std::sync::LazyLock;
-use crate::typed_value::encoders::TermRefTypedValueEncoder;
 
 static FIELDS_STRING: LazyLock<Fields> = LazyLock::new(|| {
     Fields::from(vec![

lib/engine/src/engine.rs

@@ -18,9 +18,7 @@ use rdf_fusion_logical::paths::PropertyPathLoweringRule;
 use rdf_fusion_logical::patterns::PatternLoweringRule;
 use rdf_fusion_logical::quads::QuadsLoweringRule;
 use rdf_fusion_logical::{ActiveGraph, RdfFusionLogicalPlanBuilder};
-use rdf_fusion_model::{
-    GraphName, GraphNameRef, NamedNodeRef, QuadRef, SubjectRef, TermRef,
-};
+use rdf_fusion_model::{GraphName, GraphNameRef, NamedNodeRef, QuadRef, SubjectRef, TermRef};
 use std::sync::Arc;
 
 /// Represents an instance of a RdfFusion engine.

lib/engine/src/results/mod.rs

@@ -4,8 +4,8 @@ use datafusion::arrow::error::ArrowError;
 use datafusion::error::DataFusionError;
 use datafusion::physical_plan::memory::MemoryStream;
 use futures::StreamExt;
-use rdf_fusion_model::{Variable, VariableRef};
 use oxrdfio::{RdfFormat, RdfSerializer};
+use rdf_fusion_model::{Variable, VariableRef};
 use sparesults::{
     QueryResultsFormat, QueryResultsParseError, QueryResultsParser, QueryResultsSerializer,
     ReaderQueryResultsParserOutput,
@@ -21,10 +21,10 @@ mod triples;
 
 use crate::sparql::error::QueryEvaluationError;
 pub use graph_name::GraphNameStream;
-use rdf_fusion_encoding::plain_term::{PlainTermArrayBuilder, PlainTermEncoding};
-use rdf_fusion_encoding::TermEncoding;
 pub use quads::QuadStream;
 pub use query_solution::QuerySolutionStream;
+use rdf_fusion_encoding::plain_term::{PlainTermArrayBuilder, PlainTermEncoding};
+use rdf_fusion_encoding::TermEncoding;
 pub use sparesults::QuerySolution;
 pub use triples::QueryTripleStream;
 

lib/engine/src/results/query_solution.rs

@@ -7,8 +7,8 @@ use futures::{Stream, StreamExt};
 use rdf_fusion_encoding::plain_term::decoders::DefaultPlainTermDecoder;
 use rdf_fusion_encoding::plain_term::PlainTermEncoding;
 use rdf_fusion_encoding::{TermDecoder, TermEncoding};
-use rdf_fusion_model::Variable;
 use rdf_fusion_model::ThinError;
+use rdf_fusion_model::Variable;
 pub use sparesults::QuerySolution;
 use std::pin::Pin;
 use std::sync::Arc;

lib/engine/src/sparql/error.rs

@@ -1,8 +1,8 @@
 use crate::error::StorageError;
 use crate::sparql::SparqlSyntaxError;
 use datafusion::error::DataFusionError;
-use rdf_fusion_model::{NamedNode, Term};
 use oxrdfio::RdfParseError;
+use rdf_fusion_model::{NamedNode, Term};
 use sparesults::QueryResultsParseError;
 use std::convert::Infallible;
 use std::error::Error;