Revert "ignite-nio - Removing message clone" This reverts commit 3a05bf1a6956cb8dab8b3e25ed24d25aac3dcea4.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a214c0a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a214c0a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a214c0a0 Branch: refs/heads/ignite-nio Commit: a214c0a0af5dcad5ae2da41e2102aa707ec95394 Parents: 01689b1 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Sat Feb 14 23:24:18 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Sat Feb 14 23:24:18 2015 -0800 ---------------------------------------------------------------------- .../CommunicationMessageCodeGenerator.java | 172 +++++++++---------- .../ignite/internal/GridJobExecuteRequest.java | 8 +- .../internal/direct/DirectByteBufferStream.java | 16 +- .../internal/direct/DirectMessageReader.java | 8 +- .../internal/direct/DirectMessageWriter.java | 8 +- .../communication/GridIoUserMessage.java | 4 +- .../deployment/GridDeploymentInfoBean.java | 4 +- .../deployment/GridDeploymentRequest.java | 4 +- .../eventstorage/GridEventStorageMessage.java | 4 +- .../cache/GridCacheEvictionResponse.java | 4 +- .../distributed/GridCacheTtlUpdateRequest.java | 16 +- .../distributed/GridDistributedBaseMessage.java | 8 +- .../distributed/GridDistributedLockRequest.java | 8 +- .../GridDistributedLockResponse.java | 4 +- .../GridDistributedTxFinishRequest.java | 8 +- .../GridDistributedTxPrepareRequest.java | 8 +- .../GridDistributedUnlockRequest.java | 4 +- .../distributed/dht/GridDhtLockRequest.java | 4 +- .../distributed/dht/GridDhtLockResponse.java | 12 +- .../distributed/dht/GridDhtTxFinishRequest.java | 8 +- .../dht/GridDhtTxPrepareRequest.java | 4 +- .../dht/GridDhtTxPrepareResponse.java | 12 +- .../distributed/dht/GridDhtUnlockRequest.java | 4 +- .../GridDhtAtomicDeferredUpdateResponse.java | 4 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 32 ++-- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 20 +-- .../atomic/GridNearAtomicUpdateResponse.java | 12 +- .../dht/preloader/GridDhtForceKeysRequest.java | 4 +- .../dht/preloader/GridDhtForceKeysResponse.java | 4 +- .../GridDhtPartitionDemandMessage.java | 4 +- .../GridDhtPartitionSupplyMessage.java | 8 +- .../distributed/near/GridNearGetRequest.java | 4 +- .../distributed/near/GridNearGetResponse.java | 4 +- .../distributed/near/GridNearLockRequest.java | 8 +- .../distributed/near/GridNearLockResponse.java | 12 +- .../near/GridNearTxPrepareRequest.java | 4 +- .../near/GridNearTxPrepareResponse.java | 12 +- .../cache/query/GridCacheQueryResponse.java | 8 +- .../clock/GridClockDeltaSnapshotMessage.java | 4 +- .../dataload/GridDataLoadRequest.java | 4 +- .../processors/igfs/IgfsBlocksMessage.java | 4 +- .../igfs/IgfsFragmentizerRequest.java | 4 +- .../streamer/GridStreamerExecutionRequest.java | 4 +- .../communication/MessageAdapter.java | 67 ++++++++ .../communication/MessageFieldType.java | 86 ---------- .../extensions/communication/MessageReader.java | 6 +- .../extensions/communication/MessageWriter.java | 8 +- 48 files changed, 321 insertions(+), 342 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java ---------------------------------------------------------------------- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java index 00c30ba..c8ec334 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java @@ -57,50 +57,50 @@ public class CommunicationMessageCodeGenerator { private static final String BUF_VAR = "buf"; /** */ - private static final Map<Class<?>, MessageFieldType> TYPES = U.newHashMap(30); + private static final Map<Class<?>, MessageAdapter.Type> TYPES = U.newHashMap(30); static { - TYPES.put(byte.class, MessageFieldType.BYTE); - TYPES.put(Byte.class, MessageFieldType.BYTE); - TYPES.put(short.class, MessageFieldType.SHORT); - TYPES.put(Short.class, MessageFieldType.SHORT); - TYPES.put(int.class, MessageFieldType.INT); - TYPES.put(Integer.class, MessageFieldType.INT); - TYPES.put(long.class, MessageFieldType.LONG); - TYPES.put(Long.class, MessageFieldType.LONG); - TYPES.put(float.class, MessageFieldType.FLOAT); - TYPES.put(Float.class, MessageFieldType.FLOAT); - TYPES.put(double.class, MessageFieldType.DOUBLE); - TYPES.put(Double.class, MessageFieldType.DOUBLE); - TYPES.put(char.class, MessageFieldType.CHAR); - TYPES.put(Character.class, MessageFieldType.CHAR); - TYPES.put(boolean.class, MessageFieldType.BOOLEAN); - TYPES.put(Boolean.class, MessageFieldType.BOOLEAN); - TYPES.put(byte[].class, MessageFieldType.BYTE_ARR); - TYPES.put(short[].class, MessageFieldType.SHORT_ARR); - TYPES.put(int[].class, MessageFieldType.INT_ARR); - TYPES.put(long[].class, MessageFieldType.LONG_ARR); - TYPES.put(float[].class, MessageFieldType.FLOAT_ARR); - TYPES.put(double[].class, MessageFieldType.DOUBLE_ARR); - TYPES.put(char[].class, MessageFieldType.CHAR_ARR); - TYPES.put(boolean[].class, MessageFieldType.BOOLEAN_ARR); - TYPES.put(String.class, MessageFieldType.STRING); - TYPES.put(BitSet.class, MessageFieldType.BIT_SET); - TYPES.put(UUID.class, MessageFieldType.UUID); - TYPES.put(IgniteUuid.class, MessageFieldType.IGNITE_UUID); + TYPES.put(byte.class, MessageAdapter.Type.BYTE); + TYPES.put(Byte.class, MessageAdapter.Type.BYTE); + TYPES.put(short.class, MessageAdapter.Type.SHORT); + TYPES.put(Short.class, MessageAdapter.Type.SHORT); + TYPES.put(int.class, MessageAdapter.Type.INT); + TYPES.put(Integer.class, MessageAdapter.Type.INT); + TYPES.put(long.class, MessageAdapter.Type.LONG); + TYPES.put(Long.class, MessageAdapter.Type.LONG); + TYPES.put(float.class, MessageAdapter.Type.FLOAT); + TYPES.put(Float.class, MessageAdapter.Type.FLOAT); + TYPES.put(double.class, MessageAdapter.Type.DOUBLE); + TYPES.put(Double.class, MessageAdapter.Type.DOUBLE); + TYPES.put(char.class, MessageAdapter.Type.CHAR); + TYPES.put(Character.class, MessageAdapter.Type.CHAR); + TYPES.put(boolean.class, MessageAdapter.Type.BOOLEAN); + TYPES.put(Boolean.class, MessageAdapter.Type.BOOLEAN); + TYPES.put(byte[].class, MessageAdapter.Type.BYTE_ARR); + TYPES.put(short[].class, MessageAdapter.Type.SHORT_ARR); + TYPES.put(int[].class, MessageAdapter.Type.INT_ARR); + TYPES.put(long[].class, MessageAdapter.Type.LONG_ARR); + TYPES.put(float[].class, MessageAdapter.Type.FLOAT_ARR); + TYPES.put(double[].class, MessageAdapter.Type.DOUBLE_ARR); + TYPES.put(char[].class, MessageAdapter.Type.CHAR_ARR); + TYPES.put(boolean[].class, MessageAdapter.Type.BOOLEAN_ARR); + TYPES.put(String.class, MessageAdapter.Type.STRING); + TYPES.put(BitSet.class, MessageAdapter.Type.BIT_SET); + TYPES.put(UUID.class, MessageAdapter.Type.UUID); + TYPES.put(IgniteUuid.class, MessageAdapter.Type.IGNITE_UUID); } /** * @param cls Class. * @return Type enum value. */ - private static MessageFieldType typeEnum(Class<?> cls) { - MessageFieldType type = TYPES.get(cls); + private static MessageAdapter.Type typeEnum(Class<?> cls) { + MessageAdapter.Type type = TYPES.get(cls); if (type == null) { assert MessageAdapter.class.isAssignableFrom(cls) : cls; - type = MessageFieldType.MSG; + type = MessageAdapter.Type.MSG; } return type; @@ -461,68 +461,67 @@ public class CommunicationMessageCodeGenerator { String field = raw ? "null" : '"' + name + '"'; if (type == byte.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BYTE"); + returnFalseIfFailed(write, "writer.writeByte", field, name); else if (type == short.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.SHORT"); + returnFalseIfFailed(write, "writer.writeShort", field, name); else if (type == int.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.INT"); + returnFalseIfFailed(write, "writer.writeInt", field, name); else if (type == long.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.LONG"); + returnFalseIfFailed(write, "writer.writeLong", field, name); else if (type == float.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.FLOAT"); + returnFalseIfFailed(write, "writer.writeFloat", field, name); else if (type == double.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.DOUBLE"); + returnFalseIfFailed(write, "writer.writeDouble", field, name); else if (type == char.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.CHAR"); + returnFalseIfFailed(write, "writer.writeChar", field, name); else if (type == boolean.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BOOLEAN"); + returnFalseIfFailed(write, "writer.writeBoolean", field, name); else if (type == byte[].class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BYTE_ARR"); + returnFalseIfFailed(write, "writer.writeByteArray", field, name); else if (type == short[].class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.SHORT_ARR"); + returnFalseIfFailed(write, "writer.writeShortArray", field, name); else if (type == int[].class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.INT_ARR"); + returnFalseIfFailed(write, "writer.writeIntArray", field, name); else if (type == long[].class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.LONG_ARR"); + returnFalseIfFailed(write, "writer.writeLongArray", field, name); else if (type == float[].class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.FLOAT_ARR"); + returnFalseIfFailed(write, "writer.writeFloatArray", field, name); else if (type == double[].class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.DOUBLE_ARR"); + returnFalseIfFailed(write, "writer.writeDoubleArray", field, name); else if (type == char[].class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.CHAR_ARR"); + returnFalseIfFailed(write, "writer.writeCharArray", field, name); else if (type == boolean[].class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BOOLEAN_ARR"); + returnFalseIfFailed(write, "writer.writeBooleanArray", field, name); else if (type == String.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.STRING"); + returnFalseIfFailed(write, "writer.writeString", field, name); else if (type == BitSet.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.BIT_SET"); + returnFalseIfFailed(write, "writer.writeBitSet", field, name); else if (type == UUID.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.UUID"); + returnFalseIfFailed(write, "writer.writeUuid", field, name); else if (type == IgniteUuid.class) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.IGNITE_UUID"); + returnFalseIfFailed(write, "writer.writeIgniteUuid", field, name); else if (type.isEnum()) { String arg = name + " != null ? (byte)" + name + ".ordinal() : -1"; - returnFalseIfFailed(write, "writer.writeField", field, arg, "MessageFieldType.BYTE"); + returnFalseIfFailed(write, "writer.writeByte", field, arg); } else if (BASE_CLS.isAssignableFrom(type)) - returnFalseIfFailed(write, "writer.writeField", field, name, "MessageFieldType.MSG"); + returnFalseIfFailed(write, "writer.writeMessage", field, name); else if (type.isArray()) { - returnFalseIfFailed(write, "writer.writeArrayField", field, name, - "MessageFieldType." + typeEnum(type.getComponentType())); + returnFalseIfFailed(write, "writer.writeObjectArray", field, name, + "Type." + typeEnum(type.getComponentType())); } else if (Collection.class.isAssignableFrom(type) && !Set.class.isAssignableFrom(type)) { assert colItemType != null; - returnFalseIfFailed(write, "writer.writeCollectionField", field, name, - "MessageFieldType." + typeEnum(colItemType)); + returnFalseIfFailed(write, "writer.writeCollection", field, name, "Type." + typeEnum(colItemType)); } else if (Map.class.isAssignableFrom(type)) { assert mapKeyType != null; assert mapValType != null; - returnFalseIfFailed(write, "writer.writeMapField", field, name, "MessageFieldType." + typeEnum(mapKeyType), - "MessageFieldType." + typeEnum(mapValType)); + returnFalseIfFailed(write, "writer.writeMap", field, name, "Type." + typeEnum(mapKeyType), + "Type." + typeEnum(mapValType)); } else throw new IllegalStateException("Unsupported type: " + type); @@ -542,69 +541,68 @@ public class CommunicationMessageCodeGenerator { String field = '"' + name + '"'; if (type == byte.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BYTE"); + returnFalseIfReadFailed(name, "reader.readByte", field); else if (type == short.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.SHORT"); + returnFalseIfReadFailed(name, "reader.readShort", field); else if (type == int.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.INT"); + returnFalseIfReadFailed(name, "reader.readInt", field); else if (type == long.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.LONG"); + returnFalseIfReadFailed(name, "reader.readLong", field); else if (type == float.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.FLOAT"); + returnFalseIfReadFailed(name, "reader.readFloat", field); else if (type == double.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.DOUBLE"); + returnFalseIfReadFailed(name, "reader.readDouble", field); else if (type == char.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.CHAR"); + returnFalseIfReadFailed(name, "reader.readChar", field); else if (type == boolean.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BOOLEAN"); + returnFalseIfReadFailed(name, "reader.readBoolean", field); else if (type == byte[].class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BYTE_ARR"); + returnFalseIfReadFailed(name, "reader.readByteArray", field); else if (type == short[].class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.SHORT_ARR"); + returnFalseIfReadFailed(name, "reader.readShortArray", field); else if (type == int[].class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.INT_ARR"); + returnFalseIfReadFailed(name, "reader.readIntArray", field); else if (type == long[].class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.LONG_ARR"); + returnFalseIfReadFailed(name, "reader.readLongArray", field); else if (type == float[].class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.FLOAT_ARR"); + returnFalseIfReadFailed(name, "reader.readFloatArray", field); else if (type == double[].class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.DOUBLE_ARR"); + returnFalseIfReadFailed(name, "reader.readDoubleArray", field); else if (type == char[].class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.CHAR_ARR"); + returnFalseIfReadFailed(name, "reader.readCharArray", field); else if (type == boolean[].class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BOOLEAN_ARR"); + returnFalseIfReadFailed(name, "reader.readBooleanArray", field); else if (type == String.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.STRING"); + returnFalseIfReadFailed(name, "reader.readString", field); else if (type == BitSet.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.BIT_SET"); + returnFalseIfReadFailed(name, "reader.readBitSet", field); else if (type == UUID.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.UUID"); + returnFalseIfReadFailed(name, "reader.readUuid", field); else if (type == IgniteUuid.class) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.IGNITE_UUID"); + returnFalseIfReadFailed(name, "reader.readIgniteUuid", field); else if (type.isEnum()) { String loc = name + "Ord"; read.add(builder().a("byte ").a(loc).a(";").toString()); read.add(EMPTY); - returnFalseIfReadFailed(loc, "reader.readField", field, "MessageFieldType.BYTE"); + returnFalseIfReadFailed(loc, "reader.readByte", field); read.add(EMPTY); read.add(builder().a(name).a(" = ").a(type.getSimpleName()).a(".fromOrdinal(").a(loc).a(");").toString()); } else if (BASE_CLS.isAssignableFrom(type)) - returnFalseIfReadFailed(name, "reader.readField", field, "MessageFieldType.MSG"); + returnFalseIfReadFailed(name, "reader.readMessage", field); else if (type.isArray()) { Class<?> compType = type.getComponentType(); - returnFalseIfReadFailed(name, "reader.readArrayField", field, "MessageFieldType." + typeEnum(compType), + returnFalseIfReadFailed(name, "reader.readObjectArray", field, "Type." + typeEnum(compType), compType.getSimpleName() + ".class"); } else if (Collection.class.isAssignableFrom(type) && !Set.class.isAssignableFrom(type)) { assert colItemType != null; - returnFalseIfReadFailed(name, "reader.readCollectionField", field, - "MessageFieldType." + typeEnum(colItemType)); + returnFalseIfReadFailed(name, "reader.readCollection", field, "Type." + typeEnum(colItemType)); } else if (Map.class.isAssignableFrom(type)) { assert mapKeyType != null; @@ -612,8 +610,8 @@ public class CommunicationMessageCodeGenerator { boolean linked = type.equals(LinkedHashMap.class); - returnFalseIfReadFailed(name, "reader.readMapField", field, "MessageFieldType." + typeEnum(mapKeyType), - "MessageFieldType." + typeEnum(mapValType), linked ? "true" : "false"); + returnFalseIfReadFailed(name, "reader.readMap", field, "Type." + typeEnum(mapKeyType), + "Type." + typeEnum(mapValType), linked ? "true" : "false"); } else throw new IllegalStateException("Unsupported type: " + type); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java index eef9f78..4a961a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteRequest.java @@ -478,7 +478,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes writer.incrementState(); case 9: - if (!writer.writeMap("ldrParticipants", ldrParticipants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("ldrParticipants", ldrParticipants, Type.UUID, Type.IGNITE_UUID)) return false; writer.incrementState(); @@ -538,7 +538,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes writer.incrementState(); case 19: - if (!writer.writeCollection("top", top, MessageFieldType.UUID)) + if (!writer.writeCollection("top", top, Type.UUID)) return false; writer.incrementState(); @@ -636,7 +636,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 9: - ldrParticipants = reader.readMap("ldrParticipants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + ldrParticipants = reader.readMap("ldrParticipants", Type.UUID, Type.IGNITE_UUID, false); if (!reader.isLastRead()) return false; @@ -716,7 +716,7 @@ public class GridJobExecuteRequest extends MessageAdapter implements GridTaskMes readState++; case 19: - top = reader.readCollection("top", MessageFieldType.UUID); + top = reader.readCollection("top", Type.UUID); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java index 78fe0f1..901958f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java @@ -553,7 +553,7 @@ public class DirectByteBufferStream { * @param itemType Component type. * @param writer Writer. */ - public <T> void writeObjectArray(T[] arr, MessageFieldType itemType, MessageWriter writer) { + public <T> void writeObjectArray(T[] arr, MessageAdapter.Type itemType, MessageWriter writer) { if (arr != null) { if (it == null) { writeInt(arr.length); @@ -587,7 +587,7 @@ public class DirectByteBufferStream { * @param itemType Item type. * @param writer Writer. */ - public <T> void writeCollection(Collection<T> col, MessageFieldType itemType, MessageWriter writer) { + public <T> void writeCollection(Collection<T> col, MessageAdapter.Type itemType, MessageWriter writer) { if (col != null) { if (it == null) { writeInt(col.size()); @@ -623,7 +623,7 @@ public class DirectByteBufferStream { * @param writer Writer. */ @SuppressWarnings("unchecked") - public <K, V> void writeMap(Map<K, V> map, MessageFieldType keyType, MessageFieldType valType, + public <K, V> void writeMap(Map<K, V> map, MessageAdapter.Type keyType, MessageAdapter.Type valType, MessageWriter writer) { if (map != null) { if (it == null) { @@ -935,7 +935,7 @@ public class DirectByteBufferStream { * @return Array. */ @SuppressWarnings("unchecked") - public <T> T[] readObjectArray(MessageFieldType itemType, Class<T> itemCls) { + public <T> T[] readObjectArray(MessageAdapter.Type itemType, Class<T> itemCls) { if (readSize == -1) { int size = readInt(); @@ -977,7 +977,7 @@ public class DirectByteBufferStream { * @return Collection. */ @SuppressWarnings("unchecked") - public <C extends Collection<?>> C readCollection(MessageFieldType itemType) { + public <C extends Collection<?>> C readCollection(MessageAdapter.Type itemType) { if (readSize == -1) { int size = readInt(); @@ -1021,7 +1021,7 @@ public class DirectByteBufferStream { * @return Map. */ @SuppressWarnings("unchecked") - public <M extends Map<?, ?>> M readMap(MessageFieldType keyType, MessageFieldType valType, boolean linked) { + public <M extends Map<?, ?>> M readMap(MessageAdapter.Type keyType, MessageAdapter.Type valType, boolean linked) { if (readSize == -1) { int size = readInt(); @@ -1220,7 +1220,7 @@ public class DirectByteBufferStream { * @param val Value. * @param writer Writer. */ - private void write(MessageFieldType type, Object val, MessageWriter writer) { + private void write(MessageAdapter.Type type, Object val, MessageWriter writer) { switch (type) { case BYTE: writeByte((Byte)val); @@ -1345,7 +1345,7 @@ public class DirectByteBufferStream { * @param type Type. * @return Value. */ - private Object read(MessageFieldType type) { + private Object read(MessageAdapter.Type type) { switch (type) { case BYTE: return readByte(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java index 0e6ef5b..f52a4c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageReader.java @@ -236,7 +236,7 @@ public class DirectMessageReader implements MessageReader { } /** {@inheritDoc} */ - @Override public <T> T[] readObjectArray(String name, MessageFieldType itemType, Class<T> itemCls) { + @Override public <T> T[] readObjectArray(String name, MessageAdapter.Type itemType, Class<T> itemCls) { T[] msg = stream.readObjectArray(itemType, itemCls); lastRead = stream.lastFinished(); @@ -245,7 +245,7 @@ public class DirectMessageReader implements MessageReader { } /** {@inheritDoc} */ - @Override public <C extends Collection<?>> C readCollection(String name, MessageFieldType itemType) { + @Override public <C extends Collection<?>> C readCollection(String name, MessageAdapter.Type itemType) { C col = stream.readCollection(itemType); lastRead = stream.lastFinished(); @@ -254,8 +254,8 @@ public class DirectMessageReader implements MessageReader { } /** {@inheritDoc} */ - @Override public <M extends Map<?, ?>> M readMap(String name, MessageFieldType keyType, - MessageFieldType valType, boolean linked) { + @Override public <M extends Map<?, ?>> M readMap(String name, MessageAdapter.Type keyType, + MessageAdapter.Type valType, boolean linked) { M map = stream.readMap(keyType, valType, linked); lastRead = stream.lastFinished(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java index ced0889..0438bb2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java @@ -187,22 +187,22 @@ public class DirectMessageWriter implements MessageWriter { } /** {@inheritDoc} */ - @Override public <T> boolean writeObjectArray(String name, T[] arr, MessageFieldType itemType) { + @Override public <T> boolean writeObjectArray(String name, T[] arr, MessageAdapter.Type itemType) { stream.writeObjectArray(arr, itemType, this); return stream.lastFinished(); } /** {@inheritDoc} */ - @Override public <T> boolean writeCollection(String name, Collection<T> col, MessageFieldType itemType) { + @Override public <T> boolean writeCollection(String name, Collection<T> col, MessageAdapter.Type itemType) { stream.writeCollection(col, itemType, this); return stream.lastFinished(); } /** {@inheritDoc} */ - @Override public <K, V> boolean writeMap(String name, Map<K, V> map, MessageFieldType keyType, - MessageFieldType valType) { + @Override public <K, V> boolean writeMap(String name, Map<K, V> map, MessageAdapter.Type keyType, + MessageAdapter.Type valType) { stream.writeMap(map, keyType, valType, this); return stream.lastFinished(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java index 786f11a..059f836 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java @@ -239,7 +239,7 @@ public class GridIoUserMessage extends MessageAdapter { writer.incrementState(); case 4: - if (!writer.writeMap("ldrParties", ldrParties, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("ldrParties", ldrParties, Type.UUID, Type.IGNITE_UUID)) return false; writer.incrementState(); @@ -303,7 +303,7 @@ public class GridIoUserMessage extends MessageAdapter { readState++; case 4: - ldrParties = reader.readMap("ldrParties", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + ldrParties = reader.readMap("ldrParties", Type.UUID, Type.IGNITE_UUID, false); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java index 59968a9..16ccaab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java @@ -168,7 +168,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy writer.incrementState(); case 3: - if (!writer.writeMap("participants", participants, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("participants", participants, Type.UUID, Type.IGNITE_UUID)) return false; writer.incrementState(); @@ -218,7 +218,7 @@ public class GridDeploymentInfoBean extends MessageAdapter implements GridDeploy readState++; case 3: - participants = reader.readMap("participants", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + participants = reader.readMap("participants", Type.UUID, Type.IGNITE_UUID, false); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java index 7f6a7ce..0d2dc9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java @@ -180,7 +180,7 @@ public class GridDeploymentRequest extends MessageAdapter { writer.incrementState(); case 2: - if (!writer.writeCollection("nodeIds", nodeIds, MessageFieldType.UUID)) + if (!writer.writeCollection("nodeIds", nodeIds, Type.UUID)) return false; writer.incrementState(); @@ -224,7 +224,7 @@ public class GridDeploymentRequest extends MessageAdapter { readState++; case 2: - nodeIds = reader.readCollection("nodeIds", MessageFieldType.UUID); + nodeIds = reader.readCollection("nodeIds", Type.UUID); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java index 0762849..9c51332 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java @@ -309,7 +309,7 @@ public class GridEventStorageMessage extends MessageAdapter { writer.incrementState(); case 6: - if (!writer.writeMap("ldrParties", ldrParties, MessageFieldType.UUID, MessageFieldType.IGNITE_UUID)) + if (!writer.writeMap("ldrParties", ldrParties, Type.UUID, Type.IGNITE_UUID)) return false; writer.incrementState(); @@ -389,7 +389,7 @@ public class GridEventStorageMessage extends MessageAdapter { readState++; case 6: - ldrParties = reader.readMap("ldrParties", MessageFieldType.UUID, MessageFieldType.IGNITE_UUID, false); + ldrParties = reader.readMap("ldrParties", Type.UUID, Type.IGNITE_UUID, false); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java index b1f9902..1e8fe58 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java @@ -156,7 +156,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { writer.incrementState(); case 5: - if (!writer.writeCollection("rejectedKeyBytes", rejectedKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("rejectedKeyBytes", rejectedKeyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -191,7 +191,7 @@ public class GridCacheEvictionResponse<K, V> extends GridCacheMessage<K, V> { readState++; case 5: - rejectedKeyBytes = reader.readCollection("rejectedKeyBytes", MessageFieldType.BYTE_ARR); + rejectedKeyBytes = reader.readCollection("rejectedKeyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java index 19da7fe..b0aa291 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java @@ -202,19 +202,19 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { switch (writer.state()) { case 3: - if (!writer.writeCollection("keysBytes", keysBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keysBytes", keysBytes, Type.BYTE_ARR)) return false; writer.incrementState(); case 4: - if (!writer.writeCollection("nearKeysBytes", nearKeysBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearKeysBytes", nearKeysBytes, Type.BYTE_ARR)) return false; writer.incrementState(); case 5: - if (!writer.writeCollection("nearVers", nearVers, MessageFieldType.MSG)) + if (!writer.writeCollection("nearVers", nearVers, Type.MSG)) return false; writer.incrementState(); @@ -232,7 +232,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { writer.incrementState(); case 8: - if (!writer.writeCollection("vers", vers, MessageFieldType.MSG)) + if (!writer.writeCollection("vers", vers, Type.MSG)) return false; writer.incrementState(); @@ -251,7 +251,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { switch (readState) { case 3: - keysBytes = reader.readCollection("keysBytes", MessageFieldType.BYTE_ARR); + keysBytes = reader.readCollection("keysBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -259,7 +259,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { readState++; case 4: - nearKeysBytes = reader.readCollection("nearKeysBytes", MessageFieldType.BYTE_ARR); + nearKeysBytes = reader.readCollection("nearKeysBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -267,7 +267,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { readState++; case 5: - nearVers = reader.readCollection("nearVers", MessageFieldType.MSG); + nearVers = reader.readCollection("nearVers", Type.MSG); if (!reader.isLastRead()) return false; @@ -291,7 +291,7 @@ public class GridCacheTtlUpdateRequest<K, V> extends GridCacheMessage<K, V> { readState++; case 8: - vers = reader.readCollection("vers", MessageFieldType.MSG); + vers = reader.readCollection("vers", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java index f58c520..a7d5819 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java @@ -267,13 +267,13 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< writer.incrementState(); case 5: - if (!writer.writeCollection("committedVers", committedVers, MessageFieldType.MSG)) + if (!writer.writeCollection("committedVers", committedVers, Type.MSG)) return false; writer.incrementState(); case 6: - if (!writer.writeCollection("rolledbackVers", rolledbackVers, MessageFieldType.MSG)) + if (!writer.writeCollection("rolledbackVers", rolledbackVers, Type.MSG)) return false; writer.incrementState(); @@ -314,7 +314,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< readState++; case 5: - committedVers = reader.readCollection("committedVers", MessageFieldType.MSG); + committedVers = reader.readCollection("committedVers", Type.MSG); if (!reader.isLastRead()) return false; @@ -322,7 +322,7 @@ public abstract class GridDistributedBaseMessage<K, V> extends GridCacheMessage< readState++; case 6: - rolledbackVers = reader.readCollection("rolledbackVers", MessageFieldType.MSG); + rolledbackVers = reader.readCollection("rolledbackVers", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java index ed20375..e144279 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java @@ -441,7 +441,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage switch (writer.state()) { case 8: - if (!writer.writeObjectArray("drVersByIdx", drVersByIdx, MessageFieldType.MSG)) + if (!writer.writeObjectArray("drVersByIdx", drVersByIdx, Type.MSG)) return false; writer.incrementState(); @@ -483,7 +483,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage writer.incrementState(); case 15: - if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -550,7 +550,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage switch (readState) { case 8: - drVersByIdx = reader.readObjectArray("drVersByIdx", MessageFieldType.MSG, GridCacheVersion.class); + drVersByIdx = reader.readObjectArray("drVersByIdx", Type.MSG, GridCacheVersion.class); if (!reader.isLastRead()) return false; @@ -610,7 +610,7 @@ public class GridDistributedLockRequest<K, V> extends GridDistributedBaseMessage readState++; case 15: - keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java index f02d826..ee993eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java @@ -304,7 +304,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag writer.incrementState(); case 10: - if (!writer.writeCollection("valBytes", valBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("valBytes", valBytes, Type.MSG)) return false; writer.incrementState(); @@ -339,7 +339,7 @@ public class GridDistributedLockResponse<K, V> extends GridDistributedBaseMessag readState++; case 10: - valBytes = reader.readCollection("valBytes", MessageFieldType.MSG); + valBytes = reader.readCollection("valBytes", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 9896e18..30ad331 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -395,7 +395,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes writer.incrementState(); case 14: - if (!writer.writeCollection("recoveryWritesBytes", recoveryWritesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("recoveryWritesBytes", recoveryWritesBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -431,7 +431,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes writer.incrementState(); case 20: - if (!writer.writeCollection("writeEntriesBytes", writeEntriesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("writeEntriesBytes", writeEntriesBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -498,7 +498,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 14: - recoveryWritesBytes = reader.readCollection("recoveryWritesBytes", MessageFieldType.BYTE_ARR); + recoveryWritesBytes = reader.readCollection("recoveryWritesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -546,7 +546,7 @@ public class GridDistributedTxFinishRequest<K, V> extends GridDistributedBaseMes readState++; case 20: - writeEntriesBytes = reader.readCollection("writeEntriesBytes", MessageFieldType.BYTE_ARR); + writeEntriesBytes = reader.readCollection("writeEntriesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index d685b48..41a55ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -459,7 +459,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe writer.incrementState(); case 15: - if (!writer.writeCollection("readsBytes", readsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("readsBytes", readsBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -495,7 +495,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe writer.incrementState(); case 21: - if (!writer.writeCollection("writesBytes", writesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("writesBytes", writesBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -578,7 +578,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 15: - readsBytes = reader.readCollection("readsBytes", MessageFieldType.BYTE_ARR); + readsBytes = reader.readCollection("readsBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -626,7 +626,7 @@ public class GridDistributedTxPrepareRequest<K, V> extends GridDistributedBaseMe readState++; case 21: - writesBytes = reader.readCollection("writesBytes", MessageFieldType.BYTE_ARR); + writesBytes = reader.readCollection("writesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java index 8526a9e..694c30c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java @@ -130,7 +130,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa switch (writer.state()) { case 8: - if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -149,7 +149,7 @@ public class GridDistributedUnlockRequest<K, V> extends GridDistributedBaseMessa switch (readState) { case 8: - keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java index 5455a7c..342d4b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java @@ -374,7 +374,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { writer.incrementState(); case 27: - if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -447,7 +447,7 @@ public class GridDhtLockRequest<K, V> extends GridDistributedLockRequest<K, V> { readState++; case 27: - nearKeyBytes = reader.readCollection("nearKeyBytes", MessageFieldType.BYTE_ARR); + nearKeyBytes = reader.readCollection("nearKeyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java index 038bdda..409dbb6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java @@ -214,7 +214,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> switch (writer.state()) { case 11: - if (!writer.writeCollection("invalidParts", invalidParts, MessageFieldType.INT)) + if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; writer.incrementState(); @@ -226,13 +226,13 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> writer.incrementState(); case 13: - if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR)) return false; writer.incrementState(); case 14: - if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -251,7 +251,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> switch (readState) { case 11: - invalidParts = reader.readCollection("invalidParts", MessageFieldType.INT); + invalidParts = reader.readCollection("invalidParts", Type.INT); if (!reader.isLastRead()) return false; @@ -267,7 +267,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> readState++; case 13: - nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageFieldType.BYTE_ARR); + nearEvictedBytes = reader.readCollection("nearEvictedBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -275,7 +275,7 @@ public class GridDhtLockResponse<K, V> extends GridDistributedLockResponse<K, V> readState++; case 14: - preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", MessageFieldType.BYTE_ARR); + preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index e67535a..28d60ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -387,7 +387,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest writer.incrementState(); case 25: - if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -399,7 +399,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest writer.incrementState(); case 27: - if (!writer.writeCollection("pendingVers", pendingVers, MessageFieldType.MSG)) + if (!writer.writeCollection("pendingVers", pendingVers, Type.MSG)) return false; writer.incrementState(); @@ -490,7 +490,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 25: - nearWritesBytes = reader.readCollection("nearWritesBytes", MessageFieldType.BYTE_ARR); + nearWritesBytes = reader.readCollection("nearWritesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -506,7 +506,7 @@ public class GridDhtTxFinishRequest<K, V> extends GridDistributedTxFinishRequest readState++; case 27: - pendingVers = reader.readCollection("pendingVers", MessageFieldType.MSG); + pendingVers = reader.readCollection("pendingVers", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java index bcf2e7d..0439a23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java @@ -357,7 +357,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque writer.incrementState(); case 27: - if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearWritesBytes", nearWritesBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -452,7 +452,7 @@ public class GridDhtTxPrepareRequest<K, V> extends GridDistributedTxPrepareReque readState++; case 27: - nearWritesBytes = reader.readCollection("nearWritesBytes", MessageFieldType.BYTE_ARR); + nearWritesBytes = reader.readCollection("nearWritesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index e3a3a0d..ca92980 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -226,7 +226,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp writer.incrementState(); case 11: - if (!writer.writeCollection("invalidParts", invalidParts, MessageFieldType.INT)) + if (!writer.writeCollection("invalidParts", invalidParts, Type.INT)) return false; writer.incrementState(); @@ -238,13 +238,13 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp writer.incrementState(); case 13: - if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR)) return false; writer.incrementState(); case 14: - if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("preloadEntriesBytes", preloadEntriesBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -271,7 +271,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; case 11: - invalidParts = reader.readCollection("invalidParts", MessageFieldType.INT); + invalidParts = reader.readCollection("invalidParts", Type.INT); if (!reader.isLastRead()) return false; @@ -287,7 +287,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; case 13: - nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageFieldType.BYTE_ARR); + nearEvictedBytes = reader.readCollection("nearEvictedBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -295,7 +295,7 @@ public class GridDhtTxPrepareResponse<K, V> extends GridDistributedTxPrepareResp readState++; case 14: - preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", MessageFieldType.BYTE_ARR); + preloadEntriesBytes = reader.readCollection("preloadEntriesBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java index 5c8efbe..a9d035f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java @@ -119,7 +119,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, switch (writer.state()) { case 9: - if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -138,7 +138,7 @@ public class GridDhtUnlockRequest<K, V> extends GridDistributedUnlockRequest<K, switch (readState) { case 9: - nearKeyBytes = reader.readCollection("nearKeyBytes", MessageFieldType.BYTE_ARR); + nearKeyBytes = reader.readCollection("nearKeyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java index 77d858b..f8e60c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicDeferredUpdateResponse.java @@ -88,7 +88,7 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< switch (writer.state()) { case 3: - if (!writer.writeCollection("futVers", futVers, MessageFieldType.MSG)) + if (!writer.writeCollection("futVers", futVers, Type.MSG)) return false; writer.incrementState(); @@ -107,7 +107,7 @@ public class GridDhtAtomicDeferredUpdateResponse<K, V> extends GridCacheMessage< switch (readState) { case 3: - futVers = reader.readCollection("futVers", MessageFieldType.MSG); + futVers = reader.readCollection("futVers", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index 2f33351..7e4413a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -702,13 +702,13 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp writer.incrementState(); case 4: - if (!writer.writeCollection("drVers", drVers, MessageFieldType.MSG)) + if (!writer.writeCollection("drVers", drVers, Type.MSG)) return false; writer.incrementState(); case 5: - if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("entryProcessorsBytes", entryProcessorsBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -726,19 +726,19 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp writer.incrementState(); case 8: - if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, Type.BYTE_ARR)) return false; writer.incrementState(); case 9: - if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); case 10: - if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearEntryProcessorsBytes", nearEntryProcessorsBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -750,7 +750,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp writer.incrementState(); case 12: - if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearKeyBytes", nearKeyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -762,7 +762,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp writer.incrementState(); case 14: - if (!writer.writeCollection("nearValBytes", nearValBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("nearValBytes", nearValBytes, Type.MSG)) return false; writer.incrementState(); @@ -804,7 +804,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp writer.incrementState(); case 21: - if (!writer.writeCollection("valBytes", valBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("valBytes", valBytes, Type.MSG)) return false; writer.incrementState(); @@ -837,7 +837,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 4: - drVers = reader.readCollection("drVers", MessageFieldType.MSG); + drVers = reader.readCollection("drVers", Type.MSG); if (!reader.isLastRead()) return false; @@ -845,7 +845,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 5: - entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", MessageFieldType.BYTE_ARR); + entryProcessorsBytes = reader.readCollection("entryProcessorsBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -869,7 +869,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 8: - invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageFieldType.BYTE_ARR, byte[].class); + invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", Type.BYTE_ARR, byte[].class); if (!reader.isLastRead()) return false; @@ -877,7 +877,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 9: - keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -885,7 +885,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 10: - nearEntryProcessorsBytes = reader.readCollection("nearEntryProcessorsBytes", MessageFieldType.BYTE_ARR); + nearEntryProcessorsBytes = reader.readCollection("nearEntryProcessorsBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -901,7 +901,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 12: - nearKeyBytes = reader.readCollection("nearKeyBytes", MessageFieldType.BYTE_ARR); + nearKeyBytes = reader.readCollection("nearKeyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -917,7 +917,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 14: - nearValBytes = reader.readCollection("nearValBytes", MessageFieldType.MSG); + nearValBytes = reader.readCollection("nearValBytes", Type.MSG); if (!reader.isLastRead()) return false; @@ -977,7 +977,7 @@ public class GridDhtAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> imp readState++; case 21: - valBytes = reader.readCollection("valBytes", MessageFieldType.MSG); + valBytes = reader.readCollection("valBytes", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java index 0bf33ea..c732be5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java @@ -211,7 +211,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im writer.incrementState(); case 6: - if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("nearEvictedBytes", nearEvictedBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -254,7 +254,7 @@ public class GridDhtAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> im readState++; case 6: - nearEvictedBytes = reader.readCollection("nearEvictedBytes", MessageFieldType.BYTE_ARR); + nearEvictedBytes = reader.readCollection("nearEvictedBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index 50c1e5e..c206264 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -570,7 +570,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im writer.incrementState(); case 5: - if (!writer.writeCollection("drVers", drVers, MessageFieldType.MSG)) + if (!writer.writeCollection("drVers", drVers, Type.MSG)) return false; writer.incrementState(); @@ -588,7 +588,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im writer.incrementState(); case 8: - if (!writer.writeObjectArray("filterBytes", filterBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeObjectArray("filterBytes", filterBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -612,13 +612,13 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im writer.incrementState(); case 12: - if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeObjectArray("invokeArgsBytes", invokeArgsBytes, Type.BYTE_ARR)) return false; writer.incrementState(); case 13: - if (!writer.writeCollection("keyBytes", keyBytes, MessageFieldType.BYTE_ARR)) + if (!writer.writeCollection("keyBytes", keyBytes, Type.BYTE_ARR)) return false; writer.incrementState(); @@ -666,7 +666,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im writer.incrementState(); case 21: - if (!writer.writeCollection("valBytes", valBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("valBytes", valBytes, Type.MSG)) return false; writer.incrementState(); @@ -701,7 +701,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 5: - drVers = reader.readCollection("drVers", MessageFieldType.MSG); + drVers = reader.readCollection("drVers", Type.MSG); if (!reader.isLastRead()) return false; @@ -725,7 +725,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 8: - filterBytes = reader.readObjectArray("filterBytes", MessageFieldType.BYTE_ARR, byte[].class); + filterBytes = reader.readObjectArray("filterBytes", Type.BYTE_ARR, byte[].class); if (!reader.isLastRead()) return false; @@ -757,7 +757,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 12: - invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", MessageFieldType.BYTE_ARR, byte[].class); + invokeArgsBytes = reader.readObjectArray("invokeArgsBytes", Type.BYTE_ARR, byte[].class); if (!reader.isLastRead()) return false; @@ -765,7 +765,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 13: - keyBytes = reader.readCollection("keyBytes", MessageFieldType.BYTE_ARR); + keyBytes = reader.readCollection("keyBytes", Type.BYTE_ARR); if (!reader.isLastRead()) return false; @@ -837,7 +837,7 @@ public class GridNearAtomicUpdateRequest<K, V> extends GridCacheMessage<K, V> im readState++; case 21: - valBytes = reader.readCollection("valBytes", MessageFieldType.MSG); + valBytes = reader.readCollection("valBytes", Type.MSG); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a214c0a0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java index 7912a07..468861b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java @@ -457,7 +457,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i writer.incrementState(); case 7: - if (!writer.writeCollection("nearSkipIdxs", nearSkipIdxs, MessageFieldType.INT)) + if (!writer.writeCollection("nearSkipIdxs", nearSkipIdxs, Type.INT)) return false; writer.incrementState(); @@ -469,13 +469,13 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i writer.incrementState(); case 9: - if (!writer.writeCollection("nearValBytes", nearValBytes, MessageFieldType.MSG)) + if (!writer.writeCollection("nearValBytes", nearValBytes, Type.MSG)) return false; writer.incrementState(); case 10: - if (!writer.writeCollection("nearValsIdxs", nearValsIdxs, MessageFieldType.INT)) + if (!writer.writeCollection("nearValsIdxs", nearValsIdxs, Type.INT)) return false; writer.incrementState(); @@ -544,7 +544,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 7: - nearSkipIdxs = reader.readCollection("nearSkipIdxs", MessageFieldType.INT); + nearSkipIdxs = reader.readCollection("nearSkipIdxs", Type.INT); if (!reader.isLastRead()) return false; @@ -560,7 +560,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 9: - nearValBytes = reader.readCollection("nearValBytes", MessageFieldType.MSG); + nearValBytes = reader.readCollection("nearValBytes", Type.MSG); if (!reader.isLastRead()) return false; @@ -568,7 +568,7 @@ public class GridNearAtomicUpdateResponse<K, V> extends GridCacheMessage<K, V> i readState++; case 10: - nearValsIdxs = reader.readCollection("nearValsIdxs", MessageFieldType.INT); + nearValsIdxs = reader.readCollection("nearValsIdxs", Type.INT); if (!reader.isLastRead()) return false;
