Author: rding
Date: Thu May 13 21:00:22 2010
New Revision: 944013

URL: http://svn.apache.org/viewvc?rev=944013&view=rev
Log:
PIG-1414: Problem with parameter substitution

Modified:
    hadoop/pig/trunk/CHANGES.txt
    hadoop/pig/trunk/test/org/apache/pig/test/TestStore.java

Modified: hadoop/pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/CHANGES.txt?rev=944013&r1=944012&r2=944013&view=diff
==============================================================================
--- hadoop/pig/trunk/CHANGES.txt (original)
+++ hadoop/pig/trunk/CHANGES.txt Thu May 13 21:00:22 2010
@@ -64,6 +64,8 @@ PIG-1309: Map-side Cogroup (ashutoshc)
 
 BUG FIXES
 
+PIG-1414: Problem with parameter substitution (rding)
+
 PIG-1407: Logging starts before being configured (azaroth via daijy)
 
 PIG-1391: pig unit tests leave behind files in temp directory because 

Modified: hadoop/pig/trunk/test/org/apache/pig/test/TestStore.java
URL: 
http://svn.apache.org/viewvc/hadoop/pig/trunk/test/org/apache/pig/test/TestStore.java?rev=944013&r1=944012&r2=944013&view=diff
==============================================================================
--- hadoop/pig/trunk/test/org/apache/pig/test/TestStore.java (original)
+++ hadoop/pig/trunk/test/org/apache/pig/test/TestStore.java Thu May 13 
21:00:22 2010
@@ -394,7 +394,7 @@ public class TestStore extends junit.fra
             
             String script = "a = load '"+ inputFileName + "';" +
                        "store a into '" + outputFileName + "' using " + 
-                       DummyStore.class.getName() + "();";
+                       DUMMY_STORE_CLASS_NAME + "();";
             
             for (ExecType execType : modes) {
                 if(execType == ExecType.MAPREDUCE) {
@@ -442,7 +442,7 @@ public class TestStore extends junit.fra
             
             String script = "a = load '"+ inputFileName + "';" +
                     "store a into '" + outputFileName + "' using " + 
-                    DummyStore.class.getName() + "('true');";
+                    DUMMY_STORE_CLASS_NAME + "('true');";
             
             for (ExecType execType : modes) {
                 if(execType == ExecType.MAPREDUCE) {
@@ -502,9 +502,9 @@ public class TestStore extends junit.fra
             // that both stores are considered to have failed
             String script = "a = load '"+ inputFileName + "';" +
                     "store a into '" + outputFileName1 + "' using " + 
-                    DummyStore.class.getName() + "('true', '1');" +
+                    DUMMY_STORE_CLASS_NAME + "('true', '1');" +
                     "store a into '" + outputFileName2 + "' using " + 
-                    DummyStore.class.getName() + "('false', '2');"; 
+                    DUMMY_STORE_CLASS_NAME + "('false', '2');"; 
             
             for (ExecType execType : modes) {
                 if(execType == ExecType.MAPREDUCE) {
@@ -557,6 +557,10 @@ public class TestStore extends junit.fra
             Util.deleteFile(ps.getPigContext(), cleanupSuccessFile2);
         }
     }
+    
+    private static final String DUMMY_STORE_CLASS_NAME
+            = "org.apache.pig.test.TestStore\\$DummyStore";
+    
     public static class DummyStore extends PigStorage implements StoreMetadata{
 
         private boolean failInPutNext = false;


Reply via email to