incubator-hcatalog-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tof...@apache.org
Subject svn commit: r1292107 - in /incubator/hcatalog/trunk: ./ storage-drivers/hbase/ storage-drivers/hbase/ivy/ storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/ storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/
Date Wed, 22 Feb 2012 01:58:24 GMT
Author: toffer
Date: Wed Feb 22 01:58:24 2012
New Revision: 1292107

URL: http://svn.apache.org/viewvc?rev=1292107&view=rev
Log:
HCAT-266 Upgrade HBase dependency to 0.92. (thw via toffer)

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/storage-drivers/hbase/build.xml
    incubator/hcatalog/trunk/storage-drivers/hbase/ivy.xml
    incubator/hcatalog/trunk/storage-drivers/hbase/ivy/ivysettings.xml
    incubator/hcatalog/trunk/storage-drivers/hbase/ivy/libraries.properties
    incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
    incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1292107&r1=1292106&r2=1292107&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Feb 22 01:58:24 2012
@@ -33,6 +33,8 @@ Trunk (unreleased changes)
   HCAT-2 Support nested schema conversion between Hive an Pig (julienledem via hashutosh)
 
   IMPROVEMENTS
+  HCAT-266 Upgrade HBase dependency to 0.92. (thw via toffer)
+
   HCAT-253 HBase revision manager should configure/drop znodes in the create/drop table meta
