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 2025/04/03 11:37:36 UTC

(ignite-3) 01/01: Relax Mapper requirements and allow unmapped columns.

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-25016
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit 808746c900c96291cde26eeb6cda2dcfbd647c08
Author: amashenkov <am...@apache.org>
AuthorDate: Thu Apr 3 14:32:52 2025 +0300

    Relax Mapper requirements and allow unmapped columns.
---
 .../internal/client/table/ClientKeyValueView.java  |  2 +-
 .../ignite/internal/client/table/ClientSchema.java |  4 +-
 .../ignite/internal/marshaller/Marshaller.java     |  4 ++
 .../app/client/ItThinClientMarshallingTest.java    | 64 +++++++++++++++++++++-
 .../marshaller/reflection/KvMarshallerImpl.java    |  2 +-
 .../schema/marshaller/KvMarshallerTest.java        | 19 +++++--
 6 files changed, 86 insertions(+), 9 deletions(-)

diff --git a/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientKeyValueView.java b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientKeyValueView.java
index adf57de6489..01384bf1943 100644
--- a/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientKeyValueView.java
+++ b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientKeyValueView.java
@@ -754,7 +754,7 @@ public class ClientKeyValueView<K, V> extends AbstractClientView<Entry<K, V>> im
         String[] keyCols = columnNames(schema.keyColumns());
         String[] valCols = columnNames(schema.valColumns());
 
