You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/08/05 16:39:38 UTC

[2/3] git commit: more sophisticated concurrency testing with resource reuse

more sophisticated concurrency testing with resource reuse


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/91a76bf1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/91a76bf1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/91a76bf1

Branch: refs/heads/develop
Commit: 91a76bf1b87b4937db60262543f445ecf35fe440
Parents: 42d4da8
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Aug 5 16:26:57 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Aug 5 16:26:57 2013 +0200

----------------------------------------------------------------------
 .../marmotta/kiwi/test/ConcurrencyTestBase.java | 78 ++++++++++++++------
 1 file changed, 57 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/91a76bf1/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java
index 6e06932..318039a 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/ConcurrencyTestBase.java
@@ -16,6 +16,8 @@ import org.openrdf.repository.RepositoryConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
 /**
@@ -33,13 +35,16 @@ public abstract class ConcurrencyTestBase {
 
     protected static Logger logger;
 
+    private List<URI> resources = new ArrayList<>();
+
+    private List<Value> objects = new ArrayList<>();
+
     @Rule
     public ConcurrentRule concurrently = new ConcurrentRule();
 
     @Rule
     public RepeatingRule repeatedly = new RepeatingRule();
 
-
     @Rule
     public TestWatcher watchman = new TestWatcher() {
         /**
@@ -63,26 +68,9 @@ public abstract class ConcurrencyTestBase {
         RepositoryConnection con = repository.getConnection();
         try {
             for(int i=0; i< rnd.nextInt(1000); i++) {
-                URI subject = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
-                URI predicate = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
-                Value object;
-                switch(rnd.nextInt(6)) {
-                    case 0: object = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
-                        break;
-                    case 1: object = repository.getValueFactory().createBNode();
-                        break;
-                    case 2: object = repository.getValueFactory().createLiteral(RandomStringUtils.randomAscii(40));
-                        break;
-                    case 3: object = repository.getValueFactory().createLiteral(rnd.nextInt());
-                        break;
-                    case 4: object = repository.getValueFactory().createLiteral(rnd.nextDouble());
-                        break;
-                    case 5: object = repository.getValueFactory().createLiteral(rnd.nextBoolean());
-                        break;
-                    default: object = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
-                        break;
-
-                }
+                URI subject = randomURI();
+                URI predicate = randomURI();
+                Value object = randomObject();
                 con.add(subject,predicate,object);
                 tripleCount++;
             }
@@ -94,4 +82,52 @@ public abstract class ConcurrencyTestBase {
 
         logger.info("triple count: {}", tripleCount);
     }
+
+
+    /**
+     * Return a random URI, with a 10% chance of returning a URI that has already been used.
+     * @return
+     */
+    protected URI randomURI() {
+        if(resources.size() > 0 && rnd.nextInt(10) == 0) {
+            // return a resource that was already used
+            return resources.get(rnd.nextInt(resources.size()));
+        } else {
+            URI resource = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
+            resources.add(resource);
+            return resource;
+        }
+    }
+
+    /**
+     * Return a random RDF value, either a reused object (10% chance) or of any other kind.
+     * @return
+     */
+    protected Value randomObject() {
+        if(objects.size() > 0 && rnd.nextInt(10) == 0) {
+            return objects.get(rnd.nextInt(objects.size()));
+        } else {
+            Value object;
+            switch(rnd.nextInt(6)) {
+                case 0: object = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
+                    break;
+                case 1: object = repository.getValueFactory().createBNode();
+                    break;
+                case 2: object = repository.getValueFactory().createLiteral(RandomStringUtils.randomAscii(40));
+                    break;
+                case 3: object = repository.getValueFactory().createLiteral(rnd.nextInt());
+                    break;
+                case 4: object = repository.getValueFactory().createLiteral(rnd.nextDouble());
+                    break;
+                case 5: object = repository.getValueFactory().createLiteral(rnd.nextBoolean());
+                    break;
+                default: object = repository.getValueFactory().createURI("http://localhost/"+ RandomStringUtils.randomAlphanumeric(8));
+                    break;
+
+            }
+            objects.add(object);
+            return object;
+        }
+
+    }
 }