Skip to content

Commit b87216f

Browse files
Shefeek JinnahShefeek Jinnah
authored andcommitted
Some formatting
1 parent 372d4f7 commit b87216f

2 files changed

Lines changed: 37 additions & 36 deletions

File tree

src/metadata_provider_duckdb.rs

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -165,40 +165,43 @@ impl MetadataProvider for DuckdbMetadataProvider {
165165
let mut stmt = conn.prepare(SQL_GET_DATA_FILES)?;
166166

167167
let files = stmt
168-
.query_map([table_id, snapshot_id, snapshot_id, table_id, snapshot_id, snapshot_id], |row| {
169-
// Parse data file (columns 0-5)
170-
let _data_file_id: i64 = row.get(0)?;
171-
let data_file = DuckLakeFileData {
172-
path: row.get(1)?,
173-
path_is_relative: row.get(2)?,
174-
file_size_bytes: row.get(3)?,
175-
footer_size: row.get(4)?,
176-
encryption_key: row.get(5)?,
177-
};
178-
179-
// Parse delete file (columns 6-12) if exists
180-
let delete_file = if let Ok(Some(_)) = row.get::<_, Option<i64>>(6) {
181-
Some(DuckLakeFileData {
182-
path: row.get(7)?,
183-
path_is_relative: row.get(8)?,
184-
file_size_bytes: row.get(9)?,
185-
footer_size: row.get(10)?,
186-
encryption_key: row.get(11)?,
168+
.query_map(
169+
[table_id, snapshot_id, snapshot_id, table_id, snapshot_id, snapshot_id],
170+
|row| {
171+
// Parse data file (columns 0-5)
172+
let _data_file_id: i64 = row.get(0)?;
173+
let data_file = DuckLakeFileData {
174+
path: row.get(1)?,
175+
path_is_relative: row.get(2)?,
176+
file_size_bytes: row.get(3)?,
177+
footer_size: row.get(4)?,
178+
encryption_key: row.get(5)?,
179+
};
180+
181+
// Parse delete file (columns 6-12) if exists
182+
let delete_file = if let Ok(Some(_)) = row.get::<_, Option<i64>>(6) {
183+
Some(DuckLakeFileData {
184+
path: row.get(7)?,
185+
path_is_relative: row.get(8)?,
186+
file_size_bytes: row.get(9)?,
187+
footer_size: row.get(10)?,
188+
encryption_key: row.get(11)?,
189+
})
190+
} else {
191+
None
192+
};
193+
194+
let _delete_count: Option<i64> = row.get(12)?;
195+
196+
Ok(DuckLakeTableFile {
197+
file: data_file,
198+
delete_file,
199+
row_id_start: None,
200+
snapshot_id: Some(snapshot_id),
201+
max_row_count: None, // Set to None until we have actual row count from data file metadata
187202
})
188-
} else {
189-
None
190-
};
191-
192-
let _delete_count: Option<i64> = row.get(12)?;
193-
194-
Ok(DuckLakeTableFile {
195-
file: data_file,
196-
delete_file,
197-
row_id_start: None,
198-
snapshot_id: Some(snapshot_id),
199-
max_row_count: None, // Set to None until we have actual row count from data file metadata
200-
})
201-
})?
203+
},
204+
)?
202205
.collect::<Result<Vec<_>, _>>()?;
203206

204207
Ok(files)

tests/delete_filter_tests.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,7 @@ mod integration_tests {
344344
ctx.register_catalog("all_deleted", catalog);
345345

346346
// Query the table - should return 0 rows since all data was deleted
347-
let df = ctx
348-
.sql("SELECT * FROM all_deleted.main.tbl")
349-
.await?;
347+
let df = ctx.sql("SELECT * FROM all_deleted.main.tbl").await?;
350348
let results = df.collect().await?;
351349

352350
let total_rows: usize = results.iter().map(|b| b.num_rows()).sum();

0 commit comments

Comments
 (0)