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 2015/03/23 23:23:18 UTC

[33/44] hbase git commit: Revert "HBASE-12976 Set default value for hbase.client.scanner.max.result.size."

Revert "HBASE-12976 Set default value for hbase.client.scanner.max.result.size."

This reverts commit 2583e8de574ae4b002c5dbc80b0da666b42dd699.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/64589abe
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/64589abe
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/64589abe

Branch: refs/heads/hbase-12439
Commit: 64589abe9936337fcbccdbe82e538d05020c8ee4
Parents: b728e66
Author: Lars Hofhansl <la...@apache.org>
Authored: Thu Mar 19 14:19:41 2015 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Thu Mar 19 14:19:41 2015 -0700

----------------------------------------------------------------------
 .../src/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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/64589abe/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
----------------------------------------------------------------------
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 19e251a..7d93904 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
@@ -624,9 +624,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

http://git-wip-us.apache.org/repos/asf/hbase/blob/64589abe/hbase-common/src/main/resources/hbase-default.xml
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index a3092b5..69017f6 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1290,16 +1290,6 @@ possible configurations would overwhelm and obscure the important.
   </property>
 
   <property>
-    <name>hbase.client.scanner.max.result.size</name>
-    <value>2097152</value>
-    <description>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.
-    </description>
-  </property>
-
-  <property>
     <name>hbase.status.published</name>
     <value>false</value>
     <description>