TEIID-2191 adding the full planning stack to the recursion message

teiid · Oct 17, 2012 · 6518d7c · 6518d7c
1 parent 5a7024e
commit 6518d7c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java b/engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
@@ -137,6 +137,11 @@ public boolean equals(Object obj) {
 			return group.getMetadataID().equals(other.group.getMetadataID())
 					&& command.getType() == other.command.getType();
 		}
+
+		@Override
+		public String toString() {
+			return command.getClass().getSimpleName() + " " + group.getNonCorrelationName().toString(); //$NON-NLS-1$
+		}
 	}
 
 	private static ThreadLocal<HashSet<PlanningStackEntry>> planningStack = new ThreadLocal<HashSet<PlanningStackEntry>>() {
@@ -1024,7 +1029,7 @@ private void addNestedCommand(PlanNode node,
 					//must be a compensating update/delete
 					throw new QueryPlannerException(QueryPlugin.Event.TEIID30254, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30254, nestedCommand));
 				}
-				throw new QueryPlannerException(QueryPlugin.Event.TEIID31124, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31124, nestedCommand.getClass().getSimpleName(), group.getNonCorrelationName()));
+				throw new QueryPlannerException(QueryPlugin.Event.TEIID31124, QueryPlugin.Util.gs(QueryPlugin.Event.TEIID31124, nestedCommand.getClass().getSimpleName(), group.getNonCorrelationName(), planningStack));
 			}
 		}
 		try {

diff --git a/engine/src/main/resources/org/teiid/query/i18n.properties b/engine/src/main/resources/org/teiid/query/i18n.properties
@@ -893,7 +893,7 @@ TEIID30481=Failed to find the Connection Factory with JNDI name {0}. Please chec
 TEIID31097=Connection Factory (no data source found) provided is null; Can not proceed with metadata load.
 
 TEIID30254=Source UPDATE or DELETE command "{0}" contains non-pushdown constructs that cannot be simplified into a compensating action.
-TEIID31124=Recursive plan detected.  Command type {0} was already issued against {1}.
+TEIID31124=Recursive plan detected.  Command type {0} was already issued against {1}.  Planning cycle: {2}
 
 Translate.error=Cannot translate criteria "{0}", it is not matched by selector "{1}"