svn commit: r689289 - /incubator/pig/branches/types/src/org/apache/pig/PigServer.java

[gates]

Author: gates
Date: Tue Aug 26 17:00:29 2008
New Revision: 689289

URL: http://svn.apache.org/viewvc?rev=689289&view=rev
Log:
PIG-379 Changed describe to not call the optimizer.


Modified:
    incubator/pig/branches/types/src/org/apache/pig/PigServer.java

Modified: incubator/pig/branches/types/src/org/apache/pig/PigServer.java
URL: 
http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/PigServer.java?rev=689289&r1=689288&r2=689289&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/PigServer.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/PigServer.java Tue Aug 26 
17:00:29 2008
@@ -282,7 +282,7 @@
         try {
             LogicalPlan lp = getPlanFromAlias(alias, "describe");
             try {
-                lp = compileLp(lp, "describe");
+                lp = compileLp(lp, "describe", false);
             } catch (ExecException e) {
                 throw new FrontendException(e.getMessage());
             }
@@ -529,6 +529,13 @@
     private LogicalPlan compileLp(
             LogicalPlan lp,
             String operation) throws ExecException, FrontendException {
+        return compileLp(lp, operation, true);
+    }
+
+    private LogicalPlan compileLp(
+            LogicalPlan lp,
+            String operation,
+            boolean optimize) throws ExecException, FrontendException {
         // Look up the logical plan in the aliases map.  That plan will be
         // properly connected to all the others.
 
@@ -585,8 +592,10 @@
         }
 
         // optimize
-        LogicalOptimizer optimizer = new LogicalOptimizer(lp);
-        optimizer.optimize();
+        if (optimize) {
+            LogicalOptimizer optimizer = new LogicalOptimizer(lp);
+            optimizer.optimize();
+        }
 
         return lp;
     }