Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make GetCatalogsBuilder sort catalog names #6864

Merged
merged 2 commits into from
Dec 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion arrow-flight/src/sql/metadata/catalogs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ impl GetCatalogsBuilder {
/// builds a `RecordBatch` with the correct schema for a
/// [`CommandGetCatalogs`] response
pub fn build(self) -> Result<RecordBatch> {
let Self { catalogs } = self;
let Self { mut catalogs } = self;
catalogs.sort_unstable();

let batch = RecordBatch::try_new(
Arc::clone(&GET_CATALOG_SCHEMA),
Expand Down Expand Up @@ -98,3 +99,30 @@ static GET_CATALOG_SCHEMA: Lazy<SchemaRef> = Lazy::new(|| {
false,
)]))
});

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_catalogs_are_sorted() {
let batch = ["a_catalog", "c_catalog", "b_catalog"]
.into_iter()
.fold(GetCatalogsBuilder::new(), |mut builder, catalog| {
builder.append(catalog);
builder
})
.build()
.unwrap();
let catalogs = batch
.column(0)
.as_any()
.downcast_ref::<StringArray>()
.unwrap()
.iter()
.flatten()
.collect::<Vec<_>>();
assert!(catalogs.is_sorted());
assert_eq!(catalogs, ["a_catalog", "b_catalog", "c_catalog"]);
}
}
Loading