-        Marshaller keyMarsh = schema.getMarshaller(keySer.mapper(), TuplePart.KEY, true);
+        Marshaller keyMarsh = schema.getMarshaller(keySer.mapper(), TuplePart.KEY, false);
         Marshaller valMarsh = schema.getMarshaller(valSer.mapper(), TuplePart.VAL, true);
 
         return (row) -> new IgniteBiTuple<>(
diff --git a/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientSchema.java b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientSchema.java
index 02608596b2c..4efb14da8da 100644
--- a/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientSchema.java
+++ b/modules/client/src/main/java/org/apache/ignite/internal/client/table/ClientSchema.java
@@ -235,9 +235,9 @@ public class ClientSchema {
             case KEY:
                 return marshallers.getKeysMarshaller(marshallerSchema(), mapper, true, allowUnmappedFields);
             case VAL:
-                return marshallers.getValuesMarshaller(marshallerSchema(), mapper, true, allowUnmappedFields);
+                return marshallers.getValuesMarshaller(marshallerSchema(), mapper, false, allowUnmappedFields);
             case KEY_AND_VAL:
-                return marshallers.getRowMarshaller(marshallerSchema(), mapper, true, allowUnmappedFields);
+                return marshallers.getRowMarshaller(marshallerSchema(), mapper, false, allowUnmappedFields);
             default:
                 throw new AssertionError("Unexpected tuple part: " + part);
         }
diff --git a/modules/marshaller-common/src/main/java/org/apache/ignite/internal/marshaller/Marshaller.java b/modules/marshaller-common/src/main/java/org/apache/ignite/internal/marshaller/Marshaller.java
index f09b07b37b3..2a65c0dd5d5 100644
--- a/modules/marshaller-common/src/main/java/org/apache/ignite/internal/marshaller/Marshaller.java
+++ b/modules/marshaller-common/src/main/java/org/apache/ignite/internal/marshaller/Marshaller.java
@@ -151,6 +151,10 @@ public abstract class Marshaller {
                 Set<String> fieldSet = new TreeSet<>(fields);
                 for (MarshallerColumn col : cols) {
                     String fieldName = mapper.fieldForColumn(col.name());
+                    if (fieldName == null) {
+                        assert !requireAllFields;
+                        continue;
+                    }
                     fieldSet.remove(fieldName);
                 }
 
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientMarshallingTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientMarshallingTest.java
index e41b6279db6..67b60e32112 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientMarshallingTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientMarshallingTest.java
@@ -23,6 +23,7 @@ import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.math.BigDecimal;
@@ -148,7 +149,68 @@ public class ItThinClientMarshallingTest extends ItAbstractThinClientTest {
         var kvPojoView = table.keyValueView(Integer.class, MissingFieldPojo.class);
 
         Throwable ex = assertThrowsWithCause(() -> kvPojoView.put(null, 1, new MissingFieldPojo()), IllegalArgumentException.class);
-        assertEquals("No mapped object field found for column 'VAL'", ex.getMessage());
+        assertEquals("Fields [unknown] of type org.apache.ignite.internal.runner.app.client.ItThinClientMarshallingTest$MissingFieldPojo "
+                + "are not mapped to columns", ex.getMessage());
+    }
+
+    @Test
+    public void testKvValMissingPojoFieldsWithDefault() {
+        String tableName = "testKvExtraValPojoFields";
+        ignite().sql().execute(null, "CREATE TABLE " + tableName + " (KEY INT PRIMARY KEY, VAL VARCHAR, EXTRA VARCHAR)");
+
+        Table table = ignite().tables().table(tableName);
+
+        {
+            var kvPojoView = table.keyValueView(Mapper.of(Integer.class), Mapper.builder(TestPojo.class).map("val", "VAL").build());
+
+            TestPojo expected = new TestPojo();
+            expected.val = "val";
+            kvPojoView.put(null, 1, expected);
+            TestPojo actual = kvPojoView.get(null, 1);
+
+            assertNotNull(actual);
+            assertEquals(expected.val, actual.val);
+        }
+        {
+            var recPojoView = table.recordView(TestPojo.class);
+
+            TestPojo expected = new TestPojo(2);
+            expected.val = "val";
+
+            recPojoView.insert(null, expected);
+            TestPojo actual = recPojoView.get(null, new TestPojo(2));
+
+            assertNotNull(actual);
+            assertEquals(expected.val, actual.val);
+        }
+    }
+
+    @Test
+    public void testKvUnmappedPojoField() {
+        Table table = ignite().tables().table(TABLE_NAME);
+        {
+            var kvPojoView = table.keyValueView(Mapper.of(Integer.class), Mapper.builder(TestPojo.class).map("val", "VAL").build());
+
+            TestPojo expected = new TestPojo();
+            expected.val = "val";
+            kvPojoView.put(null, 1, expected);
+            TestPojo actual = kvPojoView.get(null, 1);
+
+            assertNotNull(actual);
+            assertEquals(expected.val, actual.val);
+        }
+        {
+            var recPojoView = table.recordView(TestPojo.class);
+
+            TestPojo expected = new TestPojo(2);
+            expected.val = "val";
+
+            recPojoView.insert(null, expected);
+            TestPojo actual = recPojoView.get(null, new TestPojo(2));
+
+            assertNotNull(actual);
+            assertEquals(expected.val, actual.val);
+        }
     }
 
     @Test
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/KvMarshallerImpl.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/KvMarshallerImpl.java
index 702f122e937..aed0eb7ca7b 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/KvMarshallerImpl.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/marshaller/reflection/KvMarshallerImpl.java
@@ -74,7 +74,7 @@ public class KvMarshallerImpl<K, V> implements KvMarshaller<K, V> {
 
         MarshallerSchema marshallerSchema = schema.marshallerSchema();
         keyMarsh = marshallers.getKeysMarshaller(marshallerSchema, keyMapper, true, false);
-        valMarsh = marshallers.getValuesMarshaller(marshallerSchema, valueMapper, true, false);
+        valMarsh = marshallers.getValuesMarshaller(marshallerSchema, valueMapper, false, false);
         keyPositions = schema.keyColumns().stream().mapToInt(Column::positionInRow).toArray();
         valPositions = schema.valueColumns().stream().mapToInt(Column::positionInRow).toArray();
     }
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/marshaller/KvMarshallerTest.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/marshaller/KvMarshallerTest.java
index 6914a2a5f8e..df6dd01230f 100644
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/marshaller/KvMarshallerTest.java
+++ b/modules/schema/src/test/java/org/apache/ignite/internal/schema/marshaller/KvMarshallerTest.java
@@ -227,11 +227,22 @@ public class KvMarshallerTest {
                 columnsAllTypes(true)
         );
 
-        IllegalArgumentException ex = assertThrows(
-                IllegalArgumentException.class,
-                () -> factory.create(schema, Integer.class, TestTruncatedObject.class));
+        KvMarshaller<Long, TestTruncatedObject> marshaller =
+                factory.create(schema, Long.class, TestTruncatedObject.class);
 
-        assertEquals("No mapped object field found for column 'PRIMITIVEBOOLEANCOL'", ex.getMessage());
+        Long key = rnd.nextLong();
+        TestTruncatedObject val = TestTruncatedObject.randomObject(rnd);
+
+        Row row = Row.wrapBinaryRow(schema, marshaller.marshal(key, val));
+
+        Object restoredKey = marshaller.unmarshalKey(row);
+        Object restoredVal = marshaller.unmarshalValue(row);
+
+        assertTrue(key.getClass().isInstance(restoredKey));
+        assertTrue(val.getClass().isInstance(restoredVal));
+
+        assertEquals(key, restoredKey);
+        assertEquals(val, restoredVal);
     }
 
     @ParameterizedTest