diff --git a/flightsql/src/get_catalogs.rs b/flightsql/src/get_catalogs.rs
index 4135bcc9be..0609354098 100644
--- a/flightsql/src/get_catalogs.rs
+++ b/flightsql/src/get_catalogs.rs
@@ -10,6 +10,9 @@ use datafusion::prelude::SessionContext;
 use once_cell::sync::Lazy;
 
 /// Returns the list of catalogs in the DataFusion catalog
+///
+/// TODO: use upstream implementation when
+/// <https://github.com/apache/arrow-rs/pull/4296> is available
 pub(crate) fn get_catalogs(ctx: &SessionContext) -> Result<RecordBatch> {
     let mut catalog_names = ctx.catalog_names();
     catalog_names.sort_unstable();
diff --git a/flightsql/src/get_db_schemas.rs b/flightsql/src/get_db_schemas.rs
index 773a312cf8..8ffd4cd006 100644
--- a/flightsql/src/get_db_schemas.rs
+++ b/flightsql/src/get_db_schemas.rs
@@ -11,7 +11,10 @@ use datafusion::prelude::SessionContext;
 use once_cell::sync::Lazy;
 
 /// Implementation of FlightSQL GetDbSchemas
-
+///
+/// TODO: use upstream implementation when
+/// <https://github.com/apache/arrow-rs/pull/4296> is available
+///
 /// Return a RecordBatch for the GetDbSchemas
 ///
 /// # Parameters
diff --git a/flightsql/src/get_tables.rs b/flightsql/src/get_tables.rs
index f5ba66ec77..800ef59b51 100644
--- a/flightsql/src/get_tables.rs
+++ b/flightsql/src/get_tables.rs
@@ -17,7 +17,8 @@ use once_cell::sync::Lazy;
 
 /// Return a RecordBatch for the GetTables
 ///
-/// Return a `LogicalPlan` for GetTables
+/// TODO: use upstream implementation when
+/// <https://github.com/apache/arrow-rs/pull/4296> is available
 ///
 /// # Parameters
 ///