hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amareshw...@apache.org
Subject svn commit: r1476039 [2/22] - in /hive/branches/HIVE-4115: ./ beeline/ beeline/src/java/org/apache/hive/beeline/ bin/ builtins/ cli/ common/src/java/org/apache/hadoop/hive/conf/ conf/ data/files/ eclipse-templates/ hbase-handler/ hbase-handler/src/java...
Date Fri, 26 Apr 2013 04:59:58 GMT
Modified: hive/branches/HIVE-4115/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java
(original)
+++ hive/branches/HIVE-4115/hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java
Fri Apr 26 04:59:50 2013
@@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.client.HT
 import org.apache.hadoop.hbase.MiniHBaseCluster;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.zookeeper.Watcher;
@@ -49,7 +48,6 @@ import org.apache.zookeeper.Watcher;
 public class HBaseTestSetup extends TestSetup {
 
   private MiniHBaseCluster hbaseCluster;
-  private MiniZooKeeperCluster zooKeeperCluster;
   private int zooKeeperPort;
   private String hbaseRoot;
 
@@ -60,32 +58,36 @@ public class HBaseTestSetup extends Test
   }
 
   void preTest(HiveConf conf) throws Exception {
-    if (hbaseCluster == null) {
-      // We set up fixtures on demand for the first testcase, and leave
-      // them allocated for reuse across all others.  Then tearDown
-      // will get called once at the very end after all testcases have
-      // run, giving us a guaranteed opportunity to shut them down.
-      setUpFixtures(conf);
-    }
+	
+    setUpFixtures(conf);
+	
     conf.set("hbase.rootdir", hbaseRoot);
     conf.set("hbase.master", hbaseCluster.getMaster().getServerName().getHostAndPort());
     conf.set("hbase.zookeeper.property.clientPort", Integer.toString(zooKeeperPort));
     String auxJars = conf.getAuxJars();
-    auxJars = ((auxJars == null) ? "" : (auxJars + ",")) + "file://"
+    auxJars = ((auxJars == null) ? "" : (auxJars + ",")) + "file:///"
       + new JobConf(conf, HBaseConfiguration.class).getJar();
-    auxJars += ",file://" + new JobConf(conf, HBaseSerDe.class).getJar();
-    auxJars += ",file://" + new JobConf(conf, Watcher.class).getJar();
+    auxJars += ",file:///" + new JobConf(conf, HBaseSerDe.class).getJar();
+    auxJars += ",file:///" + new JobConf(conf, Watcher.class).getJar();
     conf.setAuxJars(auxJars);
   }
 
   private void setUpFixtures(HiveConf conf) throws Exception {
-    conf.set("hbase.master", "local");
+    /* We are not starting zookeeper server here because 
+     * QTestUtil already starts it.
+     */
+    int zkPort = conf.getInt("hive.zookeeper.client.port", -1);
+    if ((zkPort == zooKeeperPort) && (hbaseCluster != null)) {
+    	return;
+    }
+    zooKeeperPort = zkPort;
     String tmpdir =  System.getProperty("user.dir")+"/../build/ql/tmp";
-    hbaseRoot = "file://" + tmpdir + "/hbase";
+    this.tearDown();
+    conf.set("hbase.master", "local");
+
+    hbaseRoot = "file:///" + tmpdir + "/hbase";
     conf.set("hbase.rootdir", hbaseRoot);
-    zooKeeperCluster = new MiniZooKeeperCluster();
-    zooKeeperPort = zooKeeperCluster.startup(
-      new File(tmpdir, "zookeeper"));
+
     conf.set("hbase.zookeeper.property.clientPort",
       Integer.toString(zooKeeperPort));
     Configuration hbaseConf = HBaseConfiguration.create(conf);
@@ -155,9 +157,5 @@ public class HBaseTestSetup extends Test
       hbaseCluster.shutdown();
       hbaseCluster = null;
     }
-    if (zooKeeperCluster != null) {
-      zooKeeperCluster.shutdown();
-      zooKeeperCluster = null;
-    }
   }
 }

