incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tra...@apache.org
Subject svn commit: r1363579 - in /incubator/hcatalog/trunk: CHANGES.txt build.xml hcatalog-pig-adapter/build.xml hcatalog-pig-adapter/ivy.xml src/test/org/apache/hcatalog/cli/TestPermsGrp.java storage-handlers/hbase/build.xml
Date Thu, 19 Jul 2012 23:09:04 GMT
Author: travis
Date: Thu Jul 19 23:09:03 2012
New Revision: 1363579

URL: http://svn.apache.org/viewvc?rev=1363579&view=rev
Log:
HCATALOG-445 Clover builds broken on trunk

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/build.xml
    incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml
    incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml
    incubator/hcatalog/trunk/src/test/org/apache/hcatalog/cli/TestPermsGrp.java
    incubator/hcatalog/trunk/storage-handlers/hbase/build.xml

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1363579&r1=1363578&r2=1363579&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Thu Jul 19 23:09:03 2012
@@ -61,6 +61,8 @@ Trunk (unreleased changes)
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-445 Clover builds broken on trunk (aklochkov via traviscrawford)
+
   HCAT-448 HCatStorer performance is 4x slower in HCat 0.4 than HCat 0.2 (rajesh.balamohan
via khorgath)
 
   HCAT-447 findbugs target doesn't work in trunk (traviscrawford)

Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1363579&r1=1363578&r2=1363579&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Thu Jul 19 23:09:03 2012
@@ -420,7 +420,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/trunk/hcatalog-pig-adapter/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml?rev=1363579&r1=1363578&r2=1363579&view=diff
==============================================================================
--- incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml (original)
+++ incubator/hcatalog/trunk/hcatalog-pig-adapter/build.xml Thu Jul 19 23:09:03 2012
@@ -20,6 +20,8 @@
 <project name="hcatalog-pig-adapter">
   <import file="../build-common-new.xml"/>
 
+  <property name="clover.jar" location="${clover.home}/lib/clover.jar"/>
+
   <path id="compile.class.path">
     <fileset dir="${build.dir}/ivy/default"/>
     <dirset dir="../build/classes"/>
@@ -31,6 +33,7 @@
     <dirset dir="${basedir}/../build/test/classes"/>
     <dirset dir="${basedir}/build/classes"/>
     <dirset dir="${basedir}/build/test/classes"/>
+    <pathelement path="${clover.jar}"/>
   </path>
 
   <!-- Ideally we would simply use the "default" Ivy configuration jars; however,

Modified: incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml?rev=1363579&r1=1363578&r2=1363579&view=diff
==============================================================================
--- incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml (original)
+++ incubator/hcatalog/trunk/hcatalog-pig-adapter/ivy.xml Thu Jul 19 23:09:03 2012
@@ -33,6 +33,7 @@
     <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}"/>
     <dependency org="org.apache.hive" name="hive-metastore" rev="${hive.version}"/>
     <dependency org="org.apache.hive" name="hive-exec" rev="${hive.version}"/>
+    <dependency org="org.apache.hive" name="hive-builtins" rev="${hive.version}"/>
     <dependency org="org.apache.pig" name="pig" rev="${pig.version}"/>
     <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}"/>
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"/>

Modified: incubator/hcatalog/trunk/src/test/org/apache/hcatalog/cli/TestPermsGrp.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/org/apache/hcatalog/cli/TestPermsGrp.java?rev=1363579&r1=1363578&r2=1363579&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/org/apache/hcatalog/cli/TestPermsGrp.java (original)
+++ incubator/hcatalog/trunk/src/test/org/apache/hcatalog/cli/TestPermsGrp.java Thu Jul 19
23:09:03 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/trunk/storage-handlers/hbase/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-handlers/hbase/build.xml?rev=1363579&r1=1363578&r2=1363579&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-handlers/hbase/build.xml (original)
+++ incubator/hcatalog/trunk/storage-handlers/hbase/build.xml Thu Jul 19 23:09:03 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
-->



Mime
View raw message