You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by mc...@apache.org on 2011/12/30 23:36:42 UTC
svn commit: r1225952 - in
/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory:
cache/test/ memory/test/ preliminary/test/
Author: mcucchiara
Date: Fri Dec 30 22:36:41 2011
New Revision: 1225952
URL: http://svn.apache.org/viewvc?rev=1225952&view=rev
Log:
Renamed inactive tests (see http://goo.gl/etqEA)
Added:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTest.java (contents, props changed)
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTest.java (contents, props changed)
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent2Test.java (contents, props changed)
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent3Test.java (contents, props changed)
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTest.java (contents, props changed)
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTest.java (contents, props changed)
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTest.java (contents, props changed)
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTest.java
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmark.java (contents, props changed)
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmark.java (contents, props changed)
- copied, changed from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java
Removed:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTests.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTest.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTest.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTest.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTests.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTest.java Fri Dec 30 22:36:41 2011
@@ -19,9 +19,12 @@ package org.apache.directmemory.cache.te
* under the License.
*/
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
+import com.carrotsearch.junitbenchmarks.annotation.LabelType;
import org.apache.directmemory.cache.Cache;
import org.apache.directmemory.measures.Monitor;
import org.apache.directmemory.measures.Ram;
@@ -29,22 +32,19 @@ import org.apache.directmemory.memory.Me
import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
-import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
-import com.carrotsearch.junitbenchmarks.annotation.LabelType;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
@AxisRange(min = 0, max = 1)
@BenchmarkMethodChart()
@BenchmarkHistoryChart(labelWith = LabelType.CUSTOM_KEY, maxRuns = 5)
-
-public class CacheConcurrentTests extends AbstractBenchmark {
+@Ignore
+public class CacheConcurrentTest extends AbstractBenchmark {
private final static int entries = 100000;
public static AtomicInteger count = new AtomicInteger();
@@ -191,7 +191,7 @@ public class CacheConcurrentTests extend
Random rndGen = new Random();
- private static Logger logger = LoggerFactory.getLogger(CacheConcurrentTests.class);
+ private static Logger logger = LoggerFactory.getLogger(CacheConcurrentTest.class);
@BeforeClass
public static void init() {
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheConcurrentTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java?rev=1225952&r1=1225951&r2=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/CacheLightConcurrentTest.java Fri Dec 30 22:36:41 2011
@@ -19,9 +19,12 @@ package org.apache.directmemory.cache.te
* under the License.
*/
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
+import com.carrotsearch.junitbenchmarks.annotation.LabelType;
import org.apache.directmemory.cache.Cache;
import org.apache.directmemory.measures.Every;
import org.apache.directmemory.measures.Monitor;
@@ -32,21 +35,19 @@ import org.josql.QueryExecutionException
import org.josql.QueryParseException;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
-import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
-import com.carrotsearch.junitbenchmarks.annotation.LabelType;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
@AxisRange(min = 0, max = 1)
@BenchmarkMethodChart()
@BenchmarkHistoryChart(labelWith = LabelType.CUSTOM_KEY, maxRuns = 5)
+@Ignore
public class CacheLightConcurrentTest extends AbstractBenchmark {
private final static int entries = 10000;
Modified: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java?rev=1225952&r1=1225951&r2=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/cache/test/TestCachePlusSerialization.java Fri Dec 30 22:36:41 2011
@@ -19,24 +19,25 @@ package org.apache.directmemory.cache.te
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-
-import java.util.Random;
-
+import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
import org.apache.directmemory.cache.Cache;
import org.apache.directmemory.measures.Monitor;
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.misc.DummyPojo;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+@Ignore
public class TestCachePlusSerialization extends AbstractBenchmark {
private static Logger logger = LoggerFactory.getLogger(TestCachePlusSerialization.class);
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTest.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTest.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTest.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTests.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTest.java Fri Dec 30 22:36:41 2011
@@ -19,29 +19,30 @@ package org.apache.directmemory.memory.t
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.Random;
-import java.util.zip.CRC32;
-import java.util.zip.Checksum;
-
+import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.google.common.collect.Maps;
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.memory.OffHeapMemoryBuffer;
import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
-import com.google.common.collect.Maps;
+import java.util.Date;
+import java.util.Map;
+import java.util.Random;
+import java.util.zip.CRC32;
+import java.util.zip.Checksum;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
-public class BaseTests extends AbstractBenchmark{
+@Ignore
+public class BaseTest extends AbstractBenchmark{
@Test
public void smokeTest() {
OffHeapMemoryBuffer mem = OffHeapMemoryBuffer.createNew(1 * 1024 * 1024);
@@ -65,7 +66,7 @@ public class BaseTests extends AbstractB
- private static Logger logger = LoggerFactory.getLogger(MallocTests.class);
+ private static Logger logger = LoggerFactory.getLogger(MallocTest.class);
private static Random rnd = new Random();
final static Map<String, Byte> test = Maps.newHashMap();
private static int errors;
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/BaseTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent2Test.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent2Test.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent2Test.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests2.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent2Test.java Fri Dec 30 22:36:41 2011
@@ -19,33 +19,33 @@ package org.apache.directmemory.memory.t
* under the License.
*/
-import java.util.Random;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
+import com.carrotsearch.junitbenchmarks.annotation.LabelType;
+import com.google.common.collect.MapMaker;
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.memory.MemoryManager;
import org.apache.directmemory.memory.OffHeapMemoryBuffer;
import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
-import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
-import com.carrotsearch.junitbenchmarks.annotation.LabelType;
-import com.google.common.collect.MapMaker;
+import java.util.Random;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
@AxisRange(min = 0, max = 1)
@BenchmarkMethodChart()
@BenchmarkHistoryChart(labelWith = LabelType.CUSTOM_KEY, maxRuns = 5)
-
-public class ConcurrentTests2 extends AbstractBenchmark {
+@Ignore
+public class Concurrent2Test extends AbstractBenchmark {
private final static int entries = 100000;
public static AtomicInteger count = new AtomicInteger();
@@ -165,7 +165,7 @@ public class ConcurrentTests2 extends Ab
Random rndGen = new Random();
- private static Logger logger = LoggerFactory.getLogger(ConcurrentTests2.class);
+ private static Logger logger = LoggerFactory.getLogger(Concurrent2Test.class);
private static void dump(OffHeapMemoryBuffer mem) {
logger.info("off-heap - buffer: " + mem.bufferNumber);
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent2Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent2Test.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent3Test.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent3Test.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent3Test.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests3.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent3Test.java Fri Dec 30 22:36:41 2011
@@ -19,32 +19,32 @@ package org.apache.directmemory.memory.t
* under the License.
*/
-import java.util.Random;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
+import com.carrotsearch.junitbenchmarks.annotation.LabelType;
+import com.google.common.collect.MapMaker;
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.memory.MemoryManager;
import org.apache.directmemory.memory.OffHeapMemoryBuffer;
import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
-import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
-import com.carrotsearch.junitbenchmarks.annotation.LabelType;
-import com.google.common.collect.MapMaker;
+import java.util.Random;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
@AxisRange(min = 0, max = 1)
@BenchmarkMethodChart()
@BenchmarkHistoryChart(labelWith = LabelType.CUSTOM_KEY, maxRuns = 5)
-
-public class ConcurrentTests3 {
+@Ignore
+public class Concurrent3Test {
private final static int entries = 100000;
public static AtomicInteger count = new AtomicInteger();
@@ -123,7 +123,7 @@ public class ConcurrentTests3 {
@BenchmarkOptions(benchmarkRounds = 50000, warmupRounds=0, concurrency=10)
@Test
- public void write1Read8AndSomeDisposal() {
+ public void write1Read8AndSomeDisposal() {
String key = "test-" + (rndGen.nextInt(entries*2)+1);
int what = rndGen.nextInt(10);
@@ -157,7 +157,7 @@ public class ConcurrentTests3 {
@BenchmarkOptions(benchmarkRounds = 1000000, warmupRounds=0, concurrency=10)
@Test
- public void write3Read7() {
+ public void write3Read7() {
String key = "test-" + (rndGen.nextInt(entries*2)+1);
int what = rndGen.nextInt(10);
@@ -176,7 +176,7 @@ public class ConcurrentTests3 {
@BenchmarkOptions(benchmarkRounds = 1000000, warmupRounds=0, concurrency=10)
@Test
- public void write1Read9() {
+ public void write1Read9() {
String key = "test-" + (rndGen.nextInt(entries*2)+1);
int what = rndGen.nextInt(10);
@@ -195,7 +195,7 @@ public class ConcurrentTests3 {
Random rndGen = new Random();
- private static Logger logger = LoggerFactory.getLogger(ConcurrentTests3.class);
+ private static Logger logger = LoggerFactory.getLogger(Concurrent3Test.class);
private static void dump(OffHeapMemoryBuffer mem) {
logger.info("off-heap - buffer: " + mem.bufferNumber);
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent3Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Concurrent3Test.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTest.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTest.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTest.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTests.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTest.java Fri Dec 30 22:36:41 2011
@@ -19,32 +19,33 @@ package org.apache.directmemory.memory.t
* under the License.
*/
-import java.util.Random;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
+import com.carrotsearch.junitbenchmarks.annotation.LabelType;
+import com.google.common.collect.MapMaker;
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.memory.OffHeapMemoryBuffer;
import org.apache.directmemory.memory.Pointer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
-import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
-import com.carrotsearch.junitbenchmarks.annotation.LabelType;
-import com.google.common.collect.MapMaker;
+import java.util.Random;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
@AxisRange(min = 0, max = 1)
@BenchmarkMethodChart()
@BenchmarkHistoryChart(labelWith = LabelType.CUSTOM_KEY, maxRuns = 5)
-public class ConcurrentTests extends AbstractBenchmark {
+@Ignore
+public class ConcurrentTest extends AbstractBenchmark {
private final static int entries = 100000;
public static AtomicInteger count = new AtomicInteger();
@@ -165,7 +166,7 @@ public class ConcurrentTests extends Abs
Random rndGen = new Random();
- private static Logger logger = LoggerFactory.getLogger(ConcurrentTests.class);
+ private static Logger logger = LoggerFactory.getLogger(ConcurrentTest.class);
@BeforeClass
@AfterClass
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/ConcurrentTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTest.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTest.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTest.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTests.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTest.java Fri Dec 30 22:36:41 2011
@@ -19,12 +19,13 @@ package org.apache.directmemory.memory.t
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.util.Random;
-import java.util.concurrent.ConcurrentMap;
-
+import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
+import com.carrotsearch.junitbenchmarks.annotation.LabelType;
+import com.google.common.collect.MapMaker;
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.memory.OffHeapMemoryBuffer;
import org.apache.directmemory.memory.Pointer;
@@ -34,24 +35,22 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
-import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
-import com.carrotsearch.junitbenchmarks.annotation.LabelType;
-import com.google.common.collect.MapMaker;
+import java.util.Random;
+import java.util.concurrent.ConcurrentMap;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
@AxisRange(min = 0, max = 1)
@BenchmarkMethodChart()
@BenchmarkOptions(benchmarkRounds = 1, warmupRounds = 0)
@BenchmarkHistoryChart(labelWith = LabelType.CUSTOM_KEY, maxRuns = 5)
-public class MallocTests extends AbstractBenchmark {
+public class MallocTest extends AbstractBenchmark {
Random rnd = new Random();
- private static Logger logger = LoggerFactory.getLogger(MallocTests.class);
+ private static Logger logger = LoggerFactory.getLogger(MallocTest.class);
@After
public void dump() {
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MallocTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTest.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTest.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTest.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTests.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTest.java Fri Dec 30 22:36:41 2011
@@ -19,10 +19,8 @@ package org.apache.directmemory.memory.t
* under the License.
*/
-import static org.junit.Assert.*;
-import java.util.Map;
-import java.util.Random;
-
+import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
+import com.google.common.collect.Maps;
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.memory.MemoryManager;
import org.apache.directmemory.memory.OffHeapMemoryBuffer;
@@ -32,10 +30,13 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.google.common.collect.Maps;
+import java.util.Map;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
-public class MemoryManagerTests extends AbstractBenchmark {
+public class MemoryManagerTest extends AbstractBenchmark {
@BeforeClass
@@ -93,7 +94,7 @@ public class MemoryManagerTests extends
}
- private static Logger logger = LoggerFactory.getLogger(MallocTests.class);
+ private static Logger logger = LoggerFactory.getLogger(MallocTest.class);
final static Map<String, Byte> test = Maps.newHashMap();
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/MemoryManagerTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTest.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTests.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTest.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTest.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTests.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTests.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/NIOTest.java Fri Dec 30 22:36:41 2011
@@ -19,13 +19,6 @@ package org.apache.directmemory.memory.t
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.nio.ByteBuffer;
-import java.util.Random;
-
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.memory.MemoryManager;
import org.apache.directmemory.memory.Pointer;
@@ -34,9 +27,14 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class NIOTests {
+import java.nio.ByteBuffer;
+import java.util.Random;
+
+import static org.junit.Assert.*;
+
+public class NIOTest {
- private static Logger logger = LoggerFactory.getLogger(NIOTests.class);
+ private static Logger logger = LoggerFactory.getLogger(NIOTest.class);
@BeforeClass
public static void init() {
Modified: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java?rev=1225952&r1=1225951&r2=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/memory/test/Starter.java Fri Dec 30 22:36:41 2011
@@ -19,17 +19,17 @@ package org.apache.directmemory.memory.t
* under the License.
*/
-import static org.junit.Assert.assertNotNull;
-
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.memory.MemoryManager;
import org.apache.directmemory.memory.OffHeapMemoryBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertNotNull;
+
public class Starter {
- private static Logger logger = LoggerFactory.getLogger(MallocTests.class);
+ private static Logger logger = LoggerFactory.getLogger(MallocTest.class);
/**
* @param args
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmark.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmark.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmark.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmarks.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmark.java Fri Dec 30 22:36:41 2011
@@ -19,16 +19,6 @@ package org.apache.directmemory.prelimin
* under the License.
*/
-import java.nio.ByteBuffer;
-import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
-
-import org.apache.directmemory.measures.Ram;
-import org.junit.Before;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
@@ -37,15 +27,24 @@ import com.carrotsearch.junitbenchmarks.
import com.carrotsearch.junitbenchmarks.annotation.LabelType;
import com.google.common.collect.MapMaker;
import com.google.common.collect.Maps;
+import org.apache.directmemory.measures.Ram;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
@AxisRange(min = 0, max = 1)
@BenchmarkMethodChart(filePrefix = "latest-microbench")
@BenchmarkOptions(benchmarkRounds = 1, warmupRounds = 0)
@BenchmarkHistoryChart(labelWith = LabelType.CUSTOM_KEY, maxRuns = 5)
-public class MicroBenchmarks extends AbstractBenchmark {
+public class MicroBenchmark extends AbstractBenchmark {
- private static Logger logger = LoggerFactory.getLogger(MicroBenchmarks.class);
+ private static Logger logger = LoggerFactory.getLogger(MicroBenchmark.class);
private int many = 3000000;
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmark.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/MicroBenchmark.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmark.java (from r1225938, incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmark.java?p2=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmark.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java&r1=1225938&r2=1225952&rev=1225952&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmarks.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmark.java Fri Dec 30 22:36:41 2011
@@ -19,26 +19,25 @@ package org.apache.directmemory.prelimin
* under the License.
*/
-import static org.junit.Assert.*;
+import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.google.common.collect.MapMaker;
+import com.google.common.collect.Maps;
+import org.apache.directmemory.measures.Ram;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.nio.ByteBuffer;
import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
-import org.apache.directmemory.measures.Ram;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.carrotsearch.junitbenchmarks.AbstractBenchmark;
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
-import com.google.common.collect.MapMaker;
-import com.google.common.collect.Maps;
+import static org.junit.Assert.assertNotNull;
-public class PreliminarBenchmarks extends AbstractBenchmark {
+public class PreliminarBenchmark extends AbstractBenchmark {
- private static Logger logger = LoggerFactory.getLogger(PreliminarBenchmarks.class);
+ private static Logger logger = LoggerFactory.getLogger(PreliminarBenchmark.class);
final static byte payload[] = new byte[1024];
// @Before
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmark.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/preliminary/test/PreliminarBenchmark.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision