You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by pr...@apache.org on 2010/01/04 23:20:03 UTC

svn commit: r895802 - in /hadoop/pig/branches/load-store-redesign: src/org/apache/pig/impl/logicalLayer/ src/org/apache/pig/impl/logicalLayer/parser/ test/org/apache/pig/test/ test/org/apache/pig/test/utils/ test/org/apache/pig/test/utils/dotGraph/

Author: pradeepkth
Date: Mon Jan  4 22:20:03 2010
New Revision: 895802

URL: http://svn.apache.org/viewvc?rev=895802&view=rev
Log:
PIG-1090: Update sources to reflect recent changes in load-store interfaces - incremental commit to update LOLoad (rding via pradeepkth)

Modified:
    hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/LOLoad.java
    hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
    hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestInputOutputFileValidator.java
    hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidator.java
    hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java
    hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java
    hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/dotGraph/LogicalPlanLoader.java

Modified: hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/LOLoad.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/LOLoad.java?rev=895802&r1=895801&r2=895802&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/LOLoad.java (original)
+++ hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/LOLoad.java Mon Jan  4 22:20:03 2010
@@ -24,7 +24,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.pig.ExecType;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.pig.LoadFunc;
 import org.apache.pig.LoadMetadata;
 import org.apache.pig.LoadPushDown;
@@ -33,8 +33,6 @@
 import org.apache.pig.LoadPushDown.RequiredField;
 import org.apache.pig.LoadPushDown.RequiredFieldList;
 import org.apache.pig.LoadPushDown.RequiredFieldResponse;
-import org.apache.pig.backend.datastorage.DataStorage;
-import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
 import org.apache.pig.data.DataType;
 import org.apache.pig.impl.PigContext;
 import org.apache.pig.impl.io.FileSpec;
@@ -54,8 +52,7 @@
     transient private LoadFunc mLoadFunc;
     private String mSchemaFile;
     private Schema mEnforcedSchema = null ;
-    transient private DataStorage mStorage;
-    private ExecType mExecType;
+    transient private Configuration conf;
     private static Log log = LogFactory.getLog(LOLoad.class);
     private Schema mDeterminedSchema = null;
     private RequiredFieldList requiredFieldList;
@@ -67,23 +64,19 @@
      *            OperatorKey for this operator
      * @param inputFileSpec
      *            the file to be loaded *
-     * @param execType
-     *            the execution mode @see org.apache.pig.ExecType
-     * @param storage
-     *            the underlying storage
+     * @param conf
+     *            the read-only configuration object
      *            
-     * 
      */
     public LOLoad(LogicalPlan plan, OperatorKey key, FileSpec inputFileSpec,
-            ExecType execType, DataStorage storage) throws IOException {
+            Configuration conf) throws IOException {
         super(plan, key);
         mInputFileSpec = inputFileSpec;
         //mSchemaFile = schemaFile;
         // schemaFile is the input file since we are trying
         // to deduce the schema by looking at the input file
         mSchemaFile = inputFileSpec.getFileName();
-        mStorage = storage;
-        mExecType = execType;
+        this.conf = conf;
         // Generate a psudo alias. Since in the following script, we do not have alias for LOLoad, however, alias is required.
         // a = foreach (load '1') generate b0;
         this.mAlias = ""+key.getId();
@@ -147,9 +140,6 @@
                 }
 
                 if(null == mDeterminedSchema) {
-                    // Zebra loader determineSchema method depends on this signature
-                    if (mStorage!=null)
-                        mStorage.getConfiguration().setProperty("pig.loader.signature", mAlias);
                     mSchema = determineSchema();
                     mDeterminedSchema  = mSchema;    
                 }
@@ -168,15 +158,9 @@
     
     private Schema determineSchema() throws IOException {
         if(LoadMetadata.class.isAssignableFrom(mLoadFunc.getClass())) {
-            // XXX: FIXME - mStorage should no longer be needed, we
-            // should use Configuration directly by passing a 
-            // Configuration object while creating LOLoad rather than
-            // a DataStorage object
             LoadMetadata loadMetadata = (LoadMetadata)mLoadFunc;
             ResourceSchema rSchema = loadMetadata.getSchema(
-                    mInputFileSpec.getFileName(), 
-                    ConfigurationUtil.toConfiguration(
-                            mStorage.getConfiguration()));
+                    mInputFileSpec.getFileName(), conf);
             return Schema.getPigSchema(rSchema);
         } else {
             return null;
@@ -271,9 +255,6 @@
             }
         } else {
             try {
-                // Zebra loader determineSchema method depends on this signature
-                if (mStorage!=null)
-                    mStorage.getConfiguration().setProperty("pig.loader.signature", mAlias);
                 inputSchema = determineSchema();
             } catch (IOException ioe) {
                 mProjectionMap = null;

Modified: hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt?rev=895802&r1=895801&r2=895802&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt (original)
+++ hadoop/pig/branches/load-store-redesign/src/org/apache/pig/impl/logicalLayer/parser/QueryParser.jjt Mon Jan  4 22:20:03 2010
@@ -70,6 +70,7 @@
 import org.apache.pig.backend.datastorage.DataStorage;
 import org.apache.pig.backend.datastorage.ContainerDescriptor;
 import org.apache.pig.backend.datastorage.ElementDescriptor;
+import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.pig.impl.util.LinkedMultiMap;
 
@@ -1273,7 +1274,7 @@
                 fileNameMap.put(filename, absolutePath);
             }
             lo = new LOLoad(lp, new OperatorKey(scope, getNextId()), new FileSpec(absolutePath, funcSpec),
-                  pigContext.getExecType(), pigContext.getFs());
+                  ConfigurationUtil.toConfiguration(pigContext.getProperties()));
         } catch (IOException ioe) {
             // The autogenerated parser code only catches RuntimeException and
             // ParseException as special Exceptions. All others are caught as

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestInputOutputFileValidator.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestInputOutputFileValidator.java?rev=895802&r1=895801&r2=895802&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestInputOutputFileValidator.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestInputOutputFileValidator.java Mon Jan  4 22:20:03 2010
@@ -24,6 +24,7 @@
 import org.apache.pig.FuncSpec;
 import org.apache.pig.backend.datastorage.DataStorage;
 import org.apache.pig.backend.datastorage.ElementDescriptor;
+import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
 import org.apache.pig.impl.PigContext;
 import org.apache.pig.impl.io.FileLocalizer;
 import org.apache.pig.impl.io.FileSpec;
@@ -148,7 +149,8 @@
             new FileSpec(inputFile, new FuncSpec("org.apache.pig.builtin.PigStorage")) ;
         FileSpec filespec2 =
             new FileSpec(outputFile, new FuncSpec("org.apache.pig.builtin.PigStorage"));
-        LOLoad load = new LOLoad(plan, genNewOperatorKeyId(), filespec1, null, dfs) ;       
+        LOLoad load = new LOLoad(plan, genNewOperatorKeyId(), filespec1, 
+                ConfigurationUtil.toConfiguration(dfs.getConfiguration())) ;       
         LOStore store = new LOStore(plan, genNewOperatorKeyId(), filespec2) ;
         
         plan.add(load) ;

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidator.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidator.java?rev=895802&r1=895801&r2=895802&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidator.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidator.java Mon Jan  4 22:20:03 2010
@@ -951,11 +951,11 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
         LOLoad load2 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1075,11 +1075,11 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
         LOLoad load2 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1247,7 +1247,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1315,7 +1315,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1383,7 +1383,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1453,7 +1453,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1533,7 +1533,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1631,7 +1631,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1726,7 +1726,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1852,7 +1852,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -1954,11 +1954,11 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
         LOLoad load2 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -2119,11 +2119,11 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
         LOLoad load2 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -2254,11 +2254,11 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
         LOLoad load2 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, null) ;
+                                  null) ;
 
         // schema for input#1
         Schema inputSchema1 = null ;
@@ -2753,8 +2753,6 @@
         printCurrentMethodName();
         LogicalPlan plan = new LogicalPlan() ;
 
-        String pigStorage = PigStorage.class.getName() ;
-
         LOLoad load1 = genDummyLOLoad(plan) ;
         LOLoad load2 = genDummyLOLoad(plan) ;
 
@@ -5513,13 +5511,9 @@
          * 
          */
         public CastFinder(LogicalPlan lp) {
-            // TODO Auto-generated constructor stub
             super(lp, new DepthFirstWalker<LogicalOperator, LogicalPlan>(lp));
         }
         
