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 2014/03/26 22:21:04 UTC
[20/35] Merged hystrix into asyncqueue
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/136edaba/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java
index 7d97f0e..e7a3504 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationChopTest.java
@@ -18,8 +18,6 @@ import org.apache.usergrid.persistence.collection.cassandra.CassandraRule;
import org.apache.usergrid.persistence.collection.guice.MigrationManagerRule;
import org.apache.usergrid.persistence.graph.Edge;
import org.apache.usergrid.persistence.graph.MarkedEdge;
-import org.apache.usergrid.persistence.graph.SearchByEdge;
-import org.apache.usergrid.persistence.graph.guice.GraphModule;
import org.apache.usergrid.persistence.graph.guice.TestGraphModule;
import org.apache.usergrid.persistence.model.entity.Id;
import org.apache.usergrid.persistence.model.util.UUIDGenerator;
@@ -28,12 +26,8 @@ import com.google.inject.Inject;
import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
import static org.apache.usergrid.persistence.graph.test.util.EdgeTestUtils.createEdge;
-import static org.apache.usergrid.persistence.graph.test.util.EdgeTestUtils.createGetByEdge;
import static org.apache.usergrid.persistence.graph.test.util.EdgeTestUtils.createId;
import static org.apache.usergrid.persistence.graph.test.util.EdgeTestUtils.createSearchByEdge;
-import static org.apache.usergrid.persistence.graph.test.util.EdgeTestUtils.createSearchByEdgeAndId;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -41,11 +35,10 @@ import static org.mockito.Mockito.when;
/**
* Test for use with Judo CHOP to stress test
- *
*/
-@IterationChop( iterations = 10, threads = 2 )
-@RunWith( JukitoRunner.class )
-@UseModules( { TestGraphModule.class } )
+@IterationChop(iterations = 10, threads = 2)
+@RunWith(JukitoRunner.class)
+@UseModules({ TestGraphModule.class })
public class EdgeSerializationChopTest {
@ClassRule
@@ -63,18 +56,16 @@ public class EdgeSerializationChopTest {
protected OrganizationScope scope;
-
/**
* Static UUID so ALL nodes write to this as the source
*/
- private static final UUID ORG_ID = UUID.fromString("5697ad38-8dd8-11e3-8436-600308a690e3");
-
+ private static final UUID ORG_ID = UUID.fromString( "5697ad38-8dd8-11e3-8436-600308a690e3" );
/**
* Static UUID so ALL nodes write to this as the source
*/
- private static final UUID SOURCE_NODE_ID = UUID.fromString("5697ad38-8dd8-11e3-8436-600308a690e2");
+ private static final UUID SOURCE_NODE_ID = UUID.fromString( "5697ad38-8dd8-11e3-8436-600308a690e2" );
@Before
@@ -97,8 +88,8 @@ public class EdgeSerializationChopTest {
public void mixedEdgeTypes() throws ConnectionException {
- final Id sourceId = createId( SOURCE_NODE_ID, "source");
- final Id targetId = createId("target");
+ final Id sourceId = createId( SOURCE_NODE_ID, "source" );
+ final Id targetId = createId( "target" );
final Edge edge = createEdge( sourceId, "edge", targetId );
@@ -110,20 +101,18 @@ public class EdgeSerializationChopTest {
//get our edges out by name
- Iterator<MarkedEdge>
- results = serialization.getEdgesFromSource( scope, createSearchByEdge( sourceId, "edge", now, null ) );
+ Iterator<MarkedEdge> results =
+ serialization.getEdgesFromSource( scope, createSearchByEdge( sourceId, "edge", now, null ) );
boolean found = false;
- while(!found && results.hasNext()){
- if(edge.equals(results.next())){
+ while ( !found && results.hasNext() ) {
+ if ( edge.equals( results.next() ) ) {
found = true;
break;
}
}
- assertTrue("Found entity", found);
-
+ assertTrue( "Found entity", found );
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/136edaba/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
index 5a37cc8..776b9df 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/EdgeSerializationTest.java
@@ -202,59 +202,18 @@ public class EdgeSerializationTest {
SearchByEdge search = createGetByEdge( sourceId, "edge1", targetId, now, null );
- Iterator<MarkedEdge> results = serialization.getEdgeFromSource( scope, search );
+ Iterator<MarkedEdge> results = serialization.getEdgeVersions( scope, search );
assertEquals( edgev2, results.next() );
assertEquals( edgev1, results.next() );
assertFalse( "No results should be returned", results.hasNext() );
-
- results = serialization.getEdgeToTarget( scope, search );
-
- assertEquals( edgev2, results.next() );
- assertEquals( edgev1, results.next() );
- assertFalse( "No results should be returned", results.hasNext() );
-
- //test paging
- search = createGetByEdge( sourceId, "edge1", targetId, now, edgev2 );
-
- results = serialization.getEdgeFromSource( scope, search );
-
- assertEquals( edgev1, results.next() );
- assertFalse( "No results should be returned", results.hasNext() );
-
-
- results = serialization.getEdgeToTarget( scope, search );
-
- assertEquals( edgev1, results.next() );
- assertFalse( "No results should be returned", results.hasNext() );
-
- //test paging
- search = createGetByEdge( sourceId, "edge1", targetId, now, edgev1 );
-
- results = serialization.getEdgeFromSource( scope, search );
-
- assertFalse( "No results should be returned", results.hasNext() );
-
-
- results = serialization.getEdgeToTarget( scope, search );
-
- assertFalse( "No results should be returned", results.hasNext() );
-
//max version test
//test max version
search = createGetByEdge( sourceId, "edge1", targetId, edgev1.getVersion(), null );
- results = serialization.getEdgeFromSource( scope, search );
-
- assertEquals( edgev1, results.next() );
- assertFalse( "Max version was honored", results.hasNext() );
-
-
- search = createGetByEdge( sourceId, "edge1", targetId, edgev1.getVersion(), null );
-
- results = serialization.getEdgeToTarget( scope, search );
+ results = serialization.getEdgeVersions( scope, search );
assertEquals( edgev1, results.next() );
assertFalse( "Max version was honored", results.hasNext() );
@@ -339,31 +298,32 @@ public class EdgeSerializationTest {
Iterator<MarkedEdge> results = serialization.getEdgesFromSourceByTargetType( scope,
createSearchByEdgeAndId( sourceId, "edge", now, targetId1.getType(), null ) );
- assertEquals( edge1, results.next() );
assertEquals( edge2, results.next() );
+ assertEquals( edge1, results.next() );
+
assertFalse( results.hasNext() );
//test getting the next edge
results = serialization.getEdgesFromSourceByTargetType( scope,
- createSearchByEdgeAndId( sourceId, "edge", now, targetId1.getType(), edge1 ) );
+ createSearchByEdgeAndId( sourceId, "edge", now, targetId1.getType(), edge2 ) );
- assertEquals( edge2, results.next() );
+ assertEquals( edge1, results.next() );
assertFalse( results.hasNext() );
results = serialization.getEdgesFromSourceByTargetType( scope,
- createSearchByEdgeAndId( sourceId, "edge", now, targetId1.getType(), edge2 ) );
+ createSearchByEdgeAndId( sourceId, "edge", now, targetId1.getType(), edge1 ) );
assertFalse( results.hasNext() );
//test getting source edges from the target
results = serialization.getEdgesToTargetBySourceType( scope,
- createSearchByEdgeAndId( targetId1, "edge", now, sourceId.getType(), edge1 ) );
+ createSearchByEdgeAndId( targetId1, "edge", now, sourceId.getType(), edge2 ) );
assertFalse( results.hasNext() );
results = serialization.getEdgesToTargetBySourceType( scope,
- createSearchByEdgeAndId( targetId2, "edge", now, sourceId.getType(), edge2 ) );
+ createSearchByEdgeAndId( targetId2, "edge", now, sourceId.getType(), edge1 ) );
assertFalse( results.hasNext() );
}
@@ -393,15 +353,15 @@ public class EdgeSerializationTest {
Iterator<MarkedEdge> results = serialization.getEdgesFromSourceByTargetType( scope,
createSearchByEdgeAndId( sourceId, "edge", now, targetId1.getType(), null ) );
- assertEquals( edge1, results.next() );
assertEquals( edge2, results.next() );
+ assertEquals( edge1, results.next() );
assertFalse( results.hasNext() );
//get them out by type
results = serialization.getEdgesFromSource( scope, createSearchByEdge( sourceId, "edge", now, null ) );
- assertEquals( edge1, results.next() );
assertEquals( edge2, results.next() );
+ assertEquals( edge1, results.next() );
assertFalse( results.hasNext() );
@@ -498,15 +458,15 @@ public class EdgeSerializationTest {
Iterator<MarkedEdge> results = serialization.getEdgesFromSourceByTargetType( scope,
createSearchByEdgeAndId( sourceId, "edge", now, targetId1.getType(), null ) );
- assertEquals( edge1, results.next() );
assertEquals( edge2, results.next() );
+ assertEquals( edge1, results.next() );
assertFalse( results.hasNext() );
//get them out by type
results = serialization.getEdgesFromSource( scope, createSearchByEdge( sourceId, "edge", now, null ) );
- assertEquals( edge1, results.next() );
assertEquals( edge2, results.next() );
+ assertEquals( edge1, results.next() );
assertFalse( results.hasNext() );
@@ -548,13 +508,13 @@ public class EdgeSerializationTest {
MarkedEdge edge = results.next();
- assertEquals( edge1, edge );
+ assertEquals( edge2, edge );
assertTrue( edge.isDeleted() );
edge = results.next();
- assertEquals( edge2, edge );
+ assertEquals( edge1, edge );
assertTrue( edge.isDeleted() );
assertFalse( results.hasNext() );
@@ -564,12 +524,12 @@ public class EdgeSerializationTest {
edge = results.next();
- assertEquals( edge1, edge );
+ assertEquals( edge2, edge );
assertTrue( edge.isDeleted() );
edge = results.next();
- assertEquals( edge2, edge );
+ assertEquals( edge1, edge );
assertTrue( edge.isDeleted() );
assertFalse( results.hasNext() );
@@ -620,49 +580,92 @@ public class EdgeSerializationTest {
//now we've validated everything exists
}
+
/**
- * Test paging by resuming the search from the edge
- */
- @Test
- public void pageIteration() throws ConnectionException {
+ * Test paging by resuming the search from the edge
+ */
+ @Test
+ public void pageIteration() throws ConnectionException {
- int size = graphFig.getScanPageSize()*2;
+ int size = graphFig.getScanPageSize() * 2;
- final Id sourceId= createId( "source" );
- final String type = "edge";
+ final Id sourceId = createId( "source" );
+ final String type = "edge";
- Set<Edge> edges = new HashSet<Edge>(size);
+ Set<Edge> edges = new HashSet<Edge>( size );
- for(int i = 0; i < size; i ++){
- final Edge edge = createEdge( sourceId, type, createId("target" ));
+ for ( int i = 0; i < size; i++ ) {
+ final Edge edge = createEdge( sourceId, type, createId( "target" ) );
- serialization.writeEdge( scope, edge ).execute();
- edges.add( edge );
- }
+ serialization.writeEdge( scope, edge ).execute();
+ edges.add( edge );
+ }
+ UUID now = UUIDGenerator.newTimeUUID();
+ //get our edges out by name
+ Iterator<MarkedEdge> results =
+ serialization.getEdgesFromSource( scope, createSearchByEdge( sourceId, type, now, null ) );
+ for ( MarkedEdge edge : new IterableWrapper<MarkedEdge>( results ) ) {
+ assertTrue( "Removed edge from write set", edges.remove( edge ) );
+ }
+ assertEquals( "All edges were returned", 0, edges.size() );
+ }
- UUID now = UUIDGenerator.newTimeUUID();
- //get our edges out by name
- Iterator<MarkedEdge> results = serialization.getEdgesFromSource( scope,
- createSearchByEdge( sourceId, type, now, null ) );
- for(MarkedEdge edge: new IterableWrapper<MarkedEdge>(results)){
- assertTrue("Removed edge from write set", edges.remove( edge ));
- }
+ /**
+ * Tests mixing 2 edge types between 2 nodes. We should get results for the same source->destination with the 2
+ * edge types
+ */
+ @Test
+ public void testIteratorPaging() throws ConnectionException {
+ final Edge edgev1 = createEdge( "source", "edge1", "target" );
- assertEquals("All edges were returned", 0, edges.size());
+ final Id sourceId = edgev1.getSourceNode();
+ final Id targetId = edgev1.getTargetNode();
- }
+ final Edge edgev2 = createEdge( sourceId, "edge1", targetId );
+
+ assertTrue( "Edge version 1 has lower time uuid",
+ UUIDComparator.staticCompare( edgev1.getVersion(), edgev2.getVersion() ) < 0 );
+
+ //create edge type 2 to ensure we don't get it in results
+ final Edge edgeType2V1 = createEdge( sourceId, "edge2", targetId );
+
+ serialization.writeEdge( scope, edgev1 ).execute();
+ serialization.writeEdge( scope, edgev2 ).execute();
+ serialization.writeEdge( scope, edgeType2V1 ).execute();
+
+ final UUID now = UUIDGenerator.newTimeUUID();
+
+
+ SearchByEdge search = createGetByEdge( sourceId, "edge1", targetId, now, null );
+
+ Iterator<MarkedEdge> results = serialization.getEdgeVersions( scope, search );
+
+ assertEquals( edgev2, results.next() );
+ assertEquals( edgev1, results.next() );
+ assertFalse( "No results should be returned", results.hasNext() );
+
+ //max version test
+
+ //test max version
+ search = createGetByEdge( sourceId, "edge1", targetId, edgev1.getVersion(), null );
+
+ results = serialization.getEdgeVersions( scope, search );
+
+ assertEquals( edgev1, results.next() );
+ assertFalse( "Max version was honored", results.hasNext() );
+ }
- private class IterableWrapper<T> implements Iterable<T>{
+ private class IterableWrapper<T> implements Iterable<T> {
private final Iterator<T> source;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/136edaba/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java
index 6e0b365..60f714e 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/NodeSerializationTest.java
@@ -36,8 +36,8 @@ import static org.mockito.Mockito.when;
*
*
*/
-@RunWith( JukitoRunner.class )
-@UseModules( { TestGraphModule.class } )
+@RunWith(JukitoRunner.class)
+@UseModules({ TestGraphModule.class })
public class NodeSerializationTest {
@@ -171,12 +171,13 @@ public class NodeSerializationTest {
serialization.mark( scope, nodeId1, version ).execute();
serialization.mark( scope, nodeId2, version ).execute();
- Map<Id, UUID> marks = serialization.getMaxVersions( scope, Arrays.asList( createEdge( nodeId1, "test", nodeId2 ), createEdge(nodeId2, "test", nodeId3) ) );
+ Map<Id, UUID> marks = serialization.getMaxVersions( scope,
+ Arrays.asList( createEdge( nodeId1, "test", nodeId2 ), createEdge( nodeId2, "test", nodeId3 ) ) );
- assertEquals(version, marks.get( nodeId1 ));
- assertEquals(version, marks.get( nodeId2 ));
- assertFalse(marks.containsKey( nodeId3 ));
+ assertEquals( version, marks.get( nodeId1 ) );
+ assertEquals( version, marks.get( nodeId2 ) );
+ assertFalse( marks.containsKey( nodeId3 ) );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/136edaba/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/util/EdgeHasherTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/util/EdgeHasherTest.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/util/EdgeHasherTest.java
index c55138a..9d7511c 100644
--- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/util/EdgeHasherTest.java
+++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/serialization/util/EdgeHasherTest.java
@@ -288,7 +288,8 @@ public class EdgeHasherTest {
for ( Character.UnicodeBlock unicodeBlock : blocks ) {
if ( count++ < limit ) {
testCollisions( unicodeBlock );
- } else {
+ }
+ else {
break;
}
}
@@ -338,9 +339,8 @@ public class EdgeHasherTest {
if ( hashed.contains( edgeHash ) ) {
fail( String.format(
- "Expected hash of '%s' to be unique, but hash of '%s' already exists in unicode block " +
- "'%s'.",
- sourceString, edgeHash, unicodeBlock ) );
+ "Expected hash of '%s' to be unique, but hash of '%s' already exists in unicode block "
+ + "'%s'.", sourceString, edgeHash, unicodeBlock ) );
}
hashed.add( edgeHash );
@@ -367,9 +367,9 @@ public class EdgeHasherTest {
/**
- * Taken from the character source. Note this purposefully eliminates Surrogate sets from the blocks
- * since there are invalid, and do cause hash conflicts due to multiple characters mapping
- * to a single byte value by the JVM in both UTF-8 and UTF-16
+ * Taken from the character source. Note this purposefully eliminates Surrogate sets from the blocks since there
+ * are invalid, and do cause hash conflicts due to multiple characters mapping to a single byte value by the JVM in
+ * both UTF-8 and UTF-16
*/
public static Character.UnicodeBlock[] blocks = {
BASIC_LATIN, LATIN_1_SUPPLEMENT, LATIN_EXTENDED_A, LATIN_EXTENDED_B, IPA_EXTENSIONS,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/136edaba/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index 5ffab73..2beddd5 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -75,6 +75,7 @@
<systemPropertyVariables>
<archaius.deployment.environment>UNIT</archaius.deployment.environment>
</systemPropertyVariables>
+ <argLine>-Xms2G -Xmx2G</argLine>
</configuration>
</plugin>