Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid full prov #37

Merged
merged 2 commits into from
Mar 27, 2018
Merged

Avoid full prov #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e23062
avoid keeping full provenance in form of nested dependencies
lukasheinrich Mar 27, 2018
e2793fd
sorting
lukasheinrich Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 13 additions & 23 deletions packtivity/statecontexts/posixfs_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,20 @@ def __init__(self,readwrite = None, readonly = None, dependencies = None, identi
except AssertionError:
raise TypeError('readwrite and readonly must be None or a list {} {}'.format(type(readonly)))
self._identifier = identifier
self.readwrite = list(map(os.path.realpath,readwrite) if readwrite else [])
self.add_readonly = list(map(os.path.realpath,readonly) if readonly else [])
self.dependencies = dependencies or []
self.datamodel = None

def __repr__(self):
return '<LocalFSState rw: {}, ro: {}>'.format(self.readwrite,self.readonly)

@property
def readonly(self):
readonlies = [x for x in self.add_readonly]
for d in self.dependencies or []:
readonlies = list(map(os.path.realpath,readonly) if readonly else [])
for d in dependencies or []:
if d.readwrite:
readonlies += d.readwrite # if dep has readwrite add those
else:
readonlies += d.readonly # else add the readonlies
return list(map(os.path.realpath,readonlies))

self.readwrite = sorted(list(map(os.path.realpath,readwrite) if readwrite else []))
self.readonly = sorted(list(map(os.path.realpath,readonlies)))
self.datamodel = None

def __repr__(self):
return '<LocalFSState rw: {}, ro: {}>'.format(self.readwrite,self.readonly)


@property
Expand All @@ -46,9 +43,6 @@ def metadir(self):
def identifier(self):
return self._identifier

def add_dependency(self,depstate):
self.dependencies.append(depstate)

def reset(self):
'''
resets state by deleting readwrite directory contents (deletes tree and re-creates)
Expand All @@ -72,10 +66,8 @@ def state_hash(self):
checks both readwrite directories and dependencies (assumed to be subtrees of readwrite directories)
return: SHA1 hash
'''

#hash the upstream / input state
depwrites = [deprw for dep in self.dependencies for deprw in dep.readwrite]
dep_checksums = [checksumdir.dirhash(d) for d in depwrites if os.path.isdir(d)]
dep_checksums = [checksumdir.dirhash(d) for d in self.readonly if os.path.isdir(d)]

#hash out writing state
state_checksums = [checksumdir.dirhash(d) for d in self.readwrite if os.path.isdir(d)]
Expand Down Expand Up @@ -105,15 +97,13 @@ def json(self):
'state_type': 'localfs',
'identifier': self.identifier(),
'readwrite': self.readwrite,
'add_readonly': self.add_readonly,
'dependencies': [x.json() for x in self.dependencies]
'readonly': self.readonly,
}

@classmethod
def fromJSON(cls,jsondata):
return cls(
readwrite = jsondata['readwrite'],
readonly = jsondata['add_readonly'],
identifier = jsondata['identifier'],
dependencies = [LocalFSState.fromJSON(x) for x in jsondata['dependencies']]
readwrite = sorted(jsondata['readwrite']),
readonly = sorted(jsondata['readonly']),
)