[ignite] branch master updated: GNITE-12271 Fix byte order in PDS code for Big Endian archs - Fixes #6953.

[ilyak]

This is an automated email from the ASF dual-hosted git repository.

ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 2b5bb14  GNITE-12271 Fix byte order in PDS code for Big Endian archs - 
Fixes #6953.
2b5bb14 is described below

commit 2b5bb149a367826a607d13ca4873ea3db6351f21
Author: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
AuthorDate: Fri Oct 11 13:08:14 2019 +0300

    GNITE-12271 Fix byte order in PDS code for Big Endian archs - Fixes #6953.
    
    Signed-off-by: Ilya Kasnacheev <ilya.kasnach...@gmail.com>
---
 .../processors/cache/persistence/GridCacheDatabaseSharedManager.java  | 2 +-
 .../internal/processors/cache/persistence/file/FilePageStore.java     | 4 ++--
 .../processors/cache/persistence/file/FileVersionCheckingFactory.java | 2 +-
 .../cache/persistence/pagemem/DelayedPageReplacementTracker.java      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index a738f2d..5831f4e 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -1315,7 +1315,7 @@ public class GridCacheDatabaseSharedManager extends 
IgniteCacheDatabaseSharedMan
             if (fileIO.size() < minimalHdr)
                 throw new IgniteCheckedException("Partition file is too small: 
" + partFile);
 
-            ByteBuffer hdr = 
ByteBuffer.allocate(minimalHdr).order(ByteOrder.LITTLE_ENDIAN);
+            ByteBuffer hdr = 
ByteBuffer.allocate(minimalHdr).order(ByteOrder.nativeOrder());
 
             fileIO.readFully(hdr);
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
index e1603ac..d9749f4 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java
@@ -196,7 +196,7 @@ public class FilePageStore implements PageStore {
      * @return Byte buffer instance.
      */
     public ByteBuffer header(byte type, int pageSize) {
-        ByteBuffer hdr = 
ByteBuffer.allocate(headerSize()).order(ByteOrder.LITTLE_ENDIAN);
+        ByteBuffer hdr = 
ByteBuffer.allocate(headerSize()).order(ByteOrder.nativeOrder());
 
         hdr.putLong(SIGNATURE);
 
@@ -250,7 +250,7 @@ public class FilePageStore implements PageStore {
      * @throws IOException If check has failed.
      */
     private long checkFile(FileIO fileIO, File cfgFile) throws IOException {
-        ByteBuffer hdr = 
ByteBuffer.allocate(headerSize()).order(ByteOrder.LITTLE_ENDIAN);
+        ByteBuffer hdr = 
ByteBuffer.allocate(headerSize()).order(ByteOrder.nativeOrder());
 
         fileIO.readFully(hdr);
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileVersionCheckingFactory.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileVersionCheckingFactory.java
index 9c20e02..e547122 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileVersionCheckingFactory.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FileVersionCheckingFactory.java
@@ -81,7 +81,7 @@ public class FileVersionCheckingFactory implements 
FilePageStoreFactory {
             if (fileIO.size() < minHdr)
                 return createPageStore(type, pathProvider, latestVersion(), 
allocatedTracker);
 
-            ByteBuffer hdr = 
ByteBuffer.allocate(minHdr).order(ByteOrder.LITTLE_ENDIAN);
+            ByteBuffer hdr = 
ByteBuffer.allocate(minHdr).order(ByteOrder.nativeOrder());
 
             fileIO.readFully(hdr);
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/DelayedPageReplacementTracker.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/DelayedPageReplacementTracker.java
index 574b5fa..aff6eb5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/DelayedPageReplacementTracker.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/DelayedPageReplacementTracker.java
@@ -50,7 +50,7 @@ public class DelayedPageReplacementTracker {
         @Override protected ByteBuffer initialValue() {
             ByteBuffer buf = ByteBuffer.allocateDirect(pageSize);
 
-            buf.order(ByteOrder.LITTLE_ENDIAN);
+            buf.order(ByteOrder.nativeOrder());
 
             return buf;
         }