You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ol...@apache.org on 2008/12/18 20:30:47 UTC
svn commit: r727799 - in /hadoop/pig/branches/types: ./ lib/
src/org/apache/pig/builtin/ test/org/apache/pig/test/
Author: olga
Date: Thu Dec 18 11:30:47 2008
New Revision: 727799
URL: http://svn.apache.org/viewvc?rev=727799&view=rev
Log:
miseed cigwin tests commit
Modified:
hadoop/pig/branches/types/CHANGES.txt
hadoop/pig/branches/types/lib/javacc.jar
hadoop/pig/branches/types/src/org/apache/pig/builtin/BinStorage.java
hadoop/pig/branches/types/test/org/apache/pig/test/TestGrunt.java
hadoop/pig/branches/types/test/org/apache/pig/test/TestParamSubPreproc.java
hadoop/pig/branches/types/test/org/apache/pig/test/TestPigServer.java
Modified: hadoop/pig/branches/types/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/CHANGES.txt?rev=727799&r1=727798&r2=727799&view=diff
==============================================================================
--- hadoop/pig/branches/types/CHANGES.txt (original)
+++ hadoop/pig/branches/types/CHANGES.txt Thu Dec 18 11:30:47 2008
@@ -332,6 +332,8 @@
PIG-449: Schemas for bags should contain tuples all the time (pradeepk via
olgan)
+ PIG-501: make unit tests run under windows (daijy via olgan)
+
PIG-543: Restore local mode to truly run locally instead of use map
reduce. (shubhamc via gates)
Modified: hadoop/pig/branches/types/lib/javacc.jar
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/lib/javacc.jar?rev=727799&r1=727798&r2=727799&view=diff
==============================================================================
Binary files - no diff available.
Modified: hadoop/pig/branches/types/src/org/apache/pig/builtin/BinStorage.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/src/org/apache/pig/builtin/BinStorage.java?rev=727799&r1=727798&r2=727799&view=diff
==============================================================================
--- hadoop/pig/branches/types/src/org/apache/pig/builtin/BinStorage.java (original)
+++ hadoop/pig/branches/types/src/org/apache/pig/builtin/BinStorage.java Thu Dec 18 11:30:47 2008
@@ -218,6 +218,7 @@
// and figure out the schema from the data in
// the first record
Tuple t = getNext();
+ is.close();
if(t == null) {
// we couldn't get a valid record from the input
return null;
Modified: hadoop/pig/branches/types/test/org/apache/pig/test/TestGrunt.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/test/org/apache/pig/test/TestGrunt.java?rev=727799&r1=727798&r2=727799&view=diff
==============================================================================
--- hadoop/pig/branches/types/test/org/apache/pig/test/TestGrunt.java (original)
+++ hadoop/pig/branches/types/test/org/apache/pig/test/TestGrunt.java Thu Dec 18 11:30:47 2008
@@ -102,7 +102,7 @@
try {
grunt.exec();
} catch (Exception e) {
- assertTrue(e.getMessage().contains("Encountered \";\""));
+ assertTrue(e.getMessage().contains("Encountered \" \";\""));
}
}
Modified: hadoop/pig/branches/types/test/org/apache/pig/test/TestParamSubPreproc.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/test/org/apache/pig/test/TestParamSubPreproc.java?rev=727799&r1=727798&r2=727799&view=diff
==============================================================================
--- hadoop/pig/branches/types/test/org/apache/pig/test/TestParamSubPreproc.java (original)
+++ hadoop/pig/branches/types/test/org/apache/pig/test/TestParamSubPreproc.java Thu Dec 18 11:30:47 2008
@@ -674,7 +674,7 @@
ps.genSubstitutedFile(pigIStream , pigOStream , arg , argFiles);
fail ("Should have thrown an exception");
} catch (ParseException e) {
- assertTrue(e.getMessage().startsWith("Encountered \"is\" at line 2, column 6."));
+ assertTrue(e.getMessage().startsWith("Encountered \" <IDENTIFIER> \"is \"\" at line 2, column 6."));
} catch (RuntimeException e) {
fail ("Got RuntimeException : " + e.getMessage());
} catch (Error e) {
Modified: hadoop/pig/branches/types/test/org/apache/pig/test/TestPigServer.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/types/test/org/apache/pig/test/TestPigServer.java?rev=727799&r1=727798&r2=727799&view=diff
==============================================================================
--- hadoop/pig/branches/types/test/org/apache/pig/test/TestPigServer.java (original)
+++ hadoop/pig/branches/types/test/org/apache/pig/test/TestPigServer.java Thu Dec 18 11:30:47 2008
@@ -306,7 +306,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("a: {field1: int,field2: float,field3: chararray}") == true);
}
-
+ reader.close();
}
@Test
@@ -327,7 +327,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("b: {field1: int,field2: float,field3: chararray}") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -348,7 +348,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("b: {field1: int,field2: float,field3: chararray}") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -369,7 +369,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("b: {field1: int,field2: float,field3: chararray}") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -390,7 +390,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("b: {field1: int,field2: float,field3: chararray}") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -411,7 +411,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("b: {int}") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -445,7 +445,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("Schema for b unknown.") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -467,7 +467,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("c: {group: int,a: {field1: int,field2: float,field3: chararray},b: {field4: bytearray,field5: double,field6: chararray}}") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -489,7 +489,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("c: {a::field1: int,a::field2: float,a::field3: chararray,b::field4: bytearray,b::field5: double,b::field6: chararray}") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -511,7 +511,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("c: {a::field1: int,a::field2: float,a::field3: chararray,b::field4: bytearray,b::field5: double,b::field6: chararray}") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -533,7 +533,7 @@
while ((s = reader.readLine()) != null) {
assertTrue(s.equals("c: {field1: int,field2: double,field3: chararray}") == true);
}
-
+ fileWithStdOutContents.close();
}
@Test
@@ -564,6 +564,6 @@
"itemCounts::f: float,itemCounts::m: map[ ]");
assertEquals(expected, actual);
}
-
+ fileWithStdOutContents.close();
}
}