svn commit: r1346177 - /accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

[kturner]

Author: kturner
Date: Mon Jun  4 22:01:02 2012
New Revision: 1346177

URL: http://svn.apache.org/viewvc?rev=1346177&view=rev
Log:
ACCUMULO-616 read table.scan.max.memory from table configuration for batch scans

Modified:
    
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1346177&r1=1346176&r2=1346177&view=diff
==============================================================================
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 Mon Jun  4 22:01:02 2012
@@ -963,7 +963,8 @@ public class TabletServer extends Abstra
           if (isCancelled() || session == null)
             return;
 
-          long maxResultsSize = 
acuConf.getMemoryInBytes(Property.TABLE_SCAN_MAXMEM);
+          TableConfiguration acuTableConf = 
ServerConfiguration.getTableConfiguration(instance, 
session.threadPoolExtent.getTableId().toString());
+          long maxResultsSize = 
acuTableConf.getMemoryInBytes(Property.TABLE_SCAN_MAXMEM);
           long bytesAdded = 0;
           long maxScanTime = 4000;