From 7758e53b35eb21606a11324f098c6504b751de56 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Thu, 20 Dec 2018 18:29:43 +0200 Subject: [PATCH] remote: RFC: unify changed_cache Signed-off-by: Ruslan Kuprieiev --- dvc/remote/base.py | 12 ++++++++++++ dvc/remote/gs.py | 13 ------------- dvc/remote/hdfs.py | 15 --------------- dvc/remote/s3.py | 13 ------------- dvc/remote/ssh.py | 17 ----------------- 5 files changed, 12 insertions(+), 58 deletions(-) diff --git a/dvc/remote/base.py b/dvc/remote/base.py index 81c9ed10c..2b63eb9e4 100644 --- a/dvc/remote/base.py +++ b/dvc/remote/base.py @@ -200,3 +200,15 @@ class RemoteBase(object): self.remove(path_info) removed = True return removed + + def changed_cache(self, checksum): + cache = self.checksum_to_path_info(checksum) + + if {self.PARAM_CHECKSUM: checksum} != self.save_info(cache): + if self.exists(cache): + msg = 'Corrupted cache file {}' + logger.warn(msg.format(str(cache))) + self.remove(cache) + return True + + return False diff --git a/dvc/remote/gs.py b/dvc/remote/gs.py index 23a4d145e..291ae5b8b 100644 --- a/dvc/remote/gs.py +++ b/dvc/remote/gs.py @@ -73,19 +73,6 @@ class RemoteGS(RemoteBase): path_info['bucket'], path_info['path']) - def changed_cache(self, md5): - path = self.checksum_to_path(md5) - cache = {'scheme': 'gs', 'bucket': self.bucket, 'path': path} - - if {self.PARAM_CHECKSUM: md5} != self.save_info(cache): - if self.exists(cache): - msg = 'Corrupted cache file {}' - logger.warn(msg.format(self.to_string(cache))) - self.remove(cache) - return True - - return False - def changed(self, path_info, checksum_info): if not self.exists(path_info): return True diff --git a/dvc/remote/hdfs.py b/dvc/remote/hdfs.py index 513303259..2cdf64a59 100644 --- a/dvc/remote/hdfs.py +++ b/dvc/remote/hdfs.py @@ -88,21 +88,6 @@ class RemoteHDFS(RemoteBase): return "{}://{}".format(path_info['scheme'], path_info['path']) - def changed_cache(self, checksum): - cache = {} - cache['scheme'] = 'hdfs' - cache['user'] = self.user - cache['path'] = self.checksum_to_path(checksum) - - if {self.PARAM_CHECKSUM: checksum} != self.save_info(cache): - if self.exists(cache): - msg = 'Corrupted cache file {}' - logger.warn(msg.format(self.to_string(cache))) - self.remove(cache) - return True - - return False - def changed(self, path_info, checksum_info): if not self.exists(path_info): return True diff --git a/dvc/remote/s3.py b/dvc/remote/s3.py index 8851fb072..849b76a04 100644 --- a/dvc/remote/s3.py +++ b/dvc/remote/s3.py @@ -138,19 +138,6 @@ class RemoteS3(RemoteBase): def to_string(path_info): return "s3://{}/{}".format(path_info['bucket'], path_info['path']) - def changed_cache(self, etag): - path = self.checksum_to_path(etag) - cache = {'scheme': 's3', 'bucket': self.bucket, 'path': path} - - if {self.PARAM_CHECKSUM: etag} != self.save_info(cache): - if self.exists(cache): - msg = 'Corrupted cache file {}' - logger.warn(msg.format(self.to_string(cache))) - self.remove(cache) - return True - - return False - def checkout(self, path_info, checksum_info): if path_info['scheme'] != 's3': raise NotImplementedError diff --git a/dvc/remote/ssh.py b/dvc/remote/ssh.py index 1e04d9dc6..439c6912d 100644 --- a/dvc/remote/ssh.py +++ b/dvc/remote/ssh.py @@ -234,23 +234,6 @@ class RemoteSSH(RemoteBase): path_info['host'], path_info['path']) - def changed_cache(self, md5): - cache = {} - cache['scheme'] = 'ssh' - cache['host'] = self.host - cache['port'] = self.port - cache['user'] = self.user - cache['path'] = self.checksum_to_path(md5) - - if {self.PARAM_CHECKSUM: md5} != self.save_info(cache): - if self.exists(cache): - msg = 'Corrupted cache file {}' - logger.warn(msg.format(self.to_string(cache))) - self.remove(cache) - return True - - return False - def changed(self, path_info, checksum_info): if not self.exists(path_info): return True