[teiid-commits] teiid SVN: r3981 - in branches/7.7.x/engine/src/main/java/org/teiid: query/analysis and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2012-04-09 14:56:20 -0400 (Mon, 09 Apr 2012)
New Revision: 3981

Modified:
   branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
   branches/7.7.x/engine/src/main/java/org/teiid/query/analysis/AnalysisRecord.java
Log:
TEIID-1985 one last refinement to remove the analysis record 

Modified: branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2012-04-09 18:52:04 UTC (rev 3980)
+++ branches/7.7.x/engine/src/main/java/org/teiid/dqp/internal/process/RequestWorkItem.java	2012-04-09 18:56:20 UTC (rev 3981)
@@ -706,9 +706,8 @@
 		if(analysisRecord != null) {
         	if (requestMsg.getShowPlan() != ShowPlan.OFF) {
         		if (processor != null) {
-        			analysisRecord.setQueryPlan(processor.getProcessorPlan().getDescriptionProperties());
+            		response.setPlanDescription(processor.getProcessorPlan().getDescriptionProperties());
         		}
-        		response.setPlanDescription(analysisRecord.getQueryPlan());
         		if (analysisRecord.getAnnotations() != null && !analysisRecord.getAnnotations().isEmpty()) {
 		            response.setAnnotations(analysisRecord.getAnnotations());
 		            analysisRecord.getAnnotations().clear();

Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/analysis/AnalysisRecord.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/analysis/AnalysisRecord.java	2012-04-09 18:52:04 UTC (rev 3980)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/analysis/AnalysisRecord.java	2012-04-09 18:56:20 UTC (rev 3981)
@@ -106,7 +106,6 @@
     private boolean recordQueryPlan;
     private boolean recordDebug;
     
-    private PlanNode queryPlan;
     // Annotations
     private Collection<Annotation> annotations;
     
@@ -132,14 +131,6 @@
         return new AnalysisRecord(false, false);
     }
     
-    public PlanNode getQueryPlan() {
-		return queryPlan;
-	}
-    
-    public void setQueryPlan(PlanNode queryPlan) {
-		this.queryPlan = queryPlan;
-	}
-
     /**
      * Determine whether query plan should be recorded
      * @return True to record