[teiid-commits] teiid SVN: r3030 - trunk/engine/src/main/java/org/teiid/common/buffer/impl.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2011-03-23 15:28:44 -0400 (Wed, 23 Mar 2011)
New Revision: 3030

Modified:
   trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
Log:
TEIID-1509 changing the internal buffer defaults so that test execution will not be hampered by our default size assumptions

Modified: trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java	2011-03-23 18:11:52 UTC (rev 3029)
+++ trunk/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java	2011-03-23 19:28:44 UTC (rev 3030)
@@ -384,8 +384,9 @@
 	// Configuration 
     private int connectorBatchSize = BufferManager.DEFAULT_CONNECTOR_BATCH_SIZE;
     private int processorBatchSize = BufferManager.DEFAULT_PROCESSOR_BATCH_SIZE;
-    private int maxProcessingBatches = BufferManager.DEFAULT_MAX_PROCESSING_BATCHES;
-    private int maxReserveBatchColumns = BufferManager.DEFAULT_RESERVE_BUFFERS;
+    //set to acceptable defaults for testing
+    private int maxProcessingBatches = 128;
+    private int maxReserveBatchColumns = 16384; 
     private int maxProcessingKB;
     private int maxReserveBatchKB;
     private volatile int reserveBatchKB;
@@ -511,9 +512,9 @@
 	@Override
 	public void initialize() throws TeiidComponentException {
 		int maxMemory = (int)Math.min(Runtime.getRuntime().maxMemory() / 1024, Integer.MAX_VALUE);
+		maxMemory -= 300 * 1024; //assume 300 megs of overhead for the AS/system stuff
 		if (maxReserveBatchColumns < 0) {
 			this.maxReserveBatchKB = 0;
-			maxMemory -= 300 * 1024; //assume 300 megs of overhead for the AS/system stuff
 			int one_gig = 1024 * 1024;
 			if (maxMemory > one_gig) {
 				//assume 75% of the memory over the first gig
@@ -525,7 +526,7 @@
     	}
 		this.reserveBatchKB = this.maxReserveBatchKB;
 		if (this.maxProcessingBatches < 0) {
-			this.maxProcessingKB = (int)(.1 * maxMemory)/maxActivePlans;
+			this.maxProcessingKB = Math.max((int)Math.min(128 * KB_PER_VALUE * processorBatchSize, Integer.MAX_VALUE), (int)(.1 * maxMemory)/maxActivePlans);
 		} else {
 			this.maxProcessingKB = Math.max(0, (int)Math.min(maxProcessingBatches * KB_PER_VALUE * processorBatchSize, Integer.MAX_VALUE));
 		}