This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
The following commit(s) were added to refs/heads/master by this push:
new 9cf86fe2 OMID-321 Remove HBase 1.x API methods from Omid (#204)
9cf86fe2 is described below
commit 9cf86fe27571da19dd2e592bea6fb2d9bc560b4f
Author: Istvan Toth <[email protected]>
AuthorDate: Tue Oct 7 10:37:43 2025 +0200
OMID-321 Remove HBase 1.x API methods from Omid (#204)
---
.../hadoop/hbase/coprocessor/BaseRegionObserver.java | 4 +++-
.../hadoop/hbase/regionserver/CompactorScanner.java | 6 +++---
.../org/apache/omid/transaction/OmidCompactor.java | 2 --
.../apache/omid/transaction/OmidSnapshotFilter.java | 18 +++---------------
.../apache/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 59d0759a..dafbf451 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 @@ import java.util.Optional;
public abstract class BaseRegionObserver implements RegionObserver,
RegionCoprocessor {
+
+ @Override
public InternalScanner
preCompact(ObserverContext<RegionCoprocessorEnvironment> c,
Store store,
InternalScanner scanner,
@@ -36,7 +38,7 @@ public abstract class BaseRegionObserver implements
RegionObserver, RegionCoproc
return preCompact(c,store,scanner,scanType,request);
}
- public InternalScanner
preCompact(ObserverContext<RegionCoprocessorEnvironment> env,
+ protected InternalScanner
preCompact(ObserverContext<RegionCoprocessorEnvironment> 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 acb1ce6a..c3dc89c9 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<Cell> currentRowWorthValues = new ArrayList<Cell>();
private final LRUMap<Long ,Optional<CommitTimestamp>> commitCache;
- public CompactorScanner(ObserverContext<RegionCoprocessorEnvironment> e,
+ public CompactorScanner(ObserverContext<RegionCoprocessorEnvironment> c,
InternalScanner internalScanner,
Client commitTableClient,
boolean isMajorCompaction,
@@ -77,7 +77,7 @@ public class CompactorScanner implements InternalScanner {
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 class CompactorScanner implements InternalScanner {
return next(result, limit);
}
- public boolean next(List<Cell> result, int limit) throws IOException {
+ protected boolean next(List<Cell> 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 b8530002..5f27a030 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.Logger;
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 6896628a..d387d7ae 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.client.Scan;
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 class OmidSnapshotFilter extends BaseRegionObserver {
}
- // Don't add an @Override tag since this method doesn't exist in both
hbase-1 and hbase-2
+ @Override
public void postGetOp(ObserverContext<RegionCoprocessorEnvironment> e, Get
get, List<Cell> results) {
SnapshotFilterImpl snapshotFilter = snapshotFilterMap.get(get);
if (snapshotFilter != null) {
@@ -109,7 +107,7 @@ public class OmidSnapshotFilter extends BaseRegionObserver {
}
- // Don't add an @Override tag since this method doesn't exist in both
hbase-1 and hbase-2
+ @Override
public void preGetOp(ObserverContext<RegionCoprocessorEnvironment> e, Get
get, List<Cell> results)
throws IOException {
@@ -137,17 +135,7 @@ public class OmidSnapshotFilter extends BaseRegionObserver
{
return snapshotFilter;
}
-
- // Don't add an @Override tag since this method doesn't exist in both
hbase-1 and hbase-2
- public RegionScanner
preScannerOpen(ObserverContext<RegionCoprocessorEnvironment> 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<RegionCoprocessorEnvironment> 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 aa86a737..7dd3cfe3 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.HRegion;
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;
