svn commit: r1610806 [3/13] - in /hive/branches/cbo: ./ bin/ bin/ext/ common/ common/src/java/org/apache/hadoop/hive/ant/ common/src/java/org/apache/hadoop/hive/conf/ common/src/test/org/apache/hadoop/hive/conf/ conf/ data/files/ hcatalog/core/src/main...

[hashutosh]

Modified: 
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java?rev=1610806&r1=1610805&r2=1610806&view=diff
==============================================================================
--- 
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java 
(original)
+++ 
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java 
Tue Jul 15 18:50:51 2014
@@ -18,7 +18,6 @@
 package org.apache.hadoop.hive.conf;
 
 import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hadoop.util.Shell;
 import org.apache.hive.common.util.HiveTestUtils;
@@ -50,7 +49,7 @@ public class TestHiveConf {
   }
 
   private void checkConfVar(ConfVars var, String expectedConfVarVal) throws 
Exception {
-    Assert.assertEquals(expectedConfVarVal, var.defaultVal);
+    Assert.assertEquals(expectedConfVarVal, var.getDefaultValue());
   }
 
   private void checkHiveConf(String name, String expectedHiveVal) throws 
Exception {
@@ -87,7 +86,7 @@ public class TestHiveConf {
     checkHiveConf("test.property1", "hive-site.xml");
 
     // Test HiveConf property variable substitution in hive-site.xml
-    checkHiveConf("test.var.hiveconf.property", 
ConfVars.DEFAULTPARTITIONNAME.defaultVal);
+    checkHiveConf("test.var.hiveconf.property", 
ConfVars.DEFAULTPARTITIONNAME.getDefaultValue());
   }
 
   @Test

Modified: 
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java?rev=1610806&r1=1610805&r2=1610806&view=diff
==============================================================================
--- 
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java
 (original)
+++ 
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java
 Tue Jul 15 18:50:51 2014
@@ -19,7 +19,6 @@ package org.apache.hadoop.hive.conf;
 
 import junit.framework.TestCase;
 
-import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.junit.Test;
 

Modified: 
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java
URL: 
http://svn.apache.org/viewvc/hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java?rev=1610806&r1=1610805&r2=1610806&view=diff
==============================================================================
--- 
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java
 (original)
+++ 
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java
 Tue Jul 15 18:50:51 2014
@@ -18,7 +18,6 @@
 package org.apache.hadoop.hive.conf;
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStreamReader;
 
 import junit.framework.TestCase;
@@ -26,7 +25,6 @@ import junit.framework.TestCase;
 import org.apache.hadoop.hive.common.LogUtils;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hive.common.util.HiveTestUtils;
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 
 /**
  * TestHiveLogging