ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/4] ignite git commit: ignite-gg-11810
Date Wed, 28 Dec 2016 16:12:10 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-11810 6afd2e795 -> c41f751be


ignite-gg-11810


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

Branch: refs/heads/ignite-11810
Commit: e3420e9fc7114b9ad3343f9eeaa3593efae14810
Parents: 6afd2e7
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Dec 26 13:25:57 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Dec 26 13:25:57 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/database/CacheDataRowAdapter.java  | 12 ++++++------
 .../processors/cache/database/tree/io/DataPageIO.java   | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e3420e9f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
index 1e7a99b..38b19a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
@@ -196,12 +196,12 @@ public class CacheDataRowAdapter implements CacheDataRow {
         if (len == 0)
             key = null;
         else {
-            byte[] bytes = PageUtils.getBytes(buf, off, len);
-            off += len;
-
             byte type = PageUtils.getByte(buf, off);
             off++;
 
+            byte[] bytes = PageUtils.getBytes(buf, off, len);
+            off += len;
+
             key = coctx.processor().toKeyCacheObject(coctx, type, bytes);
         }
 
@@ -217,12 +217,12 @@ public class CacheDataRowAdapter implements CacheDataRow {
         if (len == 0)
             val = null;
         else {
-            byte[] bytes = PageUtils.getBytes(buf, off, len);
-            off += len;
-
             byte type = PageUtils.getByte(buf, off);
             off++;
 
+            byte[] bytes = PageUtils.getBytes(buf, off, len);
+            off += len;
+
             val = coctx.processor().toCacheObject(coctx, type, bytes);
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e3420e9f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java
index 0aaa2a4..1034220 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/DataPageIO.java
@@ -1282,23 +1282,23 @@ public class DataPageIO extends PageIO {
         PageUtils.putInt(buf, dataOff, bytes.length);
         dataOff += 4;
 
-        PageUtils.putBytes(buf, dataOff, bytes);
-        dataOff += bytes.length;
-
         PageUtils.putByte(buf, dataOff, row.key().cacheObjectType());
         dataOff++;
 
+        PageUtils.putBytes(buf, dataOff, bytes);
+        dataOff += bytes.length;
+
         bytes = row.value().valueBytes(null);
 
         PageUtils.putInt(buf, dataOff, bytes.length);
         dataOff += 4;
 
-        PageUtils.putBytes(buf, dataOff, bytes);
-        dataOff += bytes.length;
-
         PageUtils.putByte(buf, dataOff, row.value().cacheObjectType());
         dataOff++;
 
+        PageUtils.putBytes(buf, dataOff, bytes);
+        dataOff += bytes.length;
+
         CacheVersionIO.write(buf + dataOff, row.version(), false);
 
         dataOff += CacheVersionIO.size(row.version(), false);


Mime
View raw message