You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2021/04/21 23:05:57 UTC
[ignite-3] branch ignite-13670 updated (55df701 -> cdfae80)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-13670
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.
discard 55df701 Minor refactoring.
new 6f838eb Minor refactoring.
new cdfae80 Omit writing empty varlen table.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (55df701)
\
N -- N -- N refs/heads/ignite-13670 (cdfae80)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/ignite/internal/schema/BinaryRow.java | 10 +--
.../ignite/internal/schema/ByteBufferRow.java | 2 +-
.../org/apache/ignite/internal/schema/Row.java | 22 +++--
.../ignite/internal/schema/RowAssembler.java | 28 ++++--
.../ignite/internal/schema/RowAssemblerTest.java | 100 ++++++++++-----------
5 files changed, 92 insertions(+), 70 deletions(-)
[ignite-3] 02/02: Omit writing empty varlen table.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-13670
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit cdfae80c9a60592764f1bbd328a7d91a5b362a00
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Thu Apr 22 02:05:40 2021 +0300
Omit writing empty varlen table.
---
.../org/apache/ignite/internal/schema/Row.java | 18 +++-
.../ignite/internal/schema/RowAssembler.java | 22 +++--
.../ignite/internal/schema/RowAssemblerTest.java | 100 ++++++++++-----------
3 files changed, 81 insertions(+), 59 deletions(-)
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/Row.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/Row.java
index e970f3d..f562ded 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/Row.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/Row.java
@@ -307,6 +307,13 @@ public class Row implements BinaryRow {
}
/**
+ * @return Row flags.
+ */
+ private boolean hasFlag(int flag) {
+ return ((readShort(FLAGS_FIELD_OFFSET) & flag)) != 0;
+ }
+
+ /**
* Gets the column offset and length encoded into a single 8-byte value (4 least significant bytes encoding the
* offset from the beginning of the row and 4 most significant bytes encoding the field length for varlength
* columns). The offset and length should be extracted using {@link #offset(long)} and {@link #length(long)}
@@ -345,8 +352,12 @@ public class Row implements BinaryRow {
if (isNull(off, colIdx))
return -1;
+ short flags = readShort(FLAGS_FIELD_OFFSET);
+
+ boolean noVarTable = ((keyCol ? RowFlags.OMIT_KEY_VARTBL_FLAG : RowFlags.OMIT_VAL_VARTBL_FLAG) & flags) != 0;
+
return type.fixedLength() ?
- fixlenColumnOffset(cols, off, colIdx) :
+ fixlenColumnOffset(cols, off, colIdx, noVarTable) :
varlenColumnOffsetAndLength(cols, off, colIdx);
}
@@ -459,9 +470,10 @@ public class Row implements BinaryRow {
* @param cols Columns chunk.
* @param baseOff Chunk base offset.
* @param idx Column index in the chunk.
+ * @param noVarlen Varlen table is ommited.
* @return Encoded offset (from the row start) of the requested fixlen column.
*/
- int fixlenColumnOffset(Columns cols, int baseOff, int idx) {
+ int fixlenColumnOffset(Columns cols, int baseOff, int idx, boolean noVarlen) {
int nullMapOff = nullMapOffset(baseOff);
int off = 0;
@@ -480,7 +492,7 @@ public class Row implements BinaryRow {
int vartableOffset = vartableOffset(baseOff, cols);
- int vartableLen = varlenItemOffset(readShort(vartableOffset));
+ int vartableLen = noVarlen ? 0 : varlenItemOffset(readShort(vartableOffset));
return vartableOffset + vartableLen + off;
}
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/RowAssembler.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/RowAssembler.java
index e5b139e..a62715f 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/RowAssembler.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/RowAssembler.java
@@ -80,7 +80,8 @@ public class RowAssembler {
* @return Total size of the varlen table.
*/
public static int varlenTableSize(int nonNullVarlenCols) {
- return VARLEN_TABLE_SIZE_FIELD_SIZE + nonNullVarlenCols * VARLEN_COLUMN_OFFSET_FIELD_SIZE;
+ return nonNullVarlenCols == 0 ? 0 :
+ VARLEN_TABLE_SIZE_FIELD_SIZE + nonNullVarlenCols * VARLEN_COLUMN_OFFSET_FIELD_SIZE;
}
/**
@@ -171,10 +172,17 @@ public class RowAssembler {
initOffsets(BinaryRow.KEY_CHUNK_OFFSET, nonNullVarlenKeyCols);
+// if (nullMapSize == 0)
+// flags |= (baseOff == KEY_CHUNK_OFFSET ? RowFlags.NO_KEY_NULL_MAP : RowFlags.NO_VALUE_NULL_MAP);
+
buf = new ExpandableByteBuf(size);
buf.putShort(0, (short)schema.version());
- buf.putShort(nullMapOff + curCols.nullMapSize(), (short)nonNullVarlenKeyCols);
+
+ if (nonNullVarlenKeyCols == 0)
+ flags |= RowFlags.OMIT_KEY_VARTBL_FLAG;
+ else
+ buf.putShort(varlenTblOff, (short)nonNullVarlenKeyCols);
}
/**
@@ -453,15 +461,17 @@ public class RowAssembler {
buf.putShort(baseOff, (short)keyLen);
- if (schema.valueColumns() == curCols) {
- buf.putShort(nullMapOff + curCols.nullMapSize(), (short)nonNullVarlenValCols);
-
+ if (schema.valueColumns() == curCols)
return; // No more columns.
- }
curCols = schema.valueColumns(); // Switch key->value columns.
initOffsets(baseOff + keyLen, nonNullVarlenValCols);
+
+ if (nonNullVarlenValCols == 0)
+ flags |= RowFlags.OMIT_VAL_VARTBL_FLAG;
+ else
+ buf.putShort(varlenTblOff, (short)nonNullVarlenValCols);
}
}
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerTest.java
index 8ca733e..3781330 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerTest.java
@@ -49,7 +49,7 @@ public class RowAssemblerTest {
asm.appendInt(33);
asm.appendInt(-71);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, -71, -1, -1, -1}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 33, 0, 0, 0, 9, 0, 0, 0, 0, -71, -1, -1, -1}, asm.build());
}
{ // Null value.
@@ -58,7 +58,7 @@ public class RowAssemblerTest {
asm.appendInt(-33);
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, -33, -1, -1, -1, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, -33, -1, -1, -1, 5, 0, 0, 0, 1}, asm.build());
}
{ // No value.
@@ -66,7 +66,7 @@ public class RowAssemblerTest {
asm.appendInt(-33);
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, -33, -1, -1, -1}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 25, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, -33, -1, -1, -1}, asm.build());
}
}
@@ -83,7 +83,7 @@ public class RowAssemblerTest {
asm.appendShort((short)33);
asm.appendShort((short)71L);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 33, 0, 9, 0, 0, 0, 0, 0, 0, 71, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 33, 0, 7, 0, 0, 0, 0, 71, 0}, asm.build());
}
{ // No value.
@@ -91,7 +91,7 @@ public class RowAssemblerTest {
asm.appendShort((short)-33);
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, -33, -1}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 25, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, -33, -1}, asm.build());
}
}
@@ -108,7 +108,7 @@ public class RowAssemblerTest {
asm.appendShort((short)-33);
asm.appendString("val");
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, -33, -1, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 8, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, -33, -1, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
}
{ // Null value.
@@ -117,7 +117,7 @@ public class RowAssemblerTest {
asm.appendShort((short)33);
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 33, 0, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 33, 0, 5, 0, 0, 0, 1}, asm.build());
}
{ // No value.
@@ -125,7 +125,7 @@ public class RowAssemblerTest {
asm.appendShort((short)33);
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 33, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 25, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 33, 0}, asm.build());
}
}
@@ -142,7 +142,7 @@ public class RowAssemblerTest {
asm.appendShort((short)-33);
asm.appendString("val");
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, -33, -1, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 8, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, -33, -1, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
}
{ // No value.
@@ -150,7 +150,7 @@ public class RowAssemblerTest {
asm.appendShort((short)33);
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 33, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 25, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 33, 0}, asm.build());
}
}
@@ -167,7 +167,7 @@ public class RowAssemblerTest {
asm.appendShort((short)-33);
asm.appendByte((byte)71);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, -33, -1, 8, 0, 0, 0, 0, 0, 0, 71}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, -33, -1, 6, 0, 0, 0, 0, 71}, asm.build());
}
{ // Null key.
@@ -176,7 +176,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendByte((byte)-71);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, -71}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 6, 0, 0, 0, 0, -71}, asm.build());
}
{ // No value.
@@ -184,7 +184,7 @@ public class RowAssemblerTest {
asm.appendShort((short)33);
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 33, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 25, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 33, 0}, asm.build());
}
}
@@ -201,7 +201,7 @@ public class RowAssemblerTest {
asm.appendShort((short)-1133);
asm.appendShort((short)-1071);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, -109, -5, 9, 0, 0, 0, 0, 0, 0, -47, -5}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, -109, -5, 7, 0, 0, 0, 0, -47, -5}, asm.build());
}
{ // Null key.
@@ -210,7 +210,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendShort((short)1171);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 9, 0, 0, 0, 0, 0, 0, -109, 4}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 7, 0, 0, 0, 0, -109, 4}, asm.build());
}
{ // Null value.
@@ -219,7 +219,7 @@ public class RowAssemblerTest {
asm.appendShort((short)1133);
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 109, 4, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 109, 4, 5, 0, 0, 0, 1}, asm.build());
}
{ // Null both.
@@ -228,7 +228,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 5, 0, 0, 0, 1}, asm.build());
}
{ // No value.
@@ -236,7 +236,7 @@ public class RowAssemblerTest {
asm.appendShort((short)1133);
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 109, 4}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 25, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 109, 4}, asm.build());
}
}
@@ -253,7 +253,7 @@ public class RowAssemblerTest {
asm.appendInt(-33);
asm.appendString("val");
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, -33, -1, -1, -1, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 8, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, -33, -1, -1, -1, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
}
{ // Null key.
@@ -262,7 +262,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendString("val");
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 8, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
}
{ // Null value.
@@ -271,7 +271,7 @@ public class RowAssemblerTest {
asm.appendInt(33);
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 33, 0, 0, 0, 5, 0, 0, 0, 1}, asm.build());
}
{ // Null both.
@@ -280,7 +280,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 5, 0, 0, 0, 1}, asm.build());
}
{ // No value.
@@ -288,7 +288,7 @@ public class RowAssemblerTest {
asm.appendInt(33);
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 25, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 33, 0, 0, 0}, asm.build());
}
}
@@ -305,7 +305,7 @@ public class RowAssemblerTest {
asm.appendByte((byte)-33);
asm.appendString("val");
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, -33, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 8, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, -33, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
}
{ // Null key.
@@ -314,7 +314,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendString("val");
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 8, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 12, 0, 0, 0, 0, 1, 0, 9, 0, 118, 97, 108}, asm.build());
}
{ // No value.
@@ -322,7 +322,7 @@ public class RowAssemblerTest {
asm.appendByte((byte)33);
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 33}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 25, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 33}, asm.build());
}
}
@@ -340,8 +340,8 @@ public class RowAssemblerTest {
asm.appendUuid(uuidVal);
assertRowBytesEquals(new byte[] {
- 42, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121,
- 23, 0, 0, 0, 0, 0, 0, -117, -61, -31, 85, 61, -32, 57, 68, 111, 67, 56, -3, -99, -37, -58, -73}, asm.build());
+ 42, 0, 16, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121,
+ 21, 0, 0, 0, 0, -117, -61, -31, 85, 61, -32, 57, 68, 111, 67, 56, -3, -99, -37, -58, -73}, asm.build());
}
{ // Null value.
@@ -350,7 +350,7 @@ public class RowAssemblerTest {
asm.appendString("key");
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 16, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 5, 0, 0, 0, 1}, asm.build());
}
{ // No value.
@@ -358,7 +358,7 @@ public class RowAssemblerTest {
asm.appendString("key");
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 17, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
}
}
@@ -376,8 +376,8 @@ public class RowAssemblerTest {
asm.appendUuid(uuidVal);
assertRowBytesEquals(new byte[] {
- 42, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121,
- 23, 0, 0, 0, 0, 0, 0, -117, -61, -31, 85, 61, -32, 57, 68, 111, 67, 56, -3, -99, -37, -58, -73}, asm.build());
+ 42, 0, 16, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121,
+ 21, 0, 0, 0, 0, -117, -61, -31, 85, 61, -32, 57, 68, 111, 67, 56, -3, -99, -37, -58, -73}, asm.build());
}
{ // No value.
@@ -385,7 +385,7 @@ public class RowAssemblerTest {
asm.appendString("key");
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 17, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
}
}
@@ -411,7 +411,7 @@ public class RowAssemblerTest {
asm.appendString("key");
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 16, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 5, 0, 0, 0, 1}, asm.build());
}
{ // No value.
@@ -419,7 +419,7 @@ public class RowAssemblerTest {
asm.appendString("key");
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 17, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
}
}
@@ -444,7 +444,7 @@ public class RowAssemblerTest {
asm.appendString("key");
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 17, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
}
}
@@ -461,7 +461,7 @@ public class RowAssemblerTest {
asm.appendString("key");
asm.appendShort((short)-71);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 9, 0, 0, 0, 0, 0, 0, -71, -1}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 16, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 7, 0, 0, 0, 0, -71, -1}, asm.build());
}
{ // Null key.
@@ -470,7 +470,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendShort((short)71);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 9, 0, 0, 0, 0, 0, 0, 71, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 7, 0, 0, 0, 0, 71, 0}, asm.build());
}
{ // Null value.
@@ -479,7 +479,7 @@ public class RowAssemblerTest {
asm.appendString("key");
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 16, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 5, 0, 0, 0, 1}, asm.build());
}
{ // Null both.
@@ -488,7 +488,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 5, 0, 0, 0, 1}, asm.build());
}
{ // No value.
@@ -496,7 +496,7 @@ public class RowAssemblerTest {
asm.appendString("key");
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 17, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
}
}
@@ -513,7 +513,7 @@ public class RowAssemblerTest {
asm.appendString("key");
asm.appendShort((short)-71L);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 9, 0, 0, 0, 0, 0, 0, -71, -1}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 16, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 7, 0, 0, 0, 0, -71, -1}, asm.build());
}
{ // Null key.
@@ -522,7 +522,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendShort((short)71);
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 9, 0, 0, 0, 0, 0, 0, 71, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 7, 0, 0, 0, 0, 71, 0}, asm.build());
}
{ // No value.
@@ -530,7 +530,7 @@ public class RowAssemblerTest {
asm.appendString("key");
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 17, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
}
}
@@ -556,7 +556,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendBytes(new byte[] {-1, 1, 0, 120});
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 13, 0, 0, 0, 0, 1, 0, 9, 0, -1, 1, 0, 120}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 8, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 13, 0, 0, 0, 0, 1, 0, 9, 0, -1, 1, 0, 120}, asm.build());
}
{ // Null value.
@@ -565,7 +565,7 @@ public class RowAssemblerTest {
asm.appendString("key");
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 16, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121, 5, 0, 0, 0, 1}, asm.build());
}
{ // Null both.
@@ -574,7 +574,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendNull();
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 7, 0, 0, 0, 1, 0, 0}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 24, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 5, 0, 0, 0, 1}, asm.build());
}
{ // No value.
@@ -582,7 +582,7 @@ public class RowAssemblerTest {
asm.appendString("key");
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 17, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
}
}
@@ -608,7 +608,7 @@ public class RowAssemblerTest {
asm.appendNull();
asm.appendBytes(new byte[] {-1, 1, 0, 120});
- assertRowBytesEquals(new byte[] {42, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 13, 0, 0, 0, 0, 1, 0, 9, 0, -1, 1, 0, 120}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 8, 0, 0, 0, 0, 0, 5, 0, 0, 0, 1, 13, 0, 0, 0, 0, 1, 0, 9, 0, -1, 1, 0, 120}, asm.build());
}
{ // No value.
@@ -616,7 +616,7 @@ public class RowAssemblerTest {
asm.appendString("key");
- assertRowBytesEquals(new byte[] {42, 0, 1, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121,}, asm.build());
+ assertRowBytesEquals(new byte[] {42, 0, 17, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 1, 0, 9, 0, 107, 101, 121}, asm.build());
}
}
[ignite-3] 01/02: Minor refactoring.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-13670
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 6f838eb89529c6a17ab109e59304971d5f625279
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Wed Apr 21 23:24:06 2021 +0300
Minor refactoring.
---
.../org/apache/ignite/internal/schema/BinaryRow.java | 10 +++++-----
.../apache/ignite/internal/schema/ByteBufferRow.java | 2 +-
.../java/org/apache/ignite/internal/schema/Row.java | 20 ++++++++++++++------
.../apache/ignite/internal/schema/RowAssembler.java | 17 ++++++++++-------
4 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRow.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRow.java
index 577f50b..835b1d1 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRow.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/BinaryRow.java
@@ -134,19 +134,19 @@ public interface BinaryRow {
*/
final class RowFlags {
/** Flag indicated is row has no value chunk. */
- public static final int NO_VALUE = 1;
+ public static final int NO_VALUE_FLAG = 1;
/** Flag indicates key chunk omits null map. */
- public static final int NO_KEY_NULL_MAP = 1 << 1;
+ public static final int OMIT_KEY_NULL_MAP_FLAG = 1 << 1;
/** Flag indicates value chunk omits null map. */
- public static final int NO_VALUE_NULL_MAP = 1 << 2;
+ public static final int OMIT_VAL_NULL_MAP_FLAG = 1 << 2;
/** Flag indicates key chunk omits varlen table. */
- public static final int NO_VARLEN_KEY_COL = 1 << 3;
+ public static final int OMIT_KEY_VARTBL_FLAG = 1 << 3;
/** Flag indicates value chunk omits varlen table. */
- public static final int NO_VARLEN_VALUE_COL = 1 << 4;
+ public static final int OMIT_VAL_VARTBL_FLAG = 1 << 4;
/** Stub. */
private RowFlags() {
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/ByteBufferRow.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/ByteBufferRow.java
index 8b86bc7..a2ed1a5 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/ByteBufferRow.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/ByteBufferRow.java
@@ -57,7 +57,7 @@ public class ByteBufferRow implements BinaryRow {
@Override public boolean hasValue() {
short flags = readShort(FLAGS_FIELD_OFFSET);
- return (flags & RowFlags.NO_VALUE) == 0;
+ return (flags & RowFlags.NO_VALUE_FLAG) == 0;
}
/** {@inheritDoc} */
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/Row.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/Row.java
index b9cf9cd..e970f3d 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/Row.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/Row.java
@@ -25,7 +25,7 @@ import java.util.UUID;
/**
* Schema-aware row.
- *
+ * <p>
* The class contains non-generic methods to read boxed and unboxed primitives based on the schema column types.
* Any type conversions and coercions should be implemented outside the row by the key-value or query runtime.
* When a non-boxed primitive is read from a null column value, it is converted to the primitive type default value.
@@ -38,6 +38,14 @@ public class Row implements BinaryRow {
private final BinaryRow row;
/**
+ * @param itemIdx Varlen table item index.
+ * @return Varlen item offset.
+ */
+ public static int varlenItemOffset(int itemIdx) {
+ return VARLEN_TABLE_SIZE_FIELD_SIZE + itemIdx * VARLEN_COLUMN_OFFSET_FIELD_SIZE;
+ }
+
+ /**
* Constructor.
*
* @param schema Schema.
@@ -431,15 +439,15 @@ public class Row implements BinaryRow {
idx -= cols.numberOfFixsizeColumns() + numNullsBefore;
int vartableSize = readShort(vartableOffset(baseOff, cols));
- int vartableOff = vartableOffset(baseOff, cols) + VARLEN_TABLE_SIZE_FIELD_SIZE;
+ int vartableOff = vartableOffset(baseOff, cols);
// Offset of idx-th column is from base offset.
- int resOff = readShort(vartableOff + VARLEN_COLUMN_OFFSET_FIELD_SIZE * idx);
+ int resOff = readShort(vartableOff + varlenItemOffset(idx));
long len = idx == vartableSize - 1 ?
// totalLength - columnStartOffset
readInteger(baseOff) - resOff :
// nextColumnStartOffset - columnStartOffset
- readShort(vartableOff + VARLEN_COLUMN_OFFSET_FIELD_SIZE * (idx + 1)) - resOff;
+ readShort(vartableOff + varlenItemOffset(idx + 1)) - resOff;
return (len << 32) | (resOff + baseOff);
}
@@ -470,9 +478,9 @@ public class Row implements BinaryRow {
off += cols.foldFixedLength(nullMapIdx, readByte(nullMapOff + nullMapIdx) | mask);
- final int vartableOffset = vartableOffset(baseOff, cols);
+ int vartableOffset = vartableOffset(baseOff, cols);
- int vartableLen = VARLEN_TABLE_SIZE_FIELD_SIZE + readShort(vartableOffset) * VARLEN_COLUMN_OFFSET_FIELD_SIZE;
+ int vartableLen = varlenItemOffset(readShort(vartableOffset));
return vartableOffset + vartableLen + off;
}
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/RowAssembler.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/RowAssembler.java
index 1d589d5..e5b139e 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/RowAssembler.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/RowAssembler.java
@@ -24,6 +24,9 @@ import java.util.BitSet;
import java.util.UUID;
import org.apache.ignite.internal.schema.BinaryRow.RowFlags;
+import static org.apache.ignite.internal.schema.BinaryRow.VARLEN_COLUMN_OFFSET_FIELD_SIZE;
+import static org.apache.ignite.internal.schema.BinaryRow.VARLEN_TABLE_SIZE_FIELD_SIZE;
+
/**
* Utility class to build rows using column appending pattern. The external user of this class must consult
* with the schema and provide the columns in strict internal column sort order during the row construction.
@@ -77,7 +80,7 @@ public class RowAssembler {
* @return Total size of the varlen table.
*/
public static int varlenTableSize(int nonNullVarlenCols) {
- return nonNullVarlenCols * BinaryRow.VARLEN_COLUMN_OFFSET_FIELD_SIZE;
+ return VARLEN_TABLE_SIZE_FIELD_SIZE + nonNullVarlenCols * VARLEN_COLUMN_OFFSET_FIELD_SIZE;
}
/**
@@ -138,7 +141,7 @@ public class RowAssembler {
*/
static int rowChunkSize(Columns cols, int nonNullVarlenCols, int nonNullVarlenSize) {
int size = BinaryRow.CHUNK_LEN_FIELD_SIZE + cols.nullMapSize() +
- BinaryRow.VARLEN_TABLE_SIZE_FIELD_SIZE + varlenTableSize(nonNullVarlenCols);
+ varlenTableSize(nonNullVarlenCols);
for (int i = 0; i < cols.numberOfFixsizeColumns(); i++)
size += cols.column(i).type().length();
@@ -350,7 +353,7 @@ public class RowAssembler {
throw new AssemblyException("Key column missed: colIdx=" + curCol);
else {
if (curCol == 0)
- flags |= RowFlags.NO_VALUE;
+ flags |= RowFlags.NO_VALUE_FLAG;
else if (schema.valueColumns().length() != curCol)
throw new AssemblyException("Value column missed: colIdx=" + curCol);
}
@@ -377,9 +380,9 @@ public class RowAssembler {
* @param off Offset to write.
*/
private void writeOffset(int tblEntryIdx, int off) {
- assert (flags & (baseOff == BinaryRow.KEY_CHUNK_OFFSET ? RowFlags.NO_VARLEN_KEY_COL : RowFlags.NO_VARLEN_VALUE_COL)) == 0;
+ assert (flags & (baseOff == BinaryRow.KEY_CHUNK_OFFSET ? RowFlags.OMIT_KEY_VARTBL_FLAG : RowFlags.OMIT_VAL_VARTBL_FLAG)) == 0;
- buf.putShort(varlenTblOff + BinaryRow.VARLEN_COLUMN_OFFSET_FIELD_SIZE * tblEntryIdx, (short)off);
+ buf.putShort(varlenTblOff + Row.varlenItemOffset(tblEntryIdx), (short)off);
}
/**
@@ -410,7 +413,7 @@ public class RowAssembler {
* @param colIdx Column index.
*/
private void setNull(int colIdx) {
- assert (flags & (baseOff == BinaryRow.KEY_CHUNK_OFFSET ? RowFlags.NO_KEY_NULL_MAP : RowFlags.NO_VALUE_NULL_MAP)) == 0;
+ assert (flags & (baseOff == BinaryRow.KEY_CHUNK_OFFSET ? RowFlags.OMIT_KEY_NULL_MAP_FLAG : RowFlags.OMIT_VAL_NULL_MAP_FLAG)) == 0;
int byteInMap = colIdx / 8;
int bitInByte = colIdx % 8;
@@ -473,7 +476,7 @@ public class RowAssembler {
curVarlenTblEntry = 0;
nullMapOff = baseOff + BinaryRow.CHUNK_LEN_FIELD_SIZE;
- varlenTblOff = nullMapOff + curCols.nullMapSize() + BinaryRow.VARLEN_TABLE_SIZE_FIELD_SIZE;
+ varlenTblOff = nullMapOff + curCols.nullMapSize();
curOff = varlenTblOff + varlenTableSize(nonNullVarlenCols);
}