Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-250-buffer-size-fix b6a83a4ec -> 39b157651
Removed duplicate write call in entity persist Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3073fe81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3073fe81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3073fe81 Branch: refs/heads/USERGRID-250-buffer-size-fix Commit: 3073fe811f97d95a311ebcd9a13eceb7b0a683e7 Parents: b6a83a4 Author: Todd Nine <[email protected]> Authored: Wed Nov 19 14:11:07 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Wed Nov 19 14:11:07 2014 -0700 ---------------------------------------------------------------------- .../org/apache/usergrid/persistence/LargeEntityIT.java | 5 ++++- .../collection/impl/EntityCollectionManagerImpl.java | 10 ---------- .../impl/MvccEntitySerializationStrategyImpl.java | 3 ++- 3 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3073fe81/stack/core/src/test/java/org/apache/usergrid/persistence/LargeEntityIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/LargeEntityIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/LargeEntityIT.java index 4ce0b27..0954ded 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/LargeEntityIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/LargeEntityIT.java @@ -60,8 +60,11 @@ public class LargeEntityIT extends AbstractCoreIT { final Entity loadReturnedRef = em.get( createReturned ); + assertEquals( "Entities should be equal", createReturned, loadReturnedRef ); + final Entity loadReturnedId = em.get( createReturned.getUuid() ); - assertEquals( createReturned, loadReturnedRef ); + + assertEquals( "Entities should be equal", createReturned, loadReturnedId ); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3073fe81/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java index bb75cc9..919e83b 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java @@ -165,16 +165,6 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager { // observable = Concurrent.concurrent( observable, Schedulers.io(), new WaitZip(), // writeVerifyUnique, writeOptimisticVerify ); - observable.map(writeCommit).doOnNext(new Action1<Entity>() { - @Override - public void call(final Entity entity) { - //TODO fire a task here - - //post-processing to come later. leave it empty for now. - } - }).doOnError(rollback); - - // return the commit result. return observable.map(writeCommit).doOnError(rollback); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3073fe81/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java index b97429b..bbaeb4a 100644 --- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java +++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java @@ -478,7 +478,8 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat } try { - builder.addBytes( mapper.writeValueAsBytes( wrapper.entity.get() ) ); + final byte[] entityBytes = mapper.writeValueAsBytes( wrapper.entity.get() ) ; + builder.addBytes( entityBytes ); } catch ( Exception e ) { throw new RuntimeException( "Unable to serialize entity", e );