-        /* (non-Javadoc)
-         * @see org.apache.pig.impl.logicalLayer.LOVisitor#visit(org.apache.pig.impl.logicalLayer.LOCast)
-         */
         @Override
         protected void visit(LOCast cast) throws VisitorException {
             casts.add(cast);

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java?rev=895802&r1=895801&r2=895802&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/TestTypeCheckingValidatorNoSchema.java Mon Jan  4 22:20:03 2010
@@ -28,7 +28,7 @@
 import org.apache.pig.impl.plan.CompilationMessageCollector;
 import org.apache.pig.impl.plan.PlanValidationException;
 import org.apache.pig.impl.util.MultiMap;
-import org.apache.pig.backend.hadoop.datastorage.HDataStorage;
+import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
 import org.apache.pig.builtin.PigStorage;
 import org.apache.pig.data.DataType;
 import org.apache.pig.impl.logicalLayer.schema.Schema.FieldSchema ;
@@ -136,8 +136,6 @@
         // Create outer plan
         LogicalPlan plan = new LogicalPlan() ;
 
-        String pigStorage = PigStorage.class.getName() ;
-
         LOLoad load1 = genDummyLOLoad(plan) ;
 
         // set schemas
@@ -233,8 +231,6 @@
         // Create outer plan
         LogicalPlan plan = new LogicalPlan() ;
 
-        String pigStorage = PigStorage.class.getName() ;
-
         LOLoad load1 = genDummyLOLoad(plan) ;
 
         // set schemas
@@ -326,8 +322,6 @@
         printCurrentMethodName();
         LogicalPlan plan = new LogicalPlan() ;
 
-        String pigStorage = PigStorage.class.getName() ;
-
         LOLoad load1 = genDummyLOLoad(plan) ;
 
         // set schemas
@@ -363,8 +357,6 @@
         // Create outer plan
         LogicalPlan plan = new LogicalPlan() ;
 
-        String pigStorage = PigStorage.class.getName() ;
-
         LOLoad load1 = genDummyLOLoad(plan) ;
 
         // set schemas
@@ -445,7 +437,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, new HDataStorage(new Properties())) ;
+                                  ConfigurationUtil.toConfiguration(new Properties())) ;
 
         // set schemas
         load1.setEnforcedSchema(null) ;
@@ -509,7 +501,7 @@
         LOLoad load1 = new LOLoad(plan,
                                   genNewOperatorKey(),
                                   new FileSpec("pi", new FuncSpec(pigStorage)),
-                                  null, new HDataStorage(new Properties())) ;
+                                  ConfigurationUtil.toConfiguration(new Properties())) ;
 
         // set schemas
         load1.setEnforcedSchema(null) ;
@@ -570,8 +562,6 @@
         printCurrentMethodName();
         LogicalPlan plan = new LogicalPlan() ;
 
-        String pigStorage = PigStorage.class.getName() ;
-
         LOLoad load1 = genDummyLOLoad(plan) ;
         LOLoad load2 = genDummyLOLoad(plan) ;
 
@@ -621,8 +611,6 @@
         printCurrentMethodName();
         LogicalPlan plan = new LogicalPlan() ;
 
-        String pigStorage = PigStorage.class.getName() ;
-
         LOLoad load1 = genDummyLOLoad(plan) ;
         LOLoad load2 = genDummyLOLoad(plan) ;
 
@@ -664,8 +652,6 @@
         printCurrentMethodName();
         LogicalPlan plan = new LogicalPlan() ;
 
-        String pigStorage = PigStorage.class.getName() ;
-
         LOLoad load1 = genDummyLOLoad(plan) ;
         LOLoad load2 = genDummyLOLoad(plan) ;
 
@@ -766,8 +752,6 @@
         printCurrentMethodName();
         LogicalPlan plan = new LogicalPlan() ;
 
-        String pigStorage = PigStorage.class.getName() ;
-
         LOLoad load1 = genDummyLOLoad(plan) ;
         LOLoad load2 = genDummyLOLoad(plan) ;
 

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java?rev=895802&r1=895801&r2=895802&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/TypeCheckingTestUtil.java Mon Jan  4 22:20:03 2010
@@ -18,36 +18,33 @@
 
 package org.apache.pig.test.utils;
 
-import org.apache.hadoop.hdfs.server.common.HdfsConstants.NodeType;
-import org.apache.pig.backend.datastorage.DataStorage;
-import org.apache.pig.backend.hadoop.datastorage.HDataStorage;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
 import org.apache.pig.FuncSpec;
