Skip to content

Commit 402aa92

Browse files
Apache9Apache9
authored
HBASE-28862 Change the generic type for ObserverContext from 'RegionCoprocessorEnvironment' to '? extends RegionCoprocessorEnvironment' in RegionObserver (#6272)
Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
1 parent 981e071 commit 402aa92

File tree

88 files changed

+621
-576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+621
-576
lines changed

‎hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public Optional<RegionObserver> getRegionObserver() {
5252
}
5353

5454
@Override
55-
public void postBulkLoadHFile(ObserverContext<RegionCoprocessorEnvironment> ctx,
55+
public void postBulkLoadHFile(ObserverContext<? extends RegionCoprocessorEnvironment> ctx,
5656
List<Pair<byte[], String>> stagingFamilyPaths, Map<byte[], List<Path>> finalPaths)
5757
throws IOException {
5858
Configuration cfg = ctx.getEnvironment().getConfiguration();
@@ -82,7 +82,7 @@ public void postBulkLoadHFile(ObserverContext<RegionCoprocessorEnvironment> ctx,
8282
}
8383

8484
@Override
85-
public void preCommitStoreFile(final ObserverContext<RegionCoprocessorEnvironment> ctx,
85+
public void preCommitStoreFile(final ObserverContext<? extends RegionCoprocessorEnvironment> ctx,
8686
final byte[] family, final List<Pair<Path, Path>> pairs) throws IOException {
8787
Configuration cfg = ctx.getEnvironment().getConfiguration();
8888
if (pairs == null || pairs.isEmpty() || !BackupManager.isBackupEnabled(cfg)) {

‎hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ExampleRegionObserverWithMetrics.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ public Optional<RegionObserver> getRegionObserver() {
6464
}
6565

6666
@Override
67-
public void preGetOp(ObserverContext<RegionCoprocessorEnvironment> e, Get get,
67+
public void preGetOp(ObserverContext<? extends RegionCoprocessorEnvironment> e, Get get,
6868
List<Cell> results) throws IOException {
6969
// Increment the Counter whenever the coprocessor is called
7070
preGetCounter.increment();
7171
}
7272

7373
@Override
74-
public void postGetOp(ObserverContext<RegionCoprocessorEnvironment> e, Get get,
74+
public void postGetOp(ObserverContext<? extends RegionCoprocessorEnvironment> e, Get get,
7575
List<Cell> results) throws IOException {
7676
// do a costly (high latency) operation which we want to measure how long it takes by
7777
// using a Timer (which is a Meter and a Histogram).
@@ -84,20 +84,20 @@ public void postGetOp(ObserverContext<RegionCoprocessorEnvironment> e, Get get,
8484
}
8585

8686
@Override
87-
public void postFlush(ObserverContext<RegionCoprocessorEnvironment> c,
87+
public void postFlush(ObserverContext<? extends RegionCoprocessorEnvironment> c,
8888
FlushLifeCycleTracker tracker) throws IOException {
8989
flushCounter.increment();
9090
}
9191

9292
@Override
93-
public void postFlush(ObserverContext<RegionCoprocessorEnvironment> c, Store store,
93+
public void postFlush(ObserverContext<? extends RegionCoprocessorEnvironment> c, Store store,
9494
StoreFile resultFile, FlushLifeCycleTracker tracker) throws IOException {
9595
flushCounter.increment();
9696
}
9797

9898
@Override
99-
public void postCompactSelection(ObserverContext<RegionCoprocessorEnvironment> c, Store store,
100-
List<? extends StoreFile> selected, CompactionLifeCycleTracker tracker,
99+
public void postCompactSelection(ObserverContext<? extends RegionCoprocessorEnvironment> c,
100+
Store store, List<? extends StoreFile> selected, CompactionLifeCycleTracker tracker,
101101
CompactionRequest request) {
102102
if (selected != null) {
103103
filesCompactedCounter.increment(selected.size());

‎hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ScanModifyingObserver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Optional<RegionObserver> getRegionObserver() {
5656
}
5757

5858
@Override
59-
public void preScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c, Scan scan)
59+
public void preScannerOpen(ObserverContext<? extends RegionCoprocessorEnvironment> c, Scan scan)
6060
throws IOException {
6161
// Add another family:qualifier
6262
scan.addColumn(FAMILY_TO_ADD, QUALIFIER_TO_ADD);

‎hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ValueRewritingObserver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ public void start(@SuppressWarnings("rawtypes") CoprocessorEnvironment env) thro
7070
}
7171

7272
@Override
73-
public InternalScanner preCompact(ObserverContext<RegionCoprocessorEnvironment> c, Store store,
74-
final InternalScanner scanner, ScanType scanType, CompactionLifeCycleTracker tracker,
75-
CompactionRequest request) {
73+
public InternalScanner preCompact(ObserverContext<? extends RegionCoprocessorEnvironment> c,
74+
Store store, final InternalScanner scanner, ScanType scanType,
75+
CompactionLifeCycleTracker tracker, CompactionRequest request) {
7676
InternalScanner modifyingScanner = new InternalScanner() {
7777
@Override
7878
public boolean next(List<? super ExtendedCell> result, ScannerContext scannerContext)

‎hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserver.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public Optional<RegionObserver> getRegionObserver() {
7575
}
7676

7777
@Override
78-
public void preFlushScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c, Store store,
79-
ScanOptions options, FlushLifeCycleTracker tracker) throws IOException {
78+
public void preFlushScannerOpen(ObserverContext<? extends RegionCoprocessorEnvironment> c,
79+
Store store, ScanOptions options, FlushLifeCycleTracker tracker) throws IOException {
8080
options.readAllVersions();
8181
}
8282

@@ -154,42 +154,42 @@ public void close() throws IOException {
154154
}
155155

156156
@Override
157-
public InternalScanner preFlush(ObserverContext<RegionCoprocessorEnvironment> c, Store store,
158-
InternalScanner scanner, FlushLifeCycleTracker tracker) throws IOException {
157+
public InternalScanner preFlush(ObserverContext<? extends RegionCoprocessorEnvironment> c,
158+
Store store, InternalScanner scanner, FlushLifeCycleTracker tracker) throws IOException {
159159
return wrap(store.getColumnFamilyDescriptor().getName(), scanner);
160160
}
161161

162162
@Override
163-
public void preCompactScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c, Store store,
164-
ScanType scanType, ScanOptions options, CompactionLifeCycleTracker tracker,
163+
public void preCompactScannerOpen(ObserverContext<? extends RegionCoprocessorEnvironment> c,
164+
Store store, ScanType scanType, ScanOptions options, CompactionLifeCycleTracker tracker,
165165
CompactionRequest request) throws IOException {
166166
options.readAllVersions();
167167
}
168168

169169
@Override
170-
public InternalScanner preCompact(ObserverContext<RegionCoprocessorEnvironment> c, Store store,
171-
InternalScanner scanner, ScanType scanType, CompactionLifeCycleTracker tracker,
170+
public InternalScanner preCompact(ObserverContext<? extends RegionCoprocessorEnvironment> c,
171+
Store store, InternalScanner scanner, ScanType scanType, CompactionLifeCycleTracker tracker,
172172
CompactionRequest request) throws IOException {
173173
return wrap(store.getColumnFamilyDescriptor().getName(), scanner);
174174
}
175175

176176
@Override
177177
public void preMemStoreCompactionCompactScannerOpen(
178-
ObserverContext<RegionCoprocessorEnvironment> c, Store store, ScanOptions options)
178+
ObserverContext<? extends RegionCoprocessorEnvironment> c, Store store, ScanOptions options)
179179
throws IOException {
180180
options.readAllVersions();
181181
}
182182

183183
@Override
184184
public InternalScanner preMemStoreCompactionCompact(
185-
ObserverContext<RegionCoprocessorEnvironment> c, Store store, InternalScanner scanner)
185+
ObserverContext<? extends RegionCoprocessorEnvironment> c, Store store, InternalScanner scanner)
186186
throws IOException {
187187
return wrap(store.getColumnFamilyDescriptor().getName(), scanner);
188188
}
189189

190190
@Override
191-
public void preGetOp(ObserverContext<RegionCoprocessorEnvironment> c, Get get, List<Cell> result)
192-
throws IOException {
191+
public void preGetOp(ObserverContext<? extends RegionCoprocessorEnvironment> c, Get get,
192+
List<Cell> result) throws IOException {
193193
Scan scan =
194194
new Scan().withStartRow(get.getRow()).withStopRow(get.getRow(), true).readAllVersions();
195195
NavigableMap<byte[], NavigableMap<byte[], MutableLong>> sums =
@@ -249,8 +249,8 @@ private long getUniqueTimestamp(byte[] row) {
249249
}
250250

251251
@Override
252-
public Result preIncrement(ObserverContext<RegionCoprocessorEnvironment> c, Increment increment)
253-
throws IOException {
252+
public Result preIncrement(ObserverContext<? extends RegionCoprocessorEnvironment> c,
253+
Increment increment) throws IOException {
254254
byte[] row = increment.getRow();
255255
Put put = new Put(row);
256256
long ts = getUniqueTimestamp(row);
@@ -270,8 +270,8 @@ public Result preIncrement(ObserverContext<RegionCoprocessorEnvironment> c, Incr
270270
}
271271

272272
@Override
273-
public void preStoreScannerOpen(ObserverContext<RegionCoprocessorEnvironment> ctx, Store store,
274-
ScanOptions options) throws IOException {
273+
public void preStoreScannerOpen(ObserverContext<? extends RegionCoprocessorEnvironment> ctx,
274+
Store store, ScanOptions options) throws IOException {
275275
options.readAllVersions();
276276
}
277277
}

‎hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ZooKeeperScanPolicyObserver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,14 @@ private void resetTTL(ScanOptions options) {
177177
}
178178

179179
@Override
180-
public void preFlushScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c, Store store,
181-
ScanOptions options, FlushLifeCycleTracker tracker) throws IOException {
180+
public void preFlushScannerOpen(ObserverContext<? extends RegionCoprocessorEnvironment> c,
181+
Store store, ScanOptions options, FlushLifeCycleTracker tracker) throws IOException {
182182
resetTTL(options);
183183
}
184184

185185
@Override
186-
public void preCompactScannerOpen(ObserverContext<RegionCoprocessorEnvironment> c, Store store,
187-
ScanType scanType, ScanOptions options, CompactionLifeCycleTracker tracker,
186+
public void preCompactScannerOpen(ObserverContext<? extends RegionCoprocessorEnvironment> c,
187+
Store store, ScanType scanType, ScanOptions options, CompactionLifeCycleTracker tracker,
188188
CompactionRequest request) throws IOException {
189189
resetTTL(options);
190190
}

‎hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ public Optional<RegionObserver> getRegionObserver() {
145145
}
146146

147147
@Override
148-
public void preScannerOpen(final ObserverContext<RegionCoprocessorEnvironment> e,
148+
public void preScannerOpen(final ObserverContext<? extends RegionCoprocessorEnvironment> e,
149149
final Scan scan) throws IOException {
150150
if (countOfOpen.incrementAndGet() == 2) { // slowdown openScanner randomly
151151
slowdownCode(e);
152152
}
153153
}
154154

155155
@Override
156-
public boolean preScannerNext(final ObserverContext<RegionCoprocessorEnvironment> e,
156+
public boolean preScannerNext(final ObserverContext<? extends RegionCoprocessorEnvironment> e,
157157
final InternalScanner s, final List<Result> results, final int limit, final boolean hasMore)
158158
throws IOException {
159159
// this will slow down a certain next operation if the conditions are met. The slowness
@@ -165,7 +165,7 @@ public boolean preScannerNext(final ObserverContext<RegionCoprocessorEnvironment
165165
return true;
166166
}
167167

168-
protected void slowdownCode(final ObserverContext<RegionCoprocessorEnvironment> e) {
168+
protected void slowdownCode(final ObserverContext<? extends RegionCoprocessorEnvironment> e) {
169169
if (e.getEnvironment().getRegion().getRegionInfo().getReplicaId() == 0) {
170170
try {
171171
if (sleepTime.get() > 0) {

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ public Optional<RegionObserver> getRegionObserver() {
865865
}
866866

867867
@Override
868-
public void preBatchMutate(ObserverContext<RegionCoprocessorEnvironment> c,
868+
public void preBatchMutate(ObserverContext<? extends RegionCoprocessorEnvironment> c,
869869
MiniBatchOperationInProgress<Mutation> miniBatchOp) throws IOException {
870870
if (c.getEnvironment().getRegion().getRegionInfo().getTable().isSystemTable()) {
871871
return;

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ public Optional<RegionObserver> getRegionObserver() {
256256
}
257257

258258
@Override
259-
public void prePut(ObserverContext<RegionCoprocessorEnvironment> e, Put put, WALEdit edit,
260-
Durability durability) throws IOException {
259+
public void prePut(ObserverContext<? extends RegionCoprocessorEnvironment> e, Put put,
260+
WALEdit edit, Durability durability) throws IOException {
261261
Region region = e.getEnvironment().getRegion();
262262
if (
263263
!region.getRegionInfo().isMetaRegion() && !region.getRegionInfo().getTable().isSystemTable()

‎hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithTTLs.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ public Optional<RegionObserver> getRegionObserver() {
168168
}
169169

170170
@Override
171-
public void prePut(ObserverContext<RegionCoprocessorEnvironment> e, Put put, WALEdit edit,
172-
Durability durability) throws IOException {
171+
public void prePut(ObserverContext<? extends RegionCoprocessorEnvironment> e, Put put,
172+
WALEdit edit, Durability durability) throws IOException {
173173
Region region = e.getEnvironment().getRegion();
174174
if (
175175
!region.getRegionInfo().isMetaRegion() && !region.getRegionInfo().getTable().isSystemTable()

‎hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/ConstraintProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ public void start(CoprocessorEnvironment environment) {
8787
}
8888

8989
@Override
90-
public void prePut(ObserverContext<RegionCoprocessorEnvironment> e, Put put, WALEdit edit,
91-
Durability durability) throws IOException {
90+
public void prePut(ObserverContext<? extends RegionCoprocessorEnvironment> e, Put put,
91+
WALEdit edit, Durability durability) throws IOException {
9292
// check the put against the stored constraints
9393
for (Constraint c : constraints) {
9494
c.check(put);

‎hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/EndpointObserver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public interface EndpointObserver {
5858
* @param methodName the invoked service method
5959
* @return the possibly modified message
6060
*/
61-
default Message preEndpointInvocation(ObserverContext<RegionCoprocessorEnvironment> ctx,
61+
default Message preEndpointInvocation(ObserverContext<? extends RegionCoprocessorEnvironment> ctx,
6262
Service service, String methodName, Message request) throws IOException {
6363
return request;
6464
}
@@ -74,7 +74,7 @@ default Message preEndpointInvocation(ObserverContext<RegionCoprocessorEnvironme
7474
* @param responseBuilder Builder for final response to the client, with original response from
7575
* Service's method merged into it.
7676
*/
77-
default void postEndpointInvocation(ObserverContext<RegionCoprocessorEnvironment> ctx,
77+
default void postEndpointInvocation(ObserverContext<? extends RegionCoprocessorEnvironment> ctx,
7878
Service service, String methodName, Message request, Message.Builder responseBuilder)
7979
throws IOException {
8080
}

‎hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,25 @@ public Optional<RegionObserver> getRegionObserver() {
7777
}
7878

7979
@Override
80-
public void preGetOp(ObserverContext<RegionCoprocessorEnvironment> e, Get get,
80+
public void preGetOp(ObserverContext<? extends RegionCoprocessorEnvironment> e, Get get,
8181
List<Cell> results) throws IOException {
8282
registerAndMarkMetrics(e, get);
8383
}
8484

8585
@Override
86-
public void prePut(ObserverContext<RegionCoprocessorEnvironment> e, Put put, WALEdit edit,
87-
Durability durability) throws IOException {
86+
public void prePut(ObserverContext<? extends RegionCoprocessorEnvironment> e, Put put,
87+
WALEdit edit, Durability durability) throws IOException {
8888
registerAndMarkMetrics(e, put);
8989
}
9090

9191
@Override
92-
public void preDelete(ObserverContext<RegionCoprocessorEnvironment> e, Delete delete,
92+
public void preDelete(ObserverContext<? extends RegionCoprocessorEnvironment> e, Delete delete,
9393
WALEdit edit, Durability durability) {
9494
registerAndMarkMetrics(e, delete);
9595
}
9696

97-
private void registerAndMarkMetrics(ObserverContext<RegionCoprocessorEnvironment> e, Row row) {
97+
private void registerAndMarkMetrics(ObserverContext<? extends RegionCoprocessorEnvironment> e,
98+
Row row) {
9899
if (!active || !isMetaTableOp(e)) {
99100
return;
100101
}
@@ -131,7 +132,7 @@ private String getRegionIdFromOp(Row op) {
131132
return splits.length > 2 ? splits[2] : null;
132133
}
133134

134-
private boolean isMetaTableOp(ObserverContext<RegionCoprocessorEnvironment> e) {
135+
private boolean isMetaTableOp(ObserverContext<? extends RegionCoprocessorEnvironment> e) {
135136
return TableName.META_TABLE_NAME.equals(e.getEnvironment().getRegionInfo().getTable());
136137
}
137138

0 commit comments

Comments
 (0)