_opt suffix

Author: Fallen-Breath

prime_backup/action/delete_chunk_group_action.py

@@ -53,7 +53,7 @@ def __collect_chunk_group_ids_to_delete(self, session: DbSession) -> List[int]:
 		self_chunk_group_hashes_set = set(self.chunk_group_hashes)
 		all_to_delete_chunk_groups: Dict[int, None] = {}  # ordered set
 
-		chunk_groups_by_id: Dict[int, Optional[schema.ChunkGroup]] = session.get_chunk_groups_by_ids(self.chunk_group_ids)
+		chunk_groups_by_id: Dict[int, Optional[schema.ChunkGroup]] = session.get_chunk_groups_by_ids_opt(self.chunk_group_ids)
 		for chunk_group_id, chunk_group in chunk_groups_by_id.items():
 			if chunk_group is None:
 				if self.raise_if_not_found:
@@ -65,7 +65,7 @@ def __collect_chunk_group_ids_to_delete(self, session: DbSession) -> List[int]:
 				raise AssertionError('got unexpected chunk group id {!r}, should be in {}'.format(chunk_group_id, self_chunk_group_ids_set))
 			all_to_delete_chunk_groups[chunk_group.id] = None
 
-		chunk_groups_by_hash: Dict[str, Optional[schema.ChunkGroup]] = session.get_chunk_groups_by_hashes(self.chunk_group_hashes)
+		chunk_groups_by_hash: Dict[str, Optional[schema.ChunkGroup]] = session.get_chunk_groups_by_hashes_opt(self.chunk_group_hashes)
 		for chunk_group_hash, chunk_group in chunk_groups_by_hash.items():
 			if chunk_group is None:
 				if self.raise_if_not_found:

prime_backup/action/migrate_compress_method_action.py

@@ -186,7 +186,7 @@ def __update_chunk_group_and_blobs_for_chunk_changes(self, session: DbSession):
 			return
 
 		chunk_group_id_list = list(self.__affected_chunk_groups_ids)
-		chunk_groups = session.get_chunk_groups_by_ids(chunk_group_id_list)
+		chunk_groups = session.get_chunk_groups_by_ids_opt(chunk_group_id_list)
 		for chunk_group_id, chunk_group in chunk_groups.items():
 			if chunk_group is None:
 				raise AssertionError('Chunk group with id {!r} does not exists'.format(chunk_group_id))

prime_backup/action/validate_blobs_action.py

@@ -141,7 +141,7 @@ def blob_binding_key_getter(b_: schema.BlobChunkGroupBinding):
 				return b_.chunk_group_offset
 
 			bd_lst.sort(key=blob_binding_key_getter)
-		all_chunk_groups_by_id = session.get_chunk_groups_by_ids([bd.chunk_group_id for bd in all_bindings])
+		all_chunk_groups_by_id = session.get_chunk_groups_by_ids_opt([bd.chunk_group_id for bd in all_bindings])
 		all_chunks_by_chunk_group_id = session.get_chunk_group_chunks_batch([bd.chunk_group_id for bd in all_bindings])
 
 		def validate_one_blob(blob: BlobInfo):

prime_backup/db/session.py

@@ -712,7 +712,7 @@ def get_chunk_group_by_hash(self, h: str) -> schema.ChunkGroup:
 			raise ChunkGroupHashNotFound(h)
 		return chunk_group
 
-	def get_chunk_groups_by_ids(self, chunk_group_ids: List[int]) -> Dict[int, Optional[schema.ChunkGroup]]:
+	def get_chunk_groups_by_ids_opt(self, chunk_group_ids: List[int]) -> Dict[int, Optional[schema.ChunkGroup]]:
 		"""
 		:return: a dict, id -> optional chunk group. All given ids are in the dict
 		"""
@@ -723,7 +723,7 @@ def get_chunk_groups_by_ids(self, chunk_group_ids: List[int]) -> Dict[int, Optio
 				result[chunk_group.id] = chunk_group
 		return result
 
-	def get_chunk_groups_by_hashes(self, hashes: List[str]) -> Dict[str, Optional[schema.ChunkGroup]]:
+	def get_chunk_groups_by_hashes_opt(self, hashes: List[str]) -> Dict[str, Optional[schema.ChunkGroup]]:
 		"""
 		:return: a dict, hash -> optional chunk group. All given hashes are in the dict
 		"""