You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2016/03/01 04:48:05 UTC

[1/2] incubator-apex-core git commit: APEXCORE-369 - Fix timeout in AbstractReservoirTest.performanceTest

Repository: incubator-apex-core
Updated Branches:
  refs/heads/master 139a9cac6 -> cf4e29ea3


APEXCORE-369 - Fix timeout in AbstractReservoirTest.performanceTest


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/36978ec6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/36978ec6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/36978ec6

Branch: refs/heads/master
Commit: 36978ec6f3c098e55b3e0c04b999112eb65393b6
Parents: 7bbb4cf
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Mon Feb 29 15:46:47 2016 -0800
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Mon Feb 29 15:46:47 2016 -0800

----------------------------------------------------------------------
 .../datatorrent/stram/engine/AbstractReservoirTest.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/36978ec6/engine/src/test/java/com/datatorrent/stram/engine/AbstractReservoirTest.java
----------------------------------------------------------------------
diff --git a/engine/src/test/java/com/datatorrent/stram/engine/AbstractReservoirTest.java b/engine/src/test/java/com/datatorrent/stram/engine/AbstractReservoirTest.java
index 7f83036..02c11b6 100644
--- a/engine/src/test/java/com/datatorrent/stram/engine/AbstractReservoirTest.java
+++ b/engine/src/test/java/com/datatorrent/stram/engine/AbstractReservoirTest.java
@@ -121,10 +121,10 @@ public class AbstractReservoirTest
   private Object performanceTestParameters()
   {
     Object[][] performanceTestParameters = new Object[][] {
-        {null, 500},
-        {"com.datatorrent.stram.engine.AbstractReservoir$SpscArrayQueueReservoir", 500},
-        {"com.datatorrent.stram.engine.AbstractReservoir$ArrayBlockingQueueReservoir", 6000},
-        {"com.datatorrent.stram.engine.AbstractReservoir$CircularBufferReservoir", 2000}
+        {null, 1500},
+        {"com.datatorrent.stram.engine.AbstractReservoir$SpscArrayQueueReservoir", 1500},
+        {"com.datatorrent.stram.engine.AbstractReservoir$ArrayBlockingQueueReservoir", 10000},
+        {"com.datatorrent.stram.engine.AbstractReservoir$CircularBufferReservoir", 4500}
     };
     for (Object[] o : performanceTestParameters) {
       o[0] = newReservoir((String)o[0], CAPACITY);
@@ -251,7 +251,7 @@ public class AbstractReservoirTest
 
     long time = System.currentTimeMillis() - start;
     logger.debug("{}: time {}, max queue size {}", reservoir.getId(), time, maxQueueSize);
-    assertTrue("Expected to complete within " + expectedTime + "millis. Actual time " + time + " milis",
+    assertTrue("Expected to complete within " + expectedTime + " millis. Actual time " + time + " millis",
         expectedTime > time);
 
   }


[2/2] incubator-apex-core git commit: Merge branch 'APEXCORE-369' of https://github.com/vrozov/incubator-apex-core

Posted by th...@apache.org.
Merge branch 'APEXCORE-369' of https://github.com/vrozov/incubator-apex-core


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/cf4e29ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/cf4e29ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/cf4e29ea

Branch: refs/heads/master
Commit: cf4e29ea364c8089e16790561d0971527cac9a22
Parents: 139a9ca 36978ec
Author: Thomas Weise <th...@datatorrent.com>
Authored: Mon Feb 29 19:37:20 2016 -0800
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Mon Feb 29 19:37:20 2016 -0800

----------------------------------------------------------------------
 .../datatorrent/stram/engine/AbstractReservoirTest.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------