[FLINK-13073][table-blink-runtime] BinaryRow in Blink runtime has wro…

…ng FIRST_BYTE_ZERO mask This closes apache#8961
wuchong · Jul 4, 2019 · 5d0f749 · 5d0f749
1 parent a39ade1
commit 5d0f749
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/.../flink-table-runtime-blink/src/main/java/org/apache/flink/table/dataformat/BinaryRow.java b/.../flink-table-runtime-blink/src/main/java/org/apache/flink/table/dataformat/BinaryRow.java
@@ -55,7 +55,7 @@
 public final class BinaryRow extends BinaryFormat implements BaseRow {
 
 	public static final boolean LITTLE_ENDIAN = (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN);
-	private static final long FIRST_BYTE_ZERO = LITTLE_ENDIAN ? 0xFFF0 : 0x0FFF;
+	private static final long FIRST_BYTE_ZERO = LITTLE_ENDIAN ? ~0xFFL : ~(0xFFL << 56L);
 	public static final int HEADER_SIZE_IN_BITS = 8;
 
 	public static int calculateBitSetWidthInBytes(int arity) {

diff --git a/...nk-table-runtime-blink/src/test/java/org/apache/flink/table/dataformat/BinaryRowTest.java b/...nk-table-runtime-blink/src/test/java/org/apache/flink/table/dataformat/BinaryRowTest.java
@@ -289,16 +289,13 @@ public void anyNullTest() throws IOException {
 			assertTrue(row.anyNull());
 		}
 
-		{
-			BinaryRow row = new BinaryRow(80);
+		int numFields = 80;
+		for (int i = 0; i < numFields; i++) {
+			BinaryRow row = new BinaryRow(numFields);
 			BinaryRowWriter writer = new BinaryRowWriter(row);
+			row.setHeader((byte) 17);
 			assertFalse(row.anyNull());
-
-			writer.setNullAt(3);
-			assertTrue(row.anyNull());
-
-			writer = new BinaryRowWriter(row);
-			writer.setNullAt(65);
+			writer.setNullAt(i);
 			assertTrue(row.anyNull());
 		}
 	}