This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-14743-compaction
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-14743-compaction by
this push:
new 8ab6653 Minor.
8ab6653 is described below
commit 8ab6653b76bc125f42ff0b5d7fe9339bbc14e552
Author: Andrew Mashenkov <andrey.mashen...@gmail.com>
AuthorDate: Sat Jun 26 01:07:43 2021 +0300
Minor.
---
.../marshaller/reflection/JavaSerializer.java | 2 +-
.../internal/schema/row/ExpandableByteBuf.java | 7 ++
.../ignite/internal/schema/row/RowAssembler.java | 23 ++++-
.../schema/RowAssemblerAdvancedSchemaTest.java | 30 +++---
.../schema/RowAssemblerSimpleSchemaTest.java | 108 ++++++++++-----------
.../org/apache/ignite/internal/schema/RowTest.java | 2 +-
.../ignite/distributed/ITDistributedTableTest.java | 4 +-
.../ignite/internal/table/TupleMarshallerImpl.java | 3 +-
.../TupleMarshallerVarlenOnlyBenchmark.java | 13 ++-
.../raft/PartitionCommandListenerTest.java | 4 +-
10 files changed, 109 insertions(+), 87 deletions(-)
diff --git
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializer.java
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializer.java
index 06ac189..8f514bc 100644
---
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializer.java
+++
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/JavaSerializer.java
@@ -71,7 +71,7 @@ public class JavaSerializer extends AbstractSerializer {
keyMarsh.writeObject(key, asm);
valMarsh.writeObject(val, asm);
- return asm.build();
+ return asm.toBytes();
}
/**
diff --git
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/ExpandableByteBuf.java
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/ExpandableByteBuf.java
index 72cae54..ae5dd89 100644
---
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/ExpandableByteBuf.java
+++
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/ExpandableByteBuf.java
@@ -309,4 +309,11 @@ public class ExpandableByteBuf {
buf = ByteBuffer.wrap(arr);
buf.order(ByteOrder.LITTLE_ENDIAN);
}
+
+ /**
+ * @return Underlying buffer.
+ */
+ public ByteBuffer unwrap() {
+ return buf.duplicate().limit(len).order(ByteOrder.LITTLE_ENDIAN);
+ }
}
diff --git
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/RowAssembler.java
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/RowAssembler.java
index e6661b8..b821853 100644
---
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/RowAssembler.java
+++
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/RowAssembler.java
@@ -27,6 +27,7 @@ import org.apache.ignite.internal.schema.AssemblyException;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryRow.RowFlags;
import org.apache.ignite.internal.schema.BitmaskNativeType;
+import org.apache.ignite.internal.schema.ByteBufferRow;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.Columns;
import org.apache.ignite.internal.schema.NativeType;
@@ -426,7 +427,25 @@ public class RowAssembler {
/**
* @return Serialized row.
*/
- public byte[] build() {
+ public BinaryRow build() {
+ flush();
+
+ return new ByteBufferRow(buf.unwrap());
+ }
+
+ /**
+ * @return Row bytes.
+ */
+ public byte[] toBytes() {
+ flush();
+
+ return buf.toArray();
+ }
+
+ /**
+ * Finish building row.
+ */
+ private void flush() {
if (schema.keyColumns() == curCols)
throw new AssemblyException("Key column missed: colIdx=" + curCol);
else {
@@ -440,8 +459,6 @@ public class RowAssembler {
buf.putShort(BinaryRow.FLAGS_FIELD_OFFSET, flags);
buf.putInt(BinaryRow.KEY_HASH_FIELD_OFFSET, keyHash);
-
- return buf.toArray();
}
/**
diff --git
a/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerAdvancedSchemaTest.java
b/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerAdvancedSchemaTest.java
index 1668bcb..0027774 100644
---
a/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerAdvancedSchemaTest.java
+++
b/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerAdvancedSchemaTest.java
@@ -63,7 +63,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendByte((byte)-44)
.appendShort((short)-66)
.appendNull()
- .build());
+ .toBytes());
// First col null.
assertRowBytesEquals(
@@ -75,7 +75,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendNull()
.appendShort((short)-55)
.appendInt(-66)
- .build());
+ .toBytes());
// Middle col null.
assertRowBytesEquals(new byte[] {42, 0, 0, -120, 108, 41, 0, 0, 10, 0,
0, 0, 2, 11, 33, 0, 0, 0, 10, 0, 0, 0, 2, -44, -66, -1, -1, -1},
@@ -86,7 +86,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendByte((byte)-44)
.appendNull()
.appendInt(-66)
- .build());
+ .toBytes());
// Null both.
assertRowBytesEquals(new byte[] {42, 0, 0, -120, 0, 0, 0, 0, 5, 0, 0,
0, 7, 5, 0, 0, 0, 7},
@@ -97,7 +97,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendNull()
.appendNull()
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(new byte[] {42, 0, 1, 8, 22, 44, 0, 0, 12, 0, 0,
0, 0, 11, 22, 0, 33, 0, 0, 0},
@@ -105,7 +105,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendByte((byte)11)
.appendShort((short)22)
.appendInt(33)
- .build());
+ .toBytes());
}
/**
@@ -138,7 +138,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendBytes(new byte[] {33, -77})
.appendString("我愛Java")
.appendNull()
- .build());
+ .toBytes());
// Fist col null.
assertRowBytesEquals(
@@ -153,7 +153,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendNull()
.appendString("我愛Java")
.appendString("ascii")
- .build());
+ .toBytes());
// Middle col null.
assertRowBytesEquals(
@@ -168,7 +168,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendBytes(new byte[] {33, -77})
.appendNull()
.appendString("ascii")
- .build());
+ .toBytes());
// Null both.
assertRowBytesEquals(
@@ -180,7 +180,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendNull()
.appendNull()
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
@@ -191,7 +191,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendBytes(new byte[] {33, -77, 120})
.appendString("我愛Java")
.appendString("ascii")
- .build());
+ .toBytes());
}
/**
@@ -227,7 +227,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendNull()
.appendBytes(new byte[] {77, -88})
.appendString("ascii")
- .build());
+ .toBytes());
// Check null/non-null fixlen.
assertRowBytesEquals(
@@ -244,7 +244,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendNull()
.appendBytes(new byte[] {77, -88})
.appendString("ascii")
- .build());
+ .toBytes());
// Check null/non-null varlen.
assertRowBytesEquals(
@@ -261,7 +261,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendShort((short)22)
.appendBytes(new byte[] {77, -88})
.appendNull()
- .build());
+ .toBytes());
// Check null/non-null mixed.
assertRowBytesEquals(
@@ -278,7 +278,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendShort((short)22)
.appendBytes(new byte[] {77, -88})
.appendNull()
- .build());
+ .toBytes());
// Check all null/non-null.
assertRowBytesEquals(
@@ -295,7 +295,7 @@ public class RowAssemblerAdvancedSchemaTest {
.appendNull()
.appendNull()
.appendNull()
- .build());
+ .toBytes());
}
/**
diff --git
a/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerSimpleSchemaTest.java
b/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerSimpleSchemaTest.java
index 6aa5015..4e94543 100644
---
a/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerSimpleSchemaTest.java
+++
b/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerSimpleSchemaTest.java
@@ -54,7 +54,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendInt(33)
.appendInt(-71)
- .build());
+ .toBytes());
// Null value.
assertRowBytesEquals(
@@ -62,14 +62,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendInt(33)
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 12, 33, 0, 0, 0, 8, 0, 0, 0, 33, 0, 0, 0},
new RowAssembler(schema, 128, 0, 128, 0)
.appendInt(33)
- .build());
+ .toBytes());
}
/**
@@ -87,14 +87,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
.appendShort((short)-71)
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 12, 33, 0, 0, 0, 6, 0, 0, 0, 33, 0},
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
- .build());
+ .toBytes());
}
/**
@@ -111,7 +111,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 1)
.appendShort((short)-33)
.appendString("val")
- .build());
+ .toBytes());
// Null value.
assertRowBytesEquals(
@@ -119,14 +119,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 12, 33, 0, 0, 0, 6, 0, 0, 0, 33, 0},
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
- .build());
+ .toBytes());
}
/**
@@ -143,14 +143,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 1)
.appendShort((short)-33)
.appendString("val")
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 12, 33, 0, 0, 0, 6, 0, 0, 0, 33, 0},
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
- .build());
+ .toBytes());
}
/**
@@ -167,7 +167,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)-33)
.appendByte((byte)71)
- .build());
+ .toBytes());
// Null key.
assertRowBytesEquals(
@@ -175,14 +175,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendNull()
.appendByte((byte)-71)
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 8, 33, 0, 0, 0, 7, 0, 0, 0, 0, 33, 0},
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
- .build());
+ .toBytes());
}
/**
@@ -200,7 +200,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendNull()
.appendShort((short)33)
- .build());
+ .toBytes());
// Null value.
assertRowBytesEquals(
@@ -208,7 +208,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
.appendNull()
- .build());
+ .toBytes());
// Null both.
assertRowBytesEquals(
@@ -216,14 +216,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendNull()
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 8, 33, 0, 0, 0, 7, 0, 0, 0, 0, 33, 0},
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
- .build());
+ .toBytes());
}
@@ -241,7 +241,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 1)
.appendShort((short)33)
.appendString("val")
- .build());
+ .toBytes());
// Null key.
assertRowBytesEquals(
@@ -249,7 +249,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 1)
.appendNull()
.appendString("val")
- .build());
+ .toBytes());
// Null value.
assertRowBytesEquals(
@@ -257,7 +257,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
.appendNull()
- .build());
+ .toBytes());
// Null both.
assertRowBytesEquals(
@@ -265,14 +265,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendNull()
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 8, 33, 0, 0, 0, 7, 0, 0, 0, 0, 33, 0},
new RowAssembler(schema, 128, 0, 128, 0)
.appendShort((short)33)
- .build());
+ .toBytes());
}
/**
@@ -288,21 +288,21 @@ public class RowAssemblerSimpleSchemaTest {
new byte[] {42, 0, 0, -56, 33, 0, 0, 0, 6, 0, 0, 0, 0, 33, 7, 0,
0, 0, 118, 97, 108},
new RowAssembler(schema, 128, 0, 128, 1)
.appendByte((byte)33)
- .appendString("val").build());
+ .appendString("val").toBytes());
// Null key.
assertRowBytesEquals(
new byte[] {42, 0, 0, -56, 0, 0, 0, 0, 5, 0, 0, 0, 1, 7, 0, 0, 0,
118, 97, 108},
new RowAssembler(schema, 128, 0, 128, 1)
.appendNull()
- .appendString("val").build());
+ .appendString("val").toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 8, 33, 0, 0, 0, 6, 0, 0, 0, 0, 33},
new RowAssembler(schema, 128, 0, 128, 0)
.appendByte((byte)33)
- .build());
+ .toBytes());
}
/**
@@ -321,7 +321,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
.appendUuid(uuidVal)
- .build());
+ .toBytes());
// Null value.
assertRowBytesEquals(
@@ -329,14 +329,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 12, 95, -98, 1, 0, 7, 0, 0, 0, 107, 101,
121},
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
- .build());
+ .toBytes());
}
@@ -356,14 +356,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
.appendUuid(uuidVal)
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 12, 95, -98, 1, 0, 7, 0, 0, 0, 107, 101,
121},
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
- .build());
+ .toBytes());
}
@@ -384,7 +384,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 1)
.appendString("key")
.appendBytes(new byte[] {-1, 1, 0, 120})
- .build());
+ .toBytes());
// Null value.
assertRowBytesEquals(
@@ -392,14 +392,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 12, 95, -98, 1, 0, 7, 0, 0, 0, 107, 101,
121},
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
- .build());
+ .toBytes());
}
@@ -417,14 +417,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 1)
.appendString("key")
.appendBytes(new byte[] {-1, 1, 0, 120})
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 12, 95, -98, 1, 0, 7, 0, 0, 0, 107, 101,
121},
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
- .build());
+ .toBytes());
}
/**
@@ -441,7 +441,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
.appendShort((short)-71)
- .build());
+ .toBytes());
// Null key.
assertRowBytesEquals(
@@ -449,7 +449,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendNull()
.appendShort((short)71)
- .build());
+ .toBytes());
// Null value.
assertRowBytesEquals(
@@ -457,7 +457,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
.appendNull()
- .build());
+ .toBytes());
// Null both.
assertRowBytesEquals(
@@ -465,14 +465,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendNull()
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 8, 95, -98, 1, 0, 8, 0, 0, 0, 0, 107, 101,
121},
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
- .build());
+ .toBytes());
}
@@ -490,7 +490,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
.appendShort((short)-71L)
- .build());
+ .toBytes());
// Null key.
assertRowBytesEquals(
@@ -498,14 +498,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendNull()
.appendShort((short)71)
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 8, 95, -98, 1, 0, 8, 0, 0, 0, 0, 107, 101,
121},
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
- .build());
+ .toBytes());
}
/**
@@ -522,7 +522,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 1)
.appendString("key")
.appendBytes(new byte[] {-1, 1, 0, 120})
- .build());
+ .toBytes());
// Null key.
assertRowBytesEquals(
@@ -530,7 +530,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 1)
.appendNull()
.appendBytes(new byte[] {-1, 1, 0, 120})
- .build());
+ .toBytes());
// Null value.
assertRowBytesEquals(
@@ -538,7 +538,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
.appendNull()
- .build());
+ .toBytes());
// Null both.
assertRowBytesEquals(
@@ -546,14 +546,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 0)
.appendNull()
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 8, 95, -98, 1, 0, 8, 0, 0, 0, 0, 107, 101,
121},
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
- .build());
+ .toBytes());
}
/**
@@ -570,7 +570,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 1)
.appendString("key")
.appendBytes(new byte[] {-1, 1, 0, 120})
- .build());
+ .toBytes());
// Null key.
assertRowBytesEquals(
@@ -578,14 +578,14 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 0, 128, 1)
.appendNull()
.appendBytes(new byte[] {-1, 1, 0, 120})
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(
new byte[] {42, 0, 1, 8, 95, -98, 1, 0, 8, 0, 0, 0, 0, 107, 101,
121},
new RowAssembler(schema, 128, 1, 128, 0)
.appendString("key")
- .build());
+ .toBytes());
}
/**
@@ -612,7 +612,7 @@ public class RowAssemblerSimpleSchemaTest {
.appendString("keystr")
.appendInt(73)
.appendString("valstr")
- .build());
+ .toBytes());
// Null value.
assertRowBytesEquals(new byte[] {
@@ -624,7 +624,7 @@ public class RowAssemblerSimpleSchemaTest {
.appendString("keystr2")
.appendNull()
.appendNull()
- .build());
+ .toBytes());
// No value.
assertRowBytesEquals(new byte[] {
@@ -633,7 +633,7 @@ public class RowAssemblerSimpleSchemaTest {
new RowAssembler(schema, 128, 1, 128, 0)
.appendShort((short)33)
.appendString("keystr")
- .build());
+ .toBytes());
}
/**
diff --git
a/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowTest.java
b/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowTest.java
index ac149bd..39ccd97 100644
---
a/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowTest.java
+++
b/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowTest.java
@@ -486,7 +486,7 @@ public class RowTest {
}
}
- byte[] data = asm.build();
+ byte[] data = asm.toBytes();
Row row = new Row(schema, new ByteBufferRow(data));
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ITDistributedTableTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ITDistributedTableTest.java
index f44226f..9b8ef6e 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ITDistributedTableTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ITDistributedTableTest.java
@@ -194,7 +194,7 @@ public class ITDistributedTableTest {
rowBuilder.appendLong(1L);
- return new Row(SCHEMA, new ByteBufferRow(rowBuilder.build()));
+ return new Row(SCHEMA, new ByteBufferRow(rowBuilder.toBytes()));
}
/**
@@ -208,7 +208,7 @@ public class ITDistributedTableTest {
rowBuilder.appendLong(1L);
rowBuilder.appendLong(10L);
- return new Row(SCHEMA, new ByteBufferRow(rowBuilder.build()));
+ return new Row(SCHEMA, new ByteBufferRow(rowBuilder.toBytes()));
}
/**
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/TupleMarshallerImpl.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/TupleMarshallerImpl.java
index a863899..287269a 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/TupleMarshallerImpl.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/TupleMarshallerImpl.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.BitSet;
import java.util.Objects;
import java.util.UUID;
-import org.apache.ignite.internal.schema.ByteBufferRow;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.Columns;
import org.apache.ignite.internal.schema.SchemaDescriptor;
@@ -80,7 +79,7 @@ public class TupleMarshallerImpl implements TupleMarshaller {
}
}
- return new Row(schema, new ByteBufferRow(rowBuilder.build()));
+ return new Row(schema, rowBuilder.build());
}
/**
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/benchmarks/TupleMarshallerVarlenOnlyBenchmark.java
b/modules/table/src/test/java/org/apache/ignite/internal/benchmarks/TupleMarshallerVarlenOnlyBenchmark.java
index 0fb6b24..79d4bcf 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/benchmarks/TupleMarshallerVarlenOnlyBenchmark.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/benchmarks/TupleMarshallerVarlenOnlyBenchmark.java
@@ -17,9 +17,11 @@
package org.apache.ignite.internal.benchmarks;
+import java.io.Serializable;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
import java.util.stream.IntStream;
import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.Columns;
@@ -62,7 +64,7 @@ import static
org.apache.ignite.internal.schema.NativeTypes.STRING;
@SuppressWarnings("InstanceVariableMayNotBeInitialized")
public class TupleMarshallerVarlenOnlyBenchmark {
/** Random. */
- private Random rnd = new Random();
+ private Random rnd;
/** Tuple marshaller. */
private TupleMarshaller marshaller;
@@ -113,7 +115,7 @@ public class TupleMarshallerVarlenOnlyBenchmark {
schema = new SchemaDescriptor(
UUID.randomUUID(),
42,
- new Column[] {new Column("key", LONG, false)},
+ new Column[] {new Column("key", LONG, false, (Supplier<Object> &
Serializable)()-> 0L)},
IntStream.range(0, fieldsCount).boxed()
.map(i -> new Column("col" + i, useString ? STRING : BYTES,
nullable))
.toArray(Column[]::new)
@@ -132,11 +134,8 @@ public class TupleMarshallerVarlenOnlyBenchmark {
if (useString) {
final byte[] data = new byte[dataSize / fieldsCount];
- for (int i = 0; i < data.length; i++) {
- final byte b = (byte)rnd.nextInt();
-
- data[i] = b < 0 ? (byte)(-b) : b;
- }
+ for (int i = 0; i < data.length; i++)
+ data[i] = (byte)(rnd.nextInt() & 0x7F);
val = new String(data); // Latin1 string.
}
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
index a66265c..f07226b 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
@@ -681,7 +681,7 @@ public class PartitionCommandListenerTest {
rowBuilder.appendInt(key);
- return new Row(SCHEMA, new ByteBufferRow(rowBuilder.build()));
+ return new Row(SCHEMA, new ByteBufferRow(rowBuilder.toBytes()));
}
/**
@@ -695,6 +695,6 @@ public class PartitionCommandListenerTest {
rowBuilder.appendInt(key);
rowBuilder.appendInt(val);
- return new Row(SCHEMA, new ByteBufferRow(rowBuilder.build()));
+ return new Row(SCHEMA, new ByteBufferRow(rowBuilder.toBytes()));
}
}
