Skip to content

Commit d21c57b

Browse files
committed
pack codes tidying
1 parent 8ffbdb8 commit d21c57b

5 files changed

Lines changed: 1 addition & 58 deletions

File tree

prime_backup/action/compact_packs_action.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
class CollectCompactablePacksResult:
2121
pack_ids: List[int]
2222

23-
@property
24-
def count(self) -> int:
25-
return len(self.pack_ids)
26-
2723

2824
class CollectCompactablePacksStep(Step[CollectCompactablePacksResult]):
2925
def __init__(self, session: DbSession, *, pack_ids: Optional[Collection[int]] = None, threshold: float, raise_if_not_found: bool = True):

prime_backup/action/helpers/pack_reader.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import contextlib
2-
from pathlib import Path
32
from typing import BinaryIO, Generator
43

54
from prime_backup.utils import pack_utils
@@ -26,13 +25,9 @@ def read(self, size: int = -1) -> bytes:
2625

2726

2827
class PackReader:
29-
@staticmethod
30-
def get_pack_path(pack_id: int) -> Path:
31-
return pack_utils.get_pack_path(pack_id)
32-
3328
@classmethod
3429
@contextlib.contextmanager
3530
def open_entry(cls, pack_id: int, offset: int, length: int) -> Generator[SupportsReadBytes, None, None]:
36-
pack_path = cls.get_pack_path(pack_id)
31+
pack_path = pack_utils.get_pack_path(pack_id)
3732
with open(pack_path, 'rb') as fh:
3833
yield PackEntryReader(fh, offset, length)

prime_backup/action/helpers/pack_writer.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ class _ActivePack:
1616
pack: schema.Pack
1717
file: BinaryIO
1818

19-
def append(self, data: bytes) -> PackEntryLocation:
20-
return self.append_reader(_BytesReader(data), len(data))
21-
2219
def append_reader(self, reader: SupportsReadBytes, size: int) -> PackEntryLocation:
2320
offset = self.pack.size
2421
remaining = size
@@ -53,21 +50,6 @@ def close(self):
5350
self.file.close()
5451

5552

56-
class _BytesReader:
57-
def __init__(self, data: bytes):
58-
self.__data = data
59-
self.__offset = 0
60-
61-
def read(self, size: int = -1) -> bytes:
62-
if self.__offset >= len(self.__data):
63-
return b''
64-
if size is None or size < 0:
65-
size = len(self.__data) - self.__offset
66-
data = self.__data[self.__offset:self.__offset + size]
67-
self.__offset += len(data)
68-
return data
69-
70-
7153
class PackWriter:
7254
def __init__(self, session: DbSession):
7355
from prime_backup import logger

prime_backup/db/session.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,6 @@ def get_live_chunks_by_pack_id(self, pack_id: int) -> List[schema.Chunk]:
259259
def delete_pack(self, pack: schema.Pack):
260260
self.session.delete(pack)
261261

262-
def delete_packs_by_ids(self, pack_ids: List[int]):
263-
for view in collection_utils.slicing_iterate(pack_ids, self.__safe_var_limit):
264-
self.session.execute(delete(schema.Pack).where(schema.Pack.id.in_(view)))
265-
266262
# ==================================== DbMeta ====================================
267263

268264
def get_db_meta(self) -> schema.DbMeta:
@@ -800,19 +796,6 @@ def get_chunk_group_ids_by_chunk_ids(self, chunk_ids: List[int]) -> List[int]:
800796
)
801797
return list(sorted(chunk_group_ids))
802798

803-
def get_chunk_group_ids_by_pack_ids(self, pack_ids: List[int]) -> List[int]:
804-
chunk_group_ids: Set[int] = set()
805-
for v_pack_ids in collection_utils.slicing_iterate(pack_ids, self.__safe_var_limit):
806-
chunk_group_ids.update(
807-
self.session.execute(
808-
select(schema.ChunkGroupChunkBinding.chunk_group_id).
809-
join(schema.Chunk, schema.ChunkGroupChunkBinding.chunk_id == schema.Chunk.id).
810-
where(schema.Chunk.pack_id.in_(v_pack_ids)).
811-
distinct()
812-
).scalars().all()
813-
)
814-
return list(sorted(chunk_group_ids))
815-
816799
def list_chunk_group_chunk_bindings(self, limit: Optional[int] = None, offset: Optional[int] = None) -> List[schema.ChunkGroupChunkBinding]:
817800
s = select(schema.ChunkGroupChunkBinding)
818801
if limit is not None:

prime_backup/types/pack_info.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import dataclasses
22
from pathlib import Path
3-
from typing import Iterable
43

54
from typing_extensions import Self
65

@@ -36,10 +35,6 @@ def file_name(self) -> str:
3635
from prime_backup.utils import pack_utils
3736
return pack_utils.get_pack_file_name(self.id)
3837

39-
@property
40-
def dead_size(self) -> int:
41-
return max(0, self.size - self.live_size)
42-
4338

4439
@dataclasses.dataclass(frozen=True)
4540
class PackEntryLocation:
@@ -86,14 +81,6 @@ def created_size(self) -> int:
8681
def zero(cls) -> Self:
8782
return cls()
8883

89-
@classmethod
90-
def of_created_packs(cls, packs: Iterable[PackInfo]) -> 'PackChangeSummary':
91-
summary = cls()
92-
for pack in packs:
93-
summary.created_pack_count += 1
94-
summary.new_size += pack.size
95-
return summary
96-
9784
def __add__(self, other: Self) -> 'PackChangeSummary':
9885
misc_utils.ensure_type(other, type(self))
9986
return PackChangeSummary(

0 commit comments

Comments
 (0)