Fix issue with checking pre-write unique value violations.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3bba4259 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3bba4259 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3bba4259 Branch: refs/heads/master Commit: 3bba4259bdf17472760eac33de487a972f7058c2 Parents: 61aa037 Author: Michael Russo <[email protected]> Authored: Fri Jul 1 08:45:19 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Fri Jul 1 08:45:19 2016 -0700 ---------------------------------------------------------------------- .../collection/mvcc/stage/write/WriteUniqueVerify.java | 2 +- .../impl/UniqueValueSerializationStrategyImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/3bba4259/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java index 7f32888..538160a 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java @@ -156,7 +156,7 @@ public class WriteUniqueVerify implements Action1<CollectionIoEvent<MvccEntity>> } // only build the batch statement if we don't have a violation for the field - if( preWriteUniquenessViolations.get(field.getName()) != null) { + if( preWriteUniquenessViolations.get(field.getName()) == null) { // use TTL in case something goes wrong before entity is finally committed final MutationBatch mb = uniqueValueStrat.write(scope, written, serializationFig.getTimeout()); http://git-wip-us.apache.org/repos/asf/usergrid/blob/3bba4259/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java index d7b1be9..8f304f3 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImpl.java @@ -223,10 +223,9 @@ public abstract class UniqueValueSerializationStrategyImpl<FieldKey, EntityKey> if ( logger.isTraceEnabled() ) { - logger.trace( "Writing unique value version={} name={} value={} ", - uniqueValue.getEntityVersion(), uniqueValue.getField().getName(), - uniqueValue.getField().getValue() - ); + logger.trace( "Building batch statement for unique value entity={} version={} name={} value={} ", + uniqueValue.getEntityId().getUuid(), uniqueValue.getEntityVersion(), + uniqueValue.getField().getName(), uniqueValue.getField().getValue() ); }
