refactor!: move all previous code into previous mod

java/lance-jni/src/file_reader.rs

@@ -22,7 +22,7 @@ use lance::io::ObjectStore;
 use lance_core::cache::LanceCache;
 use lance_core::datatypes::Schema;
 use lance_encoding::decoder::{DecoderPlugins, FilterExpression};
-use lance_file::v2::reader::{FileReader, FileReaderOptions, ReaderProjection};
+use lance_file::reader::{FileReader, FileReaderOptions, ReaderProjection};
 use lance_io::object_store::{ObjectStoreParams, ObjectStoreRegistry};
 use lance_io::{
     scheduler::{ScanScheduler, SchedulerConfig},

java/lance-jni/src/file_writer.rs

@@ -22,8 +22,8 @@ use jni::{
 };
 use lance::io::ObjectStore;
 use lance_file::{
-    v2::writer::{FileWriter, FileWriterOptions},
     version::LanceFileVersion,
+    writer::{FileWriter, FileWriterOptions},
 };
 use lance_io::object_store::{ObjectStoreParams, ObjectStoreRegistry};
 

python/src/dataset.rs

@@ -61,7 +61,7 @@ use lance_arrow::as_fixed_size_list_array;
 use lance_core::Error;
 use lance_datafusion::utils::reader_to_stream;
 use lance_encoding::decoder::DecoderConfig;
-use lance_file::v2::reader::FileReaderOptions;
+use lance_file::reader::FileReaderOptions;
 use lance_index::scalar::inverted::query::{
     BooleanQuery, BoostQuery, FtsQuery, MatchQuery, MultiMatchQuery, Operator, PhraseQuery,
 };

python/src/file.rs

@@ -21,17 +21,12 @@ use futures::stream::StreamExt;
 use lance::io::{ObjectStore, RecordBatchStream};
 use lance_core::cache::LanceCache;
 use lance_encoding::decoder::{DecoderPlugins, FilterExpression};
-use lance_file::v2::reader::ReaderProjection;
-use lance_file::v2::LanceEncodingsIo;
-use lance_file::{
-    v2::{
-        reader::{
-            BufferDescriptor, CachedFileMetadata, FileReader, FileReaderOptions, FileStatistics,
-        },
-        writer::{FileWriter, FileWriterOptions},
-    },
-    version::LanceFileVersion,
+use lance_file::reader::{
+    BufferDescriptor, CachedFileMetadata, FileReader, FileReaderOptions, FileStatistics,
+    ReaderProjection,
 };
+use lance_file::writer::{FileWriter, FileWriterOptions};
+use lance_file::{version::LanceFileVersion, LanceEncodingsIo};
 use lance_io::object_store::ObjectStoreParams;
 use lance_io::{
     scheduler::{ScanScheduler, SchedulerConfig},
@@ -91,7 +86,7 @@ impl LancePageMetadata {
             .collect();
         Self {
             buffers,
-            encoding: lance_file::v2::reader::describe_encoding(inner),
+            encoding: lance_file::reader::describe_encoding(inner),
         }
     }
 }

python/src/utils.rs

@@ -23,7 +23,7 @@ use arrow_schema::DataType;
 use lance::datatypes::Schema;
 use lance::Result;
 use lance_arrow::FixedSizeListArrayExt;
-use lance_file::writer::FileWriter;
+use lance_file::previous::writer::FileWriter as PreviousFileWriter;
 use lance_index::scalar::IndexWriter;
 use lance_index::vector::hnsw::{builder::HnswBuildParams, HNSW};
 use lance_index::vector::kmeans::{
@@ -223,7 +223,7 @@ impl Hnsw {
         let mut writer = rt()
             .block_on(
                 Some(py),
-                FileWriter::<ManifestDescribing>::try_new(
+                PreviousFileWriter::<ManifestDescribing>::try_new(
                     &object_store,
                     &path,
                     Schema::try_from(HNSW::schema().as_ref())

rust/lance-file/benches/reader.rs

@@ -9,12 +9,10 @@ use futures::{FutureExt, StreamExt};
 use lance_datagen::ArrayGeneratorExt;
 use lance_encoding::decoder::{DecoderPlugins, FilterExpression};
 use lance_file::{
-    v2::{
-        reader::{FileReader, FileReaderOptions},
-        testing::test_cache,
-        writer::{FileWriter, FileWriterOptions},
-    },
+    reader::{FileReader, FileReaderOptions},
+    testing::test_cache,
     version::LanceFileVersion,
+    writer::{FileWriter, FileWriterOptions},
 };
 use lance_io::{
     object_store::ObjectStore,

rust/lance-file/src/format.rs

@@ -27,8 +27,6 @@ pub mod pbfile {
     include!(concat!(env!("OUT_DIR"), "/lance.file.v2.rs"));
 }
 
-pub mod metadata;
-
 /// These version/magic values are written at the end of Lance files (e.g. versions/1.version)
 pub const MAJOR_VERSION: i16 = 0;
 pub const MINOR_VERSION: i16 = 2;

rust/lance-file/src/lib.rs

@@ -3,11 +3,14 @@
 
 pub mod datatypes;
 pub mod format;
-pub mod page_table;
+pub(crate) mod io;
+pub mod previous;
 pub mod reader;
-pub mod v2;
+pub mod testing;
 pub mod writer;
 
+pub use io::LanceEncodingsIo;
+
 use format::MAGIC;
 pub use lance_encoding::version;
 

rust/lance-file/src/format/metadata.rs → rust/lance-file/src/previous/format/metadata.rs

@@ -11,6 +11,7 @@ use lance_core::datatypes::Schema;
 use lance_core::{Error, Result};
 use lance_io::traits::ProtoStruct;
 use snafu::location;
+
 /// Data File Metadata
 #[derive(Debug, Default, DeepSizeOf, PartialEq)]
 pub struct Metadata {

rust/lance-file/src/previous/format/mod.rs

@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: Copyright The Lance Authors
+
+pub mod metadata;

rust/lance-file/src/v2.rs → rust/lance-file/src/previous/mod.rs

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright The Lance Authors
 
-pub(crate) mod io;
+//! Legacy Lance file v1 implementation kept for backwards compatibility.
+
+pub mod format;
+pub mod page_table;
 pub mod reader;
-pub mod testing;
 pub mod writer;
-
-pub use io::LanceEncodingsIo;