[ogsa-dai svn] SF.net SVN: ogsa-dai:[1945] ogsa-dai/trunk/extensions/dqp/server/src/main/ java/uk/org/ogsadai/dqp/lqp

[<amy...@us...>]

Revision: 1945
          http://ogsa-dai.svn.sourceforge.net/ogsa-dai/?rev=1945&view=rev
Author:   amykrause
Date:     2011-12-06 11:52:52 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Fixed bugs in table scan implosion.

Modified Paths:
--------------
    ogsa-dai/trunk/extensions/dqp/server/src/main/java/uk/org/ogsadai/dqp/lqp/operators/SimpleSelectProjectJoinTableScanQuery.java
    ogsa-dai/trunk/extensions/dqp/server/src/main/java/uk/org/ogsadai/dqp/lqp/optimiser/implosion/TableScanImplosionOptimiser.java

Modified: ogsa-dai/trunk/extensions/dqp/server/src/main/java/uk/org/ogsadai/dqp/lqp/operators/SimpleSelectProjectJoinTableScanQuery.java
===================================================================
--- ogsa-dai/trunk/extensions/dqp/server/src/main/java/uk/org/ogsadai/dqp/lqp/operators/SimpleSelectProjectJoinTableScanQuery.java	2011-12-06 11:47:53 UTC (rev 1944)
+++ ogsa-dai/trunk/extensions/dqp/server/src/main/java/uk/org/ogsadai/dqp/lqp/operators/SimpleSelectProjectJoinTableScanQuery.java	2011-12-06 11:52:52 UTC (rev 1945)
@@ -263,7 +263,7 @@
             List<Attribute> localAtributes = new ArrayList<Attribute>();
             try
             {
-                if (mProjectAttributes.size() == 0)
+                if (mProjectAttributes.size() == 0 && mProjectExpressions.isEmpty())
                 {
                     for (Attribute attr : allLocalAtributes)
                     {

Modified: ogsa-dai/trunk/extensions/dqp/server/src/main/java/uk/org/ogsadai/dqp/lqp/optimiser/implosion/TableScanImplosionOptimiser.java
===================================================================
--- ogsa-dai/trunk/extensions/dqp/server/src/main/java/uk/org/ogsadai/dqp/lqp/optimiser/implosion/TableScanImplosionOptimiser.java	2011-12-06 11:47:53 UTC (rev 1944)
+++ ogsa-dai/trunk/extensions/dqp/server/src/main/java/uk/org/ogsadai/dqp/lqp/optimiser/implosion/TableScanImplosionOptimiser.java	2011-12-06 11:52:52 UTC (rev 1945)
@@ -276,6 +276,15 @@
                 parent.getParent().replaceChild(parent, newProject);
                 parent.disconnect();
                 newProject.setChild(0, tableScanOp);
+                
+                // add data and evaluation node annotations
+                Annotation.addDataNodeAnnotation(
+                        newProject, 
+                        Annotation.getDataNodeAnnotation(project));
+                Annotation.addEvaluationNodeAnnotation(
+                        newProject, 
+                        Annotation.getEvaluationNodeAnnotation(project));
+                
                 tableScanOp.getParent().update();
             }
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.