You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sd...@apache.org on 2022/03/04 11:04:08 UTC
[ignite-3] 08/12: .
This is an automated email from the ASF dual-hosted git repository.
sdanilov pushed a commit to branch ignite-16393
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit cbc4ec8e63ab0c8bdc387181c686333aabaa28d2
Author: Semyon Danilov <sa...@yandex.ru>
AuthorDate: Fri Mar 4 10:52:18 2022 +0300
.
---
.../network/serialization/MessageReader.java | 10 ---
.../network/serialization/MessageWriter.java | 11 ---
.../network/direct/DirectMessageReader.java | 12 ---
.../network/direct/DirectMessageWriter.java | 10 ---
.../direct/stream/DirectByteBufferStream.java | 19 -----
.../stream/DirectByteBufferStreamImplV1.java | 99 ----------------------
6 files changed, 161 deletions(-)
diff --git a/modules/network-api/src/main/java/org/apache/ignite/network/serialization/MessageReader.java b/modules/network-api/src/main/java/org/apache/ignite/network/serialization/MessageReader.java
index 2289152..712f536 100644
--- a/modules/network-api/src/main/java/org/apache/ignite/network/serialization/MessageReader.java
+++ b/modules/network-api/src/main/java/org/apache/ignite/network/serialization/MessageReader.java
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.annotations.Marshallable;
import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
/**
@@ -274,15 +273,6 @@ public interface MessageReader {
MessageCollectionItemType valType, boolean linked);
/**
- * Reads a field annotated with {@link Marshallable}.
- *
- * @param name Field name.
- * @param <T> Field's type.
- * @return Marshallable object.
- */
- <T> T readMarshallable(String name);
-
- /**
* Tells whether the last invocation of any of the {@code readXXX(...)} methods has fully written the value. {@code False} is returned
* if there were not enough remaining bytes in a byte buffer.
*
diff --git a/modules/network-api/src/main/java/org/apache/ignite/network/serialization/MessageWriter.java b/modules/network-api/src/main/java/org/apache/ignite/network/serialization/MessageWriter.java
index 7252ac3..a746eba 100644
--- a/modules/network-api/src/main/java/org/apache/ignite/network/serialization/MessageWriter.java
+++ b/modules/network-api/src/main/java/org/apache/ignite/network/serialization/MessageWriter.java
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.annotations.Marshallable;
import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
/**
@@ -302,16 +301,6 @@ public interface MessageWriter {
MessageCollectionItemType valType);
/**
- * Writes a field annotated with {@link Marshallable}.
- *
- * @param name Field name.
- * @param object Marshallable object.
- * @param <T> Object's type.
- * @return Whether a value was fully written.
- */
- <T> boolean writeMarshallable(String name, T object);
-
- /**
* Returns {@code true} if the header of the current message has been written, {@code false} otherwise.
*
* @return Whether the message header has already been written.
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/direct/DirectMessageReader.java b/modules/network/src/main/java/org/apache/ignite/internal/network/direct/DirectMessageReader.java
index 6f299a9..39de7c3 100644
--- a/modules/network/src/main/java/org/apache/ignite/internal/network/direct/DirectMessageReader.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/direct/DirectMessageReader.java
@@ -386,18 +386,6 @@ public class DirectMessageReader implements MessageReader {
/** {@inheritDoc} */
@Override
- public <T> T readMarshallable(String name) {
- DirectByteBufferStream stream = state.item().stream;
-
- T object = stream.readMarshallable(this);
-
- lastRead = stream.lastFinished();
-
- return object;
- }
-
- /** {@inheritDoc} */
- @Override
public boolean isLastRead() {
return lastRead;
}
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/direct/DirectMessageWriter.java b/modules/network/src/main/java/org/apache/ignite/internal/network/direct/DirectMessageWriter.java
index 4d77358..a4726ce 100644
--- a/modules/network/src/main/java/org/apache/ignite/internal/network/direct/DirectMessageWriter.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/direct/DirectMessageWriter.java
@@ -387,16 +387,6 @@ public class DirectMessageWriter implements MessageWriter {
state.reset();
}
- /** {@inheritDoc} */
- @Override
- public <T> boolean writeMarshallable(String name, T object) {
- DirectByteBufferStream stream = state.item().stream;
-
- stream.writeMarshallable(object, this);
-
- return stream.lastFinished();
- }
-
/**
* State item.
*/
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/direct/stream/DirectByteBufferStream.java b/modules/network/src/main/java/org/apache/ignite/internal/network/direct/stream/DirectByteBufferStream.java
index 321f047..401e18b 100644
--- a/modules/network/src/main/java/org/apache/ignite/internal/network/direct/stream/DirectByteBufferStream.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/direct/stream/DirectByteBufferStream.java
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.UUID;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.network.NetworkMessage;
-import org.apache.ignite.network.annotations.Marshallable;
import org.apache.ignite.network.serialization.MessageReader;
import org.apache.ignite.network.serialization.MessageWriter;
import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType;
@@ -434,22 +433,4 @@ public interface DirectByteBufferStream {
*/
<M extends Map<?, ?>> M readMap(MessageCollectionItemType keyType, MessageCollectionItemType valType,
boolean linked, MessageReader reader);
-
- /**
- * Writes a field annotated with {@link Marshallable}.
- *
- * @param object Marshallable object.
- * @param writer Writer.
- * @param <T> Object's type.
- */
- <T> void writeMarshallable(T object, MessageWriter writer);
-
- /**
- * Reads a field annotated with {@link Marshallable}.
- *
- * @param reader Reader.
- * @param <T> Field's type.
- * @return Marshallable object.
- */
- <T> T readMarshallable(MessageReader reader);
}
diff --git a/modules/network/src/main/java/org/apache/ignite/internal/network/direct/stream/DirectByteBufferStreamImplV1.java b/modules/network/src/main/java/org/apache/ignite/internal/network/direct/stream/DirectByteBufferStreamImplV1.java
index 5561abb..1f478e1 100644
--- a/modules/network/src/main/java/org/apache/ignite/internal/network/direct/stream/DirectByteBufferStreamImplV1.java
+++ b/modules/network/src/main/java/org/apache/ignite/internal/network/direct/stream/DirectByteBufferStreamImplV1.java
@@ -47,7 +47,6 @@ import java.util.RandomAccess;
import java.util.UUID;
import org.apache.ignite.internal.network.message.ClassDescriptorMessage;
import org.apache.ignite.internal.network.serialization.PerSessionSerializationService;
-import org.apache.ignite.internal.network.serialization.marshal.MarshalledObject;
import org.apache.ignite.internal.util.ArrayFactory;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -143,10 +142,6 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
private long uuidLocId;
- private int marshallableState;
-
- private byte[] marshallable;
-
private List<ClassDescriptorMessage> descriptors;
protected boolean lastFinished;
@@ -1361,100 +1356,6 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
return map0;
}
- /** {@inheritDoc} */
- @Override
- public <T> void writeMarshallable(T object, MessageWriter writer) {
- switch (marshallableState) {
- case 0:
- writeBoolean(object == null);
-
- if (!lastFinished || object == null) {
- return;
- }
-
- marshallableState++;
-
- //noinspection fallthrough
- case 1:
- if (marshallable == null) {
- // If object was not serialized to a byte array, serialize it
- MarshalledObject res = serializationService.writeMarshallable(object);
- marshallable = res.bytes();
- // Get descriptors that were not previously sent to the remote node
- descriptors = serializationService.createClassDescriptorsMessages(res.usedDescriptorIds());
- }
-
- writeCollection(descriptors, MessageCollectionItemType.MSG, writer);
-
- if (!lastFinished) {
- return;
- }
-
- marshallableState++;
-
- //noinspection fallthrough
- case 2:
- writeByteArray(marshallable);
-
- if (!lastFinished) {
- return;
- }
-
- marshallable = null;
- descriptors = null;
- marshallableState = 0;
- break;
-
- default:
- throw new IllegalArgumentException("Unknown marshallableState: " + marshallableState);
- }
- }
-
- /** {@inheritDoc} */
- @Override
- public <T> T readMarshallable(MessageReader reader) {
- switch (marshallableState) {
- case 0:
- boolean isNull = readBoolean();
-
- if (!lastFinished || isNull) {
- return null;
- }
-
- marshallableState++;
-
- //noinspection fallthrough
- case 1:
- descriptors = readCollection(MessageCollectionItemType.MSG, reader);
-
- if (!lastFinished) {
- return null;
- }
-
- marshallableState++;
-
- //noinspection fallthrough
- case 2:
- marshallable = readByteArray();
-
- if (!lastFinished) {
- return null;
- }
-
- break;
- default:
- throw new IllegalArgumentException("Unknown marshallableState: " + marshallableState);
- }
-
- T read = serializationService.readMarshallable(descriptors, marshallable);
-
- marshallableState = 0;
- marshallable = null;
- descriptors = null;
-
- return read;
- }
-
/**
* Writes array.
*