ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [2/3] ignite git commit: IGNITE-1770: Field ID is not written any more.
Date Tue, 27 Oct 2015 09:37:06 GMT
IGNITE-1770: Field ID is not written any more.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5be9cf39
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5be9cf39
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5be9cf39

Branch: refs/heads/ignite-1770
Commit: 5be9cf395b17b92abda7de8e4f155e1c967de538
Parents: f610e72
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Oct 27 12:27:20 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Oct 27 12:27:20 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/portable/PortableReaderExImpl.java  | 2 +-
 .../apache/ignite/internal/portable/PortableWriterExImpl.java  | 2 --
 .../ignite/internal/portable/builder/PortableBuilderImpl.java  | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5be9cf39/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
index 2d0a633..8dc5eb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
@@ -2566,7 +2566,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
             if (id0 == id) {
                 int offset = in.readIntPositioned(searchHead + 4);
 
-                in.position(start + offset + 8); // TODO: "+8" will be removed soon.
+                in.position(start + offset + 4); // TODO: "+4" will be removed soon.
 
                 return true;
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/5be9cf39/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
index 031f7a9..8cc9dad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
@@ -1825,8 +1825,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
         int off = out.position() - start;
 
         saveFieldInfo(fieldId, off);
-
-        doWriteInt(fieldId);
     }
 
      /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/5be9cf39/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java
index d703b15..6ea0474 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java
@@ -240,7 +240,7 @@ public class PortableBuilderImpl implements PortableBuilder {
                 int fieldId = reader.readIntPositioned(footerPos);
                 int fieldLen = fieldPositionAndLength(footerPos, footerEnd, rawPos).get2();
 
-                reader.skip(8); // TODO: This must be removed.
+                reader.skip(4); // TODO: This must be removed.
 
                 footerPos += 8;
 
@@ -411,7 +411,7 @@ public class PortableBuilderImpl implements PortableBuilder {
      */
     private IgniteBiTuple<Integer, Integer> fieldPositionAndLength(int footerPos, int
footerEnd, int rawPos) {
         int fieldOffset = reader.readIntPositioned(footerPos + 4);
-        int fieldPos = start + fieldOffset + 8; // TODO: 8 is to be removed.
+        int fieldPos = start + fieldOffset + 4; // TODO: 4 is to be removed.
 
         // Get field length.
         int fieldLen;
@@ -423,7 +423,7 @@ public class PortableBuilderImpl implements PortableBuilder {
             // Field is somewhere in the middle, get difference with the next offset.
             int nextFieldOffset = reader.readIntPositioned(footerPos + 8 + 4);
 
-            fieldLen = nextFieldOffset - fieldOffset - 8; // TODO: 8 is to be removed.
+            fieldLen = nextFieldOffset - fieldOffset - 4; // TODO: 4 is to be removed.
         }
 
         return F.t(fieldPos, fieldLen);


Mime
View raw message