hooks in the storage handler. (avandana via toffer)
 
   HCAT-259 Make readFields() and write() in LazyHCatRecord work (gates via khorgath)

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/build.xml?rev=1292107&r1=1292106&r2=1292107&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/build.xml (original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/build.xml Wed Feb 22 01:58:24 2012
@@ -111,21 +111,21 @@
         <pathelement location="${build.classes}" />
         <pathelement location="conf"/>
         <pathelement location="${hive.conf.dir}"/>
-        <!-- jars Thrift depends on -->
-        <fileset dir="${ivy.lib.dir}" includes="libthrift*.jar"/>
+        <!-- jars Hadoop depends on -->
+        <fileset dir="${hive.root}/build/hadoopcore/hadoop-${hadoop.version}/" >
+            <include name="**/lib/*.jar" />
+            <include name="hadoop-test-*.jar" />
+        </fileset>
+        <path refid="classpath"/>
+        <pathelement location="${driver.jar}"/>
         <!-- jars Hive depends on -->
         <fileset dir="${hive.root}/build/ivy/lib/default/">
             <include name="**/*.jar" />
             <exclude name="*hbase*.jar" />
+            <exclude name="zookeeper*.jar" />
+            <exclude name="guava*.jar" />
+            <exclude name="slf4j*.jar" />
         </fileset>
-        <!-- jars Hadoop depends on -->
-        <fileset dir="${hive.root}/build/hadoopcore/hadoop-1.0.0/lib/" >
-            <include name="**/*.jar" />
-        </fileset>
-        <pathelement location="${driver.jar}"/>
-        <path refid="classpath"/>
-        <fileset dir="${hive.root}/build/hadoopcore/hadoop-1.0.0/"
-                 includes="hadoop-test-1.0.0.jar"/>
     </path>
 
     <path id="test.zookeeper.classpath">

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/ivy.xml?rev=1292107&r1=1292106&r2=1292107&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/ivy.xml (original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/ivy.xml Wed Feb 22 01:58:24 2012
@@ -46,6 +46,11 @@
             <artifact name="zookeeper" type="jar" ext="jar"/>
             <artifact name="zookeeper" type="test-jar" ext="jar" m:classifier="tests"/>
         </dependency>
-	<dependency org="org.apache.thrift" name="libthrift" rev="${thrift.version}" conf="common->master"/>
+
+    <!-- hbase test dependencies -->
+    <dependency org="com.github.stephenc.high-scale-lib" name="high-scale-lib" rev="${high-scale-lib.version}"
conf="common->master" />
+    <dependency org="com.google.guava" name="guava" rev="${guava.version}" conf="common->master"
/>
+    <dependency org="org.mortbay.jetty" name="jetty" rev="${jetty.version}" conf="common->master"
/>
+
     </dependencies>
 </ivy-module>

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/ivy/ivysettings.xml?rev=1292107&r1=1292106&r2=1292107&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/ivy/ivysettings.xml (original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/ivy/ivysettings.xml Wed Feb 22 01:58:24
2012
@@ -32,6 +32,9 @@
     <property name="repo.maven.org" value="${mvnrepo}" override="true"/>
     <property name="maven2.pattern"  value="[organisation]/[module]/[revision]/[module]-[revision](-[classifier])"/>
     <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
+    <property name="asfrepo" value="https://repository.apache.org"/>
+    <property name="asfsnapshotrepo" value="${asfrepo}/content/repositories/snapshots"/>
+    <property name="snapshot.pattern"  value="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
     <!-- pull in the local repository -->
     <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
     <settings defaultResolver="default"/>
@@ -43,10 +46,11 @@
                 pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
/>
 
         <ibiblio name="maven2" root="${repo.maven.org}" pattern="${maven2.pattern.ext}"
m2compatible="true"/>
+        <ibiblio name="asf-snapshots" root="${asfsnapshotrepo}" pattern="${snapshot.pattern}"
checkmodified="true" m2compatible="true"/>
         <chain name="default" dual="true">
             <resolver ref="local"/>
             <resolver ref="maven2"/>
-            <resolver ref="jboss"/>
+            <resolver ref="asf-snapshots"/>
         </chain>
         <chain name="internal">
             <resolver ref="local"/>

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/ivy/libraries.properties?rev=1292107&r1=1292106&r2=1292107&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/ivy/libraries.properties (original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/ivy/libraries.properties Wed Feb 22 01:58:24
2012
@@ -16,6 +16,8 @@
 junit.version=3.8.1
 ivy.version=2.2.0
 rats-lib.version=0.5.1
-hbase.version=0.90.5
-zookeeper.version=3.4.0
-thrift.version=0.7.0
+hbase.version=0.92.0-SNAPSHOT
+zookeeper.version=3.4.3
+guava.version=11.0
+jetty.version=6.1.26
+high-scale-lib.version=1.1.1

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java?rev=1292107&r1=1292106&r2=1292107&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
(original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/ImportSequenceFile.java
Wed Feb 22 01:58:24 2012
@@ -125,11 +125,15 @@ class ImportSequenceFile {
                     try {
                         baseOutputCommitter.commitJob(jobContext);
                         Configuration conf = jobContext.getConfiguration();
+                        try {
                         //import hfiles
                         new LoadIncrementalHFiles(conf)
                                 .doBulkLoad(HFileOutputFormat.getOutputPath(jobContext),
                                                    new HTable(conf,
                                                                       conf.get(HBaseConstants.PROPERTY_OUTPUT_TABLE_NAME_KEY)));
+                        } catch (Exception e) {
+                        	throw new IOException("BulkLoad failed.", e);
+                        }
                     } finally {
                         cleanupScratch(jobContext);
                     }

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java?rev=1292107&r1=1292106&r2=1292107&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
(original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/src/test/org/apache/hcatalog/hbase/ManyMiniCluster.java
Wed Feb 22 01:58:24 2012
@@ -235,7 +235,7 @@ public class ManyMiniCluster {
             zookeeperDir = new File(workDir,"zk").getAbsolutePath();
             zookeeperPort = findFreePort();
             zookeeperCluster = new MiniZooKeeperCluster();
-            zookeeperCluster.setClientPort(zookeeperPort);
+            zookeeperCluster.setDefaultClientPort(zookeeperPort);
             zookeeperCluster.startup(new File(zookeeperDir));
         } catch(Exception e) {
             throw new IllegalStateException("Failed to Setup Zookeeper Cluster",e);
@@ -262,7 +262,7 @@ public class ManyMiniCluster {
             hbaseConf.setInt("hbase.regionserver.info.port", -1);
 
             hbaseCluster = new MiniHBaseCluster(hbaseConf, numRegionServers);
-            hbaseConf.set("hbase.master", hbaseCluster.getHMasterAddress().toString());
+            hbaseConf.set("hbase.master", hbaseCluster.getMaster().getServerName().getHostAndPort());
             //opening the META table ensures that cluster is running
             new HTable(hbaseConf, HConstants.META_TABLE_NAME);
         } catch (Exception e) {



Mime
View raw message