From db2cf674a7fd2f9a5a1ea4da824d264851081e11 Mon Sep 17 00:00:00 2001 From: stack Date: Tue, 1 Mar 2016 23:42:16 -0800 Subject: [PATCH] HBASE-15380 Purge rollback support in Store etc. --- .../java/org/apache/hadoop/hbase/regionserver/HStore.java | 11 +---------- .../java/org/apache/hadoop/hbase/regionserver/MemStore.java | 7 ------- .../main/java/org/apache/hadoop/hbase/regionserver/Store.java | 8 -------- 3 files changed, 1 insertion(+), 25 deletions(-) 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 7c71baf..c840484 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 @@ -645,16 +645,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. */ @@ -1820,6 +1810,7 @@ public class HStore implements Store { assert !this.getRegionInfo().isMetaRegion(); // Not split-able if we find a reference store file present in the store. if (hasReferences()) { + if (LOG.isTraceEnabled()) LOG.trace("Not splittable; has references: " + this); return null; } return this.storeEngine.getStoreFileManager().getSplitPoint(); 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. 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 c167535..0885605 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 - * & memstoreTS match the key & memstoreTS value of the cell - * parameter. - * @param cell - */ - void rollback(final Cell cell); - FileSystem getFileSystem(); -- 2.6.1