From f05476b37af99140bee9af45d7231452b1d41156 Mon Sep 17 00:00:00 2001 From: John Leach Date: Fri, 2 Dec 2016 00:22:14 -0600 Subject: [PATCH] HBASE-17231 Region#getCellCompartor -> Region#getCellComparator --- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ++-- .../main/java/org/apache/hadoop/hbase/regionserver/HStore.java | 2 +- .../main/java/org/apache/hadoop/hbase/regionserver/Region.java | 2 +- .../hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) 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; } 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); 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 additionalScanners) throws IOException; /** The comparator to be used with the region */ - CellComparator getCellCompartor(); + CellComparator getCellComparator(); /** * Perform one or more increment operations on a row. 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 scanners, List 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 scanners, List 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()); } } } -- 2.9.3 (Apple Git-75)