You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2012/10/23 14:51:10 UTC
svn commit: r1401279 - in /hbase/branches/0.89-fb/src:
main/java/org/apache/hadoop/hbase/HConstants.java
main/java/org/apache/hadoop/hbase/regionserver/Store.java
test/java/org/apache/hadoop/hbase/regionserver/kvaggregator/TestKeyValueAggregator.java
Author: mbautin
Date: Tue Oct 23 12:51:10 2012
New Revision: 1401279
URL: http://svn.apache.org/viewvc?rev=1401279&view=rev
Log:
[HBASE-6967] Refactor "aggregator" to "kvaggregator" and put a constant for it in HConstants
Author: adela
Summary: as in title
Test Plan: run TestKeyValueAggregator
Reviewers: kannan
Reviewed By: kannan
CC: hbase-eng@
Differential Revision: https://phabricator.fb.com/D607540
Modified:
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/kvaggregator/TestKeyValueAggregator.java
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1401279&r1=1401278&r2=1401279&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/HConstants.java Tue Oct 23 12:51:10 2012
@@ -509,7 +509,7 @@ public final class HConstants {
* pause between rpc or connect retries
*/
public static String HBASE_CLIENT_PAUSE = "hbase.client.pause";
- public static int DEFAULT_HBASE_CLIENT_PAUSE = 1000;
+ public static int DEFAULT_HBASE_CLIENT_PAUSE = 1000;
/**
* compression for each RPC and its default value
@@ -581,10 +581,10 @@ public final class HConstants {
/** Configuration key suffix for Thrift server port */
public static final String THRIFT_PORT_SUFFIX = "port";
-
- /**
+
+ /**
* The byte array represents for NO_NEXT_INDEXED_KEY;
- * The actual value is irrelevant because this is always compared by reference.
+ * The actual value is irrelevant because this is always compared by reference.
*/
public static final byte [] NO_NEXT_INDEXED_KEY = Bytes.toBytes("NO_NEXT_INDEXED_KEY");
@@ -594,6 +594,12 @@ public final class HConstants {
public static final int IPC_CALL_PARAMETER_LENGTH_MAX = 1000;
+ /**
+ * used in Configuration to get/set the KV aggregator for compaction
+ * hooks
+ */
+ public static final String KV_AGGREGATOR = "kvaggregator";
+
private HConstants() {
// Can't be instantiated with this ctor.
}
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java?rev=1401279&r1=1401278&r2=1401279&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java Tue Oct 23 12:51:10 2012
@@ -242,7 +242,7 @@ public class Store extends SchemaConfigu
setCompactionPolicy(conf.get(HConstants.COMPACTION_MANAGER_CLASS,
HConstants.DEFAULT_COMPACTION_MANAGER_CLASS));
- String aggregatorString = conf.get("aggregator");
+ String aggregatorString = conf.get(HConstants.KV_AGGREGATOR);
if (aggregatorString != null && !aggregatorString.isEmpty()) {
try {
this.aggregatorClass = ((Class<KeyValueAggregator>) Class
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/kvaggregator/TestKeyValueAggregator.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/kvaggregator/TestKeyValueAggregator.java?rev=1401279&r1=1401278&r2=1401279&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/kvaggregator/TestKeyValueAggregator.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/kvaggregator/TestKeyValueAggregator.java Tue Oct 23 12:51:10 2012
@@ -6,6 +6,7 @@ import java.util.List;
import org.apache.hadoop.hbase.HBaseTestCase;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Put;
@@ -41,7 +42,7 @@ public class TestKeyValueAggregator {
.setCompressionType(Compression.Algorithm.NONE));
TEST_UTIL
.getConfiguration()
- .set("aggregator",
+ .set(HConstants.KV_AGGREGATOR,
"org.apache.hadoop.hbase.regionserver.kvaggregator.LowerToUpperAggregator");
}