rafs: move image merger into rafs/builder

Move image merger into rafs/builder.

Signed-off-by: Jiang Liu <gerry@linux.alibaba.com>

src/bin/nydus-image/merge.rs → rafs/src/builder/merge.rs

@@ -8,15 +8,16 @@ use std::convert::TryFrom;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
-use anyhow::{Context, Result};
+use anyhow::{anyhow, bail, ensure, Context, Result};
 use hex::FromHex;
 use nydus_api::ConfigV2;
-use nydus_rafs::builder::{
+use nydus_storage::device::{BlobFeatures, BlobInfo};
+
+use super::{
     ArtifactStorage, BlobContext, BlobManager, Bootstrap, BootstrapContext, BuildContext,
     BuildOutput, ChunkSource, HashChunkDict, MetadataTreeBuilder, Overlay, Tree, WhiteoutSpec,
 };
-use nydus_rafs::metadata::{RafsInodeExt, RafsSuper, RafsVersion};
-use nydus_storage::device::{BlobFeatures, BlobInfo};
+use crate::metadata::{RafsInodeExt, RafsSuper, RafsVersion};
 
 /// Struct to generate the merged RAFS bootstrap for an image from per layer RAFS bootstraps.
 ///

rafs/src/builder/mod.rs

@@ -22,12 +22,14 @@ pub use self::core::overlay::{Overlay, WhiteoutSpec};
 pub use self::core::prefetch::{Prefetch, PrefetchPolicy};
 pub use self::core::tree::{MetadataTreeBuilder, Tree};
 pub use self::directory::DirectoryBuilder;
+pub use self::merge::Merger;
 pub use self::stargz::StargzBuilder;
 pub use self::tarball::TarballBuilder;
 
-pub mod compact;
+mod compact;
 mod core;
 mod directory;
+mod merge;
 mod stargz;
 mod tarball;
 

src/bin/nydus-image/main.rs

@@ -30,7 +30,7 @@ use nydus_app::setup_logging;
 use nydus_rafs::builder::{
     parse_chunk_dict_arg, ArtifactStorage, BlobCompactor, BlobManager, BootstrapManager,
     BuildContext, BuildOutput, Builder, ConversionType, DirectoryBuilder, Feature, Features,
-    HashChunkDict, Prefetch, PrefetchPolicy, StargzBuilder, TarballBuilder, WhiteoutSpec,
+    HashChunkDict, Merger, Prefetch, PrefetchPolicy, StargzBuilder, TarballBuilder, WhiteoutSpec,
 };
 use nydus_rafs::metadata::{RafsSuper, RafsSuperConfig, RafsVersion};
 use nydus_storage::backend::localfs::LocalFs;
@@ -43,12 +43,10 @@ use nydus_utils::trace::{EventTracerClass, TimingTracerClass, TraceClass};
 use nydus_utils::{compress, digest, event_tracer, register_tracer, root_tracer, timing_tracer};
 use serde::{Deserialize, Serialize};
 
-use crate::merge::Merger;
 use crate::unpack::{OCIUnpacker, Unpacker};
 use crate::validator::Validator;
 
 mod inspect;
-mod merge;
 mod stat;
 mod unpack;
 mod validator;