Skip to content

Evaluate stale getter deps only once #41

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

Merged
jordangarcia merged 4 commits into from
May 14, 2015
Merged

Evaluate stale getter deps only once #41

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d99c96
Evaluate stale getter deps only once
loganlinn May 6, 2015
aeeb00d
Move prevValue into block where needed
loganlinn May 6, 2015
5cb2e6f
Merge remote-tracking branch 'origin/master' into dependency-eval-cle…
loganlinn May 11, 2015
7534f03
Fix evaluator's deps comparison: use Immutable val
loganlinn May 12, 2015
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
18 changes: 9 additions & 9 deletions src/evaluator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,22 @@ class Evaluator {
// Cache hit
return this.__cachedGetters.getIn([code, 'value'])

} else if (this.__hasStaleValue(state, keyPathOrGetter)) {
var prevValue = this.__cachedGetters.getIn([code, 'value'])
var prevArgs = this.__cachedGetters.getIn([code, 'args'])
}

// evaluate dependencies
var args = getDeps(keyPathOrGetter).map(dep => this.evaluate(state, dep))

if (this.__hasStaleValue(state, keyPathOrGetter)) {
// getter deps could still be unchanged since we only looked at the unwrapped (keypath, bottom level) deps
var currArgs = toImmutable(getDeps(keyPathOrGetter).map(getter => {
return this.evaluate(state, getter)
}))
var prevArgs = this.__cachedGetters.getIn([code, 'args'])

// since Getter is a pure functions if the args are the same its a cache hit
if (isEqual(prevArgs, currArgs)) {
if (isEqual(prevArgs, toImmutable(args))) {
var prevValue = this.__cachedGetters.getIn([code, 'value'])
this.__cacheValue(state, keyPathOrGetter, prevArgs, prevValue)
return prevValue
}
}
// no cache hit evaluate
var args = getDeps(keyPathOrGetter).map(dep => this.evaluate(state, dep))

// This indicates that we have called evaluate within the body of a computeFn.
// Throw an error as this will lead to inconsistent caching
Expand Down