Issue #4526 was fixed.

orientechnologies · Jul 8, 2015 · 480f55c · 480f55c
1 parent 56f9bf3
commit 480f55c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/cache/OAbstractWriteCache.java b/core/src/main/java/com/orientechnologies/orient/core/storage/cache/OAbstractWriteCache.java
@@ -19,12 +19,9 @@
  */
 package com.orientechnologies.orient.core.storage.cache;
 
-/**
- * Created by lomak_000 on 06.06.2015.
- */
 public class OAbstractWriteCache {
-  public static long composeFileId(int id, int fileId) {
-    return (((long) id) << 32) | fileId;
+  public static long composeFileId(int storageId, int fileId) {
+    return (((long) storageId) << 32) | fileId;
   }
 
   public static int extractFileId(long fileId) {
@@ -35,9 +32,9 @@ public static int extractStorageId(long fileId) {
     return (int) (fileId >>> 32);
   }
 
-  public static long checkFileIdCompatibility(long fileId, int storageId) {
+  public static long checkFileIdCompatibility(int storageId, long fileId) {
     if (extractStorageId(fileId) == 0) {
-      return composeFileId((int) fileId, storageId);
+      return composeFileId(storageId, (int) fileId);
     }
 
     return fileId;

diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/cache/local/O2QCache.java b/core/src/main/java/com/orientechnologies/orient/core/storage/cache/local/O2QCache.java
@@ -147,7 +147,7 @@ public long openFile(final String fileName, OWriteCache writeCache) throws IOExc
 
   @Override
   public void openFile(long fileId, OWriteCache writeCache) throws IOException {
-    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(writeCache.getId(), fileId);
 
     cacheLock.acquireReadLock();
     Lock fileLock;
@@ -171,7 +171,7 @@ public void openFile(long fileId, OWriteCache writeCache) throws IOException {
 
   @Override
   public void openFile(String fileName, long fileId, OWriteCache writeCache) throws IOException {
-    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(writeCache.getId(), fileId);
 
     cacheLock.acquireWriteLock();
     try {
@@ -195,7 +195,7 @@ public void openFile(String fileName, long fileId, OWriteCache writeCache) throw
 
   @Override
   public void addFile(String fileName, long fileId, OWriteCache writeCache) throws IOException {
-    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(writeCache.getId(), fileId);
 
     cacheLock.acquireWriteLock();
     try {
@@ -234,7 +234,7 @@ public void pinPage(final OCacheEntry cacheEntry) throws IOException {
   @Override
   public OCacheEntry load(long fileId, final long pageIndex, final boolean checkPinnedPages, OWriteCache writeCache)
       throws IOException {
-    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(writeCache.getId(), fileId);
 
     final UpdateCacheResult cacheResult = doLoad(fileId, pageIndex, checkPinnedPages, false, writeCache);
     if (cacheResult == null)
@@ -299,7 +299,7 @@ private UpdateCacheResult doLoad(long fileId, long pageIndex, boolean checkPinne
 
   @Override
   public OCacheEntry allocateNewPage(long fileId, OWriteCache writeCache) throws IOException {
-    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(writeCache.getId(), fileId);
 
     UpdateCacheResult cacheResult;
 
@@ -386,7 +386,7 @@ public void clear() {
   @Override
   public void truncateFile(long fileId, OWriteCache writeCache) throws IOException {
     Lock fileLock;
-    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(writeCache.getId(), fileId);
 
     cacheLock.acquireReadLock();
     try {
@@ -442,7 +442,7 @@ private void clearFile(long fileId) {
 
   @Override
   public void closeFile(long fileId, boolean flush, OWriteCache writeCache) throws IOException {
-    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(writeCache.getId(), fileId);
 
     Lock fileLock;
     cacheLock.acquireReadLock();
@@ -464,7 +464,7 @@ public void closeFile(long fileId, boolean flush, OWriteCache writeCache) throws
 
   @Override
   public void deleteFile(long fileId, OWriteCache writeCache) throws IOException {
-    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(writeCache.getId(), fileId);
 
     Lock fileLock;