From 88270c563468f9cb19c276da024fa4c6bf5703cf Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Tue, 7 Oct 2025 08:10:31 +0200 Subject: [PATCH] OMID-321 Remove HBase 1.x API methods from Omid --- .../hbase/coprocessor/BaseRegionObserver.java | 4 +++- .../hbase/regionserver/CompactorScanner.java | 6 +++--- .../apache/omid/transaction/OmidCompactor.java | 2 -- .../omid/transaction/OmidSnapshotFilter.java | 18 +++--------------- .../omid/transaction/TestCompactorScanner.java | 3 --- 5 files changed, 9 insertions(+), 24 deletions(-) diff --git a/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java b/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java index 59d0759a8..dafbf4512 100644 --- a/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java +++ b/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java @@ -27,6 +27,8 @@ public abstract class BaseRegionObserver implements RegionObserver, RegionCoprocessor { + + @Override public InternalScanner preCompact(ObserverContext c, Store store, InternalScanner scanner, @@ -36,7 +38,7 @@ public InternalScanner preCompact(ObserverContext return preCompact(c,store,scanner,scanType,request); } - public InternalScanner preCompact(ObserverContext env, + protected InternalScanner preCompact(ObserverContext env, Store store, InternalScanner scanner, ScanType scanType, diff --git a/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/CompactorScanner.java b/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/CompactorScanner.java index acb1ce6ad..c3dc89c98 100644 --- a/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/CompactorScanner.java +++ b/hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/CompactorScanner.java @@ -66,7 +66,7 @@ public class CompactorScanner implements InternalScanner { private List currentRowWorthValues = new ArrayList(); private final LRUMap> commitCache; - public CompactorScanner(ObserverContext e, + public CompactorScanner(ObserverContext c, InternalScanner internalScanner, Client commitTableClient, boolean isMajorCompaction, @@ -77,7 +77,7 @@ public CompactorScanner(ObserverContext e, this.retainNonTransactionallyDeletedCells = preserveNonTransactionallyDeletedCells; this.lowWatermark = getLowWatermarkFromCommitTable(); // Obtain the table in which the scanner is going to operate - this.hRegion = e.getEnvironment().getRegion(); + this.hRegion = c.getEnvironment().getRegion(); commitCache = new LRUMap<>(1000); LOG.info("Scanner cleaning up uncommitted txs older than LW [{}] in region [{}]", lowWatermark, hRegion.getRegionInfo()); @@ -94,7 +94,7 @@ public boolean next(List result, ScannerContext scannerContext) throws IOE return next(result, limit); } - public boolean next(List result, int limit) throws IOException { + protected boolean next(List result, int limit) throws IOException { if (currentRowWorthValues.isEmpty()) { // 1) Read next row diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java index b8530002e..5f27a030f 100644 --- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java +++ b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java @@ -40,8 +40,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedQueue; import static org.apache.omid.committable.hbase.HBaseCommitTableConfig.COMMIT_TABLE_NAME_KEY; diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java index 6896628af..d387d7ae7 100644 --- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java +++ b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java @@ -24,8 +24,6 @@ import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; import org.apache.hadoop.hbase.filter.Filter; -import org.apache.hadoop.hbase.regionserver.RegionScanner; - import org.apache.hadoop.hbase.util.Bytes; import org.apache.omid.committable.CommitTable; @@ -100,7 +98,7 @@ public void stop(CoprocessorEnvironment e) throws IOException { } - // Don't add an @Override tag since this method doesn't exist in both hbase-1 and hbase-2 + @Override public void postGetOp(ObserverContext e, Get get, List results) { SnapshotFilterImpl snapshotFilter = snapshotFilterMap.get(get); if (snapshotFilter != null) { @@ -109,7 +107,7 @@ public void postGetOp(ObserverContext e, Get get, } - // Don't add an @Override tag since this method doesn't exist in both hbase-1 and hbase-2 + @Override public void preGetOp(ObserverContext e, Get get, List results) throws IOException { @@ -137,17 +135,7 @@ private SnapshotFilterImpl getSnapshotFilter(ObserverContext e, - Scan scan, - RegionScanner s) throws IOException { - preScannerOpen(e,scan); - return s; - } - - - // Don't add an @Override tag since this method doesn't exist in both hbase-1 and hbase-2 + @Override public void preScannerOpen(ObserverContext e, Scan scan) throws IOException { byte[] byteTransaction = scan.getAttribute(CellUtils.TRANSACTION_ATTRIBUTE); diff --git a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java index aa86a737b..7dd3cfe31 100644 --- a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java +++ b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java @@ -28,14 +28,11 @@ import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.util.Bytes; import org.apache.omid.committable.CommitTable; -import org.apache.omid.committable.CommitTable.Client; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import java.util.Queue; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when;