accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1297265 [2/2] - in /incubator/accumulo/branches/1.4: ./ src/core/ src/core/src/main/java/org/apache/accumulo/core/bloomfilter/ src/core/src/main/java/org/apache/accumulo/core/client/ src/core/src/main/java/org/apache/accumulo/core/client/a...
Date Mon, 05 Mar 2012 22:49:37 GMT
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
Mon Mar  5 22:49:35 2012
@@ -114,10 +114,10 @@ public abstract class AbstractEvaluating
   public abstract void fillMap(EventFields event, Key key, Value value) throws Exception;
   
   /**
-   * Check to see if this key should be acted upon. Provides the ability to skip this key
and all of the following ones that match using the comparator.
+   * Provides the ability to skip this key and all of the following ones that match using
the comparator.
    * 
    * @param key
-   * @return
+   * @return true if the key should be acted upon, otherwise false.
    * @throws IOException
    */
   public abstract boolean isKeyAccepted(Key key) throws IOException;

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
Mon Mar  5 22:49:35 2012
@@ -96,7 +96,7 @@ public class AndIterator implements Sort
    * Returns the given key's dataLocation
    * 
    * @param key
-   * @return
+   * @return The given key's dataLocation
    */
   protected Text getDataLocation(Key key) {
     return key.getColumnFamily();
@@ -106,7 +106,7 @@ public class AndIterator implements Sort
    * Returns the given key's term
    * 
    * @param key
-   * @return
+   * @return The given key's term
    */
   protected Text getTerm(Key key) {
     int idx = 0;
@@ -120,7 +120,7 @@ public class AndIterator implements Sort
    * Returns the given key's DocID
    * 
    * @param key
-   * @return
+   * @return The given key's DocID
    */
   protected Text getDocID(Key key) {
     int idx = 0;
@@ -134,7 +134,7 @@ public class AndIterator implements Sort
    * Returns the given key's UID
    * 
    * @param key
-   * @return
+   * @return The given key's UID
    */
   protected String getUID(Key key) {
     int idx = 0;
@@ -151,7 +151,7 @@ public class AndIterator implements Sort
    *          The desired row
    * @param dataLocation
    *          The desired dataLocation
-   * @return
+   * @return A Key object built from the given row and dataLocation.
    */
   protected Key buildKey(Text row, Text dataLocation) {
     return new Key(row, (dataLocation == null) ? nullText : dataLocation);
@@ -166,7 +166,7 @@ public class AndIterator implements Sort
    *          The desired dataLocation
    * @param term
    *          The desired term
-   * @return
+   * @return A Key object built from the given row, dataLocation, and term.
    */
   protected Key buildKey(Text row, Text dataLocation, Text term) {
     return new Key(row, (dataLocation == null) ? nullText : dataLocation, (term == null)
? nullText : term);
@@ -177,7 +177,7 @@ public class AndIterator implements Sort
    * 
    * @param key
    *          The key who will be directly before the returned key
-   * @return
+   * @return The key directly following the given key.
    */
   protected Key buildFollowingPartitionKey(Key key) {
     return key.followingKey(PartialKey.ROW);
@@ -589,7 +589,7 @@ public class AndIterator implements Sort
    * 
    * @param columns
    *          The columns to be encoded
-   * @return
+   * @return A Base64 encoded string (using a \n delimiter) of all columns to intersect on.
    */
   public static String encodeColumns(Text[] columns) {
     StringBuilder sb = new StringBuilder();
@@ -605,7 +605,7 @@ public class AndIterator implements Sort
    * 
    * @param terms
    *          The terms to be encoded
-   * @return
+   * @return A Base64 encoded string (using a \n delimiter) of all terms to intersect on.
    */
   public static String encodeTermValues(Text[] terms) {
     StringBuilder sb = new StringBuilder();
@@ -622,7 +622,7 @@ public class AndIterator implements Sort
    * 
    * @param flags
    *          The array of NOTs
-   * @return
+   * @return A base64 encoded string of which columns are NOT'ed
    */
   public static String encodeBooleans(boolean[] flags) {
     byte[] bytes = new byte[flags.length];
@@ -641,7 +641,7 @@ public class AndIterator implements Sort
    * 
    * @param columns
    *          The Base64 encoded String of the columns
-   * @return
+   * @return A Text array of the decoded columns
    */
   public static Text[] decodeColumns(String columns) {
     String[] columnStrings = columns.split("\n");
@@ -658,7 +658,7 @@ public class AndIterator implements Sort
    * 
    * @param terms
    *          The Base64 encoded String of the terms
-   * @return
+   * @return A Text array of decoded terms.
    */
   public static Text[] decodeTermValues(String terms) {
     String[] termStrings = terms.split("\n");
@@ -674,7 +674,7 @@ public class AndIterator implements Sort
    * Decode the encoded NOT flags into a <code>boolean</code> array
    * 
    * @param flags
-   * @return
+   * @return A boolean array of decoded NOT flags
    */
   public static boolean[] decodeBooleans(String flags) {
     // return null of there were no flags

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/OrIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/OrIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/OrIterator.java
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/OrIterator.java
Mon Mar  5 22:49:35 2012
@@ -150,7 +150,7 @@ public class OrIterator implements Sorte
    * Returns the given key's row
    * 
    * @param key
-   * @return
+   * @return The given key's row
    */
   protected Text getPartition(Key key) {
     return key.getRow();
@@ -160,7 +160,7 @@ public class OrIterator implements Sorte
    * Returns the given key's dataLocation
    * 
    * @param key
-   * @return
+   * @return The given key's dataLocation
    */
   protected Text getDataLocation(Key key) {
     return key.getColumnFamily();
@@ -170,7 +170,7 @@ public class OrIterator implements Sorte
    * Returns the given key's term
    * 
    * @param key
-   * @return
+   * @return The given key's term
    */
   protected Text getTerm(Key key) {
     int idx = 0;
@@ -184,7 +184,7 @@ public class OrIterator implements Sorte
    * Returns the given key's DocID
    * 
    * @param key
-   * @return
+   * @return The given key's DocID
    */
   protected Text getDocID(Key key) {
     int idx = 0;
@@ -198,7 +198,7 @@ public class OrIterator implements Sorte
    * Returns the given key's UID
    * 
    * @param key
-   * @return
+   * @return The given key's UID
    */
   static protected String getUID(Key key) {
     try {
@@ -260,7 +260,7 @@ public class OrIterator implements Sorte
    * Construct the topKey given the current <code>TermSource</code>
    * 
    * @param TS
-   * @return
+   * @return The top Key for a given TermSource
    */
   protected Key buildTopKey(TermSource TS) {
     if ((TS == null) || (TS.topKey == null)) {

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/logic/AbstractQueryLogic.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/logic/AbstractQueryLogic.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/logic/AbstractQueryLogic.java
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/logic/AbstractQueryLogic.java
Mon Mar  5 22:49:35 2012
@@ -222,8 +222,6 @@ public abstract class AbstractQueryLogic
    * @param c
    * @param auths
    * @param queryLiterals
-   * @param begin
-   * @param end
    * @param datatypes
    *          - optional list of types
    * @return map of indexed field names to types to normalizers used in this date range
@@ -286,8 +284,6 @@ public abstract class AbstractQueryLogic
    * @param c
    * @param auths
    * @param value
-   * @param begin
-   * @param end
    * @param datatypes
    *          - optional list of types
    * @return ranges that fit into the date range.
@@ -305,11 +301,6 @@ public abstract class AbstractQueryLogic
    *          multimap of indexed field name and Normalizers used
    * @param terms
    *          multimap of field name and QueryTerm object
-   * @param begin
-   *          query begin date
-   * @param end
-   *          query end date
-   * @param dateFormatter
    * @param indexTableName
    * @param reverseIndexTableName
    * @param queryString

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/FieldIndexQueryReWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/FieldIndexQueryReWriter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/FieldIndexQueryReWriter.java
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/FieldIndexQueryReWriter.java
Mon Mar  5 22:49:35 2012
@@ -90,7 +90,7 @@ public class FieldIndexQueryReWriter {
    * 
    * @param query
    * @param options
-   * @return
+   * @return String representation of a given query.
    * @throws ParseException
    * @throws Exception
    */
@@ -115,7 +115,7 @@ public class FieldIndexQueryReWriter {
    * 
    * @param query
    * @param options
-   * @return
+   * @return String representation of a given query.
    * @throws ParseException
    * @throws Exception
    */
@@ -140,7 +140,7 @@ public class FieldIndexQueryReWriter {
    * @param query
    * @param fNameUpper
    * @param fValueUpper
-   * @return
+   * @return String representation of a given query.
    * @throws ParseException
    */
   public String applyCaseSensitivity(String query, boolean fNameUpper, boolean fValueUpper)
throws ParseException {
@@ -748,9 +748,7 @@ public class FieldIndexQueryReWriter {
   }
   
   /**
-   * 
    * @param options
-   * @return
    */
   public Multimap<String,String> parseIndexedTerms(Map<String,String> options)
{
     if (options.get(INDEXED_TERMS_LIST) != null) {
@@ -782,9 +780,7 @@ public class FieldIndexQueryReWriter {
   }
   
   /**
-   * 
    * @param root
-   * @return
    */
   public RewriterTreeNode refactorTree(RewriterTreeNode root) {
     Enumeration<?> dfe = root.breadthFirstEnumeration();
@@ -983,8 +979,7 @@ public class FieldIndexQueryReWriter {
     }
     
     /**
-     * 
-     * @return
+     * @return The field name.
      */
     public String getFieldName() {
       return fieldName;
@@ -1000,7 +995,7 @@ public class FieldIndexQueryReWriter {
     
     /**
      * 
-     * @return
+     * @return The field value.
      */
     public String getFieldValue() {
       return fieldValue;
@@ -1016,7 +1011,7 @@ public class FieldIndexQueryReWriter {
     
     /**
      * 
-     * @return
+     * @return true if negated, otherwise false.
      */
     public boolean isNegated() {
       return negated;
@@ -1032,7 +1027,7 @@ public class FieldIndexQueryReWriter {
     
     /**
      * 
-     * @return
+     * @return The operator.
      */
     public String getOperator() {
       return operator;
@@ -1048,7 +1043,7 @@ public class FieldIndexQueryReWriter {
     
     /**
      * 
-     * @return
+     * @return The type.
      */
     public int getType() {
       return type;
@@ -1070,10 +1065,6 @@ public class FieldIndexQueryReWriter {
       this.removal = removal;
     }
     
-    /**
-     * 
-     * @return
-     */
     public String getContents() {
       StringBuilder s = new StringBuilder("[");
       s.append(toString());
@@ -1092,7 +1083,7 @@ public class FieldIndexQueryReWriter {
     
     /**
      * 
-     * @return
+     * @return A string represenation of the field name and value.
      */
     public String printNode() {
       StringBuilder s = new StringBuilder("[");

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/QueryEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/QueryEvaluator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/QueryEvaluator.java
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/QueryEvaluator.java
Mon Mar  5 22:49:35 2012
@@ -201,7 +201,6 @@ public class QueryEvaluator {
    * Evaluates the query against an event.
    * 
    * @param eventFields
-   * @return
    */
   public boolean evaluate(EventFields eventFields) {
     

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/RangeCalculator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/RangeCalculator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/RangeCalculator.java
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/RangeCalculator.java
Mon Mar  5 22:49:35 2012
@@ -279,9 +279,6 @@ public class RangeCalculator extends Que
    * @param auths
    * @param indexedTerms
    * @param terms
-   * @param begin
-   * @param end
-   * @param dateFormatter
    * @param query
    * @param logic
    * @param typeFilter
@@ -564,7 +561,6 @@ public class RangeCalculator extends Que
    *          mapKey for wildcard and range queries that specify which mapkey to use in the
results
    * @param typeFilter
    *          - optional list of datatypes
-   * @return
    * @throws TableNotFoundException
    */
   protected Map<MapKey,TermRange> queryGlobalIndex(Map<MapKey,Set<Range>>
indexRanges, String specificFieldName, String tableName, boolean isReverse,

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java
Mon Mar  5 22:49:35 2012
@@ -204,7 +204,7 @@ public class Query implements IQuery {
    * 
    * @param query
    * @param auths
-   * @return
+   * @return The results of a query
    * @throws ParseException
    */
   public Results query(String query, String auths) {

Propchange: incubator/accumulo/branches/1.4/src/server/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
Mon Mar  5 22:49:35 2012
@@ -42,18 +42,15 @@ public abstract class TabletBalancer {
   private static final Logger log = Logger.getLogger(TabletBalancer.class);
   
   /**
-   * Assign tablets to tablet servers
+   * Assign tablets to tablet servers. This method is called whenever the master finds tablets
that are unassigned.
    * 
    * @param current
    *          The current table-summary state of all the online tablet servers. Read-only.
The TabletServerStatus for each server may be null if the tablet
    *          server has not yet responded to a recent request for status.
    * @param unassigned
    *          A map from unassigned tablet to the last known tablet server. Read-only.
-   * @param assignements
+   * @param assignments
    *          A map from tablet to assigned server. Write-only.
-   * @return
-   * 
-   *         This method is called whenever the master finds tablets that are unassigned.
    */
   abstract public void getAssignments(SortedMap<TServerInstance,TabletServerStatus>
current, Map<KeyExtent,TServerInstance> unassigned,
       Map<KeyExtent,TServerInstance> assignments);
@@ -79,7 +76,7 @@ public abstract class TabletBalancer {
    * 
    * @param tserver
    *          The tablet server to ask.
-   * @param table
+   * @param tableId
    *          The table id
    * @return a list of tablet statistics
    * @throws ThriftSecurityException
@@ -110,7 +107,7 @@ public abstract class TabletBalancer {
    * 
    * @param current
    * @param migrations
-   * @return
+   * @return A list of TabletMigration object that passed sanity checks.
    */
   public static List<TabletMigration> checkMigrationSanity(Set<TServerInstance>
current, List<TabletMigration> migrations) {
     List<TabletMigration> result = new ArrayList<TabletMigration>(migrations.size());

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
Mon Mar  5 22:49:35 2012
@@ -44,10 +44,7 @@ public abstract class TabletStateStore i
   /**
    * Store the assigned locations in the data store.
    * 
-   * @param extent
-   *          The tablet definition
-   * @param tabletSession
-   *          the tablet server the tablet is to be assigned
+   * @param assignments
    * @throws DistributedStoreException
    */
   abstract public void setFutureLocations(Collection<Assignment> assignments) throws
DistributedStoreException;
@@ -55,10 +52,7 @@ public abstract class TabletStateStore i
   /**
    * Tablet servers will update the data store with the location when they bring the tablet
online
    * 
-   * @param extent
-   *          the tablet definition
-   * @param tabletSession
-   *          the tablet server that opened the tablet
+   * @param assignments
    * @throws DistributedStoreException
    */
   abstract public void setLocations(Collection<Assignment> assignments) throws DistributedStoreException;
@@ -66,7 +60,7 @@ public abstract class TabletStateStore i
   /**
    * Mark the tablets as having no known or future location.
    * 
-   * @param extent
+   * @param tablets
    *          the tablets' current information
    * @throws DistributedStoreException
    */

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java
Mon Mar  5 22:49:35 2012
@@ -31,8 +31,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.io.Text;
 
 /**
- * @deprecated since 1.4
- * @see CreateRandomRFile
+ * @deprecated since 1.4 (will become CreateRandomRFile)
  */
 public class CreateRandomMapFile {
   private static int num;

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/Framework.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/Framework.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/Framework.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/Framework.java
Mon Mar  5 22:49:35 2012
@@ -50,8 +50,8 @@ public class Framework {
    * 
    * @param startName
    *          Full name of starting graph or test
-   * @param traversals
-   *          Number of nodes that should be visited
+   * @param state
+   * @param confDir
    */
   public int run(String startName, State state, String confDir) {
     

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
Mon Mar  5 22:49:35 2012
@@ -73,7 +73,7 @@ public class TServerUtils {
   /**
    * Start a server, at the given port, or higher, if that port is not available.
    * 
-   * @param portHint
+   * @param portHintProperty
    *          the port to attempt to open, can be zero, meaning "any available port"
    * @param processor
    *          the service to be started
@@ -81,6 +81,9 @@ public class TServerUtils {
    *          the name of the class that is providing the service
    * @param threadName
    *          name this service's thread for better debugging
+   * @param portSearchProperty
+   * @param minThreadProperty
+   * @param timeBetweenThreadChecksProperty
    * @return the server object created, and the port actually used
    * @throws UnknownHostException
    *           when we don't know our own address

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
Mon Mar  5 22:49:35 2012
@@ -279,7 +279,7 @@ public class ZooLock implements Watcher 
   /**
    * indicates if the lock was acquired in the past.... helps discriminate between the case
where the lock was never held, or held and lost....
    * 
-   * @return
+   * @return true if the lock was aquired, otherwise false.
    */
   public synchronized boolean wasLockAcquired() {
     return lockWasAcquired;

Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
(original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
Mon Mar  5 22:49:35 2012
@@ -153,7 +153,7 @@ public class ZooReaderWriter extends Zoo
   /**
    * get an instance that retries when zookeeper connection errors occur
    * 
-   * @return
+   * @return an instance that retries when Zookeeper connection errors occur.
    */
   public static synchronized IZooReaderWriter getRetryingInstance() {
     

Modified: incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Sampler.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Sampler.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Sampler.java
(original)
+++ incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Sampler.java
Mon Mar  5 22:49:35 2012
@@ -19,7 +19,7 @@ package org.apache.accumulo.cloudtrace.i
 /**
  * Extremely simple callback to determine the frequency that an action should be performed.
  * 
- * @see Trace.wrapAll
+ * @see Trace#wrapAll
  */
 public interface Sampler {
   



Mime
View raw message