-import org.apache.pig.impl.logicalLayer.LogicalPlan;
+import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
+import org.apache.pig.builtin.PigStorage;
+import org.apache.pig.impl.io.FileSpec;
 import org.apache.pig.impl.logicalLayer.LOLoad;
-import org.apache.pig.impl.plan.OperatorKey;
+import org.apache.pig.impl.logicalLayer.LogicalPlan;
 import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.impl.plan.NodeIdGenerator;
 import org.apache.pig.impl.plan.CompilationMessageCollector;
-import org.apache.pig.impl.io.FileSpec;
-import org.apache.pig.builtin.PigStorage;
+import org.apache.pig.impl.plan.NodeIdGenerator;
+import org.apache.pig.impl.plan.OperatorKey;
 import org.apache.pig.test.TypeGraphPrinter;
 
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Properties;
-import java.io.IOException;
-
 public class TypeCheckingTestUtil {
 
     public static LOLoad genDummyLOLoad(LogicalPlan plan)  {
         String pigStorage = PigStorage.class.getName() ;
-        DataStorage dfs = new HDataStorage(new Properties());
         try {
             LOLoad load = new LOLoad(plan,
                                       genNewOperatorKey(),
                                       new FileSpec("pi", new FuncSpec(pigStorage)),
-                                      null, dfs) ;
+                                      ConfigurationUtil.toConfiguration(new Properties())) ;
             return load ;
         } catch (IOException e) {
             throw new AssertionError("This cannot happen") ;

Modified: hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/dotGraph/LogicalPlanLoader.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/dotGraph/LogicalPlanLoader.java?rev=895802&r1=895801&r2=895802&view=diff
==============================================================================
--- hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/dotGraph/LogicalPlanLoader.java (original)
+++ hadoop/pig/branches/load-store-redesign/test/org/apache/pig/test/utils/dotGraph/LogicalPlanLoader.java Mon Jan  4 22:20:03 2010
@@ -18,21 +18,30 @@
 
 package org.apache.pig.test.utils.dotGraph;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Map;
+
 import org.apache.pig.FuncSpec;
-import org.apache.pig.impl.logicalLayer.*;
-import org.apache.pig.impl.logicalLayer.schema.Schema;
-import org.apache.pig.impl.logicalLayer.parser.QueryParser ;
-import org.apache.pig.impl.logicalLayer.parser.ParseException ;
-import org.apache.pig.impl.logicalLayer.FrontendException ;
-import org.apache.pig.impl.io.FileSpec;
 import org.apache.pig.builtin.PigStorage;
 import org.apache.pig.data.DataType;
-
-import java.io.IOException;
-import java.io.ByteArrayInputStream;
-import java.util.Map;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
+import org.apache.pig.impl.io.FileSpec;
+import org.apache.pig.impl.logicalLayer.FrontendException;
+import org.apache.pig.impl.logicalLayer.LOCogroup;
+import org.apache.pig.impl.logicalLayer.LOCross;
+import org.apache.pig.impl.logicalLayer.LODistinct;
+import org.apache.pig.impl.logicalLayer.LOFilter;
+import org.apache.pig.impl.logicalLayer.LOForEach;
+import org.apache.pig.impl.logicalLayer.LOLoad;
+import org.apache.pig.impl.logicalLayer.LOSort;
+import org.apache.pig.impl.logicalLayer.LOSplit;
+import org.apache.pig.impl.logicalLayer.LOSplitOutput;
+import org.apache.pig.impl.logicalLayer.LOUnion;
+import org.apache.pig.impl.logicalLayer.LogicalOperator;
+import org.apache.pig.impl.logicalLayer.LogicalPlan;
+import org.apache.pig.impl.logicalLayer.parser.ParseException;
+import org.apache.pig.impl.logicalLayer.parser.QueryParser;
+import org.apache.pig.impl.logicalLayer.schema.Schema;
 
 
 public class LogicalPlanLoader
@@ -95,7 +104,7 @@
         FileSpec fileSpec = new FileSpec("pi",
                                          new FuncSpec(PigStorage.class.getName())) ;
         try {
-            load = new LOLoad(plan, getKey(node.attributes), fileSpec, null, null) ;
+            load = new LOLoad(plan, getKey(node.attributes), fileSpec, null) ;
             fillSchema(load, node.attributes) ;
         }
         catch (IOException ioe) {