ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [16/50] [abbrv] ignite git commit: GG-11560 - Fixed page IO issues on large page sizes.
Date Mon, 10 Oct 2016 12:13:12 GMT
GG-11560 - Fixed page IO issues on large page sizes.


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

Branch: refs/heads/ignite-gg-8-io2-selNow
Commit: c89f88dfcdd04cf3772868e4f13a9a72695a59d9
Parents: 3126688
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Wed Sep 28 14:04:21 2016 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Wed Sep 28 14:04:21 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/database/freelist/FreeListImpl.java       | 2 +-
 .../internal/processors/cache/database/tree/io/DataPageIO.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c89f88df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
index 00a84db..0898e9c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/FreeListImpl.java
@@ -187,7 +187,7 @@ public class FreeListImpl extends PagesList implements FreeList, ReuseList
{
 
             assert oldFreeSpace >= 0: oldFreeSpace;
 
-            long nextLink = io.removeRow(buf, (byte)itemId);
+            long nextLink = io.removeRow(buf, itemId);
 
             if (isWalDeltaRecordNeeded(wal, page))
                 wal.log(new DataPageRemoveRecord(cacheId, page.id(), itemId));

http://git-wip-us.apache.org/repos/asf/ignite/blob/c89f88df/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 ee0af51..0f9d193 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
@@ -19,8 +19,8 @@ package org.apache.ignite.internal.processors.cache.database.tree.io;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
-import java.util.Set;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.internal.pagemem.PageIdUtils;
 import org.apache.ignite.internal.processors.cache.CacheObject;
@@ -344,7 +344,7 @@ public class DataPageIO extends PageIO {
 
         b.a("][");
 
-        Set<Integer> set = new HashSet<>();
+        Collection<Integer> set = new HashSet<>();
 
         for (int i = directCnt; i < directCnt + indirectCnt; i++) {
             if (i != directCnt)
@@ -517,7 +517,7 @@ public class DataPageIO extends PageIO {
      * @return Fixed item ID (the index used for referencing an entry from the outside).
      */
     private int itemId(short indirectItem) {
-        return indirectItem >>> 8;
+        return (indirectItem & 0xFFFF) >>> 8;
     }
 
     /**


Mime
View raw message