You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/11/17 20:51:12 UTC
usergrid git commit: Error checking in WriteStart,
fixing timing in UV serialization test and ignore test broken by
disabled delete.
Repository: usergrid
Updated Branches:
refs/heads/ignores 78f3da6fc -> c96e2944f
Error checking in WriteStart, fixing timing in UV serialization test and ignore test broken by disabled delete.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c96e2944
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c96e2944
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c96e2944
Branch: refs/heads/ignores
Commit: c96e2944fa170cb4bc68c18943310a42de9fa352
Parents: 78f3da6
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Nov 17 14:51:08 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Tue Nov 17 14:51:08 2015 -0500
----------------------------------------------------------------------
.../persistence/collection/mvcc/stage/write/WriteStart.java | 7 +++++--
.../impl/UniqueValueSerializationStrategyImplTest.java | 4 ++--
.../persistence/graph/impl/NodeDeleteListenerTest.java | 1 +
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/c96e2944/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java
index 7d73b7b..79b2d85 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteStart.java
@@ -26,6 +26,8 @@ import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
import rx.functions.Func1;
+import static org.apache.usergrid.persistence.core.util.ValidationUtils.verifyEntityWrite;
+
/**
* This is the first stage and should be invoked immediately when a write is started. It should
@@ -53,7 +55,9 @@ public class WriteStart implements Func1<CollectionIoEvent<Entity>, CollectionIo
@Override
public CollectionIoEvent<MvccEntity> call( final CollectionIoEvent<Entity> ioEvent ) {
- {
+
+ verifyEntityWrite( ioEvent.getEvent() );
+
final Entity entity = ioEvent.getEvent();
final ApplicationScope applicationScope = ioEvent.getEntityCollection();
@@ -84,6 +88,5 @@ public class WriteStart implements Func1<CollectionIoEvent<Entity>, CollectionIo
//create the mvcc entity for the next stage
return new CollectionIoEvent<>( applicationScope, nextStage );
- }
}
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/c96e2944/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImplTest.java
index 2fae482..fcf22cf 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/UniqueValueSerializationStrategyImplTest.java
@@ -127,7 +127,7 @@ public abstract class UniqueValueSerializationStrategyImplTest {
Id entityId = new SimpleId( UUIDGenerator.newTimeUUID(), "entity" );
UUID version = UUIDGenerator.newTimeUUID();
UniqueValue stored = new UniqueValueImpl( field, entityId, version );
- strategy.write( scope, stored, 2 ).execute();
+ strategy.write( scope, stored, 5 ).execute();
Thread.sleep( 1000 );
@@ -139,7 +139,7 @@ public abstract class UniqueValueSerializationStrategyImplTest {
Assert.assertNotNull( retrieved );
assertEquals( stored, retrieved );
- Thread.sleep( 1500 );
+ Thread.sleep( 5000 );
// wait another second, should be gone now
fields = strategy.load( scope, entityId.getType(), Collections.<Field>singleton( field ) );
http://git-wip-us.apache.org/repos/asf/usergrid/blob/c96e2944/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java
index f2d4d94..5a5df79 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/impl/NodeDeleteListenerTest.java
@@ -319,6 +319,7 @@ public class NodeDeleteListenerTest {
* since it has no other targets
*/
@Test
+ @Ignore("Pending re-enable of delete functionality")
public void testMultiDelete() throws ConnectionException, InterruptedException {
GraphManager em = emf.createEdgeManager( scope );