ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [01/10] ignite git commit: IGNITE-1770: WIP on using new search algo.
Date Tue, 27 Oct 2015 09:00:56 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1770 ae2a938d6 -> fb9a816f1


IGNITE-1770: WIP on using new search algo.


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

Branch: refs/heads/ignite-1770
Commit: 6cb5be450c2136f02b896c90ff3e15320c71b5dd
Parents: ae2a938
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Oct 27 10:56:07 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Oct 27 10:56:07 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/portable/PortableReaderExImpl.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6cb5be45/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 e23a865..d0424b2 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
@@ -2512,8 +2512,8 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
     private boolean hasField(int id) {
         assert hdrLen != 0;
 
-        int searchHead = start + hdrLen;
-        int searchTail = start + PortableUtils.rawOffset(in, start);
+        int searchHead = start + footerStart;
+        int searchTail = start + footerEnd;
 
         // TODO: Opto.
 
@@ -2554,14 +2554,14 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
             int id0 = in.readIntPositioned(searchHead);
 
             if (id0 == id) {
-                in.position(searchHead + 8);
+                int offset = in.readIntPositioned(searchHead + 4);
+
+                in.position(start + offset + 8); // TODO: "+8" will be removed soon.
 
                 return true;
             }
 
-            int len = in.readIntPositioned(searchHead + 4);
-
-            searchHead += (8 + len);
+            searchHead += 8;
         }
     }
 


Mime
View raw message