refactor: Move puffin crate contents inside iceberg crate (#789)

apache · Dec 13, 2024 · 88ad671 · 88ad671
1 parent 75b41be
commit 88ad671
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 40 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,6 @@ members = [
     "crates/iceberg",
     "crates/integration_tests",
     "crates/integrations/*",
-    "crates/puffin",
     "crates/test_utils",
 ]
 exclude = ["bindings/python"]

diff --git a/crates/iceberg/Cargo.toml b/crates/iceberg/Cargo.toml
@@ -81,6 +81,7 @@ tokio = { workspace = true, optional = true }
 typed-builder = { workspace = true }
 url = { workspace = true }
 uuid = { workspace = true }
+zstd = { workspace = true }
 
 [dev-dependencies]
 ctor = { workspace = true }

diff --git a/crates/iceberg/src/lib.rs b/crates/iceberg/src/lib.rs
@@ -84,3 +84,5 @@ mod runtime;
 pub mod arrow;
 mod utils;
 pub mod writer;
+
+mod puffin;
diff --git a/crates/puffin/src/compression.rs → crates/iceberg/src/puffin/compression.rs b/crates/puffin/src/compression.rs → crates/iceberg/src/puffin/compression.rs
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use iceberg::{Error, ErrorKind, Result};
+use crate::{Error, ErrorKind, Result};
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
 /// Data compression formats
@@ -70,7 +70,7 @@ impl CompressionCodec {
 
 #[cfg(test)]
 mod tests {
-    use crate::compression::CompressionCodec;
+    use crate::puffin::compression::CompressionCodec;
 
     #[tokio::test]
     async fn test_compression_codec_none() {

diff --git a/crates/puffin/src/lib.rs → crates/iceberg/src/puffin/mod.rs b/crates/puffin/src/lib.rs → crates/iceberg/src/puffin/mod.rs
@@ -22,4 +22,3 @@
 #![allow(dead_code)]
 
 mod compression;
-pub use compression::CompressionCodec;
diff --git a/crates/puffin/Cargo.toml b/crates/puffin/Cargo.toml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,4 +22,3 @@
		#![allow(dead_code)]

		mod compression;
		pub use compression::CompressionCodec;