svn commit: r1196035 - in /incubator/accumulo/branches/1.3: docs/config.html src/core/src/main/java/org/apache/accumulo/core/conf/Property.java

[kt...@apache.org]

Author: kturner
Date: Tue Nov  1 14:58:09 2011
New Revision: 1196035

URL: http://svn.apache.org/viewvc?rev=1196035&view=rev
Log:
ACCUMULO-105 Modified default value for table.scan.max.memory from 50M to 1M

Modified:
    incubator/accumulo/branches/1.3/docs/config.html
    incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java

Modified: incubator/accumulo/branches/1.3/docs/config.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/docs/config.html?rev=1196035&r1=1196034&r2=1196035&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/docs/config.html (original)
+++ incubator/accumulo/branches/1.3/docs/config.html Tue Nov  1 14:58:09 2011
@@ -729,7 +729,7 @@ $HADOOP_HOME/lib/[^.].*.jar,
     <td>table.scan.max.memory</td>
     <td><b><a href='#MEMORY'>memory</a></b></td>
     <td>yes</td>
-    <td><pre>50M</pre></td>
+    <td><pre>1M</pre></td>
     <td>The maximum amount of memory that will be used to cache results of a client query/scan. Once this limit is reached, the buffered data is sent to the client.</td>
    </tr>
    <tr class='highlight'>

Modified: incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1196035&r1=1196034&r2=1196035&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original)
+++ incubator/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/Property.java Tue Nov  1 14:58:09 2011
@@ -191,7 +191,7 @@ public enum Property {
           + "in-memory map flushed to disk in a minor compaction.  There is no guarantee an idle " + "tablet will be compacted."),
   TABLE_SCAN_CACHE_ENABLED("table.scan.cache.enable", "false", PropertyType.BOOLEAN, "Determines whether scan cache is enabled."),
   TABLE_SCAN_CACHE_SIZE("table.scan.cache.size", "8M", PropertyType.MEMORY, "Scan cache size."),
-  TABLE_SCAN_MAXMEM("table.scan.max.memory", "50M", PropertyType.MEMORY,
+  TABLE_SCAN_MAXMEM("table.scan.max.memory", "1M", PropertyType.MEMORY,
       "The maximum amount of memory that will be used to cache results of a client query/scan. "
           + "Once this limit is reached, the buffered data is sent to the client."),
   TABLE_FILE_TYPE("table.file.type", RFile.EXTENSION, PropertyType.STRING, "Change the type of file a table writes"),