Issue #4284 , binary compatibility issue was fixed.

orientechnologies · Jun 8, 2015 · 2a004c4 · 2a004c4
1 parent cecc1fc
commit 2a004c4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 25 deletions.
diff --git a/...src/main/java/com/orientechnologies/orient/core/index/hashindex/local/cache/O2QCache.java b/...src/main/java/com/orientechnologies/orient/core/index/hashindex/local/cache/O2QCache.java
@@ -25,6 +25,7 @@
 import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.orient.core.exception.OAllCacheEntriesAreUsedException;
 import com.orientechnologies.orient.core.exception.OStorageException;
+import com.orientechnologies.orient.core.storage.cache.OAbstractWriteCache;
 import com.orientechnologies.orient.core.storage.cache.OWriteCache;
 import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurablePage;
 
@@ -140,7 +141,7 @@ public long openFile(final String fileName, OWriteCache writeCache) throws IOExc
 
   @Override
   public void openFile(long fileId, OWriteCache writeCache) throws IOException {
-    fileId = checkFileIdCompatibilty(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
 
     cacheLock.acquireReadLock();
     Lock fileLock;
@@ -164,7 +165,7 @@ public void openFile(long fileId, OWriteCache writeCache) throws IOException {
 
   @Override
   public void openFile(String fileName, long fileId, OWriteCache writeCache) throws IOException {
-    fileId = checkFileIdCompatibilty(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
 
     cacheLock.acquireWriteLock();
     try {
@@ -188,7 +189,7 @@ public void openFile(String fileName, long fileId, OWriteCache writeCache) throw
 
   @Override
   public void addFile(String fileName, long fileId, OWriteCache writeCache) throws IOException {
-    fileId = checkFileIdCompatibilty(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
 
     cacheLock.acquireWriteLock();
     try {
@@ -227,7 +228,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 = checkFileIdCompatibilty(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
 
     final UpdateCacheResult cacheResult = doLoad(fileId, pageIndex, checkPinnedPages, false, writeCache);
     if (cacheResult == null)
@@ -288,7 +289,7 @@ private UpdateCacheResult doLoad(long fileId, long pageIndex, boolean checkPinne
 
   @Override
   public OCacheEntry allocateNewPage(long fileId, OWriteCache writeCache) throws IOException {
-    fileId = checkFileIdCompatibilty(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
 
     UpdateCacheResult cacheResult;
 
@@ -375,7 +376,7 @@ public void clear() {
   @Override
   public void truncateFile(long fileId, OWriteCache writeCache) throws IOException {
     Lock fileLock;
-    fileId = checkFileIdCompatibilty(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
 
     cacheLock.acquireReadLock();
     try {
@@ -430,7 +431,7 @@ private void clearFile(long fileId) {
 
   @Override
   public void closeFile(long fileId, boolean flush, OWriteCache writeCache) throws IOException {
-    fileId = checkFileIdCompatibilty(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
 
     Lock fileLock;
     cacheLock.acquireReadLock();
@@ -452,7 +453,7 @@ public void closeFile(long fileId, boolean flush, OWriteCache writeCache) throws
 
   @Override
   public void deleteFile(long fileId, OWriteCache writeCache) throws IOException {
-    fileId = checkFileIdCompatibilty(fileId, writeCache.getId());
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, writeCache.getId());
 
     Lock fileLock;
 
@@ -933,20 +934,4 @@ private UpdateCacheResult(boolean removeColdPages, OCacheEntry cacheEntry) {
       this.cacheEntry = cacheEntry;
     }
   }
-
-  private int storageId(long fileId) {
-    return (int) (fileId >>> 32);
-  }
-
-  private long composeFileId(long fileId, int storageId) {
-    return (((long) storageId) << 32) | fileId;
-  }
-
-  private long checkFileIdCompatibilty(long fileId, int storageId) {
-    if (storageId(fileId) == 0) {
-      return composeFileId(fileId, storageId);
-    }
-
-    return fileId;
-  }
 }
diff --git a/...n/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSBTreeBonsaiLocal.java b/...n/java/com/orientechnologies/orient/core/index/sbtreebonsai/local/OSBTreeBonsaiLocal.java
@@ -44,6 +44,7 @@
 import com.orientechnologies.orient.core.index.sbtree.local.OSBTree;
 import com.orientechnologies.orient.core.index.sbtree.local.OSBTreeException;
 import com.orientechnologies.orient.core.serialization.serializer.binary.OBinarySerializerFactory;
+import com.orientechnologies.orient.core.storage.cache.OAbstractWriteCache;
 import com.orientechnologies.orient.core.storage.impl.local.OAbstractPaginatedStorage;
 import com.orientechnologies.orient.core.storage.impl.local.paginated.atomicoperations.OAtomicOperation;
 import com.orientechnologies.orient.core.storage.impl.local.paginated.base.ODurableComponent;
@@ -140,7 +141,7 @@ public void create(long fileId, OBinarySerializer<K> keySerializer, OBinarySeria
 
       openFile(atomicOperation, fileId);
 
-      this.fileId = fileId;
+      this.fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, storage.getId());
       this.name = resolveTreeName(fileId, atomicOperation);
 
       initAfterCreate(atomicOperation);
@@ -483,6 +484,7 @@ public void delete() {
   }
 
   public void load(long fileId, OBonsaiBucketPointer rootBucketPointer) {
+    fileId = OAbstractWriteCache.checkFileIdCompatibility(fileId, storage.getId());
     Lock lock = fileLockManager.acquireExclusiveLock(fileId);
     try {
       this.rootBucketPointer = rootBucketPointer;

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
@@ -16,4 +16,12 @@ public static int extractStorageId(long fileId) {
     return (int) (fileId >>> 32);
   }
 
+  public static long checkFileIdCompatibility(long fileId, int storageId) {
+    if (extractStorageId(fileId) == 0) {
+      return composeFileId((int) fileId, storageId);
+    }
+
+    return fileId;
+  }
+
 }