pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1579444 - in /pig/branches/branch-0.12: CHANGES.txt test/org/apache/pig/test/TestGrunt.java
Date Wed, 19 Mar 2014 23:06:41 GMT
Author: daijy
Date: Wed Mar 19 23:06:40 2014
New Revision: 1579444

URL: http://svn.apache.org/r1579444
Log:
PIG-3818: PIG-2499 is accidently reverted

Modified:
    pig/branches/branch-0.12/CHANGES.txt
    pig/branches/branch-0.12/test/org/apache/pig/test/TestGrunt.java

Modified: pig/branches/branch-0.12/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.12/CHANGES.txt?rev=1579444&r1=1579443&r2=1579444&view=diff
==============================================================================
--- pig/branches/branch-0.12/CHANGES.txt (original)
+++ pig/branches/branch-0.12/CHANGES.txt Wed Mar 19 23:06:40 2014
@@ -34,6 +34,8 @@ PIG-3480: TFile-based tmpfile compressio
 
 BUG FIXES
 
+PIG-3818: PIG-2499 is accidently reverted (daijy)
+
 PIG-3516: pig does not bring in joda-time as dependency in its pig-template.xml (daijy)
 
 PIG-3753: LOGenerate generates null schema (daijy)

Modified: pig/branches/branch-0.12/test/org/apache/pig/test/TestGrunt.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.12/test/org/apache/pig/test/TestGrunt.java?rev=1579444&r1=1579443&r2=1579444&view=diff
==============================================================================
--- pig/branches/branch-0.12/test/org/apache/pig/test/TestGrunt.java (original)
+++ pig/branches/branch-0.12/test/org/apache/pig/test/TestGrunt.java Wed Mar 19 23:06:40 2014
@@ -1069,14 +1069,10 @@ public class TestGrunt {
             assertFalse(new File("tempShFileToTestShCommand").exists());
 
             if (Util.WINDOWS) {
-               //FIXME
-               // We need to fix this because there is a race condition with pipes.
-               // dir command can potentially run before the TouchedFileInsideGrunt_61 is
written
-               // Solved for linux/unix below using xargs
-               strCmd = "sh echo foo > TouchedFileInsideGrunt_61 | dir /B | findstr TouchedFileInsideGrunt_61
> fileContainingTouchedFileInsideGruntShell_71";
+               strCmd = "sh echo foo > TouchedFileInsideGrunt_61 && dir /B | findstr
TouchedFileInsideGrunt_61 > fileContainingTouchedFileInsideGruntShell_71";
             }
             else {
-               strCmd = "sh touch TouchedFileInsideGrunt_61 | ls | grep TouchedFileInsideGrunt_61
> fileContainingTouchedFileInsideGruntShell_71";
+               strCmd = "sh touch TouchedFileInsideGrunt_61 && ls | grep TouchedFileInsideGrunt_61
> fileContainingTouchedFileInsideGruntShell_71";
             }
 
             cmd = new ByteArrayInputStream(strCmd.getBytes());



Mime
View raw message