hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhr...@apache.org
Subject svn commit: r694557 - in /hadoop/core/trunk: CHANGES.txt src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
Date Fri, 12 Sep 2008 00:07:40 GMT
Author: dhruba
Date: Thu Sep 11 17:07:39 2008
New Revision: 694557

URL: http://svn.apache.org/viewvc?rev=694557&view=rev
Log:
HADOOP-4094. Hive now has hive-default.xml and hive-site.xml similar
to core hadoop. (Prasad Chakka via dhruba)


Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=694557&r1=694556&r2=694557&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Sep 11 17:07:39 2008
@@ -531,6 +531,9 @@
     HADOOP-4133. Log files generated by Hive should reside in the 
     build directory. (Prasad Chakka via dhruba)
 
+    HADOOP-4094. Hive now has hive-default.xml and hive-site.xml similar
+    to core hadoop. (Prasad Chakka via dhruba)
+
 Release 0.18.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/core/trunk/src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=694557&r1=694556&r2=694557&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
(original)
+++ hadoop/core/trunk/src/contrib/hive/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
Thu Sep 11 17:07:39 2008
@@ -172,7 +172,13 @@
     if(hconfurl == null) {
       l4j.warn("Unable to locate default hive configuration");
     } else {
-      addResource("hive-default.xml");
+      addResource(hconfurl);
+    }
+    URL hsiteurl = getClassLoader().getResource("hive-site.xml");
+    if(hsiteurl == null) {
+      l4j.warn("Unable to locate hive site configuration");
+    } else {
+      addResource(hsiteurl);
     }
 
     // if hadoop configuration files are already in our path - then define 



Mime
View raw message