Skip to content

Commit 972ad3e

Browse files
committed
Move puffin crate contents inside iceberg crate
1 parent 81def62 commit 972ad3e

File tree

6 files changed

+5
-40
lines changed

6 files changed

+5
-40
lines changed

Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ members = [
2323
"crates/iceberg",
2424
"crates/integration_tests",
2525
"crates/integrations/*",
26-
"crates/puffin",
2726
"crates/test_utils",
2827
]
2928
exclude = ["bindings/python"]

crates/iceberg/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ tokio = { workspace = true, optional = true }
8181
typed-builder = { workspace = true }
8282
url = { workspace = true }
8383
uuid = { workspace = true }
84+
zstd = { workspace = true }
8485

8586
[dev-dependencies]
8687
ctor = { workspace = true }

crates/iceberg/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,5 @@ mod runtime;
8484
pub mod arrow;
8585
mod utils;
8686
pub mod writer;
87+
88+
mod puffin;

crates/puffin/src/compression.rs crates/iceberg/src/puffin/compression.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
use iceberg::{Error, ErrorKind, Result};
18+
use crate::{Error, ErrorKind, Result};
1919

2020
#[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
2121
/// Data compression formats
@@ -70,7 +70,7 @@ impl CompressionCodec {
7070

7171
#[cfg(test)]
7272
mod tests {
73-
use crate::compression::CompressionCodec;
73+
use crate::puffin::compression::CompressionCodec;
7474

7575
#[tokio::test]
7676
async fn test_compression_codec_none() {

crates/puffin/src/lib.rs crates/iceberg/src/puffin/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@
2222
#![allow(dead_code)]
2323

2424
mod compression;
25-
pub use compression::CompressionCodec;

crates/puffin/Cargo.toml

-36
This file was deleted.

0 commit comments

Comments
 (0)