You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by vg...@apache.org on 2018/07/19 20:01:20 UTC
hive git commit: HIVE-20149: TestHiveCli failing/timing out(Vineet
Garg, reviewed by Zoltan Haindrich)
Repository: hive
Updated Branches:
refs/heads/master 081fa3685 -> e867d1c69
HIVE-20149: TestHiveCli failing/timing out(Vineet Garg, reviewed by Zoltan Haindrich)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e867d1c6
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e867d1c6
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e867d1c6
Branch: refs/heads/master
Commit: e867d1c693e966706d3b7c6fe18e039a85928f51
Parents: 081fa36
Author: Vineet Garg <vg...@apache.org>
Authored: Thu Jul 19 13:00:47 2018 -0700
Committer: Vineet Garg <vg...@apache.org>
Committed: Thu Jul 19 13:00:47 2018 -0700
----------------------------------------------------------------------
.../src/java/org/apache/hive/beeline/BeeLineOpts.java | 11 ++++++-----
.../test/org/apache/hive/beeline/cli/TestHiveCli.java | 2 --
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/e867d1c6/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
----------------------------------------------------------------------
diff --git a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
index 3877b5c..062436a 100644
--- a/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
+++ b/beeline/src/java/org/apache/hive/beeline/BeeLineOpts.java
@@ -503,11 +503,12 @@ public class BeeLineOpts implements Completer {
public boolean getEscapeCRLF() {
if (beeLine.isBeeLine()) {
return escapeCRLF;
- } else {
- boolean flag;
- HiveConf conf = beeLine.getCommands().getHiveConf(true);
- flag = HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_CLI_PRINT_ESCAPE_CRLF);
- return flag;
+ } else { //hive cli
+ if(conf != null) {
+ return HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_CLI_PRINT_ESCAPE_CRLF);
+ } else {
+ return false;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/e867d1c6/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
----------------------------------------------------------------------
diff --git a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
index 6684ddd..df01ca8 100644
--- a/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
+++ b/beeline/src/test/org/apache/hive/beeline/cli/TestHiveCli.java
@@ -24,7 +24,6 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.junit.Ignore;
import java.io.BufferedWriter;
import java.io.ByteArrayOutputStream;
@@ -253,7 +252,6 @@ public class TestHiveCli {
"hive (invalidDB)>", os, null, ERRNO_OTHER, false);
}
- @Ignore("Broken tests -- HIVE-18806")
@Test
public void testNoErrorDB() {
verifyCMD(null, "Error: Method not supported (state=,code=0)", errS, new String[] { "-e", "show tables;" },