# gg-9791 - Added MessageHeader

apache · Feb 18, 2015 · 8f0b647 · 8f0b647
1 parent 0303b40
commit 8f0b647
Show file tree

Hide file tree

Showing 90 changed files with 275 additions and 274 deletions.
diff --git a/...es/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java b/...es/codegen/src/main/java/org/apache/ignite/codegen/CommunicationMessageCodeGenerator.java
@@ -291,17 +291,17 @@ public void generate(Class<? extends MessageAdapter> cls) throws Exception {
 
         Collections.sort(fields, FIELD_CMP);
 
+        int state = startState(cls);
+
         indent = 2;
 
         boolean hasSuper = cls.getSuperclass() != BASE_CLS;
 
-        start(write, hasSuper ? "writeTo" : null, true);
-        start(read, hasSuper ? "readFrom" : null, false);
+        start(write, hasSuper ? "writeTo" : null, true, state + fields.size());
+        start(read, hasSuper ? "readFrom" : null, false, 0);
 
         indent++;
 
-        int state = startState(cls);
-
         for (Field field : fields)
             processField(field, state++);
 
@@ -347,8 +347,9 @@ private int startState(Class<?> cls) {
      * @param code Code lines.
      * @param superMtd Super class method name.
      * @param write Whether write code is generated.
+     * @param fieldCnt Fields count.
      */
-    private void start(Collection<String> code, @Nullable String superMtd, boolean write) {
+    private void start(Collection<String> code, @Nullable String superMtd, boolean write, int fieldCnt) {
         assert code != null;
 
         code.add(builder().a(write ? "writer" : "reader").a(".setBuffer(").a(BUF_VAR).a(");").toString());
@@ -364,14 +365,14 @@ private void start(Collection<String> code, @Nullable String superMtd, boolean w
         }
 
         if (write) {
-            code.add(builder().a("if (!writer.isTypeWritten()) {").toString());
+            code.add(builder().a("if (!writer.isHeaderWritten()) {").toString());
 
             indent++;
 
-            returnFalseIfFailed(code, "writer.writeByte", "null", "directType()");
+            returnFalseIfFailed(code, "writer.writeHeader", "new MessageHeader(directType(), (byte)" + fieldCnt + ")");
 
             code.add(EMPTY);
-            code.add(builder().a("writer.onTypeWritten();").toString());
+            code.add(builder().a("writer.onHeaderWritten();").toString());
 
             indent--;
 

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobCancelRequest.java
@@ -113,11 +113,11 @@ public boolean system() {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)3)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

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
@@ -415,11 +415,11 @@ public UUID getSubjectId() {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)21)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobExecuteResponse.java
@@ -208,11 +208,11 @@ public void setFakeException(IgniteException fakeEx) {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)7)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsRequest.java
@@ -87,11 +87,11 @@ public byte[] topicBytes() {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)2)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/GridJobSiblingsResponse.java
@@ -80,11 +80,11 @@ public void unmarshalSiblings(Marshaller marsh) throws IgniteCheckedException {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)1)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskCancelRequest.java
@@ -64,11 +64,11 @@ public IgniteUuid sessionId() {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)1)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/GridTaskSessionRequest.java
@@ -101,11 +101,11 @@ public IgniteUuid getJobId() {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)3)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

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
@@ -216,12 +216,12 @@ public class DirectMessageWriter implements MessageWriter {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean isTypeWritten() {
+    @Override public boolean isHeaderWritten() {
         return state.isTypeWritten();
     }
 
     /** {@inheritDoc} */
-    @Override public void onTypeWritten() {
+    @Override public void onHeaderWritten() {
         state.onTypeWritten();
     }
 

diff --git a/...e/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java b/...e/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointRequest.java
@@ -87,11 +87,11 @@ public String getCheckpointSpi() {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)3)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...s/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/...s/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java
@@ -182,11 +182,11 @@ boolean isOrdered() {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)7)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...re/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java b/...re/src/main/java/org/apache/ignite/internal/managers/communication/GridIoUserMessage.java
@@ -206,11 +206,11 @@ public void deployment(GridDeployment dep) {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)7)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/.../src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java b/.../src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentInfoBean.java
@@ -141,11 +141,11 @@ public void localDeploymentOwner(boolean locDepOwner) {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)5)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...e/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java b/...e/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentRequest.java
@@ -159,11 +159,11 @@ public void nodeIds(Collection<UUID> nodeIds) {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)5)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/.../src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java b/.../src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentResponse.java
@@ -109,11 +109,11 @@ void errorMessage(String errMsg) {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)3)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...c/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java b/...c/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageMessage.java
@@ -264,11 +264,11 @@ void exceptionBytes(byte[] exBytes) {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)9)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...e/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java b/...e/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionRequest.java
@@ -146,11 +146,11 @@ void addKey(K key, GridCacheVersion ver, boolean near) {
         if (!super.writeTo(buf, writer))
             return false;
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)6)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/.../src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java b/.../src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionResponse.java
@@ -135,11 +135,11 @@ boolean error() {
         if (!super.writeTo(buf, writer))
             return false;
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)6)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -649,11 +649,11 @@ protected final void unmarshalTx(Iterable<IgniteTxEntry<K, V>> txEntries,
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)3)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...s/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java b/...s/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytes.java
@@ -123,11 +123,11 @@ public boolean isNull() {
     @Override public boolean writeTo(ByteBuffer buf, MessageWriter writer) {
         writer.setBuffer(buf);
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)2)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...nite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java b/...nite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxRequest.java
@@ -116,11 +116,11 @@ public boolean system() {
         if (!super.writeTo(buf, writer))
             return false;
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)13)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...ite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java b/...ite/internal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxResponse.java
@@ -91,11 +91,11 @@ public boolean success() {
         if (!super.writeTo(buf, writer))
             return false;
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)11)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...va/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java b/...va/org/apache/ignite/internal/processors/cache/distributed/GridCacheTtlUpdateRequest.java
@@ -193,11 +193,11 @@ public List<GridCacheVersion > nearVersions() {
         if (!super.writeTo(buf, writer))
             return false;
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)9)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {

diff --git a/...a/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java b/...a/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
@@ -246,11 +246,11 @@ public int keysCount() {
         if (!super.writeTo(buf, writer))
             return false;
 
-        if (!writer.isTypeWritten()) {
-            if (!writer.writeByte(null, directType()))
+        if (!writer.isHeaderWritten()) {
+            if (!writer.writeHeader(new MessageHeader(directType(), (byte)8)))
                 return false;
 
-            writer.onTypeWritten();
+            writer.onHeaderWritten();
         }
 
         switch (writer.state()) {