Modified: hive/branches/HIVE-4115/hcatalog/bin/hcat
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/bin/hcat?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/bin/hcat (original)
+++ hive/branches/HIVE-4115/hcatalog/bin/hcat Fri Apr 26 04:59:50 2013
@@ -119,8 +119,18 @@ done
 # Put external jars, hcat jar, and config file in the classpath
 HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${HCAT_CLASSPATH}:${HCAT_JAR}:${HIVE_CONF_DIR}
 
-if [ -n "$HBASE_CONF_DIR" ] && [ -d $HBASE_CONF_DIR ]; then
-    HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${HBASE_CONF_DIR}
+# Look for HBase in a BigTop-compatible way. Avoid thrift version
+# conflict with modern versions of HBase.
+HBASE_HOME=${HBASE_HOME:-"/usr/lib/hbase"}
+HBASE_CONF_DIR=${HBASE_CONF_DIR:-"${HBASE_HOME}/conf"}
+if [ -d ${HBASE_HOME} ] ; then
+   for jar in $(find $HBASE_HOME -name *.jar -not -name thrift\*.jar); do
+      HBASE_CLASSPATH=$HBASE_CLASSPATH:${jar}
+   done
+   export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${HBASE_CLASSPATH}"
+fi
+if [ -d $HBASE_CONF_DIR ] ; then
+    HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${HBASE_CONF_DIR}"
 fi
 
 export HADOOP_CLASSPATH=$HADOOP_CLASSPATH

Modified: hive/branches/HIVE-4115/hcatalog/build-support/ant/deploy.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/build-support/ant/deploy.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/build-support/ant/deploy.xml (original)
+++ hive/branches/HIVE-4115/hcatalog/build-support/ant/deploy.xml Fri Apr 26 04:59:50 2013
@@ -21,6 +21,8 @@
 
 <project xmlns:artifact="artifact:org.apache.maven.artifact.ant">
 
+    <loadproperties srcfile="${path.to.basedir}/build.properties"/>
+
     <macrodef name="_sign">
         <attribute name="inputFile"/>
         <sequential>
@@ -38,6 +40,35 @@
         </sequential>
     </macrodef>
 
+    <macrodef name="_mvnpublish">
+      <attribute name="module"/>
+      <attribute name="jarname" default="@{module}"/>
+      <sequential>
+        <echo message="Installing local artifact for maven : @{module}" />
+        <artifact:install file="${path.to.basedir}/../build/@{module}/hive-@{jarname}-${hive.version}.jar">
+          <artifact:pom file="${path.to.basedir}/../build/@{module}/pom.xml"/>
+          <artifact:localRepository path="${mvn.local.repo}"/>
+        </artifact:install>
+      </sequential>
+    </macrodef>
+
+    <target name="hive-mvn-publish">
+      <!-- Pick built jars for all the hive artifacts and install them to local maven
cache -->
+      <_mvnpublish module="shims" />
+      <_mvnpublish module="common" />
+      <_mvnpublish module="serde" />
+      <_mvnpublish module="metastore" />
+      <_mvnpublish module="ql" jarname="exec"/>
+      <_mvnpublish module="contrib" />
+      <_mvnpublish module="service" />
+      <_mvnpublish module="cli" />
+      <_mvnpublish module="jdbc" />
+      <_mvnpublish module="beeline" />
+      <_mvnpublish module="hwi" />
+      <_mvnpublish module="hbase-handler" />
+      <_mvnpublish module="testutils" />
+    </target>
+
     <target name="mvn-init" unless="mvn-init.complete">
         <echo message="${ant.project.name}"/>
         <get src="${mvnrepo}/org/apache/maven/maven-ant-tasks/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar"
@@ -47,6 +78,7 @@
         <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
                  uri="artifact:org.apache.maven.artifact.ant"
                  classpath="${path.to.basedir}/build/maven-ant-tasks-${maven-ant-tasks.version}.jar"/>
