[ignite-3] branch ignite-15783 updated: Minor.

[amashenkov]

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


The following commit(s) were added to refs/heads/ignite-15783 by this push:
     new 9936d05  Minor.
9936d05 is described below

commit 9936d0558cdbfca7d7c3b5ac373c52f6e2adc815
Author: Andrew Mashenkov <andrey.mashen...@gmail.com>
AuthorDate: Wed Oct 27 13:17:06 2021 +0300

    Minor.
---
 .../{KVSerializer.java => KVMarshaller.java}           |  8 ++++----
 .../apache/ignite/internal/table/KeyValueViewImpl.java | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git 
a/modules/table/src/main/java/org/apache/ignite/internal/schema/marshaller/KVSerializer.java
 
b/modules/table/src/main/java/org/apache/ignite/internal/schema/marshaller/KVMarshaller.java
similarity index 87%
rename from 
modules/table/src/main/java/org/apache/ignite/internal/schema/marshaller/KVSerializer.java
rename to 
modules/table/src/main/java/org/apache/ignite/internal/schema/marshaller/KVMarshaller.java
index 483f93c..355b5ff 100644
--- 
a/modules/table/src/main/java/org/apache/ignite/internal/schema/marshaller/KVSerializer.java
+++ 
b/modules/table/src/main/java/org/apache/ignite/internal/schema/marshaller/KVMarshaller.java
@@ -24,23 +24,23 @@ import org.jetbrains.annotations.Nullable;
 /**
  * Key-value serializer interface.
  */
-public interface KVSerializer<K, V> {
+public interface KVMarshaller<K, V> {
     /**
      * @param key Key object to serialize.
      * @param val Value object to serialize.
      * @return Table row with columns serialized from given key-value pair.
      */
-    BinaryRow serialize(@NotNull K key, V val);
+    BinaryRow marshal(@NotNull K key, V val);
 
     /**
      * @param row Table row.
      * @return Deserialized key object.
      */
-    @NotNull K deserializeKey(@NotNull BinaryRow row);
+    @NotNull K unmarshalKey(@NotNull BinaryRow row);
 
     /**
      * @param row Table row.
      * @return Deserialized value object.
      */
-    @Nullable V deserializeValue(@NotNull BinaryRow row);
+    @Nullable V unmarshalValue(@NotNull BinaryRow row);
 }
diff --git 
a/modules/table/src/main/java/org/apache/ignite/internal/table/KeyValueViewImpl.java
 
b/modules/table/src/main/java/org/apache/ignite/internal/table/KeyValueViewImpl.java
index 90e8bbf..46a6d40 100644
--- 
a/modules/table/src/main/java/org/apache/ignite/internal/table/KeyValueViewImpl.java
+++ 
b/modules/table/src/main/java/org/apache/ignite/internal/table/KeyValueViewImpl.java
@@ -27,7 +27,7 @@ import java.util.concurrent.CompletableFuture;
 import org.apache.ignite.internal.schema.BinaryRow;
 import org.apache.ignite.internal.schema.ByteBufferRow;
 import org.apache.ignite.internal.schema.SchemaRegistry;
-import org.apache.ignite.internal.schema.marshaller.KVSerializer;
+import org.apache.ignite.internal.schema.marshaller.KVMarshaller;
 import org.apache.ignite.internal.schema.marshaller.SerializationException;
 import org.apache.ignite.internal.schema.marshaller.Serializer;
 import org.apache.ignite.internal.schema.marshaller.SerializerFactory;
@@ -270,14 +270,14 @@ public class KeyValueViewImpl<K, V> extends 
AbstractTableView implements KeyValu
      * @param schemaVersion Schema version.
      * @return Marshaller.
      */
-    private KVSerializer<K, V> marshaller(int schemaVersion) {
+    private KVMarshaller<K, V> marshaller(int schemaVersion) {
         SerializerFactory factory = 
SerializerFactory.createJavaSerializerFactory();
 
         // TODO: Cache marshaller for schema or upgrade row?
-        return new KVSerializer<K, V>() {
+        return new KVMarshaller<K, V>() {
             Serializer s = factory.create(schemaReg.schema(schemaVersion), 
keyMapper.getType(), valueMapper.getType());
 
-            @Override public BinaryRow serialize(@NotNull K key, V val) {
+            @Override public BinaryRow marshal(@NotNull K key, V val) {
                 try {
                     return new ByteBufferRow(ByteBuffer.wrap(s.serialize(key, 
val)).order(ByteOrder.LITTLE_ENDIAN));
                 } catch (SerializationException e) {
@@ -285,7 +285,7 @@ public class KeyValueViewImpl<K, V> extends 
AbstractTableView implements KeyValu
                 }
             }
 
-            @NotNull @Override public K deserializeKey(@NotNull BinaryRow row) 
{
+            @NotNull @Override public K unmarshalKey(@NotNull BinaryRow row) {
                 try {
                     return s.deserializeKey(row.bytes());
                 } catch (SerializationException e) {
@@ -293,7 +293,7 @@ public class KeyValueViewImpl<K, V> extends 
AbstractTableView implements KeyValu
                 }
             }
 
-            @Nullable @Override public V deserializeValue(@NotNull BinaryRow 
row) {
+            @Nullable @Override public V unmarshalValue(@NotNull BinaryRow 
row) {
                 try {
                     return s.deserializeValue(row.bytes());
                 } catch (SerializationException e) {
@@ -304,12 +304,12 @@ public class KeyValueViewImpl<K, V> extends 
AbstractTableView implements KeyValu
     }
 
     private V unmarshalValue(BinaryRow v) {
-        return v == null ? null : 
marshaller(v.schemaVersion()).deserializeValue(v);
+        return v == null ? null : 
marshaller(v.schemaVersion()).unmarshalValue(v);
     }
 
     private BinaryRow marshal(@NotNull K key, V o) {
-        final KVSerializer<K, V> marsh = 
marshaller(schemaReg.lastSchemaVersion());
+        final KVMarshaller<K, V> marsh = 
marshaller(schemaReg.lastSchemaVersion());
 
-        return marsh.serialize(key, o);
+        return marsh.marshal(key, o);
     }
 }