You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ya...@apache.org on 2010/10/05 00:09:51 UTC

svn commit: r1004456 - in /hadoop/pig/branches/branch-0.8: CHANGES.txt contrib/zebra/build.xml contrib/zebra/src/java/org/apache/hadoop/zebra/io/ColumnGroup.java

Author: yanz
Date: Mon Oct  4 22:09:50 2010
New Revision: 1004456

URL: http://svn.apache.org/viewvc?rev=1004456&view=rev
Log:
leading '_' in directory/file names should be ignored; the 'pigtest' build target should include all pig-related zebra tests. (yanz)

Modified:
    hadoop/pig/branches/branch-0.8/CHANGES.txt
    hadoop/pig/branches/branch-0.8/contrib/zebra/build.xml
    hadoop/pig/branches/branch-0.8/contrib/zebra/src/java/org/apache/hadoop/zebra/io/ColumnGroup.java

Modified: hadoop/pig/branches/branch-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.8/CHANGES.txt?rev=1004456&r1=1004455&r2=1004456&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.8/CHANGES.txt (original)
+++ hadoop/pig/branches/branch-0.8/CHANGES.txt Mon Oct  4 22:09:50 2010
@@ -200,6 +200,8 @@ PIG-1309: Map-side Cogroup (ashutoshc)
 
 BUG FIXES
 
+PIG-1664: leading '_' in directory/file names should be ignored; the "pigtest" build target should include all pig-related zebra tests. (yanz)
+
 PIG-1662: Need better error message for MalFormedProbVecException (rding)
 
 PIG-1658: ORDER BY does not work properly on integer/short keys that are -1 (yanz)

Modified: hadoop/pig/branches/branch-0.8/contrib/zebra/build.xml
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.8/contrib/zebra/build.xml?rev=1004456&r1=1004455&r2=1004456&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.8/contrib/zebra/build.xml (original)
+++ hadoop/pig/branches/branch-0.8/contrib/zebra/build.xml Mon Oct  4 22:09:50 2010
@@ -342,42 +342,6 @@ to call at top-level: ant deploy-contrib
 	          <not>
 	            <filename name="**/pig/TestRealCluster.java"/> <!-- This requires a real cluster anyway-->
 	          </not>
-		          <not>
-		            <filename name="**/pig/TestMergeJoinNegative.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestMergeJoin.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestMergeJoinEmpty.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestSimpleType.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestOrderPreserveMultiTable.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestOrderPreserveMultiTableGlob.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestOrderPreserveProjection.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestOrderPreserveProjectionNegative.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestOrderPreserveSimple.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestTableMergeJoinFloat.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestTableMergeJoinInteger.java"/>
-		          </not>
-		          <not>
-		            <filename name="**/pig/TestOrderPreserveVariableTable.java"/>
-		          </not>
 	        </fileset> 
 	      </batchtest>
 	    </junit>

Modified: hadoop/pig/branches/branch-0.8/contrib/zebra/src/java/org/apache/hadoop/zebra/io/ColumnGroup.java
URL: http://svn.apache.org/viewvc/hadoop/pig/branches/branch-0.8/contrib/zebra/src/java/org/apache/hadoop/zebra/io/ColumnGroup.java?rev=1004456&r1=1004455&r2=1004456&view=diff
==============================================================================
--- hadoop/pig/branches/branch-0.8/contrib/zebra/src/java/org/apache/hadoop/zebra/io/ColumnGroup.java (original)
+++ hadoop/pig/branches/branch-0.8/contrib/zebra/src/java/org/apache/hadoop/zebra/io/ColumnGroup.java Mon Oct  4 22:09:50 2010
@@ -2412,6 +2412,7 @@ class ColumnGroup {
     public boolean accept(Path p) {
       return p.getName().equals(META_FILE) || p.getName().equals(SCHEMA_FILE)
           || p.getName().startsWith(".tmp.")
+          || p.getName().startsWith("_")
           || p.getName().startsWith("ttt")
           || p.getName().startsWith(getNonDataFilePrefix(conf)) ? false : true;
     }