hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject [19/50] [abbrv] hive git commit: HIVE-10877 : TestUtil class name confuses ptest2 (Thejas Nair, reviewed by Hari Sankar Sivarama Subramaniyan )
Date Fri, 05 Jun 2015 23:16:32 GMT
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/3817bb53
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/3817bb53
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/3817bb53

Branch: refs/heads/hbase-metastore
Commit: 3817bb5363948c74da99c15c65c4935cc7356f08
Parents: 55b28a0
Author: Thejas Nair <thejas@hortonworks.com>
Authored: Mon Jun 1 15:47:25 2015 -0700
Committer: Thejas Nair <thejas@hortonworks.com>
Committed: Mon Jun 1 15:47:25 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/3817bb53/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/3817bb53/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);


Mime
View raw message