svn commit: r1618296 - /hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java

[br...@apache.org]

Author: brock
Date: Sat Aug 16 00:20:54 2014
New Revision: 1618296

URL: http://svn.apache.org/r1618296
Log:
HIVE-7740 - qfile and qfile_regex should override includeFiles (Brock reviewed by Szehon)

Modified:
    hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java

Modified: hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java
URL: http://svn.apache.org/viewvc/hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java?rev=1618296&r1=1618295&r2=1618296&view=diff
==============================================================================
--- hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java (original)
+++ hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java Sat Aug 16 00:20:54 2014
@@ -93,15 +93,15 @@ public class QTestGenTask extends Task {
     }
   }
 
-  public class QFileRegexFilter extends QFileFilter {
+  public class QFileRegexFilter implements FileFilter {
     Pattern filterPattern;
-    public QFileRegexFilter(String filter, Set<String> includeOnly) {
-      super(includeOnly);
+    public QFileRegexFilter(String filter) {
       filterPattern = Pattern.compile(filter);
     }
 
     public boolean accept(File filePath) {
-      if (!super.accept(filePath)) {
+      if (filePath.isDirectory() ||
+          !filePath.getName().endsWith(".q")) {
         return false;
       }
       String testName = StringUtils.chomp(filePath.getName(), ".q");
@@ -350,6 +350,13 @@ public class QTestGenTask extends Task {
     File logDir = null;
 
     try {
+
+      System.out.println("Starting Generation of: " + className);
+      System.out.println("Include Files: " + includeQueryFile);
+      System.out.println("Excluded Files: " + excludeQueryFile);
+      System.out.println("Query Files: " + queryFile);
+      System.out.println("Query Files Regex: " + queryFileRegex);
+
       // queryDirectory should not be null
       queryDir = new File(queryDirectory);
 
@@ -358,9 +365,6 @@ public class QTestGenTask extends Task {
       if (queryFile != null && !queryFile.equals("")) {
         // The user may have passed a list of files - comma separated
         for (String qFile : CSV_SPLITTER.split(queryFile)) {
-          if (includeOnly != null && !includeOnly.contains(qFile)) {
-            continue;
-          }
           if (null != queryDir) {
             testFiles.add(new File(queryDir, qFile));
           } else {
@@ -370,7 +374,7 @@ public class QTestGenTask extends Task {
       } else if (queryFileRegex != null && !queryFileRegex.equals("")) {
         for (String regex : CSV_SPLITTER.split(queryFileRegex)) {
           testFiles.addAll(Arrays.asList(queryDir.listFiles(
-              new QFileRegexFilter(regex, includeOnly))));
+              new QFileRegexFilter(regex))));
         }
       } else if (runDisabled != null && runDisabled.equals("true")) {
         testFiles.addAll(Arrays.asList(queryDir.listFiles(new DisabledQFileFilter(includeOnly))));