This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-15783 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 5e20e9c9062ee741ea993f6b5d6fef28df0ace97 Author: Andrew Mashenkov <[email protected]> AuthorDate: Tue Oct 26 14:00:36 2021 +0300 Minor. --- .../internal/schema/marshaller/reflection/JavaSerializer.java | 4 ++-- .../ignite/internal/schema/marshaller/reflection/Marshaller.java | 8 +++----- 2 files changed, 5 insertions(+), 7 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 94bfd0a..c7da543 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 @@ -55,8 +55,8 @@ public class JavaSerializer extends AbstractSerializer { this.keyClass = keyClass; this.valClass = valClass; - keyMarsh = Marshaller.createMarshaller(schema.keyColumns(), 0, keyClass); - valMarsh = Marshaller.createMarshaller(schema.valueColumns(), schema.keyColumns().length(), valClass); + keyMarsh = Marshaller.createMarshaller(schema.keyColumns(), keyClass); + valMarsh = Marshaller.createMarshaller(schema.valueColumns(), valClass); } /** {@inheritDoc} */ diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/Marshaller.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/Marshaller.java index e43433d..f1eabbd 100644 --- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/Marshaller.java +++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/Marshaller.java @@ -37,11 +37,10 @@ class Marshaller { * Creates marshaller for class. * * @param cols Columns. - * @param firstColId First column position in schema. * @param aClass Type. * @return Marshaller. */ - static Marshaller createMarshaller(Columns cols, int firstColId, Class<? extends Object> aClass) { + static Marshaller createMarshaller(Columns cols, Class<? extends Object> aClass) { final BinaryMode mode = MarshallerUtil.mode(aClass); if (mode != null) { @@ -51,7 +50,7 @@ class Marshaller { assert mode.typeSpec() == col.type().spec() : "Target type is not compatible."; assert !aClass.isPrimitive() : "Non-nullable types are not allowed."; - return new Marshaller(FieldAccessor.createIdentityAccessor(col, firstColId, mode)); + return new Marshaller(FieldAccessor.createIdentityAccessor(col, col.schemaIndex(), mode)); } FieldAccessor[] fieldAccessors = new FieldAccessor[cols.length()]; @@ -60,8 +59,7 @@ class Marshaller { for (int i = 0; i < cols.length(); i++) { final Column col = cols.column(i); - final int colIdx = firstColId + i; /* Absolute column idx in schema. */ - fieldAccessors[i] = FieldAccessor.create(aClass, col, colIdx); + fieldAccessors[i] = FieldAccessor.create(aClass, col, col.schemaIndex()); } return new Marshaller(new ObjectFactory<>(aClass), fieldAccessors);
