Seperate drop table clean-ups

Author: mkleen

datafusion/core/src/execution/context/mod.rs

@@ -1425,17 +1425,16 @@ impl SessionContext {
             && table_provider.table_type() == table_type
         {
             schema.deregister_table(&table)?;
-            if table_type == TableType::Base
-                && let Some(lfc) = self.runtime_env().cache_manager.get_list_files_cache()
-                && let Some(fsc) =
-                    self.runtime_env().cache_manager.get_file_statistic_cache()
-            {
-                lfc.drop_table_entries(&Some(table_ref.clone()))?;
-                fsc.drop_table_entries(&Some(table_ref.clone()))?;
+            if table_type == TableType::Base {
+                if let Some(lfc) = self.runtime_env().cache_manager.get_list_files_cache() {
+                    lfc.drop_table_entries(&Some(table_ref.clone()))?;
+                }
+                if let Some(fsc) = self.runtime_env().cache_manager.get_file_statistic_cache() {
+                    fsc.drop_table_entries(&Some(table_ref.clone()))?;
+                }
+                return Ok(true);
             }
-            return Ok(true);
         }
-
         Ok(false)
     }