zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-28 07:02:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

Replace some unnecessary uses of "real" ofy() with Ofy.

Browse source 
Only Ofy itself and its two helpers (AugmentedSaver and
AugmentedDeleter) need to use the real ofy(). All other
callers should be using Ofy. Fixing this even though it
doesn't change anything because I found it baffling to
follow the code while trying to make a small change.

Update: added a presubmit to enforce this.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=154456603
This commit is contained in:
cgoldfeder 2017-04-27 12:40:36 -07:00 • committed by Ben McIlwain
parent 927eb43cbc
commit 0267214841
5 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
java/google/registry/model/ofy/CommitLoggedWork.java
View file

@ -20,8 +20,8 @@ import static com.google.common.base.Predicates.not;
import static com.google.common.collect.Maps.filterKeys;
import static com.google.common.collect.Sets.difference;
import static com.google.common.collect.Sets.union;
import static com.googlecode.objectify.ObjectifyService.ofy;
import static google.registry.model.ofy.CommitLogBucket.loadBucket;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.util.DateTimeUtils.isBeforeOrAt;
import com.google.common.base.Function;
@ -132,10 +132,15 @@ class CommitLoggedWork<R> extends VoidWork {
if (isBeforeOrAt(info.transactionTime, bucket.getLastWrittenTime())) {
throw new TimestampInversionException(info.transactionTime, bucket.getLastWrittenTime());
}
// The keys read by Objectify during this transaction. This won't include the keys of
// asynchronous save and delete operations that haven't been reaped, but that's ok because we
// already logged all of those keys in {@link TransactionInfo} and now just need to figure out
// what was loaded.
ImmutableSet<Key<?>> keysInSessionCache = ofy().getSessionKeys();
Map<Key<BackupGroupRoot>, BackupGroupRoot> rootsForTouchedKeys =
getBackupGroupRoots(touchedKeys);
Map<Key<BackupGroupRoot>, BackupGroupRoot> rootsForUntouchedKeys =
getBackupGroupRoots(difference(getObjectifySessionCacheKeys(), touchedKeys));
getBackupGroupRoots(difference(keysInSessionCache, touchedKeys));
// Check the update timestamps of all keys in the transaction, whether touched or merely read.
checkBackupGroupRootTimestamps(
info.transactionTime,
@ -153,7 +158,7 @@ class CommitLoggedWork<R> extends VoidWork {
return CommitLogMutation.create(manifestKey, saveEntity);
}})
.toSet();
ofy().save()
ofy().saveWithoutBackup()
.entities(new ImmutableSet.Builder<>()
.add(manifest)
.add(bucket.asBuilder().setLastWrittenTime(info.transactionTime).build())
@ -163,17 +168,6 @@ class CommitLoggedWork<R> extends VoidWork {
.now();
}
/**
* Returns keys read by Objectify during this transaction.
*
* <p>This won't include the keys of asynchronous save and delete operations that haven't been
* reaped. But that's ok because we already logged all of those keys in {@link TransactionInfo}
* and only need this method to figure out what was loaded.
*/
private ImmutableSet<Key<?>> getObjectifySessionCacheKeys() {
return ((SessionKeyExposingObjectify) ofy()).getSessionKeys();
}
/** Check that the timestamp of each BackupGroupRoot is in the past. */
private void checkBackupGroupRootTimestamps(
DateTime transactionTime, Set<Entry<Key<BackupGroupRoot>, BackupGroupRoot>> bgrEntries) {