fix conflict + fmt

Author: kwannoel

src/frontend/src/catalog/root_catalog.rs

@@ -679,17 +679,6 @@ impl Catalog {
         self.table_by_id.values()
     }
 
-    pub fn get_schema_by_table_id(
-        &self,
-        db_name: &str,
-        table_id: &TableId,
-    ) -> CatalogResult<&SchemaCatalog> {
-        self.database_by_name
-            .get(db_name)
-            .and_then(|db| db.find_schema_containing_table_id(table_id))
-            .ok_or_else(|| CatalogError::NotFound("schema with table", table_id.to_string()))
-    }
-
     // Used by test_utils only.
     pub fn alter_table_name_by_id(&mut self, table_id: &TableId, table_name: &str) {
         let (mut database_id, mut schema_id) = (0, 0);

src/frontend/src/optimizer/rule/table_function_to_internal_backfill_progress.rs

@@ -120,7 +120,7 @@ impl FallibleRule for TableFunctionToInternalBackfillProgressRule {
         let (agg, _rewritten_select_exprs, _rewritten_having_exprs) =
             LogicalAgg::create(select_exprs, group_key, None, union.into())?;
         let project = LogicalProject::new(
-            agg.into(),
+            agg,
             vec![
                 ExprImpl::InputRef(Box::new(InputRef {
                     index: 0,