You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by vi...@apache.org on 2018/04/19 23:20:25 UTC
hive git commit: HIVE-19242 : CliAdapter silently ignores excluded
qfiles (Vihang Karajgaonkar, reviewed by Sahil Takiar)
Repository: hive
Updated Branches:
refs/heads/master 9f15e22f4 -> 92b9ba7d3
HIVE-19242 : CliAdapter silently ignores excluded qfiles (Vihang Karajgaonkar, reviewed by Sahil Takiar)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/92b9ba7d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/92b9ba7d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/92b9ba7d
Branch: refs/heads/master
Commit: 92b9ba7d3437b12a2cc77db9e463c57cafa5e8c0
Parents: 9f15e22
Author: Vihang Karajgaonkar <vi...@cloudera.com>
Authored: Thu Apr 19 09:10:35 2018 -0700
Committer: Vihang Karajgaonkar <vi...@cloudera.com>
Committed: Thu Apr 19 16:14:03 2018 -0700
----------------------------------------------------------------------
.../hadoop/hive/cli/control/AbstractCliConfig.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/92b9ba7d/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java
index 01b9ed6..7151372 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/AbstractCliConfig.java
@@ -38,10 +38,13 @@ import org.apache.hadoop.hive.ql.QTestUtil.MiniClusterType;
import org.apache.hive.testutils.HiveTestEnvSetup;
import com.google.common.base.Splitter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class AbstractCliConfig {
public static final String HIVE_ROOT = HiveTestEnvSetup.HIVE_ROOT;
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractCliConfig.class);
enum MetastoreType {
sql
@@ -214,11 +217,18 @@ public abstract class AbstractCliConfig {
if (queryFile != null && !queryFile.equals("")) {
// The user may have passed a list of files - comma separated
for (String qFile : TEST_SPLITTER.split(queryFile)) {
+ File qF;
if (null != queryDir) {
- testFiles.add(new File(queryDir, qFile));
+ qF = new File(queryDir, qFile);
} else {
- testFiles.add(new File(qFile));
+ qF = new File(qFile);
}
+ if (excludedQueryFileNames.contains(qFile)) {
+ LOG.warn(qF.getAbsolutePath() + " is among the excluded query files for this driver."
+ + " Please update CliConfigs.java or testconfiguration.properties file to"
+ + " include the qfile");
+ }
+ testFiles.add(qF);
}
} else if (queryFileRegex != null && !queryFileRegex.equals("")) {
for (String regex : TEST_SPLITTER.split(queryFileRegex)) {