You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2015/06/04 21:26:48 UTC
[1/2] hive git commit: HIVE-10877 : TestUtil class name confuses
ptest2 (Thejas Nair, reviewed by Hari Sankar Sivarama Subramaniyan )
Repository: hive
Updated Branches:
refs/heads/branch-1.2 42dbbf53e -> 6ec0b9d85
HIVE-10877 : TestUtil class name confuses ptest2 (Thejas Nair, reviewed by Hari Sankar Sivarama Subramaniyan )
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/c700e785
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/c700e785
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/c700e785
Branch: refs/heads/branch-1.2
Commit: c700e7855bccec7d5f0ea7fd7d804dbd1f010ed6
Parents: 42dbbf5
Author: Thejas Nair <th...@hortonworks.com>
Authored: Mon Jun 1 15:47:25 2015 -0700
Committer: Hari Subramaniyan <ha...@apache.org>
Committed: Thu Jun 4 12:21:57 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hive/TestUtil.java | 41 --------------------
.../plugin/TestHiveAuthorizerShowFilters.java | 4 +-
2 files changed, 2 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/c700e785/itests/hive-unit/src/test/java/org/apache/hadoop/hive/TestUtil.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/TestUtil.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/TestUtil.java
deleted file mode 100644
index 304fe5b..0000000
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/TestUtil.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hive;
-
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
-
-/**
- * Test utilities
- */
-public class TestUtil {
- /**
- * Use this if you want a fresh metastore for your test, without any existing entries.
- * It updates the configuration to point to new derby dir location
- * @param conf HiveConf to be updated
- * @param newloc new location within test temp dir for the metastore db
- */
- public static void setNewDerbyDbLocation(HiveConf conf, String newloc) {
- String newDbLoc = System.getProperty("test.tmp.dir") + newloc + "metastore_db";
-
- conf.setVar(ConfVars.METASTORECONNECTURLKEY, "jdbc:derby:;databaseName=" + newDbLoc
- + ";create=true");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/hive/blob/c700e785/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java
index 266d888..0c03a00 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveAuthorizerShowFilters.java
@@ -27,7 +27,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.hadoop.hive.TestUtil;
+import org.apache.hadoop.hive.UtilsForTest;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.ql.CommandNeedRetryException;
@@ -120,7 +120,7 @@ public class TestHiveAuthorizerShowFilters {
conf.setBoolVar(ConfVars.HIVE_AUTHORIZATION_ENABLED, true);
conf.setBoolVar(ConfVars.HIVE_SERVER2_ENABLE_DOAS, false);
conf.setBoolVar(ConfVars.HIVE_SUPPORT_CONCURRENCY, false);
- TestUtil.setNewDerbyDbLocation(conf, TestHiveAuthorizerShowFilters.class.getSimpleName());
+ UtilsForTest.setNewDerbyDbLocation(conf, TestHiveAuthorizerShowFilters.class.getSimpleName());
SessionState.start(conf);
driver = new Driver(conf);
[2/2] hive git commit: HIVE-10877 : - adding missing UtilsForTest
from previous patch
Posted by ha...@apache.org.
HIVE-10877 : - adding missing UtilsForTest from previous patch
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6ec0b9d8
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6ec0b9d8
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6ec0b9d8
Branch: refs/heads/branch-1.2
Commit: 6ec0b9d8556c57d6a2294f0fe6b616bddc7c83bc
Parents: c700e78
Author: Thejas Nair <th...@hortonworks.com>
Authored: Mon Jun 1 16:41:13 2015 -0700
Committer: Hari Subramaniyan <ha...@apache.org>
Committed: Thu Jun 4 12:22:27 2015 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hive/UtilsForTest.java | 41 ++++++++++++++++++++
1 file changed, 41 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/6ec0b9d8/itests/hive-unit/src/test/java/org/apache/hadoop/hive/UtilsForTest.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/UtilsForTest.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/UtilsForTest.java
new file mode 100644
index 0000000..699d446
--- /dev/null
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/UtilsForTest.java
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive;
+
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
+
+/**
+ * Test utilities
+ */
+public class UtilsForTest {
+ /**
+ * Use this if you want a fresh metastore for your test, without any existing entries.
+ * It updates the configuration to point to new derby dir location
+ * @param conf HiveConf to be updated
+ * @param newloc new location within test temp dir for the metastore db
+ */
+ public static void setNewDerbyDbLocation(HiveConf conf, String newloc) {
+ String newDbLoc = System.getProperty("test.tmp.dir") + newloc + "metastore_db";
+
+ conf.setVar(ConfVars.METASTORECONNECTURLKEY, "jdbc:derby:;databaseName=" + newDbLoc
+ + ";create=true");
+ }
+
+}