TEIID-5525 adding details about the system property to the message

# Conflicts: # engine/src/main/java/org/teiid/query/QueryPlugin.java # Conflicts: # engine/src/main/java/org/teiid/query/QueryPlugin.java
teiid · Nov 2, 2018 · 055a4e3 · 055a4e3
1 parent a136741
commit 055a4e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java b/engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
@@ -302,7 +302,7 @@ private void updateEstimates(long sizeEstimate, boolean remove) throws TeiidComp
                     throw new TeiidComponentException(QueryPlugin.Event.TEIID31261, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31261, maxBatchManagerSizeEstimate, id));
                 }
                 if (!sizeWarning) {
-                    LogManager.logWarning(LogConstants.CTX_BUFFER_MGR, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31261, maxBatchManagerSizeEstimate, id));
+                    LogManager.logWarning(LogConstants.CTX_BUFFER_MGR, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31292, maxBatchManagerSizeEstimate, id));
                     sizeWarning = true;
                 }
             }

diff --git a/engine/src/main/resources/org/teiid/query/i18n.properties b/engine/src/main/resources/org/teiid/query/i18n.properties
@@ -1592,7 +1592,9 @@ TEIID31258=Only {0} DDL statements are allowed.
 TEIID31259=In the statement ending with token {0} on line {1} column {2} the ddl is not valid: {3}
 
 TEIID31560=Max size of temporary lob exceeded: {0}
-TEIID31261=Max estimated size {0} for a single operation/table id {1} has been exceeded.  The server may need to increase the amount of disk or memory available, or decrease the number of max active plans.
+TEIID31261=Max estimated size {0} for a single operation/table id {1} has been exceeded.  The server may need to increase the amount of disk or memory available, or decrease the number of max active plans.  The system property org.teiid.enforceSingleMaxBufferSizeEstimate may be set to false to turn this into a warning.
+TEIID31292=Max estimated size {0} for a single operation/table id {1} has been exceeded.  The server may need to increase the amount of disk or memory available, or decrease the number of max active plans.  The system property org.teiid.enforceSingleMaxBufferSizeEstimate may be set to true to turn this into an error.
+
 TEIID31262=Max estimated size {0} for a single session {1} has been exceeded by operation/table id {2}.  The server may need to increase the amount of disk or memory available, or decrease the number of max active plans.
 TEIID31263=Error loading functions from {0}: {1}