From aad299fabacdb1cb47573fa9068967aea0a6e450 Mon Sep 17 00:00:00 2001 From: Lars Hofhansl Date: Thu, 19 Mar 2015 14:19:41 -0700 Subject: [PATCH] Revert "HBASE-12976 Set default value for hbase.client.scanner.max.result.size." This reverts commit 2583e8de574ae4b002c5dbc80b0da666b42dd699. --- .../main/java/org/apache/hadoop/hbase/HConstants.java | 4 ++-- hbase-common/src/main/resources/hbase-default.xml | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java index 4429d8148c9..2658868d5d0 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java @@ -607,9 +607,9 @@ public final class HConstants { * Note that when a single row is larger than this limit the row is still * returned completely. * - * The default value is 2MB. + * The default value is unlimited. */ - public static final long DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE = 2 * 1024 * 1024; + public static final long DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE = Long.MAX_VALUE; /** * Parameter name for client pause value, used mostly as value to wait diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index df1894bfe79..e72484a1d65 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1178,16 +1178,6 @@ possible configurations would overwhelm and obscure the important. - - hbase.client.scanner.max.result.size - 2097152 - Maximum number of bytes returned when calling a scanner's next method. - Note that when a single row is larger than this limit the row is still returned completely. - The default value is 2MB, which is good for 1ge networks. - With faster and/or high latency networks this value should be increased. - - - hbase.status.published false