hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ecl...@apache.org
Subject [43/52] [abbrv] hbase git commit: HBASE-15380 Purge rollback support in Store etc.
Date Fri, 08 Apr 2016 19:32:35 GMT
HBASE-15380 Purge rollback support in Store etc.


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

Branch: refs/heads/HBASE-14850
Commit: e450d94a2c8655330ff1c80a757b39319d9f26d1
Parents: 394b89d
Author: stack <stack@apache.org>
Authored: Thu Apr 7 22:35:23 2016 -0700
Committer: stack <stack@apache.org>
Committed: Thu Apr 7 22:35:23 2016 -0700

----------------------------------------------------------------------
 .../hbase/regionserver/AbstractMemStore.java       | 17 -----------------
 .../apache/hadoop/hbase/regionserver/HStore.java   | 16 ++++------------
 .../apache/hadoop/hbase/regionserver/MemStore.java |  7 -------
 .../apache/hadoop/hbase/regionserver/Store.java    |  8 --------
 4 files changed, 4 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e450d94a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java
index 08e3f5e..7f1a6bb 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMemStore.java
@@ -226,23 +226,6 @@ public abstract class AbstractMemStore implements MemStore {
     return getSnapshot().getSize();
   }
 
-  /**
-   * Remove n key from the memstore. Only cells that have the same key and the
-   * same memstoreTS are removed.  It is ok to not update timeRangeTracker
-   * in this call. It is possible that we can optimize this method by using
-   * tailMap/iterator, but since this method is called rarely (only for
-   * error recovery), we can leave those optimization for the future.
-   * @param cell
-   */
-  @Override
-  public void rollback(Cell cell) {
-    // If the key is in the active, delete it. Update this.size.
-    long sz = active.rollback(cell);
-    if (sz != 0) {
-      setOldestEditTimeToNow();
-    }
-  }
-
   @Override
   public String toString() {
     StringBuffer buf = new StringBuffer();

http://git-wip-us.apache.org/repos/asf/hbase/blob/e450d94a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 9524c5b..f7ad4ae 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -646,16 +646,6 @@ public class HStore implements Store {
     }
   }
 
-  @Override
-  public void rollback(final Cell cell) {
-    lock.readLock().lock();
-    try {
-      this.memstore.rollback(cell);
-    } finally {
-      lock.readLock().unlock();
-    }
-  }
-
   /**
    * @return All store files.
    */
@@ -1817,8 +1807,10 @@ public class HStore implements Store {
     try {
       // Not split-able if we find a reference store file present in the store.
       boolean result = !hasReferences();
-      if (!result && LOG.isDebugEnabled()) {
-        LOG.debug("Cannot split region due to reference files being there");
+      if (!result) {
+          if (LOG.isTraceEnabled()) {
+            LOG.trace("Not splittable; has references: " + this);
+          }
       }
       return result;
     } finally {

http://git-wip-us.apache.org/repos/asf/hbase/blob/e450d94a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java
index 6bb7081..ea72b7f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java
@@ -87,13 +87,6 @@ public interface MemStore extends HeapSize {
   long timeOfOldestEdit();
 
   /**
-   * Remove n key from the memstore. Only kvs that have the same key and the same memstoreTS
are
-   * removed. It is ok to not update timeRangeTracker in this call.
-   * @param cell
-   */
-  void rollback(final Cell cell);
-
-  /**
    * Write a delete
    * @param deleteCell
    * @return approximate size of the passed key and value.

http://git-wip-us.apache.org/repos/asf/hbase/blob/e450d94a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
index 1cffaad..4cca4a1 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
@@ -154,14 +154,6 @@ public interface Store extends HeapSize, StoreConfigInformation, PropagatingConf
    */
   long timeOfOldestEdit();
 
-  /**
-   * Removes a Cell from the memstore. The Cell is removed only if its key
-   * &amp; memstoreTS match the key &amp; memstoreTS value of the cell
-   * parameter.
-   * @param cell
-   */
-  void rollback(final Cell cell);
-
   FileSystem getFileSystem();
 
 


Mime
View raw message