more chunking renames

Author: Fallen-Breath

prime_backup/config/backup_config.py

@@ -47,7 +47,7 @@ class BackupConfig(Serializable):
 	chunking_enabled: bool = False
 	chunking_rules: List[ChunkingRule] = [
 		ChunkingRule(
-			algorithm=ChunkMethod.cdc_32k,
+			algorithm=ChunkMethod.fastcdc_32k,
 			file_size_threshold=100 * 1048576,
 			patterns=[
 				'**/*.db'

prime_backup/types/chunk_method.py

@@ -3,21 +3,23 @@
 from typing import Optional, IO, TYPE_CHECKING
 
 from prime_backup.types.chunker import Chunker
-from prime_backup.types.chunker_definition import ChunkerDefinition, CDCChunkerDefinition, FixedSizeChunkerDefinition
+from prime_backup.types.chunker_definition import ChunkerDefinition, FastCDCChunkerDefinition, FixedSizeChunkerDefinition
 from prime_backup.utils.path_like import PathLike
 
 
 class ChunkMethod(enum.Enum):
-	# Content-Defined Chunking (CDC)
-	cdc_32k = CDCChunkerDefinition(avg_size=32 * 1024, min_size=8 * 1024, max_size=256 * 1024)
-	cdc_128k = CDCChunkerDefinition(avg_size=128 * 1024, min_size=64 * 1024, max_size=1024 * 1024)
-	cdc = cdc_32k
+	# Content-Defined Chunking with FastCDC
+	fastcdc_32k = FastCDCChunkerDefinition(avg_size=32 * 1024, min_size=8 * 1024, max_size=256 * 1024)
+	fastcdc_128k = FastCDCChunkerDefinition(avg_size=128 * 1024, min_size=64 * 1024, max_size=1024 * 1024)
 
 	# Fixed-Size Chunking
 	fixed_4k = FixedSizeChunkerDefinition(4 * 1024)
 	fixed_32k = FixedSizeChunkerDefinition(32 * 1024)
 	fixed_128k = FixedSizeChunkerDefinition(128 * 1024)
 
+	# Common Alias
+	cdc = fastcdc_32k
+
 	if TYPE_CHECKING:
 		value: ChunkerDefinition
 

prime_backup/types/chunker.py

@@ -82,17 +82,17 @@ def get_read_file_size(self) -> int:
 		return self.__file_size_sum
 
 
-# ======================== CDC Chunker ========================
+# ======================== FastCDC Chunker ========================
 
 @dataclasses.dataclass(frozen=True)
-class CDCChunkerConfig:
+class FastCDCChunkerConfig:
 	avg_size: int
 	min_size: int
 	max_size: int
 
 
 class _CDCChunker(Chunker, ABC):
-	def __init__(self, cfg: CDCChunkerConfig, need_entire_file_hash: bool):
+	def __init__(self, cfg: FastCDCChunkerConfig, need_entire_file_hash: bool):
 		super().__init__(need_entire_file_hash)
 		self.cfg = cfg
 
@@ -107,8 +107,8 @@ def _create_cdc_engine(self) -> 'pyfastcdc.FastCDC':
 		)
 
 
-class CDCFileChunker(_CDCChunker):
-	def __init__(self, cfg: CDCChunkerConfig, file_path: Path, need_entire_file_hash: bool = False):
+class FastCDCFileChunker(_CDCChunker):
+	def __init__(self, cfg: FastCDCChunkerConfig, file_path: Path, need_entire_file_hash: bool = False):
 		super().__init__(cfg, need_entire_file_hash)
 		self.file_path = file_path
 
@@ -119,8 +119,8 @@ def _iter_raw_chunks(self) -> Iterable[_RawChunk]:
 			yield _RawChunk(offset=c.offset, length=c.length, data=c.data)
 
 
-class CDCStreamChunker(_CDCChunker):
-	def __init__(self, cfg: CDCChunkerConfig, stream: 'pyfastcdc.BinaryStreamReader', need_entire_file_hash: bool = False):
+class FastCDCStreamChunker(_CDCChunker):
+	def __init__(self, cfg: FastCDCChunkerConfig, stream: 'pyfastcdc.BinaryStreamReader', need_entire_file_hash: bool = False):
 		super().__init__(cfg, need_entire_file_hash)
 		self.stream = stream
 

prime_backup/types/chunker_definition.py

@@ -5,7 +5,7 @@
 
 from typing_extensions import override
 
-from prime_backup.types.chunker import Chunker, CDCFileChunker, CDCStreamChunker, FixedSizeFileChunker, FixedSizeStreamChunker, CDCChunkerConfig
+from prime_backup.types.chunker import Chunker, FastCDCFileChunker, FastCDCStreamChunker, FixedSizeFileChunker, FixedSizeStreamChunker, FastCDCChunkerConfig
 
 
 class ChunkerDefinition(ABC):
@@ -19,22 +19,22 @@ def create_stream_chunker(self, stream, need_entire_file_hash: bool) -> Chunker:
 
 
 @dataclasses.dataclass(frozen=True)
-class CDCChunkerDefinition(ChunkerDefinition):
+class FastCDCChunkerDefinition(ChunkerDefinition):
 	avg_size: int
 	min_size: int
 	max_size: int
-	_config: CDCChunkerConfig = dataclasses.field(init=False, repr=False, compare=False)
+	_config: FastCDCChunkerConfig = dataclasses.field(init=False, repr=False, compare=False)
 
 	def __post_init__(self):
-		object.__setattr__(self, '_config', CDCChunkerConfig(self.avg_size, self.min_size, self.max_size))
+		object.__setattr__(self, '_config', FastCDCChunkerConfig(self.avg_size, self.min_size, self.max_size))
 
 	@override
 	def create_file_chunker(self, file_path: Path, need_entire_file_hash: bool) -> Chunker:
-		return CDCFileChunker(self._config, file_path, need_entire_file_hash)
+		return FastCDCFileChunker(self._config, file_path, need_entire_file_hash)
 
 	@override
 	def create_stream_chunker(self, stream: IO[bytes], need_entire_file_hash: bool) -> Chunker:
-		return CDCStreamChunker(self._config, stream, need_entire_file_hash)
+		return FastCDCStreamChunker(self._config, stream, need_entire_file_hash)
 
 
 @dataclasses.dataclass(frozen=True)

tests/test_fuzzy_run.py

@@ -499,7 +499,7 @@ def rm_test_files_dirs():
 		Config.get().backup.compress_method = CompressMethod.plain
 		Config.get().backup.chunking_enabled = True
 		Config.get().backup.chunking_rules = [ChunkingRule(
-			algorithm=ChunkMethod.cdc_32k,
+			algorithm=ChunkMethod.fastcdc_32k,
 			file_size_threshold=1 * 1048576,  # 1MiB
 			patterns=['**'],
 		)]