You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/10 00:04:23 UTC
[03/16] git commit: Refactored read stage
Refactored read stage
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f1a88aa9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f1a88aa9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f1a88aa9
Branch: refs/heads/two-dot-o
Commit: f1a88aa908211e0bb2c137f96c2fe0028ff202ac
Parents: f7d406e
Author: Todd Nine <to...@apache.org>
Authored: Thu Oct 9 11:27:23 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Thu Oct 9 11:28:56 2014 -0600
----------------------------------------------------------------------
.../persistence/collection/EntitySet.java | 3 +-
.../impl/EntityCollectionManagerImpl.java | 45 ++-
.../mvcc/MvccEntitySerializationStrategy.java | 12 -
.../collection/mvcc/stage/load/Load.java | 111 ------
.../serialization/SerializationFig.java | 19 +
.../serialization/impl/EntityRepairImpl.java | 5 +-
.../serialization/impl/EntitySetImpl.java | 10 +-
.../MvccEntitySerializationStrategyImpl.java | 32 +-
.../collection/EntityCollectionManagerIT.java | 240 +++++++++---
.../collection/mvcc/stage/load/LoadTest.java | 379 -------------------
.../serialization/EntityRepairImplTest.java | 25 +-
...MvccEntitySerializationStrategyImplTest.java | 40 +-
12 files changed, 290 insertions(+), 631 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntitySet.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntitySet.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntitySet.java
index 32c168f..7803a04 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntitySet.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntitySet.java
@@ -18,6 +18,7 @@ package org.apache.usergrid.persistence.collection;/*
*/
+import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
@@ -32,7 +33,7 @@ public interface EntitySet {
* @param entityId
* @return
*/
- public Entity getEntity(Id entityId);
+ public MvccEntity getEntity(Id entityId);
/**
* Get the number of entities in this set
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/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 4a72285..39df9cb 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
@@ -20,6 +20,7 @@ package org.apache.usergrid.persistence.collection.impl;
import java.util.Collection;
+import java.util.Collections;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,12 +31,12 @@ import org.apache.usergrid.persistence.collection.EntitySet;
import org.apache.usergrid.persistence.collection.guice.CollectionTaskExecutor;
import org.apache.usergrid.persistence.collection.guice.Write;
import org.apache.usergrid.persistence.collection.guice.WriteUpdate;
+import org.apache.usergrid.persistence.collection.mvcc.MvccEntitySerializationStrategy;
import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
import org.apache.usergrid.persistence.collection.mvcc.entity.MvccValidationUtils;
import org.apache.usergrid.persistence.collection.mvcc.stage.CollectionIoEvent;
import org.apache.usergrid.persistence.collection.mvcc.stage.delete.MarkCommit;
import org.apache.usergrid.persistence.collection.mvcc.stage.delete.MarkStart;
-import org.apache.usergrid.persistence.collection.mvcc.stage.load.Load;
import org.apache.usergrid.persistence.collection.mvcc.stage.write.RollbackAction;
import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteCommit;
import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteOptimisticVerify;
@@ -46,6 +47,7 @@ import org.apache.usergrid.persistence.core.task.TaskExecutor;
import org.apache.usergrid.persistence.core.util.ValidationUtils;
import org.apache.usergrid.persistence.model.entity.Entity;
import org.apache.usergrid.persistence.model.entity.Id;
+import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import com.google.common.base.Preconditions;
import com.google.inject.Inject;
@@ -79,9 +81,6 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
private final WriteCommit writeCommit;
private final RollbackAction rollback;
- //load stages
- private final Load load;
-
//delete stages
private final MarkStart markStart;
@@ -89,16 +88,20 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
private final TaskExecutor taskExecutor;
+ private final MvccEntitySerializationStrategy entitySerializationStrategy;
+
@Inject
public EntityCollectionManagerImpl( final UUIDService uuidService, @Write final WriteStart writeStart,
@WriteUpdate final WriteStart writeUpdate,
final WriteUniqueVerify writeVerifyUnique,
final WriteOptimisticVerify writeOptimisticVerify,
- final WriteCommit writeCommit, final RollbackAction rollback, final Load load,
+ final WriteCommit writeCommit, final RollbackAction rollback,
final MarkStart markStart, final MarkCommit markCommit,
- @CollectionTaskExecutor
- final TaskExecutor taskExecutor,
- @Assisted final CollectionScope collectionScope) {
+ final MvccEntitySerializationStrategy entitySerializationStrategy,
+ @CollectionTaskExecutor final TaskExecutor taskExecutor,
+ @Assisted final CollectionScope collectionScope
+ ) {
+
Preconditions.checkNotNull( uuidService, "uuidService must be defined" );
@@ -111,13 +114,13 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
this.writeCommit = writeCommit;
this.rollback = rollback;
- this.load = load;
this.markStart = markStart;
this.markCommit = markCommit;
this.uuidService = uuidService;
this.collectionScope = collectionScope;
this.taskExecutor = taskExecutor;
+ this.entitySerializationStrategy = entitySerializationStrategy;
}
@@ -183,14 +186,30 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
Preconditions.checkNotNull( entityId.getUuid(), "Entity id uuid required in load stage" );
Preconditions.checkNotNull( entityId.getType(), "Entity id type required in load stage" );
- return Observable.from( new CollectionIoEvent<Id>( collectionScope, entityId ) )
- .map( load );
+ return load( Collections.singleton(entityId) ).map( new Func1<EntitySet, Entity>() {
+ @Override
+ public Entity call( final EntitySet entitySet ) {
+ final MvccEntity entity = entitySet.getEntity( entityId );
+
+ if(entity == null){
+ return null;
+ }
+
+ return entity.getEntity().orNull();
+ }
+ } );
}
@Override
public Observable<EntitySet> load( final Collection<Id> entityIds ) {
- return null;
+
+ Preconditions.checkNotNull( entityIds, "entityIds cannot be null" );
+
+ final EntitySet
+ results = entitySerializationStrategy.load( collectionScope, entityIds, UUIDGenerator.newTimeUUID() );
+
+ return Observable.just( results );
}
@@ -222,7 +241,7 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
//we an update, signal the fix
//TODO T.N Change this to fire a task
- Observable.from( new CollectionIoEvent<Id>(collectionScope, entityId ) ).map( load ).subscribeOn( Schedulers.io() ).subscribe();
+// Observable.from( new CollectionIoEvent<Id>(collectionScope, entityId ) ).map( load ).subscribeOn( Schedulers.io() ).subscribe();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/MvccEntitySerializationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/MvccEntitySerializationStrategy.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/MvccEntitySerializationStrategy.java
index 7947029..0467c95 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/MvccEntitySerializationStrategy.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/MvccEntitySerializationStrategy.java
@@ -47,18 +47,6 @@ public interface MvccEntitySerializationStrategy {
public MutationBatch write( CollectionScope context, MvccEntity entity );
- /**
- * Load and return the entity with the given id and a version that is <= the version provided
- *
- * @param context The context to persist the entity into
- * @param entityId The entity id to load
- * @param version The version to load. This will return the version <= the given version
- *
- * @return The deserialized version of the entity. Null if no version == to version exists. If the entity version
- * has been cleared, the MvccEntity will be returned, but the optional entity will not be set
- */
- public MvccEntity load( CollectionScope context, Id entityId, UUID version );
-
/**
* Load the entities into the entitySet from the specified Ids. Loads versions <= the maxVersion
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/Load.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/Load.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/Load.java
deleted file mode 100644
index f9c66cc..0000000
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/Load.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.usergrid.persistence.collection.mvcc.stage.load;
-
-
-import java.util.Iterator;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.usergrid.persistence.collection.CollectionScope;
-import org.apache.usergrid.persistence.collection.mvcc.MvccEntitySerializationStrategy;
-import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
-import org.apache.usergrid.persistence.collection.mvcc.stage.CollectionIoEvent;
-import org.apache.usergrid.persistence.collection.serialization.EntityRepair;
-import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
-import org.apache.usergrid.persistence.collection.serialization.impl.EntityRepairImpl;
-import org.apache.usergrid.persistence.collection.service.UUIDService;
-import org.apache.usergrid.persistence.core.util.ValidationUtils;
-import org.apache.usergrid.persistence.model.entity.Entity;
-import org.apache.usergrid.persistence.model.entity.Id;
-
-import com.google.common.base.Preconditions;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-import rx.functions.Func1;
-
-
-/**
- * This stage is a load stage to load a single entity
- */
-@Singleton
-public class Load implements Func1<CollectionIoEvent<Id>, Entity> {
-
-
- private static final Logger LOG = LoggerFactory.getLogger( Load.class );
-
- private final UUIDService uuidService;
- private final MvccEntitySerializationStrategy entitySerializationStrategy;
- private final EntityRepair entityRepair;
-
-
- @Inject
- public Load( final UUIDService uuidService, final MvccEntitySerializationStrategy entitySerializationStrategy, final
- SerializationFig serializationFig ) {
- Preconditions.checkNotNull( entitySerializationStrategy, "entitySerializationStrategy is required" );
- Preconditions.checkNotNull( uuidService, "uuidService is required" );
-
-
- this.uuidService = uuidService;
- this.entitySerializationStrategy = entitySerializationStrategy;
- entityRepair = new EntityRepairImpl( entitySerializationStrategy, serializationFig );
-
- }
-
- //TODO: do reads partial merges in batches. maybe 5 or 10 at a time.
- /**
- * for example
- so if like v1 is a full
- and you have v1 -> v20, where v2->20 is all partial
- you merge up to 10, then flush
- then process 10->20, then flush
- */
- @Override
- public Entity call( final CollectionIoEvent<Id> idIoEvent ) {
- final Id entityId = idIoEvent.getEvent();
-
- ValidationUtils.verifyIdentity( entityId );
-
-
- final CollectionScope collectionScope = idIoEvent.getEntityCollection();
-
- //generate a version that represents now
- final UUID versionMax = uuidService.newTimeUUID();
-
- Iterator<MvccEntity> results = entitySerializationStrategy.load(
- collectionScope, entityId, versionMax, 1 );
-
- if(!results.hasNext()){
- return null;
- }
-
- final MvccEntity returned = results.next();
-
- final MvccEntity repairedEntity = entityRepair.maybeRepair( collectionScope, returned );
-
- if(repairedEntity == null)
- return null;
-
- return repairedEntity.getEntity().orNull();
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java
index 7e69a19..15bae5c 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java
@@ -56,4 +56,23 @@ public interface SerializationFig extends GuicyFig {
@Key( "collection.task.pool.queuesize" )
@Default( "20" )
int getTaskPoolQueueSize();
+
+ /**
+ * The maximum amount of entites we can load at any one time
+ * @return
+ */
+ @Key( "collection.max.load.size" )
+ @Default( "1000" )
+ int getMaxLoadSize();
+
+
+
+ /**
+ * The maximum number of bytes a serialized entity can be. Any thing beyond this is rejected
+ * @return
+ */
+ @Key( "collection.max.entry.size" )
+ @Default( "512" )
+ int getMaxEntrySize();
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntityRepairImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntityRepairImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntityRepairImpl.java
index d26cd3f..62f4915 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntityRepairImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntityRepairImpl.java
@@ -36,6 +36,7 @@ import org.apache.usergrid.persistence.model.field.Field;
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import com.netflix.astyanax.MutationBatch;
@Singleton
@@ -102,7 +103,9 @@ public class EntityRepairImpl implements EntityRepair {
final MvccEntity mergedEntity = entityRepair( changeLog, targetEntity );
try {
- mvccEntitySerializationStrategy.write( collectionScope, mergedEntity ).execute();
+ final MutationBatch batch = mvccEntitySerializationStrategy.write( collectionScope, mergedEntity );
+
+ batch.execute();
}
catch ( Exception e ) {
throw new RuntimeException( "Couldn't rewrite repaired entity", e );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntitySetImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntitySetImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntitySetImpl.java
index 89ec69e..9e03754 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntitySetImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/EntitySetImpl.java
@@ -45,14 +45,8 @@ public class EntitySetImpl implements EntitySet {
@Override
- public Entity getEntity( final Id entityId ) {
- final MvccEntity entity = entities.get( entityId );
-
- if ( entity == null ) {
- return null;
- }
-
- return entity.getEntity().orNull();
+ public MvccEntity getEntity( final Id entityId ) {
+ return entities.get( entityId );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/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 b36ee0e..5449e46 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
@@ -142,33 +142,6 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
}
- @Override
- public MvccEntity load( final CollectionScope collectionScope, final Id entityId, final UUID version ) {
- Preconditions.checkNotNull( collectionScope, "collectionScope is required" );
- Preconditions.checkNotNull( entityId, "entity id is required" );
- Preconditions.checkNotNull( version, "version is required" );
-
-
- Column<UUID> column;
-
- try {
- column = keyspace.prepareQuery( CF_ENTITY_DATA ).getKey( ScopedRowKey.fromKey( collectionScope, entityId ) )
- .getColumn( version ).execute().getResult();
- }
-
- catch ( NotFoundException e ) {
- //swallow, there's just no column
- return null;
- }
- catch ( ConnectionException e ) {
- throw new CollectionRuntimeException( null, collectionScope, "An error occurred connecting to cassandra",
- e );
- }
-
-
- return new MvccColumnParser( entityId ).parseColumn( column );
- }
-
@Override
public EntitySet load( final CollectionScope collectionScope, final Collection<Id> entityIds,
@@ -181,6 +154,11 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
Preconditions.checkNotNull( maxVersion, "version is required" );
+ //didnt put the max in the error message, I don't want to take the string construction hit every time
+ Preconditions.checkArgument( entityIds.size() <= serializationFig.getMaxLoadSize(), "requested size cannot be over configured maximum");
+
+
+
final List<ScopedRowKey<CollectionScope, Id>> rowKeys = new ArrayList<>( entityIds.size() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
index 9e8bbe3..823cb87 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
@@ -18,6 +18,8 @@
package org.apache.usergrid.persistence.collection;
+import java.util.ArrayList;
+import java.util.List;
import java.util.UUID;
import org.jukito.UseModules;
@@ -29,20 +31,27 @@ import org.apache.usergrid.persistence.collection.exception.WriteUniqueVerifyExc
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.collection.guice.TestCollectionModule;
import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
+import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
+import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
import org.apache.usergrid.persistence.core.cassandra.ITRunner;
import org.apache.usergrid.persistence.model.entity.Entity;
+import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.entity.SimpleId;
+import org.apache.usergrid.persistence.model.field.BooleanField;
import org.apache.usergrid.persistence.model.field.IntegerField;
import org.apache.usergrid.persistence.model.field.StringField;
import com.fasterxml.uuid.UUIDComparator;
-import com.fasterxml.uuid.impl.UUIDUtil;
import com.google.inject.Inject;
import rx.Observable;
-
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/** @author tnine */
@@ -57,12 +66,15 @@ public class EntityCollectionManagerIT {
@Rule
public MigrationManagerRule migrationManagerRule;
+ @Inject
+ private SerializationFig serializationFig;
+
@Test
public void write() {
- CollectionScope context = new CollectionScopeImpl(
- new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
+ CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
Entity newEntity = new Entity( new SimpleId( "test" ) );
@@ -78,17 +90,18 @@ public class EntityCollectionManagerIT {
assertNotNull( "Version exists", returned.getVersion() );
}
+
@Test
public void writeWithUniqueValues() {
- CollectionScope context = new CollectionScopeImpl(
- new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
+ CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
EntityCollectionManager manager = factory.createCollectionManager( context );
{
Entity newEntity = new Entity( new SimpleId( "test" ) );
- newEntity.setField( new IntegerField("count", 5, true) );
+ newEntity.setField( new IntegerField( "count", 5, true ) );
Observable<Entity> observable = manager.write( newEntity );
Entity returned = observable.toBlocking().lastOrDefault( null );
@@ -97,23 +110,24 @@ public class EntityCollectionManagerIT {
{
try {
Entity newEntity = new Entity( new SimpleId( "test" ) );
- newEntity.setField( new IntegerField("count", 5, true) );
+ newEntity.setField( new IntegerField( "count", 5, true ) );
manager.write( newEntity ).toBlocking().last();
- fail("Write should have thrown an exception");
-
- } catch ( Exception ex ) {
- WriteUniqueVerifyException e = (WriteUniqueVerifyException)ex;
+ fail( "Write should have thrown an exception" );
+ }
+ catch ( Exception ex ) {
+ WriteUniqueVerifyException e = ( WriteUniqueVerifyException ) ex;
assertEquals( 1, e.getVioliations().size() );
}
}
}
+
@Test
public void writeAndLoad() {
- CollectionScope context = new CollectionScopeImpl(
- new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
+ CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
Entity newEntity = new Entity( new SimpleId( "test" ) );
@@ -139,8 +153,8 @@ public class EntityCollectionManagerIT {
@Test
public void writeLoadDelete() {
- CollectionScope context = new CollectionScopeImpl(
- new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
+ CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
Entity newEntity = new Entity( new SimpleId( "test" ) );
EntityCollectionManager manager = factory.createCollectionManager( context );
@@ -174,8 +188,8 @@ public class EntityCollectionManagerIT {
@Test
public void writeLoadUpdateLoad() {
- CollectionScope context = new CollectionScopeImpl(
- new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
+ CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
Entity newEntity = new Entity( new SimpleId( "test" ) );
newEntity.setField( new IntegerField( "counter", 1 ) );
@@ -221,8 +235,8 @@ public class EntityCollectionManagerIT {
public void writeAndLoadScopeClosure() {
- CollectionScope collectionScope1 = new CollectionScopeImpl(
- new SimpleId( "organization" ), new SimpleId( "test1" ), "test1" );
+ CollectionScope collectionScope1 =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "test1" ), "test1" );
Entity newEntity = new Entity( new SimpleId( "test" ) );
@@ -245,30 +259,32 @@ public class EntityCollectionManagerIT {
//now make sure we can't load it from another scope, using the same org
- CollectionScope collectionScope2 = new CollectionScopeImpl(
- collectionScope1.getApplication(), new SimpleId("test2"), collectionScope1.getName());
+ CollectionScope collectionScope2 =
+ new CollectionScopeImpl( collectionScope1.getApplication(), new SimpleId( "test2" ),
+ collectionScope1.getName() );
EntityCollectionManager manager2 = factory.createCollectionManager( collectionScope2 );
- Entity loaded = manager2.load( createReturned.getId() )
- .toBlocking().lastOrDefault( null );
+ Entity loaded = manager2.load( createReturned.getId() ).toBlocking().lastOrDefault( null );
assertNull( "CollectionScope works correctly", loaded );
//now try to load it from another org, with the same scope
- CollectionScope collectionScope3 = new CollectionScopeImpl(
- new SimpleId("organization2"), collectionScope1.getOwner(), collectionScope1.getName());
+ CollectionScope collectionScope3 =
+ new CollectionScopeImpl( new SimpleId( "organization2" ), collectionScope1.getOwner(),
+ collectionScope1.getName() );
assertNotNull( collectionScope3 );
}
+
@Test
public void partialUpdate() {
- StringField testField1 = new StringField("testField","value");
+ StringField testField1 = new StringField( "testField", "value" );
StringField addedField = new StringField( "testFud", "NEWPARTIALUPDATEZOMG" );
- CollectionScope context = new CollectionScopeImpl(
- new SimpleId( "organization" ), new SimpleId( "testUpdate" ), "testUpdate" );
+ CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "testUpdate" ), "testUpdate" );
Entity oldEntity = new Entity( new SimpleId( "testUpdate" ) );
oldEntity.setField( new StringField( "testField", "value" ) );
@@ -283,12 +299,12 @@ public class EntityCollectionManagerIT {
final UUID writeVersion = returned.getVersion();
- assertNotNull("Write version was set", writeVersion);
+ assertNotNull( "Write version was set", writeVersion );
/**
* Modify the oldEntity
*/
- oldEntity.getFields().remove( testField1 );
+ oldEntity.getFields().remove( testField1 );
oldEntity.setField( addedField );
observable = manager.update( oldEntity );
@@ -300,7 +316,7 @@ public class EntityCollectionManagerIT {
final UUID updatedVersion = updateReturned.getVersion();
- assertNotNull("Updated version returned", updatedVersion);
+ assertNotNull( "Updated version returned", updatedVersion );
assertTrue( "Updated version higher", UUIDComparator.staticCompare( updatedVersion, writeVersion ) > 0 );
@@ -309,21 +325,20 @@ public class EntityCollectionManagerIT {
final UUID returnedVersion = newEntity.getVersion();
- assertEquals("Loaded version matches updated version", updatedVersion, returnedVersion);
+ assertEquals( "Loaded version matches updated version", updatedVersion, returnedVersion );
assertNotNull( "Returned has a uuid", returned.getId() );
- assertEquals( addedField, newEntity.getField( "testFud" ));
-
-
+ assertEquals( addedField, newEntity.getField( "testFud" ) );
}
+
@Test
public void partialUpdateDelete() {
- StringField testField = new StringField("testField","value");
+ StringField testField = new StringField( "testField", "value" );
StringField addedField = new StringField( "testFud", "NEWPARTIALUPDATEZOMG" );
- CollectionScope context = new CollectionScopeImpl(
- new SimpleId( "organization" ), new SimpleId( "testUpdate" ), "testUpdate" );
+ CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "testUpdate" ), "testUpdate" );
Entity oldEntity = new Entity( new SimpleId( "testUpdate" ) );
oldEntity.setField( new StringField( "testField", "value" ) );
@@ -336,13 +351,13 @@ public class EntityCollectionManagerIT {
assertNotNull( "Returned has a uuid", returned.getId() );
- oldEntity.getFields().remove( testField );
+ oldEntity.getFields().remove( testField );
oldEntity.setField( addedField );
//Entity is deleted then updated right afterwards.
manager.delete( oldEntity.getId() );
- observable = manager.update( oldEntity);
+ observable = manager.update( oldEntity );
returned = observable.toBlocking().lastOrDefault( null );
@@ -353,9 +368,7 @@ public class EntityCollectionManagerIT {
Entity newEntity = newEntityObs.toBlocking().last();
assertNotNull( "Returned has a uuid", returned.getId() );
- assertEquals( addedField, newEntity.getField( addedField.getName()) );
-
-
+ assertEquals( addedField, newEntity.getField( addedField.getName() ) );
}
@@ -366,10 +379,10 @@ public class EntityCollectionManagerIT {
Entity origEntity = new Entity( new SimpleId( "testUpdate" ) );
origEntity.setField( new StringField( "testField", "value" ) );
- CollectionScope context = new CollectionScopeImpl(
- new SimpleId( "organization" ), new SimpleId( "testUpdate" ), "testUpdate" );
+ CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "testUpdate" ), "testUpdate" );
EntityCollectionManager manager = factory.createCollectionManager( context );
- Entity returned = manager.write(origEntity).toBlocking().lastOrDefault( null );
+ Entity returned = manager.write( origEntity ).toBlocking().lastOrDefault( null );
// note its version
UUID oldVersion = returned.getVersion();
@@ -379,17 +392,140 @@ public class EntityCollectionManagerIT {
// partial update entity but we don't have version number
Entity updateEntity = new Entity( origEntity.getId() );
- updateEntity.setField( new StringField("addedField", "other value" ) );
- manager.update(origEntity).toBlocking().lastOrDefault(null);
+ updateEntity.setField( new StringField( "addedField", "other value" ) );
+ manager.update( origEntity ).toBlocking().lastOrDefault( null );
// get entity now, it must have a new version
- returned = manager.load(origEntity.getId() ).toBlocking().lastOrDefault( null );
+ returned = manager.load( origEntity.getId() ).toBlocking().lastOrDefault( null );
UUID newVersion = returned.getVersion();
assertNotNull( "A new version must be assigned", newVersion );
// new Version should be > old version
- assertTrue( UUIDComparator.staticCompare( newVersion, oldVersion ) > 0);
+ assertTrue( UUIDComparator.staticCompare( newVersion, oldVersion ) > 0 );
+ }
+
+
+ @Test
+ public void writeMultiget() {
+
+ final CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
+ final EntityCollectionManager manager = factory.createCollectionManager( context );
+
+ final int multigetSize = serializationFig.getMaxLoadSize();
+
+ final List<Entity> writtenEntities = new ArrayList<>( multigetSize );
+ final List<Id> entityIds = new ArrayList<>( multigetSize );
+
+ for ( int i = 0; i < multigetSize; i++ ) {
+ final Entity entity = new Entity( new SimpleId( "test" ) );
+
+ final Entity written = manager.write( entity ).toBlocking().last();
+
+ writtenEntities.add( written );
+ entityIds.add( written.getId() );
+ }
+
+
+ final EntitySet entitySet = manager.load( entityIds ).toBlocking().lastOrDefault( null );
+
+ assertNotNull( entitySet );
+
+ assertEquals(multigetSize, entitySet.size());
+ assertFalse(entitySet.isEmpty());
+
+ /**
+ * Validate every element exists
+ */
+ for(int i = 0; i < multigetSize; i ++){
+ final Entity expected = writtenEntities.get( i );
+
+ final MvccEntity returned = entitySet.getEntity( expected.getId() );
+
+ assertEquals("Same entity returned", expected, returned.getEntity().get());
+ }
+
+
}
+
+ /**
+ * Perform a multiget where every entity will need repaired on load
+ */
+ @Test
+ public void writeMultigetRepair() {
+
+ final CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
+ final EntityCollectionManager manager = factory.createCollectionManager( context );
+
+ final int multigetSize = serializationFig.getMaxLoadSize();
+
+ final List<Entity> writtenEntities = new ArrayList<>( multigetSize );
+ final List<Id> entityIds = new ArrayList<>( multigetSize );
+
+ for ( int i = 0; i < multigetSize; i++ ) {
+ final Entity entity = new Entity( new SimpleId( "test" ) );
+
+ final Entity written = manager.write( entity ).toBlocking().last();
+
+ written.setField( new BooleanField( "updated", true ) );
+
+ final Entity updated = manager.update( written ).toBlocking().last();
+
+ writtenEntities.add( updated );
+ entityIds.add( updated.getId() );
+ }
+
+
+ final EntitySet entitySet = manager.load( entityIds ).toBlocking().lastOrDefault( null );
+
+ assertNotNull( entitySet );
+
+ assertEquals(multigetSize, entitySet.size());
+ assertFalse(entitySet.isEmpty());
+
+ /**
+ * Validate every element exists
+ */
+ for(int i = 0; i < multigetSize; i ++){
+ final Entity expected = writtenEntities.get( i );
+
+ final MvccEntity returned = entitySet.getEntity( expected.getId() );
+
+ assertEquals("Same entity returned", expected, returned.getEntity().get());
+
+ assertTrue( ( Boolean ) returned.getEntity().get().getField( "updated" ).getValue() );
+ }
+
+
+ }
+
+
+
+ @Test(expected = IllegalArgumentException.class)
+ public void readTooLarge() {
+
+ final CollectionScope context =
+ new CollectionScopeImpl( new SimpleId( "organization" ), new SimpleId( "test" ), "test" );
+ final EntityCollectionManager manager = factory.createCollectionManager( context );
+
+ final int multigetSize = serializationFig.getMaxLoadSize() +1;
+
+
+ final List<Id> entityIds = new ArrayList<>( multigetSize );
+
+ for ( int i = 0; i < multigetSize; i++ ) {
+
+ entityIds.add( new SimpleId( "simple" ) );
+ }
+
+
+ //should throw an exception
+ manager.load( entityIds ).toBlocking().lastOrDefault( null );
+
+
+
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/LoadTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/LoadTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/LoadTest.java
deleted file mode 100644
index ab0e2f4..0000000
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/LoadTest.java
+++ /dev/null
@@ -1,379 +0,0 @@
-package org.apache.usergrid.persistence.collection.mvcc.stage.load;
-
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-
-import org.apache.usergrid.persistence.collection.CollectionScope;
-import org.apache.usergrid.persistence.collection.mvcc.MvccEntitySerializationStrategy;
-import org.apache.usergrid.persistence.collection.mvcc.changelog.ChangeLogGenerator;
-import org.apache.usergrid.persistence.collection.mvcc.changelog.ChangeLogGeneratorImpl;
-import org.apache.usergrid.persistence.collection.mvcc.entity.MvccEntity;
-import org.apache.usergrid.persistence.collection.mvcc.stage.AbstractIdStageTest;
-import org.apache.usergrid.persistence.collection.mvcc.stage.CollectionIoEvent;
-import org.apache.usergrid.persistence.collection.mvcc.stage.TestEntityGenerator;
-import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
-import org.apache.usergrid.persistence.collection.service.UUIDService;
-import org.apache.usergrid.persistence.model.entity.Entity;
-import org.apache.usergrid.persistence.model.entity.Id;
-import org.apache.usergrid.persistence.model.field.StringField;
-import org.apache.usergrid.persistence.model.util.UUIDGenerator;
-
-import com.google.common.collect.Lists;
-import com.netflix.astyanax.MutationBatch;
-import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.mockito.Matchers.same;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-/** @author tnine */
-
-public class LoadTest extends AbstractIdStageTest {
-
-
- @Test
- public void testLoadWithData(){
- final CollectionScope collection = mock(CollectionScope.class);
- final UUIDService uuidService = mock(UUIDService.class);
- final MvccEntitySerializationStrategy serializationStrategy = mock(MvccEntitySerializationStrategy.class);
- final SerializationFig serializationFig = mock(SerializationFig.class);
- when(serializationFig.getBufferSize()).thenReturn( 10 );
-
-
- final UUID loadVersion = UUIDGenerator.newTimeUUID();
-
- //mock up the time uuid
- when(uuidService.newTimeUUID()).thenReturn(loadVersion);
-
- final Id entityId = TestEntityGenerator.generateId();
-
- final CollectionIoEvent<Id> entityIoEvent = new CollectionIoEvent<Id>(collection, entityId );
-
-
- final Entity entity = TestEntityGenerator.generateEntity(entityId, loadVersion);
-
- final MvccEntity mvccEntity = TestEntityGenerator.fromEntityStatus( entity, MvccEntity.Status.COMPLETE );
-
- final Iterator<MvccEntity> results = Lists.newArrayList( mvccEntity ).iterator();
-
- //mock up returning a list of MvccEntities
- when(serializationStrategy.load( collection, entityId, loadVersion, 1 )).thenReturn( results);
-
-
-
- Load load = new Load( uuidService, serializationStrategy, serializationFig );
- Entity loaded = load.call( entityIoEvent );
-
-
- assertSame("Same entity was loaded", entity, loaded);
-
- }
-
-
- /**
- * Handles second trigger condition with partial updates.
- * A read on an entity , and we recognize that the entity we are reading is partial.
- */
- @Test
- public void testLoadWithPartialWrite() throws ConnectionException {
- final CollectionScope collection = mock(CollectionScope.class);
- final UUIDService uuidService = mock(UUIDService.class);
- final MvccEntitySerializationStrategy serializationStrategy = mock(MvccEntitySerializationStrategy.class);
- final SerializationFig serializationFig = mock(SerializationFig.class);
- when(serializationFig.getBufferSize()).thenReturn( 10 );
-
-
-
- final UUID loadVersion = UUIDGenerator.newTimeUUID();
-
- //mock up the time uuid
- when(uuidService.newTimeUUID()).thenReturn(loadVersion);
-
- final Id entityId = TestEntityGenerator.generateId();
-
- final CollectionIoEvent<Id> entityIoEvent = new CollectionIoEvent<Id>(collection, entityId );
-
-
- final Entity entity = TestEntityGenerator.generateEntity(entityId, loadVersion);
- entity.setField( new StringField( "derp","noderp" ) );
-
- final MvccEntity completeMvccEntity = TestEntityGenerator.fromEntityStatus( entity, MvccEntity.Status.COMPLETE );
-
-
- final Entity entity2 = TestEntityGenerator.generateEntity( entityId, UUIDGenerator.newTimeUUID() );
- entity2.setField( new StringField( "derp","noderp" ) );
- entity2.setField( new StringField( "merple","nomerple" ) );
-
- final MvccEntity partialMvccEntity = TestEntityGenerator.fromEntityStatus( entity2, MvccEntity.Status.PARTIAL );
-
- final List<MvccEntity> results = Lists.newArrayList( partialMvccEntity );
- results.add( completeMvccEntity );
-
-
- //mock up returning a list of MvccEntities
- when( serializationStrategy.load( collection, entityId, loadVersion, 1 ) ).thenReturn( results.iterator());
-
- /**
- * Mock up returning the batch for repair
- */
-
- final MutationBatch batch = mock(MutationBatch.class);
-
- ArgumentCaptor<MvccEntity> writtenEntityArg = ArgumentCaptor.forClass( MvccEntity.class );
-
- when(serializationStrategy.write( same(collection), writtenEntityArg.capture() )).thenReturn( batch );
-
- Load load = new Load( uuidService, serializationStrategy, serializationFig );
- Entity loaded = load.call( entityIoEvent );
-
- assertNotNull( loaded.getField( "derp" ) );
- assertNull( loaded.getField( "derple" ) );
-
- /**
- * Verify that the repair executed
- */
- verify(batch).execute();
-
- /**
- * Verify the fields in the argument are correct
- */
- MvccEntity writtenEntity = writtenEntityArg.getValue();
-
- //assert all fields that should be updated
-
- assertSame( loaded, writtenEntity.getEntity().get() );
- assertNotNull( writtenEntity );
- assertNotNull( writtenEntity.getEntity().get().getField( "derp" ) );
- assertNull( writtenEntity.getEntity().get().getField( "derple" ) );
-
- }
-
- /**
- * Handles second trigger condition with partial updates.
- * A read on an entity , and we recognize that the entity we are reading is partial.
- */
- @Test
- public void testLoadWithPartialDelete() throws ConnectionException {
- final CollectionScope collection = mock(CollectionScope.class);
- final UUIDService uuidService = mock(UUIDService.class);
- final MvccEntitySerializationStrategy serializationStrategy = mock(MvccEntitySerializationStrategy.class);
- final SerializationFig serializationFig = mock(SerializationFig.class);
- when(serializationFig.getBufferSize()).thenReturn( 10 );
-
- final ChangeLogGenerator changeLogGenerator = new ChangeLogGeneratorImpl();
-
-
-
- final UUID loadVersion = UUIDGenerator.newTimeUUID();
-
- //mock up the time uuid
- when(uuidService.newTimeUUID()).thenReturn(loadVersion);
-
- final Id entityId = TestEntityGenerator.generateId();
-
- final CollectionIoEvent<Id> entityIoEvent = new CollectionIoEvent<Id>(collection, entityId );
-
-
- final Entity entity = TestEntityGenerator.generateEntity(entityId, loadVersion);
- entity.setField( new StringField( "derp","noderp" ) );
- entity.setField( new StringField( "derple","somemerple" ) );
-
- final MvccEntity completeMvccEntity = TestEntityGenerator.fromEntityStatus( entity, MvccEntity.Status.COMPLETE );
-
-
- final Entity entity2 = TestEntityGenerator.generateEntity( entityId, UUIDGenerator.newTimeUUID() );
- entity2.setField( new StringField( "derple","somemerple" ) );
-
-
- final MvccEntity partialMvccEntity = TestEntityGenerator.fromEntityStatus( entity2, MvccEntity.Status.PARTIAL );
-
- final List<MvccEntity> results = Lists.newArrayList( partialMvccEntity );
- results.add( completeMvccEntity );
-
- //mock up returning a list of MvccEntities
- when( serializationStrategy.load( collection, entityId, loadVersion, 1 ) ).thenReturn( results.iterator());
-
-
- /**
- * Mock up returning the batch for repair
- */
-
- final MutationBatch batch = mock(MutationBatch.class);
-
- ArgumentCaptor<MvccEntity> writtenEntityArg = ArgumentCaptor.forClass( MvccEntity.class );
-
- when(serializationStrategy.write( same(collection), writtenEntityArg.capture() )).thenReturn( batch );
-
- Load load = new Load( uuidService, serializationStrategy, serializationFig );
- Entity loaded = load.call( entityIoEvent );
-
- assertNotNull( loaded.getField( "derple" ) );
-
-
- /**
- * Verify that the repair executed
- */
- verify(batch).execute();
-
- /**
- * Verify the fields in the argument are correct
- */
- MvccEntity writtenEntity = writtenEntityArg.getValue();
-
- //assert all fields that should be updated
-
- assertSame( loaded, writtenEntity.getEntity().get() );
- assertNotNull( writtenEntity );
- assertNotNull( writtenEntity.getEntity().get().getField( "derple" ) );
-
-
- }
-
- @Test
- public void testLoadWithPartialWriteDeleteThreeTimes() throws ConnectionException {
- final CollectionScope collection = mock(CollectionScope.class);
- final UUIDService uuidService = mock(UUIDService.class);
- final MvccEntitySerializationStrategy serializationStrategy = mock(MvccEntitySerializationStrategy.class);
- final SerializationFig serializationFig = mock(SerializationFig.class);
- when(serializationFig.getBufferSize()).thenReturn( 10 );
-
-
- final UUID loadVersion = UUIDGenerator.newTimeUUID();
-
- //mock up the time uuid
- when(uuidService.newTimeUUID()).thenReturn(loadVersion);
-
- final Id entityId = TestEntityGenerator.generateId();
-
- final CollectionIoEvent<Id> entityIoEvent = new CollectionIoEvent<Id>(collection, entityId );
-
-
- final Entity entity = TestEntityGenerator.generateEntity(entityId, loadVersion);
- entity.setField( new StringField( "derp","noderp" ) );
- entity.setField( new StringField( "derple","somemerple" ) );
-
- final MvccEntity completeMvccEntity = TestEntityGenerator.fromEntityStatus( entity, MvccEntity.Status.COMPLETE );
-
-
- final Entity entity2 = TestEntityGenerator.generateEntity( entityId, UUIDGenerator.newTimeUUID() );
- entity2.setField( new StringField( "derple","somemerple" ) );
-
-
- final MvccEntity partialMvccEntity = TestEntityGenerator.fromEntityStatus( entity2, MvccEntity.Status.PARTIAL );
-
- final Entity entity3 = TestEntityGenerator.generateEntity( entityId, UUIDGenerator.newTimeUUID() );
- entity3.setField( new StringField( "derp","noderp" ) );
-
-
- final MvccEntity partialMvccEntity2 = TestEntityGenerator.fromEntityStatus( entity3, MvccEntity.Status.PARTIAL );
-
- final List<MvccEntity> results = Lists.newArrayList( partialMvccEntity2 );
- results.add( partialMvccEntity );
- results.add( completeMvccEntity );
-
- //mock up returning a list of MvccEntities
- when( serializationStrategy.load( collection, entityId, loadVersion, 1 ) ).thenReturn( results.iterator());
-
-
- /**
- * Mock up returning the batch for repair
- */
-
- final MutationBatch batch = mock(MutationBatch.class);
-
- ArgumentCaptor<MvccEntity> writtenEntityArg = ArgumentCaptor.forClass( MvccEntity.class );
-
- when(serializationStrategy.write( same(collection), writtenEntityArg.capture() )).thenReturn( batch );
-
- Load load = new Load( uuidService, serializationStrategy, serializationFig );
- Entity loaded = load.call( entityIoEvent );
-
- assertNotNull( loaded.getField( "derp" ) );
- assertNull( loaded.getField( "derple" ) );
-
- /**
- * Verify that the repair executed
- */
- verify(batch).execute();
-
- /**
- * Verify the fields in the argument are correct
- */
- MvccEntity writtenEntity = writtenEntityArg.getValue();
-
- //assert all fields that should be updated
-
- assertSame( loaded, writtenEntity.getEntity().get() );
- assertNotNull( writtenEntity );
- assertNotNull( writtenEntity.getEntity().get().getField( "derp" ) );
- assertNull( writtenEntity.getEntity().get().getField( "derple" ) );
-
-
-
-
- }
-
- @Test
- public void testLoadCleared(){
- final CollectionScope collection = mock(CollectionScope.class);
- final UUIDService uuidService = mock(UUIDService.class);
- final MvccEntitySerializationStrategy serializationStrategy = mock(MvccEntitySerializationStrategy.class);
- final SerializationFig serializationFig = mock(SerializationFig.class);
- when(serializationFig.getBufferSize()).thenReturn( 10 );
-
-
-
- final UUID loadVersion = UUIDGenerator.newTimeUUID();
-
- //mock up the time uuid
- when(uuidService.newTimeUUID()).thenReturn(loadVersion);
-
- final Id entityId = TestEntityGenerator.generateId();
-
- final CollectionIoEvent<Id> entityIoEvent = new CollectionIoEvent<Id>(collection, entityId );
-
-
- final Iterator<MvccEntity> results = Collections.EMPTY_LIST.iterator();
-
- //mock up returning a list of MvccEntities
- when(serializationStrategy.load( collection, entityId, loadVersion, 1 )).thenReturn( results);
-
- Load load = new Load( uuidService, serializationStrategy, serializationFig );
- Entity loaded = load.call( entityIoEvent );
-
- assertNull( "No entity was loaded", loaded );
- }
-
-
-
-
-
- @Override
- protected void validateStage( final CollectionIoEvent<Id> event ) {
- final UUIDService uuidService = mock(UUIDService.class);
- final SerializationFig serializationFig = mock(SerializationFig.class);
- when(serializationFig.getBufferSize()).thenReturn( 10 );
-
-
- /**
- * Mock up wrong UUID type
- */
- when(uuidService.newTimeUUID()).thenReturn( UUID.randomUUID() );
-
-
- final MvccEntitySerializationStrategy serializationStrategy = mock(MvccEntitySerializationStrategy.class);
-
- new Load(uuidService, serializationStrategy, serializationFig).call( event );
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/EntityRepairImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/EntityRepairImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/EntityRepairImplTest.java
index f4a75d4..d1b2961 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/EntityRepairImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/EntityRepairImplTest.java
@@ -38,8 +38,12 @@ import org.apache.usergrid.persistence.model.entity.SimpleId;
import org.apache.usergrid.persistence.model.field.StringField;
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
+import com.netflix.astyanax.MutationBatch;
+import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -53,7 +57,7 @@ public class EntityRepairImplTest {
* Tests changing from a full version to 2 updates, ensures we have a proper output
*/
@Test
- public void testSimpleRolling() {
+ public void testSimpleRolling() throws ConnectionException {
final SerializationFig serializationFig = mock( SerializationFig.class );
@@ -101,6 +105,11 @@ public class EntityRepairImplTest {
.thenReturn( Arrays.<MvccEntity>asList( v3, v2, v1 ).iterator() );
+ final MutationBatch mutationBatch = mock( MutationBatch.class);
+
+ when(mvccEntitySerializationStrategy.write( scope, v3 )).thenReturn( mutationBatch );
+
+
EntityRepairImpl entityRepair = new EntityRepairImpl( mvccEntitySerializationStrategy, serializationFig );
final MvccEntity returned = entityRepair.maybeRepair( scope, v3 );
@@ -118,12 +127,12 @@ public class EntityRepairImplTest {
final Entity finalVersion = returned.getEntity().get();
-
- final Object expectedField1Value = v2.getEntity().get().getField( "field1" ).getValue();
-
- final Object returnedField1Value = finalVersion.getField( "field1" ).getValue();
-
- assertEquals( "Same field value", expectedField1Value, returnedField1Value );
+//
+// final Object expectedField1Value = v2.getEntity().get().getField( "field1" ).getValue();
+//
+// final Object returnedField1Value = finalVersion.getField( "field1" ).getValue();
+//
+// assertEquals( "Same field value", expectedField1Value, returnedField1Value );
@@ -132,5 +141,7 @@ public class EntityRepairImplTest {
final Object returnedField2Value = finalVersion.getField( "field2" ).getValue();
assertEquals( "Same field value", expectedField2Value, returnedField2Value );
+
+ verify(mutationBatch).execute();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f1a88aa9/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
index ba5ebce..8965668 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImplTest.java
@@ -163,7 +163,7 @@ public class MvccEntitySerializationStrategyImplTest {
//now load it back
- MvccEntity returned = serializationStrategy.load( context, id, version );
+ MvccEntity returned = serializationStrategy.load( context, Collections.singleton( id), version ).getEntity( id );
assertEquals( "Mvcc entities are the same", saved, returned );
@@ -223,7 +223,7 @@ public class MvccEntitySerializationStrategyImplTest {
//now get it, should be gone
- returned = serializationStrategy.load( context, id, version );
+ returned = serializationStrategy.load( context, Collections.singleton( id), version ).getEntity( id );
assertNull( returned );
}
@@ -255,7 +255,7 @@ public class MvccEntitySerializationStrategyImplTest {
//now load it back
- MvccEntity returned = serializationStrategy.load( context, entityId, version );
+ MvccEntity returned = serializationStrategy.load( context, Collections.singleton( entityId ), version ).getEntity( entityId );
assertEquals( "Mvcc entities are the same", saved, returned );
@@ -270,7 +270,7 @@ public class MvccEntitySerializationStrategyImplTest {
serializationStrategy.mark( context, entityId, version ).execute();
- returned = serializationStrategy.load( context, entityId, version );
+ returned = serializationStrategy.load( context, Collections.singleton( entityId ), version ).getEntity( entityId );
assertEquals( entityId, returned.getId() );
assertEquals( version, returned.getVersion() );
@@ -281,7 +281,7 @@ public class MvccEntitySerializationStrategyImplTest {
//now get it, should be gone
- returned = serializationStrategy.load( context, entityId, version );
+ returned = serializationStrategy.load( context, Collections.singleton( entityId ), version ).getEntity( entityId );
assertNull( returned );
}
@@ -318,7 +318,7 @@ public class MvccEntitySerializationStrategyImplTest {
//now load it back
- MvccEntity returned = serializationStrategy.load( context, id, version );
+ MvccEntity returned = serializationStrategy.load( context, Collections.singleton( id ), version ).getEntity( id );
assertEquals( "Mvcc entities are the same", saved, returned );
@@ -349,7 +349,7 @@ public class MvccEntitySerializationStrategyImplTest {
//now get it, should be gone
- returned = serializationStrategy.load( context, id, version );
+ returned = serializationStrategy.load( context, Collections.singleton( id ) , version ).getEntity( id );
assertNull( returned );
}
@@ -383,7 +383,7 @@ public class MvccEntitySerializationStrategyImplTest {
//now load it back
- MvccEntity returnedV1 = serializationStrategy.load( context, id, version1 );
+ MvccEntity returnedV1 = serializationStrategy.load( context, Collections.singleton( id ) , version1 ).getEntity( id );
assertEquals( "Mvcc entities are the same", saved, returnedV1 );
@@ -403,7 +403,7 @@ public class MvccEntitySerializationStrategyImplTest {
serializationStrategy.write( context, savedV2 ).execute();
- MvccEntity returnedV2 = serializationStrategy.load( context, id, version2 );
+ MvccEntity returnedV2 = serializationStrategy.load( context, Collections.singleton( id ) , version2 ).getEntity( id );
assertEquals( "Mvcc entities are the same", savedV2, returnedV2 );
@@ -412,14 +412,14 @@ public class MvccEntitySerializationStrategyImplTest {
UUID version3 = UUIDGenerator.newTimeUUID();
- serializationStrategy.mark( context, id, version3 ).execute();
+ serializationStrategy.mark( context, id , version3 ).execute();
final Optional<Entity> empty = Optional.absent();
MvccEntity clearedV3 = new MvccEntityImpl( id, version3, MvccEntity.Status.COMPLETE, empty );
- MvccEntity returnedV3 = serializationStrategy.load( context, id, version3 );
+ MvccEntity returnedV3 = serializationStrategy.load( context, Collections.singleton( id ) , version3 ).getEntity( id );
assertEquals( "entities are the same", clearedV3, returnedV3 );
@@ -443,8 +443,8 @@ public class MvccEntitySerializationStrategyImplTest {
//now delete v2 and v1, we should still get v3
- serializationStrategy.delete( context, id, version1 ).execute();
- serializationStrategy.delete( context, id, version2 ).execute();
+ serializationStrategy.delete( context, id , version1 ).execute();
+ serializationStrategy.delete( context, id , version2 ).execute();
entities = serializationStrategy.load( context, id, current, 3 );
@@ -453,7 +453,7 @@ public class MvccEntitySerializationStrategyImplTest {
//now get it, should be gone
- serializationStrategy.delete( context, id, version3 ).execute();
+ serializationStrategy.delete( context, id , version3 ).execute();
entities = serializationStrategy.load( context, id, current, 3 );
@@ -540,7 +540,7 @@ public class MvccEntitySerializationStrategyImplTest {
//now load it back
- MvccEntity returned = serializationStrategy.load( context, id, version );
+ MvccEntity returned = serializationStrategy.load( context, Collections.singleton( id ) , version ).getEntity( id );
assertEquals( "Mvcc entities are the same", saved, returned );
@@ -592,11 +592,11 @@ public class MvccEntitySerializationStrategyImplTest {
//now delete it
- serializationStrategy.delete( context, id, version ).execute();
+ serializationStrategy.delete( context, id , version ).execute();
//now get it, should be gone
- returned = serializationStrategy.load( context, id, version );
+ returned = serializationStrategy.load( context, Collections.singleton( id ) , version ).getEntity( id );
assertNull( returned );
}
@@ -641,7 +641,7 @@ public class MvccEntitySerializationStrategyImplTest {
@Test(expected = NullPointerException.class)
public void loadParamContext() throws ConnectionException {
- serializationStrategy.load( null, new SimpleId( "test" ), UUIDGenerator.newTimeUUID() );
+ serializationStrategy.load( null, Collections.<Id>emptyList(), UUIDGenerator.newTimeUUID() );
}
@@ -649,7 +649,7 @@ public class MvccEntitySerializationStrategyImplTest {
public void loadParamEntityId() throws ConnectionException {
serializationStrategy
- .load( new CollectionScopeImpl(new SimpleId( "organization" ), new SimpleId( "test" ), "test" ), (Id)null, UUIDGenerator.newTimeUUID() );
+ .load( new CollectionScopeImpl(new SimpleId( "organization" ), new SimpleId( "test" ), "test" ), null, UUIDGenerator.newTimeUUID() );
}
@@ -657,7 +657,7 @@ public class MvccEntitySerializationStrategyImplTest {
public void loadParamVersion() throws ConnectionException {
serializationStrategy
- .load( new CollectionScopeImpl(new SimpleId( "organization" ), new SimpleId( "test" ), "test" ), new SimpleId( "test" ), null );
+ .load( new CollectionScopeImpl(new SimpleId( "organization" ), new SimpleId( "test" ), "test" ), Collections.<Id>singleton( new SimpleId( "test" )), null );
}