Repository: hbase Updated Branches: refs/heads/master ad9ffaaaf -> 67d135831
HBASE-18043 Institute a hard limit for individual cell size that cannot be overridden by clients. - Addendum to fix test issue in TestMobStoreScanner. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/67d13583 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/67d13583 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/67d13583 Branch: refs/heads/master Commit: 67d1358311ab031ae1d152da4e8d357bed59bebf Parents: ad9ffaa Author: anoopsamjohn <anoopsamj...@gmail.com> Authored: Tue May 16 18:53:27 2017 +0530 Committer: anoopsamjohn <anoopsamj...@gmail.com> Committed: Tue May 16 18:53:27 2017 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/client/HTable.java | 2 +- .../apache/hadoop/hbase/regionserver/TestMobStoreScanner.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/67d13583/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java index e89d4ed..bcb9d6b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java @@ -232,7 +232,7 @@ public class HTable implements Table { * @return maxKeyValueSize from configuration. */ public static int getMaxKeyValueSize(Configuration conf) { - return conf.getInt("hbase.client.keyvalue.maxsize", -1); + return conf.getInt(ConnectionConfiguration.MAX_KEYVALUE_SIZE_KEY, -1); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/67d13583/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java index d501cdd..9305bbc 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java @@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.ConnectionConfiguration; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -82,7 +83,9 @@ public class TestMobStoreScanner { @BeforeClass public static void setUpBeforeClass() throws Exception { - TEST_UTIL.getConfiguration().setInt("hbase.client.keyvalue.maxsize", 100 * 1024 * 1024); + TEST_UTIL.getConfiguration().setInt(ConnectionConfiguration.MAX_KEYVALUE_SIZE_KEY, + 100 * 1024 * 1024); + TEST_UTIL.getConfiguration().setInt(HRegion.HBASE_MAX_CELL_SIZE_KEY, 100 * 1024 * 1024); TEST_UTIL.startMiniCluster(1); }
