Repository: hive Updated Branches: refs/heads/master 63399363f -> 2da8f155d
HIVE-17787: Apply more filters on the BeeLine test output files (follow-up on HIVE-17569) (Marta Kuczora, via Peter Vary) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/2da8f155 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2da8f155 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2da8f155 Branch: refs/heads/master Commit: 2da8f155db4d26c5a0bdd6b0c89065dedee3b27e Parents: 6339936 Author: Peter Vary <[email protected]> Authored: Mon Oct 16 12:30:11 2017 +0200 Committer: Peter Vary <[email protected]> Committed: Mon Oct 16 12:30:11 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/hive/beeline/QFile.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/2da8f155/itests/util/src/main/java/org/apache/hive/beeline/QFile.java ---------------------------------------------------------------------- diff --git a/itests/util/src/main/java/org/apache/hive/beeline/QFile.java b/itests/util/src/main/java/org/apache/hive/beeline/QFile.java index 21be8b0..6cb4fb6 100644 --- a/itests/util/src/main/java/org/apache/hive/beeline/QFile.java +++ b/itests/util/src/main/java/org/apache/hive/beeline/QFile.java @@ -67,7 +67,14 @@ public final class QFile { private static final String MASK_PATTERN = "#### A masked pattern was here ####\n"; - private static final String[] COMMANDS_TO_REMOVE = {"EXPLAIN", "DESCRIBE[\\s\\n]+EXTENDED", "DESCRIBE[\\s\\n]+FORMATTED"}; + private static final String[] COMMANDS_TO_REMOVE = { + "EXPLAIN", + "DESC(RIBE)?[\\s\\n]+EXTENDED", + "DESC(RIBE)?[\\s\\n]+FORMATTED", + "DESC(RIBE)?", + "SHOW[\\s\\n]+TABLES", + "SHOW[\\s\\n]+FORMATTED[\\s\\n]+INDEXES", + "SHOW[\\s\\n]+DATABASES"}; private String name; private String databaseName; @@ -360,6 +367,9 @@ public final class QFile { filterSet.addFilter(String.format(regex, command), Pattern.DOTALL | Pattern.CASE_INSENSITIVE, ""); } + filterSet.addFilter("(Warning: )(.* Join .*JOIN\\[\\d+\\].*)( is a cross product)", "$1MASKED$3"); + filterSet.addFilter("mapreduce.jobtracker.address=.*\n", + "mapreduce.jobtracker.address=MASKED\n"); return filterSet; }
