You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/12/04 00:07:48 UTC
hbase git commit: HBASE-17231 Region#getCellCompartor ->
Region#getCellComparator
Repository: hbase
Updated Branches:
refs/heads/master 03423fec6 -> 42ff4a716
HBASE-17231 Region#getCellCompartor -> Region#getCellComparator
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/42ff4a71
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/42ff4a71
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/42ff4a71
Branch: refs/heads/master
Commit: 42ff4a7164fccf10b18b60301e8e4039c7ffc0db
Parents: 03423fe
Author: John Leach <jl...@splicemachine.com>
Authored: Fri Dec 2 00:22:14 2016 -0600
Committer: Michael Stack <st...@apache.org>
Committed: Sat Dec 3 16:07:42 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ++--
.../java/org/apache/hadoop/hbase/regionserver/HStore.java | 2 +-
.../java/org/apache/hadoop/hbase/regionserver/Region.java | 2 +-
.../hbase/regionserver/TestScannerHeartbeatMessages.java | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/42ff4a71/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index d2a1838..86da348 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -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;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/42ff4a71/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
----------------------------------------------------------------------
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 70928a2..b35c38f 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
@@ -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);
http://git-wip-us.apache.org/repos/asf/hbase/blob/42ff4a71/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
index 09016e8..295b825 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Region.java
@@ -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.
http://git-wip-us.apache.org/repos/asf/hbase/blob/42ff4a71/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java
index 868f898..bf3f1e0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java
@@ -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());
}
}
}