You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hcatalog-commits@incubator.apache.org by ga...@apache.org on 2012/03/10 01:30:27 UTC

svn commit: r1299129 - in /incubator/hcatalog/trunk: ./ src/java/org/apache/hcatalog/mapreduce/ storage-drivers/hbase/ storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/...

Author: gates
Date: Sat Mar 10 01:30:27 2012
New Revision: 1299129

URL: http://svn.apache.org/viewvc?rev=1299129&view=rev
Log:
HCATALOG-299 Javadoc build issues

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java
    incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java
    incubator/hcatalog/trunk/storage-drivers/hbase/build.xml
    incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java
    incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
    incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1299129&r1=1299128&r2=1299129&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Sat Mar 10 01:30:27 2012
@@ -79,6 +79,8 @@ Release 0.4.0 - Unreleased
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-299 Javadoc build issues (gates)
+
   HCAT-303 Fix build failure due to HBaseSerDe.parseColumnMapping method signature change in hive (rohini via toffer)
 
   HCAT-282 HCatInputFormat shouldn't expect storageHandler to be serializable (khorgath via gates)

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java?rev=1299129&r1=1299128&r2=1299129&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java (original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/HCatBaseOutputFormat.java Sat Mar 10 01:30:27 2012
@@ -163,7 +163,6 @@ public abstract class HCatBaseOutputForm
    * of partvals from which it picks the dynamic partvals
    * @param context the job context
    * @param jobInfo the output job info
-   * @return the output driver instance
    * @throws IOException
    */
 

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java?rev=1299129&r1=1299128&r2=1299129&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java (original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/InputJobInfo.java Sat Mar 10 01:30:27 2012
@@ -169,7 +169,7 @@ public class InputJobInfo implements Ser
   /**
    * Set/Get Property information to be passed down to *StorageDriver implementation
    * put implementation specific storage driver configurations here
-   * @return
+   * @return the implementation specific job properties 
    */
   public Properties getProperties() {
     return properties;

Modified: incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java?rev=1299129&r1=1299128&r2=1299129&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java (original)
+++ incubator/hcatalog/trunk/src/java/org/apache/hcatalog/mapreduce/OutputJobInfo.java Sat Mar 10 01:30:27 2012
@@ -207,7 +207,7 @@ public class OutputJobInfo implements Se
   /**
    * Set/Get Property information to be passed down to *StorageDriver implementation
    * put implementation specific storage driver configurations here
-   * @return
+   * @return the implementation specific job properties 
    */
   public Properties getProperties() {
     return properties;

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/build.xml?rev=1299129&r1=1299128&r2=1299129&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/build.xml (original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/build.xml Sat Mar 10 01:30:27 2012
@@ -298,8 +298,9 @@
 
     <target name="javadoc" depends="jar" description="Create documentation">
         <mkdir dir="${build.javadoc}" />
-        <javadoc overview="${src.dir}/../docs/overview.html" packagenames="org.apache.hcatalog.*" destdir="${build.javadoc}" author="true" version="true" use="true" windowtitle="HCatalog ${hcatalog.version} API" doctitle="HCatalog ${hcatalog.version} API">
-            <packageset dir="${src.dir}" />
+        <javadoc packagenames="org.apache.hcatalog.*" destdir="${build.javadoc}" author="true" version="true" use="true"
+        windowtitle="HCatalog ${hcatalog.version} API" doctitle="HCatalog ${hcatalog.version} API" sourcepath="${src.dir}:${basedir}/src/gen-java">
+            <!--<packageset dir="${src.dir}" /> -->
             <classpath>
                 <path refid="classpath" />
             </classpath>

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java?rev=1299129&r1=1299128&r2=1299129&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java (original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/RevisionManager.java Sat Mar 10 01:30:27 2012
@@ -52,7 +52,7 @@ public interface RevisionManager {
      *
      * @param table
      * @param families
-     * @return
+     * @return a new Transaction
      * @throws IOException
      */
     public Transaction beginWriteTransaction(String table, List<String> families)
@@ -64,7 +64,7 @@ public interface RevisionManager {
      * @param table
      * @param families
      * @param keepAlive
-     * @return
+     * @return a new Transaction
      * @throws IOException
      */
     public Transaction beginWriteTransaction(String table,
@@ -103,7 +103,7 @@ public interface RevisionManager {
      * Create the latest snapshot of the table.
      *
      * @param tableName
-     * @return
+     * @return a new snapshot
      * @throws IOException
      */
     public TableSnapshot createSnapshot(String tableName) throws IOException;
@@ -113,7 +113,7 @@ public interface RevisionManager {
      *
      * @param tableName
      * @param revision
-     * @return
+     * @return a new snapshot
      * @throws IOException
      */
     public TableSnapshot createSnapshot(String tableName, long revision)

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java?rev=1299129&r1=1299128&r2=1299129&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java (original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/ZKBasedRevisionManager.java Sat Mar 10 01:30:27 2012
@@ -202,7 +202,7 @@ public class ZKBasedRevisionManager impl
 
     /**
      * This method aborts a write transaction.
-     * @param state the state associated with the Transaction
+     * @param transaction
      * @throws java.io.IOException
      */
     public void abortWriteTransaction(Transaction transaction) throws IOException {

Modified: incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java?rev=1299129&r1=1299128&r2=1299129&view=diff
==============================================================================
--- incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java (original)
+++ incubator/hcatalog/trunk/storage-drivers/hbase/src/java/org/apache/hcatalog/hbase/snapshot/lock/WriteLock.java Sat Mar 10 01:30:27 2012
@@ -57,7 +57,7 @@ public class WriteLock extends ProtocolS
      * zookeeper contructor for writelock
      * @param zookeeper zookeeper client instance
      * @param dir the parent path you want to use for locking
-     * @param acls the acls that you want to use for all the paths,
+     * @param acl the acls that you want to use for all the paths,
      * if null world read/write is used.
      */
     public WriteLock(ZooKeeper zookeeper, String dir, List<ACL> acl) {