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/06/09 19:36:24 UTC
[ignite-3] 12/15: Merge branch 'main' into gg-14743
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-14743
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit abcb9e02223f8d4f74e19588a4e63809396dd417
Merge: cdb9015 fb14a5f
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Wed Jun 9 11:04:46 2021 +0300
Merge branch 'main' into gg-14743
# Conflicts:
# modules/schema/src/main/java/org/apache/ignite/internal/schema/RowAssembler.java
# modules/schema/src/main/java/org/apache/ignite/internal/schema/row/Row.java
# modules/schema/src/test/java/org/apache/ignite/internal/schema/RowAssemblerTest.java
.../asm/IdentityMarshallerCodeGenerator.java | 3 +-
.../asm/ObjectMarshallerCodeGenerator.java | 5 +-
.../org/apache/ignite/internal/schema/row/Row.java | 4 +-
.../internal/schema/ExpandableByteBufTest.java | 29 +-
.../schema/RowAssemblerAdvancedSchemaTest.java | 307 ++++++++++
.../schema/RowAssemblerSimpleSchemaTest.java | 643 +++++++++++++++++++++
6 files changed, 981 insertions(+), 10 deletions(-)
diff --cc modules/schema/src/main/java/org/apache/ignite/internal/schema/row/Row.java
index c3dd7f7,973e8b2..963ac1a
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/Row.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/row/Row.java
@@@ -368,31 -365,15 +368,31 @@@ public class Row implements BinaryRow
throw new InvalidTypeException("Invalid column type requested [requested=" + type +
", column=" + cols.column(colIdx) + ']');
- boolean hasVarTable = ((keyCol ? RowFlags.OMIT_KEY_VARTBL_FLAG : RowFlags.OMIT_VAL_VARTBL_FLAG) & flags) == 0;
- boolean hasNullMap = ((keyCol ? RowFlags.OMIT_KEY_NULL_MAP_FLAG : RowFlags.OMIT_VAL_NULL_MAP_FLAG) & flags) == 0;
+ assert reader != null;
- if (hasNullMap && isNull(off, colIdx))
+ if (reader.isNull(colIdx))
return -1;
+ assert reader.hasVartable() || type.fixedLength();
+
return type.fixedLength() ?
- reader.fixlenColumnOffset(cols, colIdx) :
- reader.varlenColumnOffsetAndLength(cols, colIdx);
- fixlenColumnOffset(cols, off, colIdx, hasVarTable, hasNullMap) :
- varlenColumnOffsetAndLength(cols, off, colIdx, hasVarTable, hasNullMap);
++ reader.fixlenColumnOffset(cols, off, colIdx, hasVarTable, hasNullMap) :
++ reader.varlenColumnOffsetAndLength(cols, off, colIdx, hasVarTable, hasNullMap);
+ }
+
+ private ChunkReader valueReader() {
+ if (valReader != null)
+ return valReader;
+
+ final short flags = readShort(FLAGS_FIELD_OFFSET);
+
+ assert (flags & RowFlags.NO_VALUE_FLAG) == 0 : "Row has no value.";
+
+ return (valReader = ChunkFormat.createReader(
+ this,
+ KEY_CHUNK_OFFSET + keyReader.chunkLength(),
+ schema.keyColumns().nullMapSize(),
+ (byte)(flags >>> RowFlags.VAL_FLAGS_OFFSET)));
}
/**