accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [2/3] accumulo git commit: ACCUMULO-3778 Fix minor javadoc bugs
Date Wed, 06 May 2015 22:55:44 GMT
ACCUMULO-3778 Fix minor javadoc bugs


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f8303008
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f8303008
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f8303008

Branch: refs/heads/master
Commit: f8303008c62a8ca49dbefe3ad2499f8fb8f89f5f
Parents: cd765a8
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed May 6 18:53:55 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed May 6 18:55:25 2015 -0400

----------------------------------------------------------------------
 core/src/main/java/org/apache/accumulo/core/data/Mutation.java  | 3 ++-
 .../org/apache/accumulo/server/fs/PreferredVolumeChooser.java   | 5 ++++-
 .../java/org/apache/accumulo/server/replication/StatusUtil.java | 2 +-
 .../master/replication/RemoveCompleteReplicationRecords.java    | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8303008/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
index 1cc4242..5a49341 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java
@@ -98,7 +98,8 @@ public class Mutation implements Writable {
     }
   }
 
-  /* This is so hashCode & equals can be called without changing this object.
+  /**
+   * This is so hashCode and equals can be called without changing this object.
    *
    * It will return a copy of the current data buffer if serialized has not been
    * called previously. Otherwise, this.data will be returned since the buffer is

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8303008/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
index 04242a9..6bc225f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/PreferredVolumeChooser.java
@@ -46,7 +46,10 @@ import com.google.common.base.Predicate;
 public class PreferredVolumeChooser extends RandomVolumeChooser implements VolumeChooser
{
   private static final Logger log = LoggerFactory.getLogger(PreferredVolumeChooser.class);
 
-  public static final String PREFERRED_VOLUMES_CUSTOM_KEY = Property.TABLE_ARBITRARY_PROP_PREFIX.getKey()
+ "preferredVolumes";
+  /**
+   * This should match {@link Property#TABLE_ARBITRARY_PROP_PREFIX}
+   */
+  public static final String PREFERRED_VOLUMES_CUSTOM_KEY = "table.custom.preferredVolumes";
   // TODO ACCUMULO-3417 replace this with the ability to retrieve by String key.
   private static final Predicate<String> PREFERRED_VOLUMES_FILTER = new Predicate<String>()
{
     @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8303008/server/base/src/main/java/org/apache/accumulo/server/replication/StatusUtil.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusUtil.java
b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusUtil.java
index d72eea2..ad892b8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusUtil.java
@@ -86,7 +86,7 @@ public class StatusUtil {
    *          Existing {@link Builder} to use
    * @param recordsReplicated
    *          Offset of records which have been replicated
-   * @returnA {@link Status} tracking data that must be replicated
+   * @return A {@link Status} tracking data that must be replicated
    */
   public static Status replicated(Status.Builder builder, long recordsReplicated) {
     return replicatedAndIngested(builder, recordsReplicated, 0);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8303008/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
----------------------------------------------------------------------
diff --git a/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
b/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
index 9966feb..e286371 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/replication/RemoveCompleteReplicationRecords.java
@@ -108,7 +108,7 @@ public class RemoveCompleteReplicationRecords implements Runnable {
 
   /**
    * Removes {@link Status} records read from the given {@code bs} and writes a delete, using
the given {@code bw}, when that {@link Status} is fully replicated
-   * and closed, as defined by {@link StatusUtil#isSafeForRemoval(Status)}.
+   * and closed, as defined by {@link StatusUtil#isSafeForRemoval(org.apache.accumulo.server.replication.proto.Replication.Status)}.
    *
    * @param conn
    *          A Connector


Mime
View raw message