incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From avand...@apache.org
Subject svn commit: r1378448 - in /incubator/hcatalog/branches/branch-0.4: CHANGES.txt build.xml src/test/org/apache/hcatalog/cli/TestPermsGrp.java storage-handlers/hbase/build.xml webhcat/java-client/build.xml
Date Wed, 29 Aug 2012 06:04:19 GMT
Author: avandana
Date: Wed Aug 29 06:04:18 2012
New Revision: 1378448

URL: http://svn.apache.org/viewvc?rev=1378448&view=rev
Log:
HCAT-445 Clover builds broken on trunk (for branch)

Modified:
    incubator/hcatalog/branches/branch-0.4/CHANGES.txt
    incubator/hcatalog/branches/branch-0.4/build.xml
    incubator/hcatalog/branches/branch-0.4/src/test/org/apache/hcatalog/cli/TestPermsGrp.java
    incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/build.xml
    incubator/hcatalog/branches/branch-0.4/webhcat/java-client/build.xml

Modified: incubator/hcatalog/branches/branch-0.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/CHANGES.txt?rev=1378448&r1=1378447&r2=1378448&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.4/CHANGES.txt (original)
+++ incubator/hcatalog/branches/branch-0.4/CHANGES.txt Wed Aug 29 06:04:18 2012
@@ -61,7 +61,9 @@ Trunk (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
-  HCAT-477 Drop table API in webhcat client does not respect the "ifExists" parameter.
+  HCAT-445 Clover builds broken on trunk (rohinip via avandana)
+
+  HCAT-477 Drop table API in webhcat client does not respect the "ifExists" parameter. (avandana)
 
   HCAT-471 Test HCat_ShowDes_1[1-3] fails (vikram.dixit via gates)
 

Modified: incubator/hcatalog/branches/branch-0.4/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/build.xml?rev=1378448&r1=1378447&r2=1378448&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.4/build.xml (original)
+++ incubator/hcatalog/branches/branch-0.4/build.xml Wed Aug 29 06:04:18 2012
@@ -393,7 +393,7 @@
     <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
     <mkdir dir="${clover.db.dir}"/>
     <clover-setup initString="${clover.db.dir}/hcat_coverage.db">
-      <fileset dir="src" includes="**/*.java"/>
+      <fileset dir="src" includes="**/*.java" excludes="**/NoExitSecurityManager.java"/>
     </clover-setup>
   </target>
 

Modified: incubator/hcatalog/branches/branch-0.4/src/test/org/apache/hcatalog/cli/TestPermsGrp.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/src/test/org/apache/hcatalog/cli/TestPermsGrp.java?rev=1378448&r1=1378447&r2=1378448&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.4/src/test/org/apache/hcatalog/cli/TestPermsGrp.java
(original)
+++ incubator/hcatalog/branches/branch-0.4/src/test/org/apache/hcatalog/cli/TestPermsGrp.java
Wed Aug 29 06:04:18 2012
@@ -25,7 +25,6 @@ import junit.framework.TestCase;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
 import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.metastore.HiveMetaStore;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.MetaStoreUtils;
 import org.apache.hadoop.hive.metastore.Warehouse;
@@ -42,7 +41,7 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hadoop.hive.metastore.api.Type;
 import org.apache.hadoop.hive.ql.metadata.Hive;
 import org.apache.hadoop.hive.serde.Constants;
-import org.apache.hadoop.util.StringUtils;
+import org.apache.hadoop.hive.shims.ShimLoader;
 import org.apache.hcatalog.ExitException;
 import org.apache.hcatalog.NoExitSecurityManager;
 import org.apache.hcatalog.cli.HCatCli;
@@ -55,26 +54,12 @@ import org.slf4j.LoggerFactory;
 public class TestPermsGrp extends TestCase {
 
   private boolean isServerRunning = false;
-  private static final String msPort = "20101";
+  private static final int msPort = 20101;
   private HiveConf hcatConf;
   private Warehouse clientWH;
-  private Thread t;
   private HiveMetaStoreClient msc;
   private static final Logger LOG = LoggerFactory.getLogger(TestPermsGrp.class);
 
-  private static class RunMS implements Runnable {
-
-    @Override
-    public void run() {
-      try {
-        HiveMetaStore.main(new String[]{"-v","-p",msPort});
-      } catch(Throwable t) {
-          LOG.error("Exiting. Got exception from metastore: ", t);
-      }
-    }
-
-  }
-
   @Override
   protected void tearDown() throws Exception {
     System.setSecurityManager(securityManager);
@@ -87,9 +72,7 @@ public class TestPermsGrp extends TestCa
       return;
     }
 
-    t = new Thread(new RunMS());
-    t.start();
-    Thread.sleep(40000);
+    MetaStoreUtils.startMetaStore(msPort, ShimLoader.getHadoopThriftAuthBridge());
 
     isServerRunning = true;
 

Modified: incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/build.xml?rev=1378448&r1=1378447&r2=1378448&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/build.xml (original)
+++ incubator/hcatalog/branches/branch-0.4/storage-handlers/hbase/build.xml Wed Aug 29 06:04:18
2012
@@ -74,6 +74,8 @@
     <property name="test.output" value="no"/>
     <property name="hive.conf.dir" value="${hive.root}/conf"/>
 
+    <property name="clover.jar" location="${clover.home}/lib/clover.jar"/>
+
     <!-- ivy properteis set here -->
     <property name="ivy.repo.dir" value="${user.home}/ivyrepo" />
     <property name="ivy.dir" location="../../ivy" />
@@ -249,6 +251,7 @@
                     <pathelement location="${test.build.classes}" />
                     <pathelement location="." />
                     <path refid="test.classpath"/>
+                    <pathelement path="${clover.jar}"/>
                 </classpath>
                 <formatter type="${test.junit.output.format}" />
                 <!-- If the user has not defined a particular test to run, run them all
-->

Modified: incubator/hcatalog/branches/branch-0.4/webhcat/java-client/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/branches/branch-0.4/webhcat/java-client/build.xml?rev=1378448&r1=1378447&r2=1378448&view=diff
==============================================================================
--- incubator/hcatalog/branches/branch-0.4/webhcat/java-client/build.xml (original)
+++ incubator/hcatalog/branches/branch-0.4/webhcat/java-client/build.xml Wed Aug 29 06:04:18
2012
@@ -47,6 +47,7 @@
   <property name="test.junit.output.format" value="plain" />
   <property name="test.output" value="no"/>
   <property name="test.warehouse.dir" value="/tmp/hcat_junit_warehouse"/>  
+  <property name="clover.jar" location="${clover.home}/lib/clover.jar"/>
  
   <property name="ivy.repo.dir" value="${user.home}/ivyrepo" />
   <property name="ivy.dir" location="${path.to.basedir}/ivy" />
@@ -160,6 +161,7 @@
                    <!-- <pathelement location="${test.build.classes}" />
                     <pathelement location="." /> i-->
                     <path refid="test.class.path"/>
+                    <pathelement path="${clover.jar}"/>
                 </classpath>
                 <formatter type="${test.junit.output.format}" />
                 <!-- If the user has not defined a particular test to run, run them all
-->



Mime
View raw message