Cleaned up pom.xml

Small fix for pact runtime tests.

pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/io/MemoryAccessSpeedBenchmark.java

-/***********************************************************************************************************************
- *
- * Copyright (C) 2010 by the Stratosphere project (http://stratosphere.eu)
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
- * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License.
- *
- **********************************************************************************************************************/
-
-package eu.stratosphere.pact.runtime.io;
-
-import java.lang.ref.WeakReference;
-import java.util.Random;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class MemoryAccessSpeedBenchmark {
-	private static final int ARRAY_LENGTH = 1024 * 1024 * 164;
-
-	private static final int SEGMENT_OFFSET = 1024 * 1024 * 16;
-
-	private static final int SEGMENT_LENGTH = 1024 * 1024 * 128; // 128M segment
-
-	private static final int NUMBER_OF_ITERATIONS = 16; // x8 iterations (i.e. test for 1G read + 1G write throughput )
-
-	private static final long RANDOM_SEED = 235646234421L;
-
-	private static byte[] sourceBytes;
-
-	private static byte[] targetBytes;
-
-	private static MemorySegmentHardReference segmentHardReference;
-
-	private static MemorySegmentWeakReference segmentWeakReference;
-
-	private static Random random = new Random();
-
-	@BeforeClass
-	public static void initialize() {
-		sourceBytes = new byte[SEGMENT_LENGTH];
-		targetBytes = new byte[ARRAY_LENGTH];
-		MemorySegmentDescriptor descriptor = new MemorySegmentDescriptor(targetBytes, SEGMENT_OFFSET, SEGMENT_LENGTH);
-		WeakReference<MemorySegmentDescriptor> descriptorReference = new WeakReference<MemorySegmentDescriptor>(
-			descriptor);
-		segmentHardReference = new MemorySegmentHardReference(descriptor);
-		segmentWeakReference = new MemorySegmentWeakReference(descriptorReference);
-	}
-
-	@AfterClass
-	public static void destruct() {
-		sourceBytes = null;
-		targetBytes = null;
-		segmentHardReference = null;
-		segmentWeakReference = null;
-	}
-
-	@Before
-	public void setUp() {
-		random.setSeed(RANDOM_SEED);
-		random.nextBytes(sourceBytes);
-	}
-
-	@Test
-	public void testIndirectAccessWithWeakReference() {
-		for (int i = 0; i < NUMBER_OF_ITERATIONS; i++) {
-			for (int j = 0; j < SEGMENT_LENGTH; j++) {
-				segmentWeakReference.write(j, sourceBytes[j]);
-			}
-
-			for (int j = 0; j < SEGMENT_LENGTH; j++) {
-				assert (sourceBytes[j] == segmentWeakReference.read(j));
-			}
-		}
-	}
-
-	@Test
-	public void testIndirectAccessWithHardReference() {
-		for (int i = 0; i < NUMBER_OF_ITERATIONS; i++) {
-			for (int j = 0; j < SEGMENT_LENGTH; j++) {
-				segmentHardReference.write(j, sourceBytes[j]);
-			}
-
-			for (int j = 0; j < SEGMENT_LENGTH; j++) {
-				assert (sourceBytes[j] == segmentHardReference.read(j));
-			}
-		}
-	}
-
-	@Test
-	public void testDirectAccess() {
-		for (int i = 0; i < NUMBER_OF_ITERATIONS; i++) {
-			for (int j = 0; j < SEGMENT_LENGTH; j++) {
-				targetBytes[SEGMENT_OFFSET + j] = sourceBytes[j];
-			}
-
-			for (int j = 0; j < SEGMENT_LENGTH; j++) {
-				assert (sourceBytes[j] == targetBytes[SEGMENT_OFFSET + j]);
-			}
-		}
-	}
-
-	private static final class MemorySegmentHardReference {
-		private final MemorySegmentDescriptor descriptor;
-
-		public MemorySegmentHardReference(MemorySegmentDescriptor descriptor) {
-			this.descriptor = descriptor;
-		}
-
-		public byte read(int position) {
-			if (position < descriptor.start || descriptor.end >= position) {
-				return descriptor.memory[(position + descriptor.start)];
-			} else {
-				throw new IndexOutOfBoundsException();
-			}
-		}
-
-		public void write(int position, byte data) {
-			if (position < descriptor.start || descriptor.end >= position) {
-				descriptor.memory[(position + descriptor.start)] = data;
-			} else {
-				throw new IndexOutOfBoundsException();
-			}
-		}
-	}
-
-	private static final class MemorySegmentWeakReference {
-		private final WeakReference<MemorySegmentDescriptor> descriptorReference;
-
-		public MemorySegmentWeakReference(WeakReference<MemorySegmentDescriptor> descriptorReference) {
-			this.descriptorReference = descriptorReference;
-		}
-
-		public byte read(int position) {
-			MemorySegmentDescriptor descriptor = descriptorReference.get();
-
-			if (position < descriptor.start || descriptor.end >= position) {
-				return descriptor.memory[(position + descriptor.start)];
-			} else {
-				throw new IndexOutOfBoundsException();
-			}
-		}
-
-		public void write(int position, byte data) {
-			MemorySegmentDescriptor descriptor = descriptorReference.get();
-
-			if (position < descriptor.start || descriptor.end >= position) {
-				descriptor.memory[(position + descriptor.start)] = data;
-			} else {
-				throw new IndexOutOfBoundsException();
-			}
-		}
-	}
-
-	private static final class MemorySegmentDescriptor {
-		public final byte[] memory;
-
-		public final int start;
-
-		public final int end;
-
-		public MemorySegmentDescriptor(byte[] bytes, int start, int end) {
-			this.memory = bytes;
-			this.start = start;
-			this.end = end;
-		}
-	}
-}

pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/iterative/concurrent/BlockingBackChannelTest.java

@@ -32,6 +32,7 @@ import static org.junit.Assert.assertEquals;
 public class BlockingBackChannelTest {
 
 	private static final int NUM_ITERATIONS = 3;
+
 	private static final Integer INPUT_COMPLETELY_PROCESSED_MESSAGE = 1;
 
 	@Test
@@ -52,10 +53,10 @@ public class BlockingBackChannelTest {
 		head.join();
 		tail.join();
 
-    int action = 0;
-    for (String log : actionLog) {
-      System.out.println("ACTION " + (++action) + ": " + log);
-    }
+//		int action = 0;
+//		for (String log : actionLog) {
+//			System.out.println("ACTION " + (++action) + ": " + log);
+//		}
 
 		assertEquals(12, actionLog.size());
 
@@ -76,8 +77,11 @@ public class BlockingBackChannelTest {
 	class IterationHead implements Runnable {
 
 		private final BlockingBackChannel backChannel;
+
 		private final BlockingQueue<Integer> dataChannel;
+
 		private final Random random;
+
 		private final List<String> actionLog;
 
 		IterationHead(BlockingBackChannel backChannel, BlockingQueue<Integer> dataChannel, List<String> actionLog) {
@@ -114,8 +118,11 @@ public class BlockingBackChannelTest {
 	class IterationTail implements Runnable {
 
 		private final BlockingBackChannel backChannel;
+
 		private final BlockingQueue<Integer> dataChannel;
+
 		private final Random random;
+
 		private final List<String> actionLog;
 
 		IterationTail(BlockingBackChannel backChannel, BlockingQueue<Integer> dataChannel, List<String> actionLog) {

pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/iterative/concurrent/BrokerTest.java

@@ -69,8 +69,11 @@ public class BrokerTest {
 	class IterationHead implements Callable<StringPair> {
 
 		private final Random random;
+
 		private final Broker<String> broker;
+
 		private final String key;
+
 		private final String value;
 
 		IterationHead(Broker<String> broker, Integer key, String value) {
@@ -83,7 +86,7 @@ public class BrokerTest {
 		@Override
 		public StringPair call() throws Exception {
 			Thread.sleep(random.nextInt(10));
-      System.out.println("Head " + key + " hands in " + value);
+			// System.out.println("Head " + key + " hands in " + value);
 			broker.handIn(key, value);
 			Thread.sleep(random.nextInt(10));
 			return null;
@@ -94,7 +97,9 @@ public class BrokerTest {
 	class IterationTail implements Callable<StringPair> {
 
 		private final Random random;
+
 		private final Broker<String> broker;
+
 		private final String key;
 
 		IterationTail(Broker<String> broker, Integer key) {
@@ -107,15 +112,14 @@ public class BrokerTest {
 		public StringPair call() throws Exception {
 
 			Thread.sleep(random.nextInt(10));
-      System.out.println("Tail " + key + " asks for handover");
+//			System.out.println("Tail " + key + " asks for handover");
 			String value = broker.get(key);
 
-      System.out.println("Tail " + key + " received " + value);
+//			System.out.println("Tail " + key + " received " + value);
 			Preconditions.checkNotNull(value);
 
 			return new StringPair(key, value);
 		}
 	}
 
-
 }

pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/iterative/concurrent/StringPair.java

@@ -18,6 +18,7 @@ package eu.stratosphere.pact.runtime.iterative.concurrent;
 class StringPair {
 
 	private final String first;
+
 	private final String second;
 
 	StringPair(String first, String second) {

pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/iterative/concurrent/SuperstepBarrierTest.java

@@ -67,7 +67,9 @@ public class SuperstepBarrierTest {
 	class IterationHead implements Runnable {
 
 		private final SuperstepBarrier barrier;
+
 		private final TerminationSignaled terminationSignaled;
+
 		private final Random random;
 
 		IterationHead(SuperstepBarrier barrier, TerminationSignaled terminationSignaled) {
@@ -96,7 +98,9 @@ public class SuperstepBarrierTest {
 	class IterationSync implements Runnable {
 
 		private final SuperstepBarrier barrier;
+
 		private final AbstractTaskEvent event;
+
 		private final Random random;
 
 		IterationSync(SuperstepBarrier barrier, AbstractTaskEvent event) {

pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/task/util/HashVsSortTest.java → pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/task/util/HashVsSortMiniBenchmark.java

@@ -46,7 +46,8 @@ import eu.stratosphere.pact.runtime.test.util.TestData.Generator.KeyMode;
 import eu.stratosphere.pact.runtime.test.util.TestData.Generator.ValueMode;
 
 
-public class HashVsSortTest {
+public class HashVsSortMiniBenchmark {
+	
 	// total memory
 	private static final int MEMORY_SIZE = 1024 * 1024 * 32;
 	
@@ -83,8 +84,7 @@ public class HashVsSortTest {
 
 	@SuppressWarnings("unchecked")
 	@Before
-	public void beforeTest()
-	{
+	public void beforeTest() {
 		this.serializer1 = PactRecordSerializer.get();
 		this.serializer2 = PactRecordSerializer.get();
 		this.comparator1 = new PactRecordComparator(new int[] {0}, new Class[] {TestData.Key.class});
@@ -96,8 +96,7 @@ public class HashVsSortTest {
 	}
 
 	@After
-	public void afterTest()
-	{
+	public void afterTest() {
 		if (this.memoryManager != null) {
 			Assert.assertTrue("Memory Leak: Not all memory has been returned to the memory manager.",
 				this.memoryManager.verifyEmpty());
@@ -244,10 +243,8 @@ public class HashVsSortTest {
 	}
 	
 	
-	private static final class NoOpMatcher extends MatchStub
-	{
+	private static final class NoOpMatcher extends MatchStub {
 		@Override
 		public void match(PactRecord rec1, PactRecord rec2, Collector<PactRecord> out) {}
-		
 	}
 }

pact/pact-runtime/src/test/java/eu/stratosphere/pact/runtime/task/util/OutputEmitterTest.java

@@ -42,13 +42,12 @@ import eu.stratosphere.pact.runtime.plugable.pactrecord.PactRecordComparator;
 import eu.stratosphere.pact.runtime.shipping.PactRecordOutputEmitter;
 import eu.stratosphere.pact.runtime.shipping.ShipStrategyType;
 
-public class OutputEmitterTest extends TestCase
-{
+public class OutputEmitterTest extends TestCase {
+	
 	private static final long SEED = 485213591485399L;
 	
 	@Test
-	public void testPartitionHash()
-	{
+	public void testPartitionHash() {
 		// Test for PactInteger
 		@SuppressWarnings("unchecked")
 		final PactRecordComparator intComp = new PactRecordComparator(new int[] {0}, new Class[] {PactInteger.class});
@@ -105,8 +104,7 @@ public class OutputEmitterTest extends TestCase
 	}
 	
 	@Test
-	public void testForward()
-	{
+	public void testForward() {
 		// Test for PactInteger
 		@SuppressWarnings("unchecked")
 		final PactRecordComparator intComp = new PactRecordComparator(new int[] {0}, new Class[] {PactInteger.class});
@@ -164,8 +162,7 @@ public class OutputEmitterTest extends TestCase
 	}
 	
 	@Test
-	public void testBroadcast()
-	{
+	public void testBroadcast() {
 		// Test for PactInteger
 		@SuppressWarnings("unchecked")
 		final PactRecordComparator intComp = new PactRecordComparator(new int[] {0}, new Class[] {PactInteger.class});
@@ -216,8 +213,7 @@ public class OutputEmitterTest extends TestCase
 	}
 	
 	@Test
-	public void testMultiKeys()
-	{	
+	public void testMultiKeys() {
 		@SuppressWarnings("unchecked")
 		final PactRecordComparator multiComp = new PactRecordComparator(new int[] {0,1,3}, new Class[] {PactInteger.class, PactString.class, PactDouble.class});
 		final ChannelSelector<PactRecord> oe1 = new PactRecordOutputEmitter(ShipStrategyType.PARTITION_HASH, multiComp);
@@ -249,8 +245,7 @@ public class OutputEmitterTest extends TestCase
 	}
 	
 	@Test
-	public void testMissingKey()
-	{
+	public void testMissingKey() {
 		// Test for PactInteger
 		@SuppressWarnings("unchecked")
 		final PactRecordComparator intComp = new PactRecordComparator(new int[] {1}, new Class[] {PactInteger.class});
@@ -269,8 +264,7 @@ public class OutputEmitterTest extends TestCase
 	}
 	
 	@Test
-	public void testNullKey()
-	{
+	public void testNullKey() {
 		// Test for PactInteger
 		@SuppressWarnings("unchecked")
 		final PactRecordComparator intComp = new PactRecordComparator(new int[] {0}, new Class[] {PactInteger.class});
@@ -324,8 +318,7 @@ public class OutputEmitterTest extends TestCase
 	}
 	
 	@Test
-	public void testPartitionRange()
-	{
+	public void testPartitionRange() {
 		final Random rnd = new Random(SEED);
 		
 		final int DISTR_MIN = 0;
@@ -370,28 +363,30 @@ public class OutputEmitterTest extends TestCase
 		}
 	}
 	
-	private static final class IntegerUniformDistribution implements DataDistribution
-	{
+	private static final class IntegerUniformDistribution implements DataDistribution {
+		
 		private int min;	
 		private int max;
 		
-		public IntegerUniformDistribution(int min, int max)
-		{
+		public IntegerUniformDistribution(int min, int max) {
 			this.min = min;
 			this.max = max;
 		}
 
 		@Override
-		public void write(DataOutput out)
-		{}
+		public void write(DataOutput out) throws IOException {
+			out.writeInt(this.min);
+			out.writeInt(this.max);
+		}
 
 		@Override
-		public void read(DataInput in)
-		{}
+		public void read(DataInput in) throws IOException {
+			this.min = in.readInt();
+			this.max = in.readInt();
+		}
 
 		@Override
-		public PactRecord getBucketBoundary(int splitNum, int totalSplits)
-		{
+		public PactRecord getBucketBoundary(int splitNum, int totalSplits) {
 			final int range = this.max - this.min + 1;
 			final float bucketWidth = ((float) range) / totalSplits;
 			final int upperBoundary = this.min + (int) ((splitNum + 1) * bucketWidth);

pom.xml

@@ -160,28 +160,29 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
 			<!-- measure and report source code complexity -->
+<!--			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>javancss-maven-plugin</artifactId>
 				<version>2.0</version>
-			</plugin>
+			</plugin> -->
 
-			<plugin>
 			<!-- analyze dependencies in source code -->
+<!--			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jdepend-maven-plugin</artifactId>
-			</plugin>
+				<version></version>
+			</plugin> -->
 
 			<!-- disabled because currently no SCM defined generates changelog <plugin> 
 				<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changelog-plugin</artifactId> 
 				<version>2.2-SNAPSHOT</version> </plugin> -->
 
-			<plugin>
 			<!-- report occurrences of various todo markers in code -->
+<!--			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>taglist-maven-plugin</artifactId>
-				<!-- <version>2.3</version> -->
+				<version>2.3</version>
 				<configuration>
 					<tags>
 						<tag>TODO</tag>
@@ -190,7 +191,7 @@
 						<tag>@deprecated</tag>
 					</tags>
 				</configuration>
-			</plugin>
+			</plugin> -->
 
 			<!-- todo: reenable when SCM is available <plugin> <groupId>org.codehaus.mojo</groupId> 
 				<artifactId>scmchangelog-maven-plugin</artifactId> <version>1.2</version> 
@@ -198,33 +199,32 @@
 				<tagBase>https://projekte.itmc.tu-dortmund.de/svn/sla4dgrid/tags/</tagBase> 
 				<filter>.*</filter> </configuration> </plugin> -->
 
-			<plugin>
-				<!-- generates cross references in code so that you can click in the 
-					reports and jump to the respective lines -->
+			<!-- generates cross references in code so that you can click in the reports and jump to the respective lines -->
+<!--			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jxr-maven-plugin</artifactId>
 				<configuration>
 					<linkJavadoc>true</linkJavadoc>
 				</configuration>
-			</plugin>
+			</plugin> -->
 
-			<plugin>
 			<!-- discovers frequent bugs in programs -->
+<!--			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>findbugs-maven-plugin</artifactId>
-				<!-- <version>2.0.1</version> -->
+				<version>2.0.1</version>
 				<configuration>
 					<effort>Max</effort>
 					<threshold>Medium</threshold>
 					<findbugsXmlOutput>true</findbugsXmlOutput>
 					<xmlOutput>true</xmlOutput>
 				</configuration>
-			</plugin>
+			</plugin> -->
 
-			<plugin>
 			<!-- maven source code analysis for frequent bugs -->
+<!--			<plugin>
 				<artifactId>maven-pmd-plugin</artifactId>
-				<!-- <version>2.5</version> -->
+				<version>2.5</version>
 				<configuration>
 					<targetJdk>1.6</targetJdk>
 				</configuration>
@@ -236,18 +236,17 @@
 						</reports>
 					</reportSet>
 				</reportSets>
-			</plugin>
+			</plugin> -->
 
-			<!-- TEST ME -->
-			<plugin>
 			<!-- generation of JavaDoc -->
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.5</version>
 			</plugin>
 
-			<plugin>
 			<!-- style checker -->
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
 				<version>2.6</version>
@@ -256,15 +255,15 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
 			<!-- execution of Unit Tests -->
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
 				<version>2.7</version>
 			</plugin>
 
-			<plugin>
 			<!-- check coverage of tests -->
+<!--			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
 				<configuration>
@@ -273,7 +272,7 @@
 						<format>xml</format>
 					</formats>
 				</configuration>
-			</plugin>
+			</plugin> -->
 
 			<!-- Generator for QA reports, summarizes various inputs and draws diagrams 
 				indicating improvements/deterioration <plugin> <groupId>net.objectlab</groupId> 
@@ -282,10 +281,10 @@
 				<report>report-movers-all</report> </reports> </reportSet> </reportSets> 
 				</plugin> -->
 
-			<plugin>
+<!--			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>dashboard-maven-plugin</artifactId>
-			</plugin>
+			</plugin> -->
 
 		</plugins>
 	</reporting>
@@ -409,7 +408,7 @@
 	<profiles>
 		<!-- Hudson by default defines a property BUILD_NUMBER which is used to 
 			enable the profile. -->
-		<profile>
+<!--		<profile>
 			<id>hudson</id>
 			<activation>
 				<property>
@@ -463,8 +462,8 @@
 					</plugin>
 				</plugins>
 			</build>
-		</profile>
-		<profile>
+		</profile> -->
+<!--		<profile>
 			<id>nightly</id>
 			<activation>
 				<property>
@@ -472,7 +471,7 @@
 				</property>
 			</activation>
 			<build>
-				<finalName>${artifactId}-${project.version}-nightly-${BUILD_NUMBER}</finalName>
+				<finalName>${project.artifactId}-${project.version}-nightly-${BUILD_NUMBER}</finalName>
 			<plugins>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -493,7 +492,7 @@
 			</plugins>
 			</build>
 		</profile>
-	</profiles>
+	</profiles> -->
 
 	<modules>
 		<module>nephele</module>