You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/10/08 19:38:18 UTC
[08/10] flink git commit: [FLINK-7312] [checkstyle] Enable checkstyle
for 'flink/core/memory/*'
http://git-wip-us.apache.org/repos/asf/flink/blob/c3235c39/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentTestBase.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentTestBase.java b/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentTestBase.java
index 8c10902..62e0a56 100644
--- a/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentTestBase.java
+++ b/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentTestBase.java
@@ -36,19 +36,24 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Random;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Tests for the access and transfer methods of the HeapMemorySegment.
*/
public abstract class MemorySegmentTestBase {
-
+
private final Random random = new Random();
-
+
private final int pageSize;
-
-
- public MemorySegmentTestBase(int pageSize) {
+
+ MemorySegmentTestBase(int pageSize) {
this.pageSize = pageSize;
}
@@ -58,8 +63,8 @@ public abstract class MemorySegmentTestBase {
abstract MemorySegment createSegment(int size);
- abstract MemorySegment createSegment(int size, Object owner);
-
+ abstract MemorySegment createSegment(@SuppressWarnings("SameParameterValue") int size, Object owner);
+
// ------------------------------------------------------------------------
// Access to primitives
// ------------------------------------------------------------------------
@@ -409,7 +414,7 @@ public abstract class MemorySegmentTestBase {
continue;
} else {
occupied[pos] = true;
- occupied[pos+1] = true;
+ occupied[pos + 1] = true;
}
segment.putChar(pos, (char) (random.nextInt(Character.MAX_VALUE)));
@@ -425,7 +430,7 @@ public abstract class MemorySegmentTestBase {
continue;
} else {
occupied[pos] = true;
- occupied[pos+1] = true;
+ occupied[pos + 1] = true;
}
assertEquals((char) (random.nextInt(Character.MAX_VALUE)), segment.getChar(pos));
@@ -544,7 +549,7 @@ public abstract class MemorySegmentTestBase {
continue;
} else {
occupied[pos] = true;
- occupied[pos+1] = true;
+ occupied[pos + 1] = true;
}
segment.putShort(pos, (short) random.nextInt());
@@ -560,7 +565,7 @@ public abstract class MemorySegmentTestBase {
continue;
} else {
occupied[pos] = true;
- occupied[pos+1] = true;
+ occupied[pos + 1] = true;
}
assertEquals((short) random.nextInt(), segment.getShort(pos));
@@ -695,9 +700,9 @@ public abstract class MemorySegmentTestBase {
continue;
} else {
occupied[pos] = true;
- occupied[pos+1] = true;
- occupied[pos+2] = true;
- occupied[pos+3] = true;
+ occupied[pos + 1] = true;
+ occupied[pos + 2] = true;
+ occupied[pos + 3] = true;
}
segment.putInt(pos, random.nextInt());
@@ -713,9 +718,9 @@ public abstract class MemorySegmentTestBase {
continue;
} else {
occupied[pos] = true;
- occupied[pos+1] = true;
- occupied[pos+2] = true;
- occupied[pos+3] = true;
+ occupied[pos + 1] = true;
+ occupied[pos + 2] = true;
+ occupied[pos + 3] = true;
}
assertEquals(random.nextInt(), segment.getInt(pos));
@@ -847,19 +852,18 @@ public abstract class MemorySegmentTestBase {
int pos = random.nextInt(pageSize - 7);
if (occupied[pos] || occupied[pos + 1] || occupied[pos + 2] || occupied[pos + 3] ||
- occupied[pos + 4] || occupied[pos + 5] || occupied[pos + 6] || occupied[pos + 7])
- {
+ occupied[pos + 4] || occupied[pos + 5] || occupied[pos + 6] || occupied[pos + 7]) {
continue;
}
else {
occupied[pos] = true;
- occupied[pos+1] = true;
- occupied[pos+2] = true;
- occupied[pos+3] = true;
- occupied[pos+4] = true;
- occupied[pos+5] = true;
- occupied[pos+6] = true;
- occupied[pos+7] = true;
+ occupied[pos + 1] = true;
+ occupied[pos + 2] = true;
+ occupied[pos + 3] = true;
+ occupied[pos + 4] = true;
+ occupied[pos + 5] = true;
+ occupied[pos + 6] = true;
+ occupied[pos + 7] = true;
}
segment.putLong(pos, random.nextLong());
@@ -872,19 +876,18 @@ public abstract class MemorySegmentTestBase {
int pos = random.nextInt(pageSize - 7);
if (occupied[pos] || occupied[pos + 1] || occupied[pos + 2] || occupied[pos + 3] ||
- occupied[pos + 4] || occupied[pos + 5] || occupied[pos + 6] || occupied[pos + 7])
- {
+ occupied[pos + 4] || occupied[pos + 5] || occupied[pos + 6] || occupied[pos + 7]) {
continue;
}
else {
occupied[pos] = true;
- occupied[pos+1] = true;
- occupied[pos+2] = true;
- occupied[pos+3] = true;
- occupied[pos+4] = true;
- occupied[pos+5] = true;
- occupied[pos+6] = true;
- occupied[pos+7] = true;
+ occupied[pos + 1] = true;
+ occupied[pos + 2] = true;
+ occupied[pos + 3] = true;
+ occupied[pos + 4] = true;
+ occupied[pos + 5] = true;
+ occupied[pos + 6] = true;
+ occupied[pos + 7] = true;
}
assertEquals(random.nextLong(), segment.getLong(pos));
@@ -1019,9 +1022,9 @@ public abstract class MemorySegmentTestBase {
continue;
} else {
occupied[pos] = true;
- occupied[pos+1] = true;
- occupied[pos+2] = true;
- occupied[pos+3] = true;
+ occupied[pos + 1] = true;
+ occupied[pos + 2] = true;
+ occupied[pos + 3] = true;
}
segment.putFloat(pos, random.nextFloat());
@@ -1037,9 +1040,9 @@ public abstract class MemorySegmentTestBase {
continue;
} else {
occupied[pos] = true;
- occupied[pos+1] = true;
- occupied[pos+2] = true;
- occupied[pos+3] = true;
+ occupied[pos + 1] = true;
+ occupied[pos + 2] = true;
+ occupied[pos + 3] = true;
}
assertEquals(random.nextFloat(), segment.getFloat(pos), 0.0);
@@ -1170,19 +1173,18 @@ public abstract class MemorySegmentTestBase {
int pos = random.nextInt(pageSize - 7);
if (occupied[pos] || occupied[pos + 1] || occupied[pos + 2] || occupied[pos + 3] ||
- occupied[pos + 4] || occupied[pos + 5] || occupied[pos + 6] || occupied[pos + 7])
- {
+ occupied[pos + 4] || occupied[pos + 5] || occupied[pos + 6] || occupied[pos + 7]) {
continue;
}
else {
occupied[pos] = true;
- occupied[pos+1] = true;
- occupied[pos+2] = true;
- occupied[pos+3] = true;
- occupied[pos+4] = true;
- occupied[pos+5] = true;
- occupied[pos+6] = true;
- occupied[pos+7] = true;
+ occupied[pos + 1] = true;
+ occupied[pos + 2] = true;
+ occupied[pos + 3] = true;
+ occupied[pos + 4] = true;
+ occupied[pos + 5] = true;
+ occupied[pos + 6] = true;
+ occupied[pos + 7] = true;
}
segment.putDouble(pos, random.nextDouble());
@@ -1195,19 +1197,18 @@ public abstract class MemorySegmentTestBase {
int pos = random.nextInt(pageSize - 7);
if (occupied[pos] || occupied[pos + 1] || occupied[pos + 2] || occupied[pos + 3] ||
- occupied[pos + 4] || occupied[pos + 5] || occupied[pos + 6] || occupied[pos + 7])
- {
+ occupied[pos + 4] || occupied[pos + 5] || occupied[pos + 6] || occupied[pos + 7]) {
continue;
}
else {
occupied[pos] = true;
- occupied[pos+1] = true;
- occupied[pos+2] = true;
- occupied[pos+3] = true;
- occupied[pos+4] = true;
- occupied[pos+5] = true;
- occupied[pos+6] = true;
- occupied[pos+7] = true;
+ occupied[pos + 1] = true;
+ occupied[pos + 2] = true;
+ occupied[pos + 3] = true;
+ occupied[pos + 4] = true;
+ occupied[pos + 5] = true;
+ occupied[pos + 6] = true;
+ occupied[pos + 7] = true;
}
assertEquals(random.nextDouble(), segment.getDouble(pos), 0.0);
@@ -1222,7 +1223,7 @@ public abstract class MemorySegmentTestBase {
public void testBulkBytePutExceptions() {
final MemorySegment segment = createSegment(pageSize);
- byte[] bytes = new byte[pageSize / 4 + (pageSize%4)];
+ byte[] bytes = new byte[pageSize / 4 + (pageSize % 4)];
random.nextBytes(bytes);
// wrong positions into memory segment
@@ -1884,7 +1885,7 @@ public abstract class MemorySegmentTestBase {
testByteBufferGet(false);
testByteBufferGet(true);
}
-
+
private void testByteBufferGet(boolean directBuffer) {
MemorySegment seg = createSegment(pageSize);
byte[] bytes = new byte[pageSize];
@@ -1926,7 +1927,7 @@ public abstract class MemorySegmentTestBase {
ByteBuffer source = directBuffer ?
ByteBuffer.allocateDirect(pageSize) :
ByteBuffer.allocate(pageSize);
-
+
source.put(bytes);
source.clear();
@@ -1969,9 +1970,9 @@ public abstract class MemorySegmentTestBase {
ByteBuffer target = directBuffer ?
ByteBuffer.allocateDirect(pageSize + 49) :
ByteBuffer.allocate(pageSize + 49);
-
+
target.position(19).limit(19 + pageSize);
-
+
ByteBuffer slicedTarget = target.slice();
// transfer the segment in chunks into the byte buffer
@@ -2004,7 +2005,7 @@ public abstract class MemorySegmentTestBase {
ByteBuffer source = directBuffer ?
ByteBuffer.allocateDirect(pageSize + 49) :
ByteBuffer.allocate(pageSize + 49);
-
+
source.put(bytes);
source.position(19).limit(19 + pageSize);
ByteBuffer slicedSource = source.slice();
@@ -2048,8 +2049,7 @@ public abstract class MemorySegmentTestBase {
for (ByteBuffer bb : new ByteBuffer[] {
ByteBuffer.allocate(bbCapacity),
- ByteBuffer.allocateDirect(bbCapacity) } )
- {
+ ByteBuffer.allocateDirect(bbCapacity) }) {
for (int off : validOffsets) {
for (int len : invalidLengths) {
try {
@@ -2141,7 +2141,6 @@ public abstract class MemorySegmentTestBase {
assertEquals(0, bb.position());
assertEquals(bb.capacity(), bb.limit());
-
int pos = bb.capacity() / 3;
int limit = 2 * bb.capacity() / 3;
bb.limit(limit);
@@ -2167,7 +2166,7 @@ public abstract class MemorySegmentTestBase {
assertEquals(pos, bb.position());
assertEquals(limit, bb.limit());
}
-
+
// ------------------------------------------------------------------------
// Comparing and swapping
// ------------------------------------------------------------------------
@@ -2199,7 +2198,7 @@ public abstract class MemorySegmentTestBase {
int pos2 = random.nextInt(bytes2.length);
int len = Math.min(Math.min(bytes1.length - pos1, bytes2.length - pos2),
- random.nextInt(pageSize / 50 ));
+ random.nextInt(pageSize / 50));
int cmp = seg1.compare(seg2, pos1, pos2, len);
@@ -2214,34 +2213,34 @@ public abstract class MemorySegmentTestBase {
@Test
public void testSwapBytes() {
- final int HALF_SIZE = pageSize / 2;
+ final int halfPageSize = pageSize / 2;
final byte[] bytes1 = new byte[pageSize];
- final byte[] bytes2 = new byte[HALF_SIZE];
+ final byte[] bytes2 = new byte[halfPageSize];
Arrays.fill(bytes2, (byte) 1);
MemorySegment seg1 = createSegment(pageSize);
- MemorySegment seg2 = createSegment(HALF_SIZE);
+ MemorySegment seg2 = createSegment(halfPageSize);
seg1.put(0, bytes1);
seg2.put(0, bytes2);
// wap the second half of the first segment with the second segment
int pos = 0;
- while (pos < HALF_SIZE) {
+ while (pos < halfPageSize) {
int len = random.nextInt(pageSize / 40);
- len = Math.min(len, HALF_SIZE - pos);
- seg1.swapBytes(new byte[len], seg2, pos + HALF_SIZE, pos, len);
+ len = Math.min(len, halfPageSize - pos);
+ seg1.swapBytes(new byte[len], seg2, pos + halfPageSize, pos, len);
pos += len;
}
// the second segment should now be all zeros, the first segment should have one in its second half
- for (int i = 0; i < HALF_SIZE; i++) {
+ for (int i = 0; i < halfPageSize; i++) {
assertEquals((byte) 0, seg1.get(i));
assertEquals((byte) 0, seg2.get(i));
- assertEquals((byte) 1, seg1.get(i + HALF_SIZE));
+ assertEquals((byte) 1, seg1.get(i + halfPageSize));
}
}
@@ -2300,9 +2299,9 @@ public abstract class MemorySegmentTestBase {
assertTrue(e instanceof IllegalStateException || e instanceof NullPointerException);
}
}
-
+
// ------------------------------------------------------------------------
- // Miscellaneous
+ // Miscellaneous
// ------------------------------------------------------------------------
@Test
@@ -2389,26 +2388,26 @@ public abstract class MemorySegmentTestBase {
@Test
public void testSizeAndFreeing() {
// a segment without an owner has a null owner
- final int SIZE = 651;
- MemorySegment seg = createSegment(SIZE);
+ final int segmentSize = 651;
+ MemorySegment seg = createSegment(segmentSize);
- assertEquals(SIZE, seg.size());
+ assertEquals(segmentSize, seg.size());
assertFalse(seg.isFreed());
seg.free();
assertTrue(seg.isFreed());
- assertEquals(SIZE, seg.size());
+ assertEquals(segmentSize, seg.size());
}
-
+
// ------------------------------------------------------------------------
// Parametrization to run with different segment sizes
// ------------------------------------------------------------------------
-
+
@Parameterized.Parameters(name = "segment-size = {0}")
public static Collection<Object[]> executionModes(){
return Arrays.asList(
- new Object[] { 32*1024 },
- new Object[] { 4*1024 },
- new Object[] { 512*1024 } );
+ new Object[] { 32 * 1024 },
+ new Object[] { 4 * 1024 },
+ new Object[] { 512 * 1024 });
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flink/blob/c3235c39/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentUndersizedTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentUndersizedTest.java b/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentUndersizedTest.java
index 950da0e..5f80742 100644
--- a/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentUndersizedTest.java
+++ b/flink-core/src/test/java/org/apache/flink/core/memory/MemorySegmentUndersizedTest.java
@@ -31,8 +31,12 @@ import java.nio.ByteBuffer;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+/**
+ * Tests for undersized {@link HeapMemorySegment} and {@link HybridMemorySegment} (in both heap and
+ * off-heap modes).
+ */
public class MemorySegmentUndersizedTest {
-
+
@Test
public void testZeroSizeHeapSegment() {
MemorySegment segment = new HeapMemorySegment(new byte[0]);
@@ -109,7 +113,7 @@ public class MemorySegmentUndersizedTest {
assertTrue(e instanceof IndexOutOfBoundsException);
}
}
-
+
private static void testSegmentWithSizeLargerZero(MemorySegment segment) {
// ------ bytes ------
@@ -145,7 +149,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.put(Integer.MAX_VALUE, (byte) 0);
fail("IndexOutOfBoundsException expected");
@@ -161,7 +165,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.get(1);
fail("IndexOutOfBoundsException expected");
@@ -169,7 +173,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.get(-1);
fail("IndexOutOfBoundsException expected");
@@ -193,7 +197,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.get(Integer.MAX_VALUE);
fail("IndexOutOfBoundsException expected");
@@ -243,7 +247,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.putBoolean(Integer.MAX_VALUE, true);
fail("IndexOutOfBoundsException expected");
@@ -259,7 +263,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.getBoolean(1);
fail("IndexOutOfBoundsException expected");
@@ -373,7 +377,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.getChar(1);
fail("IndexOutOfBoundsException expected");
@@ -487,7 +491,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.getShort(1);
fail("IndexOutOfBoundsException expected");
@@ -971,7 +975,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.getDouble(Integer.MIN_VALUE);
fail("IndexOutOfBoundsException expected");
@@ -979,7 +983,6 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
// ------ byte[] ------
@@ -1046,7 +1049,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.get(1, new byte[7]);
fail("IndexOutOfBoundsException expected");
@@ -1098,8 +1101,8 @@ public class MemorySegmentUndersizedTest {
// ------ ByteBuffer ------
final ByteBuffer buf = ByteBuffer.allocate(7);
- final int numBytes = 3;
-
+ final int numBytes = 3;
+
try {
segment.put(0, buf, numBytes);
fail("IndexOutOfBoundsException expected");
@@ -1139,7 +1142,7 @@ public class MemorySegmentUndersizedTest {
catch (Exception e) {
assertTrue(e instanceof IndexOutOfBoundsException);
}
-
+
try {
segment.put(Integer.MAX_VALUE, buf, numBytes);
fail("IndexOutOfBoundsException expected");
@@ -1215,7 +1218,7 @@ public class MemorySegmentUndersizedTest {
final DataInput dataInput = new DataInputStream(new ByteArrayInputStream(new byte[20]));
final DataOutput dataOutput = new DataOutputStream(new ByteArrayOutputStream());
-
+
try {
segment.put(dataInput, 0, numBytes);
fail("IndexOutOfBoundsException expected");
http://git-wip-us.apache.org/repos/asf/flink/blob/c3235c39/flink-core/src/test/java/org/apache/flink/core/memory/OperationsOnFreedSegmentTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/core/memory/OperationsOnFreedSegmentTest.java b/flink-core/src/test/java/org/apache/flink/core/memory/OperationsOnFreedSegmentTest.java
index 57f3db1..ad9d63f 100644
--- a/flink-core/src/test/java/org/apache/flink/core/memory/OperationsOnFreedSegmentTest.java
+++ b/flink-core/src/test/java/org/apache/flink/core/memory/OperationsOnFreedSegmentTest.java
@@ -28,12 +28,17 @@ import java.io.DataOutput;
import java.io.DataOutputStream;
import java.nio.ByteBuffer;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+/**
+ * Various tests with freed memory segments for {@link HeapMemorySegment} and {@link
+ * HybridMemorySegment} (in both heap and off-heap modes).
+ */
public class OperationsOnFreedSegmentTest {
private static final int PAGE_SIZE = (int) ((Math.random() * 10000) + 1000);
-
+
@Test
public void testSingleSegmentOperationsHeapSegment() throws Exception {
testOpsOnFreedSegment(new HeapMemorySegment(new byte[PAGE_SIZE]));
@@ -78,7 +83,7 @@ public class OperationsOnFreedSegmentTest {
}
}
}
-
+
@Test
public void testCopyTo() {
MemorySegment aliveHeap = new HeapMemorySegment(new byte[PAGE_SIZE]);
@@ -154,13 +159,13 @@ public class OperationsOnFreedSegmentTest {
}
}
}
-
+
private void testOpsOnFreedSegment(MemorySegment segment) throws Exception {
segment.free();
assertTrue(segment.isFreed());
-
- // --------- bytes -----------
-
+
+ // --------- bytes -----------
+
try {
segment.get(0);
fail("Should fail with an exception");
@@ -190,7 +195,7 @@ public class OperationsOnFreedSegmentTest {
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
-
+
try {
segment.get(Integer.MAX_VALUE);
fail("Should fail with an exception");
@@ -245,7 +250,7 @@ public class OperationsOnFreedSegmentTest {
}
catch (IllegalStateException | NullPointerException ignored) {}
- // --------- booleans -----------
+ // --------- booleans -----------
try {
segment.getBoolean(0);
@@ -330,8 +335,8 @@ public class OperationsOnFreedSegmentTest {
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException ignored) {}
-
- // --------- char -----------
+
+ // --------- char -----------
try {
segment.getChar(0);
@@ -417,7 +422,7 @@ public class OperationsOnFreedSegmentTest {
}
catch (IllegalStateException ignored) {}
- // --------- short -----------
+ // --------- short -----------
try {
segment.getShort(0);
@@ -503,7 +508,7 @@ public class OperationsOnFreedSegmentTest {
}
catch (IllegalStateException ignored) {}
- // --------- integer -----------
+ // --------- integer -----------
try {
segment.getInt(0);
@@ -589,7 +594,7 @@ public class OperationsOnFreedSegmentTest {
}
catch (IllegalStateException ignored) {}
- // --------- longs -----------
+ // --------- longs -----------
try {
segment.getLong(0);
@@ -675,7 +680,7 @@ public class OperationsOnFreedSegmentTest {
}
catch (IllegalStateException ignored) {}
- // --------- floats -----------
+ // --------- floats -----------
try {
segment.getFloat(0);
@@ -761,7 +766,7 @@ public class OperationsOnFreedSegmentTest {
}
catch (IllegalStateException ignored) {}
- // --------- doubles -----------
+ // --------- doubles -----------
try {
segment.getDouble(0);
@@ -847,10 +852,10 @@ public class OperationsOnFreedSegmentTest {
}
catch (IllegalStateException ignored) {}
- // --------- byte[] -----------
+ // --------- byte[] -----------
final byte[] array = new byte[55];
-
+
try {
segment.get(0, array, 3, 17);
fail("Should fail with an exception");
@@ -935,90 +940,90 @@ public class OperationsOnFreedSegmentTest {
}
catch (IllegalStateException | NullPointerException ignored) {}
- // --------- ByteBuffer -----------
+ // --------- ByteBuffer -----------
for (ByteBuffer bbuf : new ByteBuffer[] {
ByteBuffer.allocate(55),
- ByteBuffer.allocateDirect(55) } )
- {
+ ByteBuffer.allocateDirect(55) }) {
+
try {
segment.get(0, bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException ignored) {}
-
+
try {
segment.get(-1, bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
-
+
try {
segment.get(1, bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException ignored) {}
-
+
try {
segment.get(segment.size(), bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException ignored) {}
-
+
try {
segment.get(-segment.size(), bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
-
+
try {
segment.get(Integer.MAX_VALUE, bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
-
+
try {
segment.get(Integer.MIN_VALUE, bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
-
+
try {
segment.put(0, bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
-
+
try {
segment.put(-1, bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
-
+
try {
segment.put(1, bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException ignored) {}
-
+
try {
segment.put(segment.size(), bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException ignored) {}
-
+
try {
segment.put(-segment.size(), bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
-
+
try {
- segment.put(Integer.MAX_VALUE,bbuf, 17);
+ segment.put(Integer.MAX_VALUE, bbuf, 17);
fail("Should fail with an exception");
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
-
+
try {
segment.put(Integer.MIN_VALUE, bbuf, 17);
fail("Should fail with an exception");
@@ -1026,7 +1031,7 @@ public class OperationsOnFreedSegmentTest {
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
}
- // --------- Data Input / Output -----------
+ // --------- Data Input / Output -----------
final DataInput din = new DataInputStream(new ByteArrayInputStream(new byte[100]));
final DataOutput dout = new DataOutputStream(new ByteArrayOutputStream());
@@ -1115,12 +1120,11 @@ public class OperationsOnFreedSegmentTest {
}
catch (IllegalStateException | NullPointerException | IndexOutOfBoundsException ignored) {}
}
-
-
+
private void testCompare(MemorySegment seg1, MemorySegment seg2) {
int[] offsetsToTest = { 0, 1, -1, seg1.size(), -seg1.size(), Integer.MAX_VALUE, Integer.MIN_VALUE };
int[] lengthsToTest = { 1, seg1.size(), Integer.MAX_VALUE };
-
+
for (int off1 : offsetsToTest) {
for (int off2 : offsetsToTest) {
for (int len : lengthsToTest) {
@@ -1155,7 +1159,7 @@ public class OperationsOnFreedSegmentTest {
int[] offsetsToTest = { 0, 1, -1, seg1.size(), -seg1.size(), Integer.MAX_VALUE, Integer.MIN_VALUE };
int[] lengthsToTest = { 0, 1, -1, seg1.size(), -seg1.size(), Integer.MAX_VALUE, Integer.MIN_VALUE };
byte[] swapBuffer = new byte[seg1.size()];
-
+
for (int off1 : offsetsToTest) {
for (int off2 : offsetsToTest) {
for (int len : lengthsToTest) {
http://git-wip-us.apache.org/repos/asf/flink/blob/c3235c39/flink-runtime/src/main/java/org/apache/flink/runtime/memory/MemoryManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/memory/MemoryManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/memory/MemoryManager.java
index e53237a..192a586 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/memory/MemoryManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/memory/MemoryManager.java
@@ -685,7 +685,7 @@ public class MemoryManager {
hybridSegment.free();
}
else {
- throw new IllegalArgumentException("Memory segment is not a " + HeapMemorySegment.class.getSimpleName());
+ throw new IllegalArgumentException("Memory segment is not a " + HybridMemorySegment.class.getSimpleName());
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/c3235c39/tools/maven/suppressions-core.xml
----------------------------------------------------------------------
diff --git a/tools/maven/suppressions-core.xml b/tools/maven/suppressions-core.xml
index d0d838a..066b30a 100644
--- a/tools/maven/suppressions-core.xml
+++ b/tools/maven/suppressions-core.xml
@@ -128,14 +128,6 @@ under the License.
checks="AvoidStarImport"/>
<suppress
- files="(.*)core[/\\]memory[/\\](.*)"
- checks="NewlineAtEndOfFile|RegexpSingleline|TodoComment|RedundantImport|ImportOrder|RedundantModifier|JavadocMethod|JavadocParagraph|JavadocType|JavadocStyle|PackageName|TypeNameCheck|ConstantNameCheck|StaticVariableNameCheck|MemberNameCheck|MethodNameCheck|ParameterName|LocalFinalVariableName|LocalVariableName|LeftCurly|UpperEll|FallThrough|reliefPattern|SimplifyBooleanExpression|EmptyStatement|ModifierOrder|EmptyLineSeparator|WhitespaceAround|WhitespaceAfter|NoWhitespaceAfter|NoWhitespaceBefore|OperatorWrap|ParenPad"/>
- <!--Only additional checks for test sources. Those checks were present in the "pre-strict" checkstyle but were not applied to test sources. We do not want to suppress them for sources directory-->
- <suppress
- files="(.*)test[/\\](.*)core[/\\]memory[/\\](.*)"
- checks="AvoidStarImport"/>
-
- <suppress
files="(.*)migration[/\\](.*)"
checks="NewlineAtEndOfFile|RegexpSingleline|TodoComment|RedundantImport|ImportOrder|RedundantModifier|JavadocMethod|JavadocParagraph|JavadocType|JavadocStyle|PackageName|TypeNameCheck|ConstantNameCheck|StaticVariableNameCheck|MemberNameCheck|MethodNameCheck|ParameterName|LocalFinalVariableName|LocalVariableName|LeftCurly|UpperEll|FallThrough|reliefPattern|SimplifyBooleanExpression|EmptyStatement|ModifierOrder|EmptyLineSeparator|WhitespaceAround|WhitespaceAfter|NoWhitespaceAfter|NoWhitespaceBefore|OperatorWrap|ParenPad"/>