Refactor schema adapter tests to remove unused as_any method and improve type checking

Author: kosiew

datafusion/core/tests/parquet/schema_adapter.rs

@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use std::any::Any;
 use std::sync::Arc;
 
 use arrow::array::{record_batch, RecordBatch, RecordBatchOptions};
@@ -24,13 +25,18 @@ use bytes::{BufMut, BytesMut};
 use datafusion::assert_batches_eq;
 use datafusion::common::Result;
 use datafusion::datasource::listing::{ListingTable, ListingTableConfig};
+use datafusion::datasource::physical_plan::{ArrowSource, CsvSource, FileSource, JsonSource, ParquetSource};
+use datafusion_physical_plan::ExecutionPlan;
 use datafusion::prelude::{SessionConfig, SessionContext};
 use datafusion_common::tree_node::{Transformed, TransformedResult, TreeNode};
 use datafusion_common::DataFusionError;
 use datafusion_common::{ColumnStatistics, ScalarValue};
+use datafusion_datasource::file_scan_config::FileScanConfigBuilder;
+use datafusion::datasource::listing::PartitionedFile;
 use datafusion_datasource::schema_adapter::{
     DefaultSchemaAdapterFactory, SchemaAdapter, SchemaAdapterFactory, SchemaMapper,
 };
+use datafusion_datasource::source::DataSourceExec;
 use datafusion_datasource::ListingTableUrl;
 use datafusion_execution::object_store::ObjectStoreUrl;
 use datafusion_physical_expr::expressions::{self, Column};
@@ -380,6 +386,7 @@ async fn test_custom_schema_adapter_and_custom_expression_adapter() {
 #[derive(Debug, PartialEq)]
 struct UppercaseAdapterFactory {}
 
+
 impl SchemaAdapterFactory for UppercaseAdapterFactory {
     fn create(
         &self,
@@ -391,11 +398,9 @@ impl SchemaAdapterFactory for UppercaseAdapterFactory {
         })
     }
 
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
 }
 
+
 /// Schema adapter that transforms column names to uppercase
 #[derive(Debug)]
 struct UppercaseAdapter {
@@ -627,12 +632,7 @@ async fn test_multi_source_schema_adapter_reuse() -> Result<()> {
         assert!(source_with_adapter.schema_adapter_factory().is_some());
 
         let retrieved_factory = source_with_adapter.schema_adapter_factory().unwrap();
-        assert_eq!(
-            retrieved_factory
-                .as_any()
-                .downcast_ref::<UppercaseAdapterFactory>(),
-            Some(factory.as_ref())
-        );
+        assert!(retrieved_factory.as_ref().type_id() == factory.as_ref().type_id());
     }
 
     // Test ParquetSource
@@ -649,12 +649,7 @@ async fn test_multi_source_schema_adapter_reuse() -> Result<()> {
         assert!(source_with_adapter.schema_adapter_factory().is_some());
 
         let retrieved_factory = source_with_adapter.schema_adapter_factory().unwrap();
-        assert_eq!(
-            retrieved_factory
-                .as_any()
-                .downcast_ref::<UppercaseAdapterFactory>(),
-            Some(factory.as_ref())
-        );
+        assert!(retrieved_factory.as_ref().type_id() == factory.as_ref().type_id());
     }
 
     // Test CsvSource
@@ -670,12 +665,7 @@ async fn test_multi_source_schema_adapter_reuse() -> Result<()> {
         assert!(source_with_adapter.schema_adapter_factory().is_some());
 
         let retrieved_factory = source_with_adapter.schema_adapter_factory().unwrap();
-        assert_eq!(
-            retrieved_factory
-                .as_any()
-                .downcast_ref::<UppercaseAdapterFactory>(),
-            Some(factory.as_ref())
-        );
+        assert!(retrieved_factory.as_ref().type_id() == factory.as_ref().type_id());
     }
 
     // Test JsonSource
@@ -691,12 +681,7 @@ async fn test_multi_source_schema_adapter_reuse() -> Result<()> {
         assert!(source_with_adapter.schema_adapter_factory().is_some());
 
         let retrieved_factory = source_with_adapter.schema_adapter_factory().unwrap();
-        assert_eq!(
-            retrieved_factory
-                .as_any()
-                .downcast_ref::<UppercaseAdapterFactory>(),
-            Some(factory.as_ref())
-        );
+        assert!(retrieved_factory.as_ref().type_id() == factory.as_ref().type_id());
     }
 
     Ok(())