You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2015/04/23 08:43:16 UTC
hbase git commit: HBASE-13501 - Deprecate/Remove getComparator() in
HRegionInfo. (Ram)
Repository: hbase
Updated Branches:
refs/heads/master a4202879a -> bcb2a279c
HBASE-13501 - Deprecate/Remove getComparator() in HRegionInfo. (Ram)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bcb2a279
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bcb2a279
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bcb2a279
Branch: refs/heads/master
Commit: bcb2a279c49213bf4eb90a7602a01ff5d0810915
Parents: a420287
Author: ramkrishna <ra...@gmail.com>
Authored: Thu Apr 23 12:12:36 2015 +0530
Committer: ramkrishna <ra...@gmail.com>
Committed: Thu Apr 23 12:12:36 2015 +0530
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/HRegionInfo.java | 2 ++
.../hadoop/hbase/regionserver/HRegion.java | 23 ++++++++++----------
.../hadoop/hbase/regionserver/HStore.java | 2 +-
.../hadoop/hbase/regionserver/Region.java | 4 ++++
.../regionserver/ReversedRegionScannerImpl.java | 6 ++---
.../TestScannerHeartbeatMessages.java | 8 +++----
6 files changed, 25 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bcb2a279/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
index 7a43a50..1a1bd0d 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HRegionInfo.java
@@ -870,7 +870,9 @@ public class HRegionInfo implements Comparable<HRegionInfo> {
/**
* @return Comparator to use comparing {@link KeyValue}s.
+ * @deprecated This method should not have been here. Use Region#getCellComparator()
*/
+ @Deprecated
public KVComparator getComparator() {
return isMetaRegion()?
KeyValue.META_COMPARATOR: KeyValue.COMPARATOR;
http://git-wip-us.apache.org/repos/asf/hbase/blob/bcb2a279/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 2133206..5805149 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
@@ -83,6 +83,7 @@ import org.apache.hadoop.hbase.HDFSBlocksDistribution;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.KeyValue.KVComparator;
import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.NotServingRegionException;
@@ -289,7 +290,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
private final HRegionFileSystem fs;
protected final Configuration conf;
private final Configuration baseConf;
- private final KeyValue.KVComparator comparator;
private final int rowLockWaitDuration;
static final int DEFAULT_ROWLOCK_WAIT_DURATION = 30000;
@@ -638,7 +638,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
throw new IllegalArgumentException("Need original base configuration");
}
- this.comparator = fs.getRegionInfo().getComparator();
this.wal = wal;
this.fs = fs;
@@ -1643,13 +1642,6 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
return size;
}
- /**
- * @return KeyValue Comparator
- */
- public KeyValue.KVComparator getComparator() {
- return this.comparator;
- }
-
/*
* Do preparation for pending compaction.
* @throws IOException
@@ -5207,6 +5199,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
private long readPt;
private long maxResultSize;
protected HRegion region;
+ protected KVComparator comparator;
@Override
public HRegionInfo getRegionInfo() {
@@ -5223,6 +5216,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
} else {
this.filter = null;
}
+ this.comparator = region.getCellCompartor();
/**
* By default, calls to next/nextRaw must enforce the batch limit. Thus, construct a default
@@ -5273,9 +5267,9 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
protected void initializeKVHeap(List<KeyValueScanner> scanners,
List<KeyValueScanner> joinedScanners, HRegion region)
throws IOException {
- this.storeHeap = new KeyValueHeap(scanners, region.comparator);
+ this.storeHeap = new KeyValueHeap(scanners, comparator);
if (!joinedScanners.isEmpty()) {
- this.joinedHeap = new KeyValueHeap(joinedScanners, region.comparator);
+ this.joinedHeap = new KeyValueHeap(joinedScanners, comparator);
}
}
@@ -7147,7 +7141,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
public static final long FIXED_OVERHEAD = ClassSize.align(
ClassSize.OBJECT +
ClassSize.ARRAY +
- 45 * ClassSize.REFERENCE + 2 * Bytes.SIZEOF_INT +
+ 44 * ClassSize.REFERENCE + 2 * Bytes.SIZEOF_INT +
(14 * Bytes.SIZEOF_LONG) +
5 * Bytes.SIZEOF_BOOLEAN);
@@ -7837,4 +7831,9 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
configurationManager.get().deregisterObserver(s);
}
}
+
+ @Override
+ public KVComparator getCellCompartor() {
+ return this.getRegionInfo().isMetaRegion() ? KeyValue.META_COMPARATOR : KeyValue.COMPARATOR;
+ }
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/bcb2a279/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 e29af5c..3cebaf6 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
@@ -232,7 +232,7 @@ public class HStore implements Store {
this.dataBlockEncoder =
new HFileDataBlockEncoderImpl(family.getDataBlockEncoding());
- this.comparator = info.getComparator();
+ this.comparator = region.getCellCompartor();
// 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/bcb2a279/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 9a33b64..a74c209 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
@@ -27,6 +27,7 @@ import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.HDFSBlocksDistribution;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.KeyValue.KVComparator;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.client.Append;
@@ -392,6 +393,9 @@ public interface Region extends ConfigurationObserver {
*/
RegionScanner getScanner(Scan scan) throws IOException;
+ /** The comparator to be used with the region */
+ KVComparator getCellCompartor();
+
/**
* Perform one or more increment operations on a row.
* @param increment
http://git-wip-us.apache.org/repos/asf/hbase/blob/bcb2a279/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java
index feda699..81c14e5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.java
@@ -48,17 +48,17 @@ class ReversedRegionScannerImpl extends RegionScannerImpl {
@Override
protected void initializeKVHeap(List<KeyValueScanner> scanners,
List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {
- this.storeHeap = new ReversedKeyValueHeap(scanners, region.getComparator());
+ this.storeHeap = new ReversedKeyValueHeap(scanners, comparator);
if (!joinedScanners.isEmpty()) {
this.joinedHeap = new ReversedKeyValueHeap(joinedScanners,
- region.getComparator());
+ comparator);
}
}
@Override
protected boolean isStopRow(byte[] currentRow, int offset, short length) {
return currentRow == null
- || (super.stopRow != null && region.getComparator().compareRows(
+ || (super.stopRow != null && comparator.compareRows(
stopRow, 0, stopRow.length, currentRow, offset, length) >= super.isScan);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/bcb2a279/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 a272323..50545c9 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
@@ -457,9 +457,9 @@ public class TestScannerHeartbeatMessages {
@Override
protected void initializeKVHeap(List<KeyValueScanner> scanners,
List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {
- this.storeHeap = new HeartbeatReversedKVHeap(scanners, region.getComparator());
+ this.storeHeap = new HeartbeatReversedKVHeap(scanners, region.getCellCompartor());
if (!joinedScanners.isEmpty()) {
- this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners, region.getComparator());
+ this.joinedHeap = new HeartbeatReversedKVHeap(joinedScanners, region.getCellCompartor());
}
}
}
@@ -485,9 +485,9 @@ public class TestScannerHeartbeatMessages {
@Override
protected void initializeKVHeap(List<KeyValueScanner> scanners,
List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {
- this.storeHeap = new HeartbeatKVHeap(scanners, region.getComparator());
+ this.storeHeap = new HeartbeatKVHeap(scanners, region.getCellCompartor());
if (!joinedScanners.isEmpty()) {
- this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getComparator());
+ this.joinedHeap = new HeartbeatKVHeap(joinedScanners, region.getCellCompartor());
}
}
}