Skip to content

refactor: compose exact current-format readers #8024

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.

Sign up for GitHub

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

Draft
Xuanwo wants to merge 2 commits into
base: xuanwo/exact-version-stack-06-writers
Choose a base branch
from
Draft

refactor: compose exact current-format readers #8024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daced25
refactor: compose exact current-format readers
Xuanwo Jul 27, 2026
a5ba57d
Merge branch 'xuanwo/exact-version-stack-06-writers' into xuanwo/exac…
Xuanwo Jul 27, 2026
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
19 changes: 9 additions & 10 deletions java/lance-jni/src/file_reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ use lance::io::ObjectStore;
use lance_core::cache::LanceCache;
use lance_core::datatypes::{BlobHandling, OnMissing, Projection, Schema};
use lance_encoding::decoder::{DecoderPlugins, FilterExpression};
use lance_encoding::version::LanceFileVersion;
use lance_file::reader::{FileReader, FileReaderOptions, ReaderProjection};
use lance_file::versions as file_versions;
use lance_io::object_store::{ObjectStoreParams, ObjectStoreRegistry};
use lance_io::{
ReadBatchParams,
Expand Down Expand Up @@ -262,18 +262,17 @@ pub extern "system" fn Java_org_lance_file_LanceFileReader_readAllNative(

let transformed_schema = projection.to_bare_schema();

let field_id_to_column_index = base_schema
.fields_pre_order()
.filter(|field| {
file_version < LanceFileVersion::V2_1
|| field.is_leaf()
|| field.is_packed_struct()
let (field_ids, column_indices) =
file_versions::data_file_columns(file_version, &base_schema);
let field_id_to_column_index = field_ids
.into_iter()
.zip(column_indices)
.filter_map(|(field_id, column_index)| {
(column_index >= 0).then_some((field_id as u32, column_index as u32))
})
.enumerate()
.map(|(idx, field)| (field.id as u32, idx as u32))
.collect::<BTreeMap<_, _>>();

Some(ReaderProjection::from_field_ids(
Some(file_versions::reader_projection_from_field_ids(
file_version,
&transformed_schema,
&field_id_to_column_index,
Expand Down
3 changes: 1 addition & 2 deletions python/src/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ use lance_core::utils::path::LancePathExt;
use lance_encoding::decoder::{DecoderPlugins, FilterExpression};
use lance_file::reader::{
BufferDescriptor, CachedFileMetadata, FileReader, FileReaderOptions, FileStatistics,
ReaderProjection,
};
use lance_file::writer::{FileWriter, FileWriterOptions};
use lance_file::{LanceEncodingsIo, version::LanceFileVersion, versions as file_versions};
Expand Down Expand Up @@ -820,7 +819,7 @@ impl LanceFileReader {
let mut base_projection = None;
if let Some(columns) = columns {
base_projection = Some(
ReaderProjection::from_column_names(
file_versions::reader_projection_from_column_names(
file_metadata.version(),
&file_metadata.file_schema,
&columns.iter().map(|s| s.as_str()).collect::<Vec<&str>>(),
Expand Down
Loading
Loading