diff --git a/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java b/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java index ca7e094..a59fbc7 100644 --- a/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java +++ b/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java @@ -93,15 +93,15 @@ public boolean accept(File fpath) { } } - public class QFileRegexFilter extends QFileFilter { + public class QFileRegexFilter implements FileFilter { Pattern filterPattern; - public QFileRegexFilter(String filter, Set 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 void execute() throws BuildException { 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 void execute() throws BuildException { 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 void execute() throws BuildException { } 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))));