+        <antcall target="hive-mvn-publish" />
         <artifact:dependencies>
             <dependency groupId="org.apache.hcatalog" artifactId="hcatalog" version="${hcatalog.version}"
scope="system" systemPath="${path.to.basedir}/pom.xml"/>
         </artifact:dependencies>

Modified: hive/branches/HIVE-4115/hcatalog/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/build.properties?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/build.properties (original)
+++ hive/branches/HIVE-4115/hcatalog/build.properties Fri Apr 26 04:59:50 2013
@@ -15,7 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-hcatalog.version=0.11.0-SNAPSHOT
+hive.version=0.12.0-SNAPSHOT
+hcatalog.version=${hive.version}
 jar.name=${ant.project.name}-${hcatalog.version}.jar
 hcatalog.jar=${ant.project.name}-${hcatalog.version}.jar
 hcatalog.core.jar=${ant.project.name}-core-${hcatalog.version}.jar

Modified: hive/branches/HIVE-4115/hcatalog/core/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/core/pom.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/core/pom.xml (original)
+++ hive/branches/HIVE-4115/hcatalog/core/pom.xml Fri Apr 26 04:59:50 2013
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,6 @@
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>hcatalog-core</artifactId>
     <packaging>jar</packaging>
-    <version>0.11.0-SNAPSHOT</version>
     <name>hcatalog-core</name>
     <url>http://maven.apache.org</url>
 
