hive git commit: HIVE-10747 - Enable the cleanup of side effect for the Encryption related qfile test

2015-05-21 Thread ekoifman 
Repository: hive
Updated Branches:
  refs/heads/branch-1.2 3a70b0a1e - 9253f5a0d


HIVE-10747 - Enable the cleanup of side effect for the Encryption related qfile 
test


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9253f5a0
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9253f5a0
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9253f5a0

Branch: refs/heads/branch-1.2
Commit: 9253f5a0d9415144c1efd3edc487162438af1c57
Parents: 3a70b0a
Author: Eugene Koifman ekoif...@hortonworks.com
Authored: Thu May 21 18:04:58 2015 -0700
Committer: Eugene Koifman ekoif...@hortonworks.com
Committed: Thu May 21 18:04:58 2015 -0700

--
 .../java/org/apache/hadoop/hive/ql/QTestUtil.java | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/9253f5a0/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
--
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java 
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index 925f1ee..3c4b8de 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -731,14 +731,12 @@ public class QTestUtil {
 clearTablesCreatedDuringTests();
 clearKeysCreatedInTests();
 
-if (clusterType != MiniClusterType.encrypted) {
-  // allocate and initialize a new conf since a test can
-  // modify conf by using 'set' commands
-  conf = new HiveConf (Driver.class);
-  initConf();
-  // renew the metastore since the cluster type is unencrypted
-  db = Hive.get(conf);  // propagate new conf to meta store
-}
+// allocate and initialize a new conf since a test can
+// modify conf by using 'set' commands
+conf = new HiveConf(Driver.class);
+initConf();
+// renew the metastore since the cluster type is unencrypted
+db = Hive.get(conf);  // propagate new conf to meta store
 
 setup.preTest(conf);
   }

[49/50] [abbrv] hive git commit: HIVE-10747: Enable the cleanup of side effect for the Encryption related qfile test (Ferdinand Xu, reviewed by Sergio Pena)

2015-05-20 Thread spena 
HIVE-10747: Enable the cleanup of side effect for the Encryption related qfile 
test (Ferdinand Xu, reviewed by Sergio Pena)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1253a8db
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1253a8db
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1253a8db

Branch: refs/heads/parquet
Commit: 1253a8db49a313edb325731379b8d15effd2ff01
Parents: d703c22
Author: Sergio Pena sergio.p...@cloudera.com
Authored: Wed May 20 10:03:01 2015 -0500
Committer: Sergio Pena sergio.p...@cloudera.com
Committed: Wed May 20 10:03:01 2015 -0500

--
 .../java/org/apache/hadoop/hive/ql/QTestUtil.java | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/1253a8db/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
--
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java 
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index f357c14..2b4bd85 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -733,14 +733,12 @@ public class QTestUtil {
 clearTablesCreatedDuringTests();
 clearKeysCreatedInTests();
 
-if (clusterType != MiniClusterType.encrypted) {
-  // allocate and initialize a new conf since a test can
-  // modify conf by using 'set' commands
-  conf = new HiveConf (Driver.class);
-  initConf();
-  // renew the metastore since the cluster type is unencrypted
-  db = Hive.get(conf);  // propagate new conf to meta store
-}
+// allocate and initialize a new conf since a test can
+// modify conf by using 'set' commands
+conf = new HiveConf(Driver.class);
+initConf();
+// renew the metastore since the cluster type is unencrypted
+db = Hive.get(conf);  // propagate new conf to meta store
 
 setup.preTest(conf);
   }

hive git commit: HIVE-10747: Enable the cleanup of side effect for the Encryption related qfile test (Ferdinand Xu, reviewed by Sergio Pena)

2015-05-20 Thread spena 
Repository: hive
Updated Branches:
  refs/heads/master d703c2221 - 1253a8db4


HIVE-10747: Enable the cleanup of side effect for the Encryption related qfile 
test (Ferdinand Xu, reviewed by Sergio Pena)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1253a8db
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1253a8db
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1253a8db

Branch: refs/heads/master
Commit: 1253a8db49a313edb325731379b8d15effd2ff01
Parents: d703c22
Author: Sergio Pena sergio.p...@cloudera.com
Authored: Wed May 20 10:03:01 2015 -0500
Committer: Sergio Pena sergio.p...@cloudera.com
Committed: Wed May 20 10:03:01 2015 -0500

--
 .../java/org/apache/hadoop/hive/ql/QTestUtil.java | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/1253a8db/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
--
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java 
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index f357c14..2b4bd85 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -733,14 +733,12 @@ public class QTestUtil {
 clearTablesCreatedDuringTests();
 clearKeysCreatedInTests();
 
-if (clusterType != MiniClusterType.encrypted) {
-  // allocate and initialize a new conf since a test can
-  // modify conf by using 'set' commands
-  conf = new HiveConf (Driver.class);
-  initConf();
-  // renew the metastore since the cluster type is unencrypted
-  db = Hive.get(conf);  // propagate new conf to meta store
-}
+// allocate and initialize a new conf since a test can
+// modify conf by using 'set' commands
+conf = new HiveConf(Driver.class);
+initConf();
+// renew the metastore since the cluster type is unencrypted
+db = Hive.get(conf);  // propagate new conf to meta store
 
 setup.preTest(conf);
   }