svn commit: r1446291 - in /accumulo/branches/1.4: ./ src/ src/core/ src/server/ src/server/src/ src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java

[ecn]

Author: ecn
Date: Thu Feb 14 18:21:05 2013
New Revision: 1446291

URL: http://svn.apache.org/r1446291
Log:
ACCUMULO-1062 2000 threads is a little too much for a unit test; merge to 1.4 
branch

Modified:
    accumulo/branches/1.4/   (props changed)
    accumulo/branches/1.4/src/   (props changed)
    accumulo/branches/1.4/src/core/   (props changed)
    accumulo/branches/1.4/src/server/   (props changed)
    accumulo/branches/1.4/src/server/src/   (props changed)
    
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java

Propchange: accumulo/branches/1.4/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1445876

Propchange: accumulo/branches/1.4/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1445876
  Merged /accumulo/trunk:r1445876,1446290

Propchange: accumulo/branches/1.4/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1445876
  Merged /accumulo/trunk/core:r1445876,1446290

Propchange: accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/server:r1445876
  Merged /accumulo/trunk/server:r1445876,1446290

Propchange: accumulo/branches/1.4/src/server/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/server/src:r1445876,1446290
  Merged /accumulo/trunk/src/server/src:r1445876

Modified: 
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java?rev=1446291&r1=1446290&r2=1446291&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
 (original)
+++ 
accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/tabletserver/InMemoryMapTest.java
 Thu Feb 14 18:21:05 2013
@@ -277,7 +277,7 @@ public class InMemoryMapTest extends Tes
   @Test
   public void testParallelWriteSpeed() throws InterruptedException {
     List<Double> timings = new ArrayList<Double>();
-    for (int threads: new int[]{1, 2, 16, 64, 256, 2048} ) {
+    for (int threads: new int[]{1, 2, 16, 64, 256} ) {
       final long now = System.currentTimeMillis();
       final long counts[] = new long[threads];
       final InMemoryMap imm = new InMemoryMap(false, "/tmp");