Issue #2029 , mechanics of freezing new atomic operations was added. …

…Modification lock was replaced by new mechanics.
orientechnologies · Sep 15, 2015 · d10ab9b · d10ab9b
1 parent 99765cc
commit d10ab9b
Show file tree

Hide file tree

Showing 16 changed files with 857 additions and 1,600 deletions.
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OClusterRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OClusterRemote.java
@@ -19,7 +19,6 @@
  */
 package com.orientechnologies.orient.client.remote;
 
-import com.orientechnologies.common.concur.lock.OModificationLock;
 import com.orientechnologies.orient.core.config.OStorageClusterConfiguration;
 import com.orientechnologies.orient.core.conflict.ORecordConflictStrategy;
 import com.orientechnologies.orient.core.exception.ORecordNotFoundException;
@@ -83,11 +82,6 @@ public void open() throws IOException {
   public void close() throws IOException {
   }
 
-  @Override
-  public OModificationLock getExternalModificationLock() {
-    throw new UnsupportedOperationException("getExternalModificationLock");
-  }
-
   @Override
   public void close(boolean flush) throws IOException {
   }

diff --git a/core/src/main/java/com/orientechnologies/common/concur/lock/ODistributedCounter.java b/core/src/main/java/com/orientechnologies/common/concur/lock/ODistributedCounter.java
@@ -17,7 +17,7 @@ public class ODistributedCounter extends OOrientListenerAbstract {
   private static final int MAX_RETRIES = 8;
 
   private static final AtomicInteger nextHashCode = new AtomicInteger();
-  private final AtomicBoolean poolBusy = new AtomicBoolean();
+  private final AtomicBoolean           isBusy         = new AtomicBoolean();
   private final int maxPartitions = Runtime.getRuntime().availableProcessors() << 3;
 
 
@@ -60,7 +60,8 @@ public void add(long delta) {
   }
 
   public void clear() {
-    while (!poolBusy.compareAndSet(false, true)) ;
+    while (!isBusy.compareAndSet(false, true))
+      ;
 
     final AtomicLong[] cts = new AtomicLong[counters.length];
     for (int i = 0; i < counters.length; i++) {
@@ -69,7 +70,7 @@ public void clear() {
 
     counters = cts;
 
-    poolBusy.set(false);
+    isBusy.set(false);
   }
 
   private void updateCounter(long delta) {
@@ -82,15 +83,15 @@ private void updateCounter(long delta) {
       AtomicLong counter = cts[index];
 
       if (counter == null) {
-        if (!poolBusy.get() && poolBusy.compareAndSet(false, true)) {
+        if (!isBusy.get() && isBusy.compareAndSet(false, true)) {
           if (cts == counters) {
             counter = cts[index];
 
             if (counter == null)
               cts[index] = new AtomicLong();
           }
 
-          poolBusy.set(false);
+          isBusy.set(false);
         }
 
         continue;
@@ -112,7 +113,7 @@ private void updateCounter(long delta) {
           return;
         }
 
-        if (!poolBusy.get() && poolBusy.compareAndSet(false, true)) {
+        if (!isBusy.get() && isBusy.compareAndSet(false, true)) {
           if (cts == counters) {
             if (cts.length < maxPartitions) {
               final AtomicLong[] newCts = new AtomicLong[cts.length << 1];
@@ -121,7 +122,7 @@ private void updateCounter(long delta) {
             }
           }
 
-          poolBusy.set(false);
+          isBusy.set(false);
         }
 
         continue;

diff --git a/core/src/main/java/com/orientechnologies/common/concur/lock/OModificationLock.java b/core/src/main/java/com/orientechnologies/common/concur/lock/OModificationLock.java
diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/ODatabase.java b/core/src/main/java/com/orientechnologies/orient/core/db/ODatabase.java
@@ -433,46 +433,7 @@ enum ATTRIBUTES {
    */
   void freeze(boolean throwException);
 
-  /**
-   * Flush cached cluster content to the disk.
-   *
-   * After this call users can perform only select queries. All write-related commands will queued till {@link #releaseCluster(int)}
-   * command will be called.
-   *
-   * Given command waits till all on going modifications in indexes or DB will be finished.
-   *
-   * IMPORTANT: This command is not reentrant.
-   *
-   * @param iClusterId
-   *          that must be released
-   */
-  void freezeCluster(int iClusterId);
-
-  /**
-   * Allows to execute write-related commands on the cluster
-   *
-   * @param iClusterId
-   *          that must be released
-   */
-  void releaseCluster(int iClusterId);
 
-  /**
-   * Flush cached cluster content to the disk.
-   *
-   * After this call users can perform only select queries. All write-related commands will queued till {@link #releaseCluster(int)}
-   * command will be called.
-   *
-   * Given command waits till all on going modifications in indexes or DB will be finished.
-   *
-   * IMPORTANT: This command is not reentrant.
-   *
-   * @param iClusterId
-   *          that must be released
-   * @param throwException
-   *          If <code>true</code> {@link com.orientechnologies.common.concur.lock.OModificationOperationProhibitedException}
-   *          exception will be thrown in case of write command will be performed.
-   */
-  void freezeCluster(int iClusterId, boolean throwException);
 
   enum OPERATION_MODE {
     SYNCHRONOUS, ASYNCHRONOUS, ASYNCHRONOUS_NOANSWER

diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseWrapperAbstract.java b/core/src/main/java/com/orientechnologies/orient/core/db/ODatabaseWrapperAbstract.java
@@ -349,21 +349,6 @@ public void release() {
     underlying.release();
   }
 
-  @Override
-  public void freezeCluster(int iClusterId, boolean throwException) {
-    underlying.freezeCluster(iClusterId, throwException);
-  }
-
-  @Override
-  public void freezeCluster(int iClusterId) {
-    underlying.freezeCluster(iClusterId);
-  }
-
-  @Override
-  public void releaseCluster(int iClusterId) {
-    underlying.releaseCluster(iClusterId);
-  }
-
   protected void checkOpeness() {
     if (isClosed())
       throw new ODatabaseException("Database '" + getURL() + "' is closed");

diff --git a/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentTx.java b/core/src/main/java/com/orientechnologies/orient/core/db/document/ODatabaseDocumentTx.java
@@ -1421,35 +1421,6 @@ public ORecordMetadata getRecordMetadata(final ORID rid) {
     return storage.getRecordMetadata(rid);
   }
 
-  @Override
-  public void freezeCluster(final int iClusterId) {
-    freezeCluster(iClusterId, false);
-  }
-
-  @Override
-  public void releaseCluster(final int iClusterId) {
-    checkIfActive();
-    final OLocalPaginatedStorage storage;
-    if (getStorage() instanceof OLocalPaginatedStorage)
-      storage = ((OLocalPaginatedStorage) getStorage());
-    else {
-      OLogManager.instance().error(this, "Only local paginated storage supports release of cluster");
-      return;
-    }
-
-    storage.release(iClusterId);
-  }
-
-  @Override
-  public void freezeCluster(final int iClusterId, final boolean throwException) {
-    checkIfActive();
-    if (getStorage() instanceof OLocalPaginatedStorage) {
-      final OLocalPaginatedStorage paginatedStorage = ((OLocalPaginatedStorage) getStorage());
-      paginatedStorage.freeze(throwException, iClusterId);
-    } else {
-      OLogManager.instance().error(this, "Only local paginated storage supports freeze of cluster");
-    }
-  }
 
   public OTransaction getTransaction() {
     checkIfActive();

diff --git a/core/src/main/java/com/orientechnologies/orient/core/storage/OCluster.java b/core/src/main/java/com/orientechnologies/orient/core/storage/OCluster.java
@@ -19,7 +19,6 @@
  */
 package com.orientechnologies.orient.core.storage;
 
-import com.orientechnologies.common.concur.lock.OModificationLock;
 import com.orientechnologies.orient.core.config.OStorageClusterConfiguration;
 import com.orientechnologies.orient.core.conflict.ORecordConflictStrategy;
 import com.orientechnologies.orient.core.exception.ORecordNotFoundException;
@@ -47,8 +46,6 @@ enum ATTRIBUTES {
 
   void delete() throws IOException;
 
-  OModificationLock getExternalModificationLock();
-
   Object set(ATTRIBUTES iAttribute, Object iValue) throws IOException;
 
   String encryption();