Apache DataFusion SQL Query Engine
refactor: make PhysicalExprAdatperFactory::create fallible (#20017)
niebayesaae3e0f4a1f0
diff --git a/datafusion-examples/examples/custom_data_source/custom_file_casts.rs b/datafusion-examples/examples/custom_data_source/custom_file_casts.rsindex 895b6f52b6..36cc936332 100644--- a/datafusion-examples/examples/custom_data_source/custom_file_casts.rs+++ b/datafusion-examples/examples/custom_data_source/custom_file_casts.rs@@ -156,14 +156,14 @@ impl PhysicalExprAdapterFactory for CustomCastPhysicalExprAdapterFactory {&self,logical_file_schema: SchemaRef,physical_file_schema: SchemaRef,- ) -> Arc<dyn PhysicalExprAdapter> {+ ) -> Result<Arc<dyn PhysicalExprAdapter>> {let inner = self.inner- .create(logical_file_schema, Arc::clone(&physical_file_schema));- Arc::new(CustomCastsPhysicalExprAdapter {+ .create(logical_file_schema, Arc::clone(&physical_file_schema))?;+ Ok(Arc::new(CustomCastsPhysicalExprAdapter {physical_file_schema,inner,- })+ }))}}diff --git a/datafusion-examples/examples/custom_data_source/default_column_values.rs b/datafusion-examples/examples/custom_data_source/default_column_values.rsindex 81d74cfbec..d7171542d5 100644--- a/datafusion-examples/examples/custom_data_source/default_column_values.rs+++ b/datafusion-examples/examples/custom_data_source/default_column_values.rs@@ -278,18 +278,18 @@ impl PhysicalExprAdapterFactory for DefaultValuePhysicalExprAdapterFactory {&self,logical_file_schema: SchemaRef,physical_file_schema: SchemaRef,- ) -> Arc<dyn PhysicalExprAdapter> {+ ) -> Result<Arc<dyn PhysicalExprAdapter>> {let default_factory = DefaultPhysicalExprAdapterFactory;let default_adapter = default_factory.create(Arc::clone(&logical_file_schema),Arc::clone(&physical_file_schema),- );+ )?;- Arc::new(DefaultValuePhysicalExprAdapter {+ Ok(Arc::new(DefaultValuePhysicalExprAdapter {logical_file_schema,physical_file_schema,default_adapter,- })+ }))}}diff --git a/datafusion-examples/examples/data_io/json_shredding.rs b/datafusion-examples/examples/data_io/json_shredding.rsindex d2ffacc946..77dba5a98a 100644--- a/datafusion-examples/examples/data_io/json_shredding.rs+++ b/datafusion-examples/examples/data_io/json_shredding.rs@@ -275,17 +275,17 @@ impl PhysicalExprAdapterFactory for ShreddedJsonRewriterFactory {&self,logical_file_schema: SchemaRef,physical_file_schema: SchemaRef,- ) -> Arc<dyn PhysicalExprAdapter> {+ ) -> Result<Arc<dyn PhysicalExprAdapter>> {let default_factory = DefaultPhysicalExprAdapterFactory;let default_adapter = default_factory.create(Arc::clone(&logical_file_schema),Arc::clone(&physical_file_schema),- );+ )?;- Arc::new(ShreddedJsonRewriter {+ Ok(Arc::new(ShreddedJsonRewriter {physical_file_schema,default_adapter,- })+ }))}}diff --git a/datafusion/core/src/datasource/mod.rs b/datafusion/core/src/datasource/mod.rsindex 1f21d6a7e6..32b3b0799d 100644--- a/datafusion/core/src/datasource/mod.rs+++ b/datafusion/core/src/datasource/mod.rs@@ -149,10 +149,10 @@ mod tests {&self,_logical_file_schema: SchemaRef,physical_file_schema: SchemaRef,- ) -> Arc<dyn PhysicalExprAdapter> {- Arc::new(TestPhysicalExprAdapter {+ ) -> Result<Arc<dyn PhysicalExprAdapter>> {+ Ok(Arc::new(TestPhysicalExprAdapter {physical_file_schema,- })+ }))}}diff --git a/datafusion/core/tests/parquet/expr_adapter.rs b/datafusion/core/tests/parquet/expr_adapter.rsindex 515422ed75..aee37fda16 100644--- a/datafusion/core/tests/parquet/expr_adapter.rs+++ b/datafusion/core/tests/parquet/expr_adapter.rs@@ -63,15 +63,15 @@ impl PhysicalExprAdapterFactory for CustomPhysicalExprAdapterFactory {&self,logical_file_schema: SchemaRef,physical_file_schema: SchemaRef,- ) -> Arc<dyn PhysicalExprAdapter> {- Arc::new(CustomPhysicalExprAdapter {+ ) -> Result<Arc<dyn PhysicalExprAdapter>> {+ Ok(Arc::new(CustomPhysicalExprAdapter {logical_file_schema: Arc::clone(&logical_file_schema),physical_file_schema: Arc::clone(&physical_file_schema),inner: Arc::new(DefaultPhysicalExprAdapter::new(logical_file_schema,physical_file_schema,)),- })+ }))}}diff --git a/datafusion/datasource-parquet/src/opener.rs b/datafusion/datasource-parquet/src/opener.rsindex e79483ce79..50407235e7 100644--- a/datafusion/datasource-parquet/src/opener.rs+++ b/datafusion/datasource-parquet/src/opener.rs@@ -412,7 +412,7 @@ impl FileOpener for ParquetOpener {let rewriter = expr_adapter_factory.create(Arc::clone(&logical_file_schema),Arc::clone(&physical_file_schema),- );+ )?;let simplifier = PhysicalExprSimplifier::new(&physical_file_schema);predicate = predicate.map(|p| simplifier.simplify(rewriter.rewrite(p)?))diff --git a/datafusion/datasource-parquet/src/row_filter.rs b/datafusion/datasource-parquet/src/row_filter.rsindex bc195f1767..2924208c5b 100644--- a/datafusion/datasource-parquet/src/row_filter.rs+++ b/datafusion/datasource-parquet/src/row_filter.rs@@ -739,6 +739,7 @@ mod test {let expr = logical2physical(&expr, &table_schema);let expr = DefaultPhysicalExprAdapterFactory {}.create(Arc::new(table_schema.clone()), Arc::clone(&file_schema))+ .expect("creating expr adapter").rewrite(expr).expect("rewriting expression");let candidate = FilterCandidateBuilder::new(expr, file_schema.clone())@@ -778,6 +779,7 @@ mod test {// Rewrite the expression to add CastExpr for type coercionlet expr = DefaultPhysicalExprAdapterFactory {}.create(Arc::new(table_schema), Arc::clone(&file_schema))+ .expect("creating expr adapter").rewrite(expr).expect("rewriting expression");let candidate = FilterCandidateBuilder::new(expr, file_schema)diff --git a/datafusion/physical-expr-adapter/src/schema_rewriter.rs b/datafusion/physical-expr-adapter/src/schema_rewriter.rsindex b2bed36f0e..7b94ed263b 100644--- a/datafusion/physical-expr-adapter/src/schema_rewriter.rs+++ b/datafusion/physical-expr-adapter/src/schema_rewriter.rs@@ -141,11 +141,11 @@ where/// &self,/// logical_file_schema: SchemaRef,/// physical_file_schema: SchemaRef,-/// ) -> Arc<dyn PhysicalExprAdapter> {-/// Arc::new(CustomPhysicalExprAdapter {+/// ) -> Result<Arc<dyn PhysicalExprAdapter>> {+/// Ok(Arc::new(CustomPhysicalExprAdapter {/// logical_file_schema,/// physical_file_schema,-/// })+/// }))/// }/// }/// ```@@ -178,7 +178,7 @@ pub trait PhysicalExprAdapterFactory: Send + Sync + std::fmt::Debug {&self,logical_file_schema: SchemaRef,physical_file_schema: SchemaRef,- ) -> Arc<dyn PhysicalExprAdapter>;+ ) -> Result<Arc<dyn PhysicalExprAdapter>>;}#[derive(Debug, Clone)]@@ -189,11 +189,11 @@ impl PhysicalExprAdapterFactory for DefaultPhysicalExprAdapterFactory {&self,logical_file_schema: SchemaRef,physical_file_schema: SchemaRef,- ) -> Arc<dyn PhysicalExprAdapter> {- Arc::new(DefaultPhysicalExprAdapter {+ ) -> Result<Arc<dyn PhysicalExprAdapter>> {+ Ok(Arc::new(DefaultPhysicalExprAdapter {logical_file_schema,physical_file_schema,- })+ }))}}@@ -232,7 +232,8 @@ impl PhysicalExprAdapterFactory for DefaultPhysicalExprAdapterFactory {/// # logical_file_schema: &Schema,/// # ) -> datafusion_common::Result<()> {/// let factory = DefaultPhysicalExprAdapterFactory;-/// let adapter = factory.create(Arc::new(logical_file_schema.clone()), Arc::new(physical_file_schema.clone()));+/// let adapter =+/// factory.create(Arc::new(logical_file_schema.clone()), Arc::new(physical_file_schema.clone()))?;/// let adapted_predicate = adapter.rewrite(predicate)?;/// # Ok(())/// # }@@ -571,7 +572,7 @@ impl BatchAdapterFactory {pub fn make_adapter(&self, source_schema: SchemaRef) -> Result<BatchAdapter> {let expr_adapter = self.expr_adapter_factory- .create(Arc::clone(&self.target_schema), Arc::clone(&source_schema));+ .create(Arc::clone(&self.target_schema), Arc::clone(&source_schema))?;let simplifier = PhysicalExprSimplifier::new(&self.target_schema);@@ -647,7 +648,9 @@ mod tests {let (physical_schema, logical_schema) = create_test_schema();let factory = DefaultPhysicalExprAdapterFactory;- let adapter = factory.create(Arc::new(logical_schema), Arc::new(physical_schema));+ let adapter = factory+ .create(Arc::new(logical_schema), Arc::new(physical_schema))+ .unwrap();let column_expr = Arc::new(Column::new("a", 0));let result = adapter.rewrite(column_expr).unwrap();@@ -660,7 +663,9 @@ mod tests {fn test_rewrite_multi_column_expr_with_type_cast() {let (physical_schema, logical_schema) = create_test_schema();let factory = DefaultPhysicalExprAdapterFactory;- let adapter = factory.create(Arc::new(logical_schema), Arc::new(physical_schema));+ let adapter = factory+ .create(Arc::new(logical_schema), Arc::new(physical_schema))+ .unwrap();// Create a complex expression: (a + 5) OR (c > 0.0) that tests the recursive case of the rewriterlet column_a = Arc::new(Column::new("a", 0)) as Arc<dyn PhysicalExpr>;@@ -725,7 +730,9 @@ mod tests {)]);let factory = DefaultPhysicalExprAdapterFactory;- let adapter = factory.create(Arc::new(logical_schema), Arc::new(physical_schema));+ let adapter = factory+ .create(Arc::new(logical_schema), Arc::new(physical_schema))+ .unwrap();let column_expr = Arc::new(Column::new("data", 0));let error_msg = adapter.rewrite(column_expr).unwrap_err().to_string();@@ -763,7 +770,9 @@ mod tests {)]);let factory = DefaultPhysicalExprAdapterFactory;- let adapter = factory.create(Arc::new(logical_schema), Arc::new(physical_schema));+ let adapter = factory+ .create(Arc::new(logical_schema), Arc::new(physical_schema))+ .unwrap();let column_expr = Arc::new(Column::new("data", 0));let result = adapter.rewrite(column_expr).unwrap();@@ -803,7 +812,9 @@ mod tests {let (physical_schema, logical_schema) = create_test_schema();let factory = DefaultPhysicalExprAdapterFactory;- let adapter = factory.create(Arc::new(logical_schema), Arc::new(physical_schema));+ let adapter = factory+ .create(Arc::new(logical_schema), Arc::new(physical_schema))+ .unwrap();let column_expr = Arc::new(Column::new("c", 2));let result = adapter.rewrite(column_expr)?;@@ -827,7 +838,9 @@ mod tests {]);let factory = DefaultPhysicalExprAdapterFactory;- let adapter = factory.create(Arc::new(logical_schema), Arc::new(physical_schema));+ let adapter = factory+ .create(Arc::new(logical_schema), Arc::new(physical_schema))+ .unwrap();let column_expr = Arc::new(Column::new("b", 1));let error_msg = adapter.rewrite(column_expr).unwrap_err().to_string();@@ -843,7 +856,9 @@ mod tests {]);let factory = DefaultPhysicalExprAdapterFactory;- let adapter = factory.create(Arc::new(logical_schema), Arc::new(physical_schema));+ let adapter = factory+ .create(Arc::new(logical_schema), Arc::new(physical_schema))+ .unwrap();let column_expr = Arc::new(Column::new("b", 1));let result = adapter.rewrite(column_expr).unwrap();@@ -909,7 +924,9 @@ mod tests {let (physical_schema, logical_schema) = create_test_schema();let factory = DefaultPhysicalExprAdapterFactory;- let adapter = factory.create(Arc::new(logical_schema), Arc::new(physical_schema));+ let adapter = factory+ .create(Arc::new(logical_schema), Arc::new(physical_schema))+ .unwrap();let column_expr = Arc::new(Column::new("b", 1)) as Arc<dyn PhysicalExpr>;let result = adapter.rewrite(Arc::clone(&column_expr))?;@@ -933,7 +950,9 @@ mod tests {]);let factory = DefaultPhysicalExprAdapterFactory;- let adapter = factory.create(Arc::new(logical_schema), Arc::new(physical_schema));+ let adapter = factory+ .create(Arc::new(logical_schema), Arc::new(physical_schema))+ .unwrap();let column_expr = Arc::new(Column::new("b", 1));let result = adapter.rewrite(column_expr);@@ -991,8 +1010,9 @@ mod tests {];let factory = DefaultPhysicalExprAdapterFactory;- let adapter =- factory.create(Arc::clone(&logical_schema), Arc::clone(&physical_schema));+ let adapter = factory+ .create(Arc::clone(&logical_schema), Arc::clone(&physical_schema))+ .unwrap();let adapted_projection = projection.into_iter()@@ -1093,8 +1113,9 @@ mod tests {let projection = vec![col("data", &logical_schema).unwrap()];let factory = DefaultPhysicalExprAdapterFactory;- let adapter =- factory.create(Arc::clone(&logical_schema), Arc::clone(&physical_schema));+ let adapter = factory+ .create(Arc::clone(&logical_schema), Arc::clone(&physical_schema))+ .unwrap();let adapted_projection = projection.into_iter()