Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-17231 Region#getCellCompartor -> Region#getCellComparator 

Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
John Leach 2016-12-02 00:22:14 -06:00 committed by Michael Stack
parent 03423fec6b
commit 42ff4a7164
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -5709,7 +5709,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
} else {
this.filter = null;
}
this.comparator = region.getCellCompartor();
this.comparator = region.getCellComparator();
/**
* By default, calls to next/nextRaw must enforce the batch limit. Thus, construct a default
* scanner context that can be used to enforce the batch limit in the event that a
@ -8176,7 +8176,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
@Override
public CellComparator getCellCompartor() {
public CellComparator getCellComparator() {
return this.getRegionInfo().isMetaRegion() ? CellComparator.META_COMPARATOR
: CellComparator.COMPARATOR;
}

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
View File

@ -229,7 +229,7 @@ public class HStore implements Store {
this.dataBlockEncoder =
new HFileDataBlockEncoderImpl(family.getDataBlockEncoding());
this.comparator = region.getCellCompartor();
this.comparator = region.getCellComparator();
// used by ScanQueryMatcher
long timeToPurgeDeletes =
Math.max(conf.getLong("hbase.hstore.time.to.purge.deletes", 0), 0);

2
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
View File

@ -445,7 +445,7 @@ public interface Region extends ConfigurationObserver {
RegionScanner getScanner(Scan scan, List<KeyValueScanner> additionalScanners) throws IOException;
/** The comparator to be used with the region */
CellComparator getCellCompartor();
CellComparator getCellComparator();
/**
* Perform one or more increment operations on a row.

8
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java
View File

@ -500,9 +500,9 @@ public class TestScannerHeartbeatMessages {
@Override
protected void initializeKVHeap(List<KeyValueScanner> scanners,
List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {
this.storeHeap = new HeartbeatReversedKVHeap(scanners, region.getCellCompartor());
this.storeHeap = new HeartbeatReversedKVHeap(scanners, region.getCellComparator());
if (!joinedScanners.isEmpty()) {
this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners, region.getCellCompartor());
this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners, region.getCellComparator());
}
}
}
@ -527,9 +527,9 @@ public class TestScannerHeartbeatMessages {
@Override
protected void initializeKVHeap(List<KeyValueScanner> scanners,
List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {
this.storeHeap = new HeartbeatKVHeap(scanners, region.getCellCompartor());
this.storeHeap = new HeartbeatKVHeap(scanners, region.getCellComparator());
if (!joinedScanners.isEmpty()) {
this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getCellCompartor());
this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getCellComparator());
}
}
}