@@ -61,12 +60,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
-            <artifactId>hive-builtins</artifactId>
-            <version>${hive.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hive</groupId>
             <artifactId>hive-cli</artifactId>
             <version>${hive.version}</version>
             <scope>compile</scope>

Modified: hive/branches/HIVE-4115/hcatalog/core/src/main/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/core/src/main/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/core/src/main/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java
(original)
+++ hive/branches/HIVE-4115/hcatalog/core/src/main/java/org/apache/hcatalog/mapreduce/HCatStorageHandler.java
Fri Apr 26 04:59:50 2013
@@ -22,8 +22,8 @@ package org.apache.hcatalog.mapreduce;
 import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler;
 import org.apache.hadoop.hive.ql.metadata.HiveException;
-import org.apache.hadoop.hive.ql.metadata.HiveStorageHandler;
 import org.apache.hadoop.hive.ql.plan.TableDesc;
 import org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider;
 import org.apache.hadoop.mapred.OutputFormat;
@@ -32,7 +32,7 @@ import org.apache.hadoop.mapred.OutputFo
  * The abstract Class HCatStorageHandler would server as the base class for all
  * the storage handlers required for non-native tables in HCatalog.
  */
-public abstract class HCatStorageHandler implements HiveStorageHandler {
+public abstract class HCatStorageHandler extends DefaultStorageHandler {
 
     //TODO move this to HiveStorageHandler
 

Modified: hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/pom.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/pom.xml (original)
+++ hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/pom.xml Fri Apr 26 04:59:50 2013
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,6 @@
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>hcatalog-pig-adapter</artifactId>
     <packaging>jar</packaging>
-    <version>0.11.0-SNAPSHOT</version>
     <name>hcatalog-pig-adapter</name>
     <url>http://maven.apache.org</url>
 

Modified: hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatStorer.java
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatStorer.java?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatStorer.java
(original)
+++ hive/branches/HIVE-4115/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hcatalog/pig/TestHCatStorer.java
Fri Apr 26 04:59:50 2013
@@ -429,9 +429,9 @@ public class TestHCatStorer extends HCat
         driver.getResults(res);
 
         Iterator<String> itr = res.iterator();
-        Assert.assertEquals("0\tNULL\tNULL\tNULL\tNULL\tnull\tnull", itr.next());
-        Assert.assertEquals("NULL\t4.2\t2.2\t4\tlets hcat\tbinary-data\tnull", itr.next());
-        Assert.assertEquals("3\t6.2999997\t3.3000000000000003\t6\tlets hcat\tbinary-data\tnull",
itr.next());
+        Assert.assertEquals("0\tNULL\tNULL\tNULL\tNULL\tNULL\tNULL", itr.next());
+        Assert.assertEquals("NULL\t4.2\t2.2\t4\tlets hcat\tbinary-data\tNULL", itr.next());
+        Assert.assertEquals("3\t6.2999997\t3.3000000000000003\t6\tlets hcat\tbinary-data\tNULL",
itr.next()); 
         Assert.assertFalse(itr.hasNext());
 
         server.registerQuery("B = load 'junit_unparted' using " + HCatLoader.class.getName()
+ ";");

Modified: hive/branches/HIVE-4115/hcatalog/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/pom.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/pom.xml (original)
+++ hive/branches/HIVE-4115/hcatalog/pom.xml Fri Apr 26 04:59:50 2013
@@ -30,7 +30,7 @@
       <hadoop23.version>2.0.3-alpha</hadoop23.version>
       <hbase.version>0.94.5</hbase.version>
       <hcatalog.version>${project.version}</hcatalog.version>
-      <hive.version>0.11.0-SNAPSHOT</hive.version>
+      <hive.version>${project.version}</hive.version>
       <jackson.version>1.9.2</jackson.version>
       <jersey.version>1.14</jersey.version>
       <jetty.webhcat.version>7.6.0.v20120127</jetty.webhcat.version>
@@ -42,16 +42,10 @@
       <metrics-core.version>2.1.2</metrics-core.version>
   </properties>
 
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>11</version>
-  </parent>
-
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hcatalog</groupId>
   <artifactId>hcatalog</artifactId>
-  <version>0.11.0-SNAPSHOT</version>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <build>

Modified: hive/branches/HIVE-4115/hcatalog/server-extensions/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/server-extensions/pom.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/server-extensions/pom.xml (original)
+++ hive/branches/HIVE-4115/hcatalog/server-extensions/pom.xml Fri Apr 26 04:59:50 2013
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,6 @@
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>hcatalog-server-extensions</artifactId>
     <packaging>jar</packaging>
-    <version>0.11.0-SNAPSHOT</version>
     <name>server-extensions</name>
     <url>http://maven.apache.org</url>
 

Modified: hive/branches/HIVE-4115/hcatalog/storage-handlers/hbase/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/storage-handlers/hbase/pom.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/storage-handlers/hbase/pom.xml (original)
+++ hive/branches/HIVE-4115/hcatalog/storage-handlers/hbase/pom.xml Fri Apr 26 04:59:50 2013
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>hcatalog</artifactId>
-    <version>0.11.0-SNAPSHOT</version>
+    <version>0.12.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -32,7 +32,6 @@
   <groupId>org.apache.hcatalog</groupId>
   <artifactId>hbase-storage-handler</artifactId>
   <packaging>jar</packaging>
-  <version>0.11.0-SNAPSHOT</version>
   <name>hbase-storage-handler</name>
   <url>http://maven.apache.org</url>
 

Modified: hive/branches/HIVE-4115/hcatalog/webhcat/java-client/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/webhcat/java-client/pom.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/webhcat/java-client/pom.xml (original)
+++ hive/branches/HIVE-4115/hcatalog/webhcat/java-client/pom.xml Fri Apr 26 04:59:50 2013
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,6 @@
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>webhcat-java-client</artifactId>
     <packaging>jar</packaging>
-    <version>0.11.0-SNAPSHOT</version>
     <name>webhcat-java-client</name>
     <url>http://maven.apache.org</url>
 

Modified: hive/branches/HIVE-4115/hcatalog/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/webhcat/svr/pom.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/webhcat/svr/pom.xml (original)
+++ hive/branches/HIVE-4115/hcatalog/webhcat/svr/pom.xml Fri Apr 26 04:59:50 2013
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.hcatalog</groupId>
         <artifactId>hcatalog</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
+        <version>0.12.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -32,7 +32,6 @@
     <groupId>org.apache.hcatalog</groupId>
     <artifactId>webhcat</artifactId>
     <packaging>jar</packaging>
-    <version>0.11.0-SNAPSHOT</version>
     <name>webhcat</name>
     <url>http://maven.apache.org</url>
 

Modified: hive/branches/HIVE-4115/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh (original)
+++ hive/branches/HIVE-4115/hcatalog/webhcat/svr/src/main/bin/webhcat_config.sh Fri Apr 26
04:59:50 2013
@@ -64,6 +64,8 @@ fi
 # Allow alternate conf dir location.
 if [ -e "${WEBHCAT_PREFIX}/etc/webhcat/webhcat-env.sh" ]; then
   DEFAULT_CONF_DIR=${WEBHCAT_PREFIX}/"etc/webhcat"
+elif [ -e "${WEBHCAT_PREFIX}/conf/webhcat-env.sh" ]; then
+  DEFAULT_CONF_DIR=${WEBHCAT_PREFIX}/"conf"
 else
   DEFAULT_CONF_DIR="/etc/webhcat"
 fi

Modified: hive/branches/HIVE-4115/hwi/ivy.xml
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/hwi/ivy.xml?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/hwi/ivy.xml (original)
+++ hive/branches/HIVE-4115/hwi/ivy.xml Fri Apr 26 04:59:50 2013
@@ -31,8 +31,6 @@
     <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" />
 
     <!-- Test Dependencies -->
-    <dependency org="org.apache.hive" name="hive-builtins" rev="${version}"
-                conf="test->default" transitive="false"/>
     <dependency org="commons-httpclient" name="commons-httpclient" rev="${commons-httpclient.version}"
                 conf="test->default"
                 transitive="false"/>

Modified: hive/branches/HIVE-4115/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/ivy/libraries.properties?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/ivy/libraries.properties (original)
+++ hive/branches/HIVE-4115/ivy/libraries.properties Fri Apr 26 04:59:50 2013
@@ -44,7 +44,7 @@ commons-logging-api.version=1.0.4
 commons-pool.version=1.5.4
 derby.version=10.4.2.0
 guava.version=11.0.2
-hbase.version=0.92.0
+hbase.version=0.94.6.1
 jackson.version=1.8.8
 javaewah.version=0.3.2
 jdo-api.version=2.3-ec
@@ -66,5 +66,6 @@ ST4.version=4.0.4
 tempus-fugit.version=1.1
 snappy.version=0.2
 velocity.version=1.5
+metrics-core.version=2.1.2
 zookeeper.version=3.4.3
 javolution.version=5.5.1

Modified: hive/branches/HIVE-4115/metastore/if/hive_metastore.thrift
URL: http://svn.apache.org/viewvc/hive/branches/HIVE-4115/metastore/if/hive_metastore.thrift?rev=1476039&r1=1476038&r2=1476039&view=diff
==============================================================================
--- hive/branches/HIVE-4115/metastore/if/hive_metastore.thrift (original)
+++ hive/branches/HIVE-4115/metastore/if/hive_metastore.thrift Fri Apr 26 04:59:50 2013
@@ -455,6 +455,10 @@ service ThriftHiveMetastore extends fb30
                        throws(1:NoSuchObjectException o1, 2:MetaException o2)
   Partition get_partition(1:string db_name, 2:string tbl_name, 3:list<string> part_vals)
                        throws(1:MetaException o1, 2:NoSuchObjectException o2)
+  Partition exchange_partition(1:map<string, string> partitionSpecs, 2:string source_db,
+      3:string source_table_name, 4:string dest_db, 5:string dest_table_name)
+      throws(1:MetaException o1, 2:NoSuchObjectException o2, 3:InvalidObjectException o3,
+      4:InvalidInputException o4)
 
   Partition get_partition_with_auth(1:string db_name, 2:string tbl_name, 3:list<string>
part_vals, 
       4: string user_name, 5: list<string> group_names) throws(1:MetaException o1,
2:NoSuchObjectException o2)



Mime
View raw message