diff options
| author | Brian S. O'Neill <bronee@gmail.com> | 2007-09-03 17:13:02 +0000 |
|---|---|---|
| committer | Brian S. O'Neill <bronee@gmail.com> | 2007-09-03 17:13:02 +0000 |
| commit | ce4fecd9d313d61d9468954c675e735d468a4a5e (patch) | |
| tree | 443126fa9931526230817a8e2c9448e556099cab /src/main/java/com/amazon/carbonado/repo | |
| parent | 4db278970eec5165c04fa0bc1d9c2dd7aa7ce6b3 (diff) | |
Calling Storable.update when there are no dirty properties actually does an update instead of being "smart" and ignoring the update request. The old behavior was non-intuitive and interfered with expected trigger behavior.
Diffstat (limited to 'src/main/java/com/amazon/carbonado/repo')
| -rw-r--r-- | src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java | 83 |
1 files changed, 25 insertions, 58 deletions
diff --git a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java index 7b9804d..c3adeed 100644 --- a/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java +++ b/src/main/java/com/amazon/carbonado/repo/replicated/ReplicationTrigger.java @@ -131,69 +131,36 @@ class ReplicationTrigger<S extends Storable> extends Trigger<S> { private Object beforeUpdate(S replica, boolean forTry) throws PersistException {
final S master = mMasterStorage.prepare();
replica.copyPrimaryKeyProperties(master);
+ replica.copyVersionProperty(master);
+ replica.copyDirtyProperties(master);
- if (!replica.hasDirtyProperties()) {
- // Nothing to update, but must load from master anyhow, since
- // update must always perform a fresh load as a side-effect. We
- // cannot simply call update on the master, since it may need a
- // version property to be set. Setting the version has the
- // side-effect of making the storable look dirty, so the master
- // will perform an update. This in turn causes the version to
- // increase for no reason.
- try {
- if (forTry) {
- if (!master.tryLoad()) {
- // Master record does not exist. To ensure consistency,
- // delete record from replica.
- tryDeleteReplica(replica);
- throw abortTry();
- }
- } else {
- try {
- master.load();
- } catch (FetchNoneException e) {
- // Master record does not exist. To ensure consistency,
- // delete record from replica.
- tryDeleteReplica(replica);
- throw e;
- }
+ try {
+ if (forTry) {
+ if (!master.tryUpdate()) {
+ // Master record does not exist. To ensure consistency,
+ // delete record from replica.
+ tryDeleteReplica(replica);
+ throw abortTry();
}
- } catch (FetchException e) {
- throw e.toPersistException
- ("Could not load master object for update: " + master.toStringKeyOnly());
- }
- } else {
- replica.copyVersionProperty(master);
- replica.copyDirtyProperties(master);
-
- try {
- if (forTry) {
- if (!master.tryUpdate()) {
- // Master record does not exist. To ensure consistency,
- // delete record from replica.
- tryDeleteReplica(replica);
- throw abortTry();
- }
- } else {
- try {
- master.update();
- } catch (PersistNoneException e) {
- // Master record does not exist. To ensure consistency,
- // delete record from replica.
- tryDeleteReplica(replica);
- throw e;
- }
+ } else {
+ try {
+ master.update();
+ } catch (PersistNoneException e) {
+ // Master record does not exist. To ensure consistency,
+ // delete record from replica.
+ tryDeleteReplica(replica);
+ throw e;
}
- } catch (OptimisticLockException e) {
- // This may be caused by an inconsistency between replica and
- // master.
+ }
+ } catch (OptimisticLockException e) {
+ // This may be caused by an inconsistency between replica and
+ // master.
- repair(replica);
+ repair(replica);
- // Throw original exception since we don't know what the user's
- // intentions really are.
- throw e;
- }
+ // Throw original exception since we don't know what the user's
+ // intentions really are.
+ throw e;
}
// Copy master properties back, since its repository may have
|