incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1297265 [1/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
Author: billie
Date: Mon Mar  5 22:49:35 2012
New Revision: 1297265

URL: http://svn.apache.org/viewvc?rev=1297265&view=rev
Log:
ACCUMULO-441 ACCUMULO-411 merged javadocs fixes from trunk to 1.4 and added better links

Removed:
    incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/
Modified:
    incubator/accumulo/branches/1.4/   (props changed)
    incubator/accumulo/branches/1.4/src/core/   (props changed)
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Instance.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/NoLabelIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RegExIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/AgeOffFilter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnAgeOffFilter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnQualifierFilter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/DeleteFilter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/Filter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/NoLabelFilter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/RegExFilter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/VisibilityFilter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AbstractEvaluatingIterator.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/OrIterator.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/logic/AbstractQueryLogic.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/FieldIndexQueryReWriter.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/QueryEvaluator.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/parser/RangeCalculator.java
    incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/query/Query.java
    incubator/accumulo/branches/1.4/src/server/   (props changed)
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/CreateRandomMapFile.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/Framework.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooLock.java
    incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/zookeeper/ZooReaderWriter.java
    incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Sampler.java

Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  5 22:49:35 2012
@@ -1,4 +1,3 @@
 /incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1205476
-/incubator/accumulo/trunk:1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734
+/incubator/accumulo/trunk:1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495

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

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java Mon Mar  5 22:49:35 2012
@@ -113,7 +113,7 @@ public abstract class Filter implements 
    * 
    * @param key
    *          The key to add.
-   * @return
+   * @return true if the key was added, false otherwise.
    */
   public abstract boolean add(Key key);
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Connector.java Mon Mar  5 22:49:35 2012
@@ -44,14 +44,14 @@ public class Connector {
    *           when a generic exception occurs
    * @throws AccumuloSecurityException
    *           when a user's credentials are invalid
-   * @see Instance.getConnector(String user, byte[] password)
+   * @see Instance#getConnector(String user, byte[] password)
    */
   public Connector(Instance instance, String user, byte[] password) throws AccumuloException, AccumuloSecurityException {
     impl = instance.getConnector(user, password);
   }
   
   /**
-   * @see Instance.getConnector(String user, byte[] password)
+   * @see Instance#getConnector(String user, byte[] password)
    * @deprecated Not for client use
    */
   public Connector() {

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Instance.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Instance.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Instance.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/Instance.java Mon Mar  5 22:49:35 2012
@@ -87,10 +87,8 @@ public interface Instance {
   /**
    * Returns a connection to accumulo.
    * 
-   * @param user
-   *          a valid accumulo user
-   * @param pass
-   *          A UTF-8 encoded password. The password may be cleared after making this call.
+   * @param auth
+   *          An AuthInfo object.
    * @return the accumulo Connector
    * @throws AccumuloException
    *           when a generic exception occurs

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java Mon Mar  5 22:49:35 2012
@@ -63,14 +63,12 @@ public interface ScannerBase extends Ite
   public void updateScanIteratorOption(String iteratorName, String key, String value);
   
   /**
-   * @deprecated since 1.4
-   * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(IteratorSetting)}
+   * @deprecated Since 1.4, use {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator}.
    */
   public void setScanIterators(int priority, String iteratorClass, String iteratorName) throws IOException;
   
   /**
-   * @deprecated since 1.4
-   * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(IteratorSetting)}
+   * @deprecated Since 1.4, use {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator}.
    */
   public void setScanIteratorOption(String iteratorName, String key, String value);
   
@@ -84,9 +82,8 @@ public interface ScannerBase extends Ite
    * @throws IOException
    *           if an exception occurs reading from the iterator stack
    * 
-   * @deprecated since 1.4
-   * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(IteratorSetting)}
-   * @see {@link org.apache.accumulo.core.iterators.user.RegExFilter}
+   * @deprecated Since 1.4, use {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator} and
+   *             {@link org.apache.accumulo.core.iterators.user.RegExFilter}
    */
   public void setupRegex(String iteratorName, int iteratorPriority) throws IOException;
   
@@ -97,11 +94,10 @@ public interface ScannerBase extends Ite
    * @param regex
    *          java regular expression to match
    * 
-   * @deprecated since 1.4
-   * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(IteratorSetting)}
-   * @see {@link org.apache.accumulo.core.iterators.user.RegExFilter#ROW_REGEX}
+   * @deprecated Since 1.4, use {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator} and
+   *             {@link org.apache.accumulo.core.iterators.user.RegExFilter}
    * 
-   *      <pre>
+   *             <pre>
    * // Use the more flexible addScanIterator method:
    * ScanIterator cfg = new ScanIterator(&quot;regex&quot;, RegexIterator.class);
    * RegexIterator.setRegexs(cfg, row, null, null, null, false);
@@ -117,9 +113,8 @@ public interface ScannerBase extends Ite
    * @param regex
    *          java regular expression to match
    * 
-   * @deprecated since 1.4
-   * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(IteratorSetting)}
-   * @see {@link org.apache.accumulo.core.iterators.user.RegExFilter#COLF_REGEX}
+   * @deprecated Since 1.4, use {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator} and
+   *             {@link org.apache.accumulo.core.iterators.user.RegExFilter}
    */
   public void setColumnFamilyRegex(String regex);
   
@@ -131,9 +126,8 @@ public interface ScannerBase extends Ite
    * @param regex
    *          java regular expression to match
    * 
-   * @deprecated since 1.4
-   * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(IteratorSetting)}
-   * @see {@link org.apache.accumulo.core.iterators.user.RegExFilter#COLQ_REGEX}.
+   * @deprecated Since 1.4, use {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator} and
+   *             {@link org.apache.accumulo.core.iterators.user.RegExFilter}
    * 
    */
   public void setColumnQualifierRegex(String regex);
@@ -144,9 +138,8 @@ public interface ScannerBase extends Ite
    * @param regex
    *          java regular expression to match
    * 
-   * @deprecated since 1.4
-   * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(IteratorSetting)}
-   * @see {@link org.apache.accumulo.core.iterators.user.RegExFilter}
+   * @deprecated Since 1.4, use {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator} and
+   *             {@link org.apache.accumulo.core.iterators.user.RegExFilter}
    */
   public void setValueRegex(String regex);
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java Mon Mar  5 22:49:35 2012
@@ -44,8 +44,6 @@ public interface InstanceOperations {
   /**
    * Removes a instance property from zookeeper
    * 
-   * @param tableName
-   *          the name of the table
    * @param property
    *          the name of a per-table property
    * @throws AccumuloException
@@ -62,16 +60,17 @@ public interface InstanceOperations {
   /**
    * List the currently active tablet servers participating in the accumulo instance
    * 
-   * @return
+   * @return A list of currently active tablet servers.
    */
   
   public List<String> getTabletServers();
   
   /**
-   * List the active scans on tablet server. The tablet server address should be of the form <ip address>:<port>
+   * List the active scans on tablet server.
    * 
    * @param tserver
-   * @return
+   *          The tablet server address should be of the form <ip address>:<port>
+   * @return A list of active scans on tablet server.
    * @throws AccumuloException
    * @throws AccumuloSecurityException
    */
@@ -83,7 +82,7 @@ public interface InstanceOperations {
    * 
    * @param className
    * @param asTypeName
-   * @return
+   * @return true if the instance can load the given class as the given type, false otherwise
    * @throws AccumuloException
    */
   public boolean testClassLoad(final String className, final String asTypeName) throws AccumuloException, AccumuloSecurityException;

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java Mon Mar  5 22:49:35 2012
@@ -87,10 +87,10 @@ public interface TableOperations {
   /**
    * @param tableName
    *          the name of the table
+   * @param versioningIter
+   *          Enables/disables the versioning iterator, which will limit the number of Key versions kept.
    * @param timeType
    *          specifies logical or real-time based time recording for entries in the table
-   * @param limitVersion
-   *          Enables/disables the versioning iterator, which will limit the number of Key versions kept.
    * @throws AccumuloException
    *           if a general error occurs
    * @throws AccumuloSecurityException
@@ -412,8 +412,7 @@ public interface TableOperations {
       AccumuloSecurityException;
   
   /**
-   * @deprecated Since 1.4
-   * @see {@link TableOperations#importDirectory(String, String, String)};
+   * @deprecated Since 1.4 use {@link #importDirectory(String, String, String, boolean)}
    */
   public AssignmentStats importDirectory(String tableName, String dir, String failureDir, int numThreads, int numAssignThreads, boolean disableGC)
       throws IOException, AccumuloException, AccumuloSecurityException;

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java Mon Mar  5 22:49:35 2012
@@ -50,14 +50,14 @@ public class ConnectorImpl extends Conne
   
 /**
      * 
-     * Use {@link Instance#getConnector(String, byte[])
+     * Use {@link Instance#getConnector(String, byte[])}
      * 
      * @param instance
      * @param user
      * @param password
      * @throws AccumuloException
      * @throws AccumuloSecurityException
-     * @see Instance.getConnector(String user, byte[] password)
+     * @see Instance#getConnector(String user, byte[] password)
      * @deprecated Not for client use
      */
   public ConnectorImpl(Instance instance, String user, byte[] password) throws AccumuloException, AccumuloSecurityException {

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java Mon Mar  5 22:49:35 2012
@@ -163,7 +163,7 @@ public class AccumuloFileOutputFormat ex
   /**
    * 
    * @param job
-   * @return
+   * @return The Accumulo instance.
    * 
    * @deprecated since 1.4, use {@link #setBlockSize(Configuration, int)} no other configurations are used by OutputFormat
    */
@@ -174,7 +174,7 @@ public class AccumuloFileOutputFormat ex
   /**
    * 
    * @param conf
-   * @return
+   * @return The Accumulo instance.
    * 
    * @deprecated since 1.4, use {@link #setBlockSize(Configuration, int)} no other configurations are used by OutputFormat
    */

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java Mon Mar  5 22:49:35 2012
@@ -106,7 +106,7 @@ public class AccumuloOutputFormat extend
   public static void setOutputInfo(JobContext job, String user, byte[] passwd, boolean createTables, String defaultTable) {
     setOutputInfo(job.getConfiguration(), user, passwd, createTables, defaultTable);
   }
-
+  
   /**
    * Configure the output format.
    * 
@@ -140,7 +140,7 @@ public class AccumuloOutputFormat extend
   public static void setZooKeeperInstance(JobContext job, String instanceName, String zooKeepers) {
     setZooKeeperInstance(job.getConfiguration(), instanceName, zooKeepers);
   }
-
+  
   public static void setZooKeeperInstance(Configuration conf, String instanceName, String zooKeepers) {
     if (conf.getBoolean(INSTANCE_HAS_BEEN_SET, false))
       throw new IllegalStateException("Instance info can only be set once per job");
@@ -157,7 +157,7 @@ public class AccumuloOutputFormat extend
   public static void setMockInstance(JobContext job, String instanceName) {
     setMockInstance(job.getConfiguration(), instanceName);
   }
-
+  
   public static void setMockInstance(Configuration conf, String instanceName) {
     conf.setBoolean(INSTANCE_HAS_BEEN_SET, true);
     conf.setBoolean(MOCK, true);
@@ -170,7 +170,7 @@ public class AccumuloOutputFormat extend
   public static void setMaxMutationBufferSize(JobContext job, long numberOfBytes) {
     setMaxMutationBufferSize(job.getConfiguration(), numberOfBytes);
   }
-
+  
   public static void setMaxMutationBufferSize(Configuration conf, long numberOfBytes) {
     conf.setLong(MAX_MUTATION_BUFFER_SIZE, numberOfBytes);
   }
@@ -210,7 +210,7 @@ public class AccumuloOutputFormat extend
   }
   
   /**
-   * @deprecated Use {@link #setSimulationMode(Configurtion)} instead
+   * @deprecated Use {@link #setSimulationMode(Configuration)} instead
    */
   public static void setSimulationMode(JobContext job) {
     setSimulationMode(job.getConfiguration());

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Mon Mar  5 22:49:35 2012
@@ -143,18 +143,22 @@ public abstract class InputFormatBase<K,
    * Enable or disable use of the {@link IsolatedScanner}. By default it is not enabled.
    * 
    * @param job
+   *          The Hadoop job object
    * @param enable
+   *          if true, enable usage of the IsolatedScanner. Otherwise, disable.
    * @deprecated Use {@link #setIsolated(Configuration,boolean)} instead
    */
   public static void setIsolated(JobContext job, boolean enable) {
     setIsolated(job.getConfiguration(), enable);
   }
-
+  
   /**
    * Enable or disable use of the {@link IsolatedScanner}. By default it is not enabled.
    * 
    * @param conf
+   *          The Hadoop configuration object
    * @param enable
+   *          if true, enable usage of the IsolatedScanner. Otherwise, disable.
    */
   public static void setIsolated(Configuration conf, boolean enable) {
     conf.setBoolean(ISOLATED, enable);
@@ -164,18 +168,22 @@ public abstract class InputFormatBase<K,
    * Enable or disable use of the {@link ClientSideIteratorScanner}. By default it is not enabled.
    * 
    * @param job
+   *          The Hadoop job object
    * @param enable
+   *          if true, enable usage of the ClientSideInteratorScanner. Otherwise, disable.
    * @deprecated Use {@link #setLocalIterators(Configuration,boolean)} instead
    */
   public static void setLocalIterators(JobContext job, boolean enable) {
     setLocalIterators(job.getConfiguration(), enable);
   }
-
+  
   /**
    * Enable or disable use of the {@link ClientSideIteratorScanner}. By default it is not enabled.
    * 
-   * @param job
+   * @param conf
+   *          The Hadoop configuration object
    * @param enable
+   *          if true, enable usage of the ClientSideInteratorScanner. Otherwise, disable.
    */
   public static void setLocalIterators(Configuration conf, boolean enable) {
     conf.setBoolean(LOCAL_ITERATORS, enable);
@@ -187,7 +195,7 @@ public abstract class InputFormatBase<K,
   public static void setInputInfo(JobContext job, String user, byte[] passwd, String table, Authorizations auths) {
     setInputInfo(job.getConfiguration(), user, passwd, table, auths);
   }
-
+  
   public static void setInputInfo(Configuration conf, String user, byte[] passwd, String table, Authorizations auths) {
     if (conf.getBoolean(INPUT_INFO_HAS_BEEN_SET, false))
       throw new IllegalStateException("Input info can only be set once per job");
@@ -207,7 +215,7 @@ public abstract class InputFormatBase<K,
   public static void setZooKeeperInstance(JobContext job, String instanceName, String zooKeepers) {
     setZooKeeperInstance(job.getConfiguration(), instanceName, zooKeepers);
   }
-
+  
   public static void setZooKeeperInstance(Configuration conf, String instanceName, String zooKeepers) {
     if (conf.getBoolean(INSTANCE_HAS_BEEN_SET, false))
       throw new IllegalStateException("Instance info can only be set once per job");
@@ -224,7 +232,7 @@ public abstract class InputFormatBase<K,
   public static void setMockInstance(JobContext job, String instanceName) {
     setMockInstance(job.getConfiguration(), instanceName);
   }
-
+  
   public static void setMockInstance(Configuration conf, String instanceName) {
     conf.setBoolean(INSTANCE_HAS_BEEN_SET, true);
     conf.setBoolean(MOCK, true);
@@ -232,12 +240,12 @@ public abstract class InputFormatBase<K,
   }
   
   /**
-   * @deprecated Use {@link #setRanges(Configuration,Collection<Range>)} instead
+   * @deprecated Use {@link #setRanges(Configuration,Collection)} instead
    */
   public static void setRanges(JobContext job, Collection<Range> ranges) {
     setRanges(job.getConfiguration(), ranges);
   }
-
+  
   public static void setRanges(Configuration conf, Collection<Range> ranges) {
     ArgumentChecker.notNull(ranges);
     ArrayList<String> rangeStrings = new ArrayList<String>(ranges.size());
@@ -259,7 +267,7 @@ public abstract class InputFormatBase<K,
   public static void disableAutoAdjustRanges(JobContext job) {
     disableAutoAdjustRanges(job.getConfiguration());
   }
-
+  
   public static void disableAutoAdjustRanges(Configuration conf) {
     conf.setBoolean(AUTO_ADJUST_RANGES, false);
   }
@@ -316,7 +324,7 @@ public abstract class InputFormatBase<K,
   public static void setMaxVersions(JobContext job, int maxVersions) throws IOException {
     setMaxVersions(job.getConfiguration(), maxVersions);
   }
-
+  
   /**
    * Sets the max # of values that may be returned for an individual Accumulo cell. By default, applied before all other Accumulo iterators (highest priority)
    * leveraged in the scan by the record reader. To adjust priority use setIterator() & setIteratorOptions() w/ the VersioningIterator type explicitly.
@@ -338,7 +346,7 @@ public abstract class InputFormatBase<K,
    * @param columnFamilyColumnQualifierPairs
    *          A pair of {@link Text} objects corresponding to column family and column qualifier. If the column qualifier is null, the entire column family is
    *          selected. An empty set is the default and is equivalent to scanning the all columns.
-   * @deprecated Use {@link #fetchColumns(Configuration,Collection<Pair<Text, Text>>)} instead
+   * @deprecated Use {@link #fetchColumns(Configuration,Collection)} instead
    */
   public static void fetchColumns(JobContext job, Collection<Pair<Text,Text>> columnFamilyColumnQualifierPairs) {
     fetchColumns(job.getConfiguration(), columnFamilyColumnQualifierPairs);
@@ -383,8 +391,6 @@ public abstract class InputFormatBase<K,
    * 
    * @param job
    *          The job in which to save the iterator configuration
-   * @param priority
-   *          The priority of the iterator
    * @param cfg
    *          The configuration of the iterator
    * @deprecated Use {@link #addIterator(Configuration,IteratorSetting)} instead
@@ -392,14 +398,12 @@ public abstract class InputFormatBase<K,
   public static void addIterator(JobContext job, IteratorSetting cfg) {
     addIterator(job.getConfiguration(), cfg);
   }
-
+  
   /**
    * Encode an iterator on the input.
    * 
    * @param conf
    *          The job in which to save the iterator configuration
-   * @param priority
-   *          The priority of the iterator
    * @param cfg
    *          The configuration of the iterator
    */
@@ -504,7 +508,7 @@ public abstract class InputFormatBase<K,
   protected static boolean isIsolated(JobContext job) {
     return isIsolated(job.getConfiguration());
   }
-
+  
   protected static boolean isIsolated(Configuration conf) {
     return conf.getBoolean(ISOLATED, false);
   }
@@ -515,7 +519,7 @@ public abstract class InputFormatBase<K,
   protected static boolean usesLocalIterators(JobContext job) {
     return usesLocalIterators(job.getConfiguration());
   }
-
+  
   protected static boolean usesLocalIterators(Configuration conf) {
     return conf.getBoolean(LOCAL_ITERATORS, false);
   }
@@ -526,7 +530,7 @@ public abstract class InputFormatBase<K,
   protected static String getUsername(JobContext job) {
     return getUsername(job.getConfiguration());
   }
-
+  
   protected static String getUsername(Configuration conf) {
     return conf.get(USERNAME);
   }
@@ -534,12 +538,13 @@ public abstract class InputFormatBase<K,
   /**
    * WARNING: The password is stored in the Configuration and shared with all MapReduce tasks; It is BASE64 encoded to provide a charset safe conversion to a
    * string, and is not intended to be secure.
+   * 
    * @deprecated Use {@link #getPassword(Configuration)} instead
    */
   protected static byte[] getPassword(JobContext job) {
     return getPassword(job.getConfiguration());
   }
-
+  
   /**
    * WARNING: The password is stored in the Configuration and shared with all MapReduce tasks; It is BASE64 encoded to provide a charset safe conversion to a
    * string, and is not intended to be secure.
@@ -554,7 +559,7 @@ public abstract class InputFormatBase<K,
   protected static String getTablename(JobContext job) {
     return getTablename(job.getConfiguration());
   }
-
+  
   protected static String getTablename(Configuration conf) {
     return conf.get(TABLE_NAME);
   }
@@ -565,7 +570,7 @@ public abstract class InputFormatBase<K,
   protected static Authorizations getAuthorizations(JobContext job) {
     return getAuthorizations(job.getConfiguration());
   }
-
+  
   protected static Authorizations getAuthorizations(Configuration conf) {
     String authString = conf.get(AUTHORIZATIONS);
     return authString == null ? Constants.NO_AUTHS : new Authorizations(authString.split(","));
@@ -577,7 +582,7 @@ public abstract class InputFormatBase<K,
   protected static Instance getInstance(JobContext job) {
     return getInstance(job.getConfiguration());
   }
-
+  
   protected static Instance getInstance(Configuration conf) {
     if (conf.getBoolean(MOCK, false))
       return new MockInstance(conf.get(INSTANCE_NAME));
@@ -590,7 +595,7 @@ public abstract class InputFormatBase<K,
   protected static TabletLocator getTabletLocator(JobContext job) throws TableNotFoundException {
     return getTabletLocator(job.getConfiguration());
   }
-
+  
   protected static TabletLocator getTabletLocator(Configuration conf) throws TableNotFoundException {
     if (conf.getBoolean(MOCK, false))
       return new MockTabletLocator();
@@ -608,7 +613,7 @@ public abstract class InputFormatBase<K,
   protected static List<Range> getRanges(JobContext job) throws IOException {
     return getRanges(job.getConfiguration());
   }
-
+  
   protected static List<Range> getRanges(Configuration conf) throws IOException {
     ArrayList<Range> ranges = new ArrayList<Range>();
     for (String rangeString : conf.getStringCollection(RANGES)) {
@@ -626,7 +631,7 @@ public abstract class InputFormatBase<K,
   protected static String getRegex(JobContext job, RegexType type) {
     return getRegex(job.getConfiguration(), type);
   }
-
+  
   protected static String getRegex(Configuration conf, RegexType type) {
     String key = null;
     switch (type) {
@@ -662,7 +667,7 @@ public abstract class InputFormatBase<K,
   protected static Set<Pair<Text,Text>> getFetchedColumns(JobContext job) {
     return getFetchedColumns(job.getConfiguration());
   }
-
+  
   protected static Set<Pair<Text,Text>> getFetchedColumns(Configuration conf) {
     Set<Pair<Text,Text>> columns = new HashSet<Pair<Text,Text>>();
     for (String col : conf.getStringCollection(COLUMNS)) {
@@ -680,7 +685,7 @@ public abstract class InputFormatBase<K,
   protected static boolean getAutoAdjustRanges(JobContext job) {
     return getAutoAdjustRanges(job.getConfiguration());
   }
-
+  
   protected static boolean getAutoAdjustRanges(Configuration conf) {
     return conf.getBoolean(AUTO_ADJUST_RANGES, true);
   }
@@ -691,7 +696,7 @@ public abstract class InputFormatBase<K,
   protected static Level getLogLevel(JobContext job) {
     return getLogLevel(job.getConfiguration());
   }
-
+  
   protected static Level getLogLevel(Configuration conf) {
     return Level.toLevel(conf.getInt(LOGLEVEL, Level.INFO.toInt()));
   }
@@ -704,7 +709,7 @@ public abstract class InputFormatBase<K,
   protected static void validateOptions(JobContext job) throws IOException {
     validateOptions(job.getConfiguration());
   }
-
+  
   // InputFormat doesn't have the equivalent of OutputFormat's
   // checkOutputSpecs(JobContext job)
   protected static void validateOptions(Configuration conf) throws IOException {
@@ -742,7 +747,7 @@ public abstract class InputFormatBase<K,
   protected static int getMaxVersions(JobContext job) {
     return getMaxVersions(job.getConfiguration());
   }
-
+  
   // Get the maxVersions the VersionsIterator should be configured with. Return -1 if none.
   protected static int getMaxVersions(Configuration conf) {
     return conf.getInt(MAX_VERSIONS, -1);
@@ -755,7 +760,7 @@ public abstract class InputFormatBase<K,
   protected static List<AccumuloIterator> getIterators(JobContext job) {
     return getIterators(job.getConfiguration());
   }
-
+  
   // Return a list of the iterator settings (for iterators to apply to a scanner)
   protected static List<AccumuloIterator> getIterators(Configuration conf) {
     
@@ -782,7 +787,7 @@ public abstract class InputFormatBase<K,
   protected static List<AccumuloIteratorOption> getIteratorOptions(JobContext job) {
     return getIteratorOptions(job.getConfiguration());
   }
-
+  
   // Return a list of the iterator options specified
   protected static List<AccumuloIteratorOption> getIteratorOptions(Configuration conf) {
     String iteratorOptions = conf.get(ITERATORS_OPTIONS);
@@ -826,7 +831,7 @@ public abstract class InputFormatBase<K,
     protected boolean setupRegex(TaskAttemptContext attempt, Scanner scanner) throws AccumuloException {
       return setupRegex(attempt.getConfiguration(), scanner);
     }
-
+    
     protected boolean setupRegex(Configuration conf, Scanner scanner) throws AccumuloException {
       try {
         checkAndEnableRegex(getRegex(conf, RegexType.ROW), scanner, "setRowRegex");
@@ -846,7 +851,7 @@ public abstract class InputFormatBase<K,
     protected void setupIterators(TaskAttemptContext attempt, Scanner scanner) throws AccumuloException {
       setupIterators(attempt.getConfiguration(), scanner);
     }
-
+    
     // Apply the configured iterators from the job to the scanner
     protected void setupIterators(Configuration conf, Scanner scanner) throws AccumuloException {
       List<AccumuloIterator> iterators = getIterators(conf);
@@ -871,7 +876,7 @@ public abstract class InputFormatBase<K,
     protected void setupMaxVersions(TaskAttemptContext attempt, Scanner scanner) {
       setupMaxVersions(attempt.getConfiguration(), scanner);
     }
-
+    
     // Apply the VersioningIterator at priority 0 based on the job config
     protected void setupMaxVersions(Configuration conf, Scanner scanner) {
       int maxVersions = getMaxVersions(conf);
@@ -992,7 +997,7 @@ public abstract class InputFormatBase<K,
       splitsToAdd = new HashMap<Range,ArrayList<String>>();
     
     HashMap<String,String> hostNameCache = new HashMap<String,String>();
-
+    
     for (Entry<String,Map<KeyExtent,List<Range>>> tserverBin : binnedRanges.entrySet()) {
       String ip = tserverBin.getKey().split(":", 2)[0];
       String location = hostNameCache.get(ip);
@@ -1001,7 +1006,7 @@ public abstract class InputFormatBase<K,
         location = inetAddress.getHostName();
         hostNameCache.put(ip, location);
       }
-
+      
       for (Entry<KeyExtent,List<Range>> extentRanges : tserverBin.getValue().entrySet()) {
         Range ke = extentRanges.getKey().toDataRange();
         for (Range r : extentRanges.getValue()) {

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java Mon Mar  5 22:49:35 2012
@@ -25,6 +25,7 @@ import java.util.SortedMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 
 import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.admin.TableOperations;
 import org.apache.accumulo.core.client.admin.TimeType;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
@@ -114,7 +115,7 @@ public class MockTable {
   }
   
   /**
-   * @deprecated since 1.4 {@link #attachIterator(String, IteratorSetting)}
+   * @deprecated Since 1.4, use {@link TableOperations#attachIterator(String tableName, IteratorSetting setting)}
    */
   public void addAggregators(List<? extends org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig> aggregators) {
     for (Entry<String,String> entry : IteratorUtil.generateAggTableProperties(aggregators).entrySet()) {

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileOperations.java Mon Mar  5 22:49:35 2012
@@ -146,8 +146,8 @@ public class MapFileOperations extends F
   }
   
   /**
-   * @deprecated since 1.4
-   * @use org.apache.hadoop.io.MapFile.Writer
+   * @deprecated since 1.4, MapFiles will no longer be written. Instead use {@link org.apache.accumulo.core.file.rfile.RFileOperations#openWriter}.
+   * @see org.apache.hadoop.io.MapFile.Writer
    */
   public FileSKVWriter openWriter(final String file, final FileSystem fs, Configuration conf, AccumuloConfiguration acuconf) throws IOException {
     final MyMapFile.Writer mfw = MapFileUtil.openMapFileWriter(acuconf, conf, fs, file);

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java Mon Mar  5 22:49:35 2012
@@ -35,7 +35,7 @@ public class MapFileUtil {
    * @param conf
    * @param fs
    * @param dirName
-   * @return
+   * @return true if the attempt was successful, false otherwise
    */
   public static boolean attemptToFixMapFile(Configuration conf, FileSystem fs, String dirName) {
     boolean fixed = true;
@@ -90,13 +90,13 @@ public class MapFileUtil {
   }
   
   /**
-   * @deprecated sicne 1.4
+   * @deprecated since 1.4
    * 
    * @param acuTableConf
    * @param conf
    * @param fs
    * @param dirname
-   * @return
+   * @return a MapFile writer
    * @throws IOException
    */
   public static MyMapFile.Writer openMapFileWriter(AccumuloConfiguration acuTableConf, Configuration conf, FileSystem fs, String dirname) throws IOException {

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java Mon Mar  5 22:49:35 2012
@@ -73,15 +73,13 @@ import org.apache.log4j.Logger;
  * a sorted change list, to create a new version of the database in a new file. Sorting large change lists can be done with {@link MySequenceFile.Sorter}.
  * 
  * 
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.file.rfile.RFile
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.file.rfile.RFile}
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class MyMapFile {
   
   /**
-   * @deprecated since 1.4
-   * @use org.apache.accumulo.core.Constants.MAPFILE_EXTENSION
+   * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.Constants#MAPFILE_EXTENSION}
    */
   public static final String EXTENSION = "map";
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/map/MySequenceFile.java Mon Mar  5 22:49:35 2012
@@ -192,8 +192,7 @@ import org.apache.hadoop.util.Reflection
  * </p>
  * 
  * @see CompressionCodec
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.file.rfile.RFile
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.file.rfile.RFile}
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class MySequenceFile {

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java Mon Mar  5 22:49:35 2012
@@ -35,8 +35,7 @@ import org.apache.log4j.Logger;
 /**
  * This iterator wraps another iterator. It automatically aggregates.
  * 
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.Combiner
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.Combiner}
  */
 
 public class AggregatingIterator implements SortedKeyValueIterator<Key,Value>, OptionDescriber {

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java Mon Mar  5 22:49:35 2012
@@ -295,13 +295,12 @@ public abstract class Combiner extends W
   }
   
   /**
-   * A convenience method to set the "all columns" option on a Combiner. If true, the columns option will be ignored and the Combiner will be applied to all
-   * columns.
+   * A convenience method to set the "all columns" option on a Combiner. 
    * 
    * @param is
    *          iterator settings object to configure
-   * @param enableAllColumns
-   *          if true the combiner will be applied to all columns
+   * @param combineAllColumns
+   *          if true, the columns option is ignored and the Combiner will be applied to all columns
    */
   public static void setCombineAllColumns(IteratorSetting is, boolean combineAllColumns) {
     is.addOption(ALL_OPTION, Boolean.toString(combineAllColumns));

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java Mon Mar  5 22:49:35 2012
@@ -21,8 +21,7 @@ import org.apache.accumulo.core.iterator
 /**
  * This class remains here for backwards compatibility.
  * 
- * @deprecated since 1.4
- * @see org.apache.accumulo.core.iterators.user.IndexedDocIterator
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.IndexedDocIterator}
  */
 public class FamilyIntersectingIterator extends IndexedDocIterator {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java Mon Mar  5 22:49:35 2012
@@ -34,8 +34,7 @@ import org.apache.accumulo.start.classlo
 import org.apache.log4j.Logger;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.Filter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.Filter}
  **/
 public class FilteringIterator extends WrappingIterator implements OptionDescriber {
   private List<? extends Filter> filters;

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java Mon Mar  5 22:49:35 2012
@@ -19,8 +19,7 @@ package org.apache.accumulo.core.iterato
 /**
  * This class remains here for backwards compatibility.
  * 
- * @deprecated since 1.4
- * @see org.apache.accumulo.core.iterators.user.GrepIterator
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.GrepIterator}
  */
 public class GrepIterator extends org.apache.accumulo.core.iterators.user.GrepIterator {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java Mon Mar  5 22:49:35 2012
@@ -19,8 +19,7 @@ package org.apache.accumulo.core.iterato
 /**
  * This class remains here for backwards compatibility.
  * 
- * @deprecated since 1.4
- * @see org.apache.accumulo.core.iterators.user.IntersectingIterator
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.IntersectingIterator}
  */
 public class IntersectingIterator extends org.apache.accumulo.core.iterators.user.IntersectingIterator {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java Mon Mar  5 22:49:35 2012
@@ -63,9 +63,9 @@ public class IteratorUtil {
   /**
    * @deprecated since 1.4
    * @param aggregators
-   * @return
+   * @return A map of Aggregator Table Properties.
    * 
-   * @see {@link TableOperations#attachIterators(String, IteratorSetting)}
+   * @see TableOperations#attachIterator(String, IteratorSetting)
    */
   public static Map<String,String> generateAggTableProperties(List<? extends PerColumnIteratorConfig> aggregators) {
     

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java Mon Mar  5 22:49:35 2012
@@ -19,8 +19,7 @@ package org.apache.accumulo.core.iterato
 /**
  * This class remains here for backwards compatibility.
  * 
- * @deprecated since 1.4
- * @see org.apache.accumulo.core.iterators.user.LargeRowFilter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.LargeRowFilter}
  */
 public class LargeRowFilter extends org.apache.accumulo.core.iterators.user.LargeRowFilter {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java Mon Mar  5 22:49:35 2012
@@ -47,7 +47,18 @@ public abstract class LongCombiner exten
   protected static final String CLASS_PREFIX = "class:";
   
   public static enum Type {
-    VARLEN, FIXEDLEN, STRING
+    /**
+     * indicates a variable-length encoding of a Long using {@link LongCombiner.VarLenEncoder}
+     */
+    VARLEN,
+    /**
+     * indicates a fixed-length (8-byte) encoding of a Long using {@link LongCombiner.FixedLenEncoder}
+     */
+    FIXEDLEN,
+    /**
+     * indicates a string representation of a Long using {@link LongCombiner.StringEncoder}
+     */
+    STRING
   }
   
   @Override
@@ -61,8 +72,8 @@ public abstract class LongCombiner exten
     if (type == null)
       throw new IllegalArgumentException("no type specified");
     if (type.startsWith(CLASS_PREFIX)) {
-        setEncoder(type.substring(CLASS_PREFIX.length()));
-        testEncoder(42l);
+      setEncoder(type.substring(CLASS_PREFIX.length()));
+      testEncoder(42l);
     } else {
       switch (Type.valueOf(type)) {
         case VARLEN:

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/NoLabelIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/NoLabelIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/NoLabelIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/NoLabelIterator.java Mon Mar  5 22:49:35 2012
@@ -24,8 +24,7 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.filter.NoLabelFilter;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.NoVisFilter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.ReqVisFilter}
  **/
 public class NoLabelIterator extends SkippingIterator implements OptionDescriber {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RegExIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RegExIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RegExIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RegExIterator.java Mon Mar  5 22:49:35 2012
@@ -25,8 +25,7 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.filter.RegExFilter;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.RegExFilter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.RegExFilter}
  **/
 public class RegExIterator extends SkippingIterator implements OptionDescriber {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java Mon Mar  5 22:49:35 2012
@@ -19,8 +19,7 @@ package org.apache.accumulo.core.iterato
 /**
  * This class remains here for backwards compatibility.
  * 
- * @deprecated since 1.4
- * @see org.apache.accumulo.core.iterators.user.RowDeletingIterator
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.RowDeletingIterator}
  */
 public class RowDeletingIterator extends org.apache.accumulo.core.iterators.user.RowDeletingIterator {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java Mon Mar  5 22:49:35 2012
@@ -22,8 +22,7 @@ import org.apache.accumulo.core.data.Val
 /**
  * This class remains here for backwards compatibility.
  * 
- * @deprecated since 1.4
- * @see org.apache.accumulo.core.iterators.user.VersioningIterator
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.VersioningIterator}
  */
 public class VersioningIterator extends org.apache.accumulo.core.iterators.user.VersioningIterator {
   public VersioningIterator() {}

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java Mon Mar  5 22:49:35 2012
@@ -19,8 +19,7 @@ package org.apache.accumulo.core.iterato
 /**
  * This class remains here for backwards compatibility.
  * 
- * @deprecated since 1.4
- * @see org.apache.accumulo.core.iterators.user.WholeRowIterator
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.WholeRowIterator}
  */
 public class WholeRowIterator extends org.apache.accumulo.core.iterators.user.WholeRowIterator {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java Mon Mar  5 22:49:35 2012
@@ -19,8 +19,7 @@ package org.apache.accumulo.core.iterato
 import org.apache.accumulo.core.data.Value;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.Combiner
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.Combiner}
  */
 public interface Aggregator {
   void reset();

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java Mon Mar  5 22:49:35 2012
@@ -22,8 +22,8 @@ import org.apache.accumulo.core.data.Val
 import org.apache.log4j.Logger;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.SummingCombiner with SummingCombiner.Type.FIXEDLEN
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.SummingCombiner} with
+ *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#FIXEDLEN}
  */
 public class LongSummation implements Aggregator {
   private static final Logger log = Logger.getLogger(LongSummation.class);

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java Mon Mar  5 22:49:35 2012
@@ -26,8 +26,8 @@ import org.apache.accumulo.core.data.Val
 import org.apache.hadoop.io.WritableUtils;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.SummingArrayCombiner with SummingArrayCombiner.Type.VARLONG
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.SummingArrayCombiner} with
+ *             {@link org.apache.accumulo.core.iterators.user.SummingArrayCombiner.Type#VARLEN}
  */
 public class NumArraySummation implements Aggregator {
   long[] sum = new long[0];

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java Mon Mar  5 22:49:35 2012
@@ -26,8 +26,8 @@ import org.apache.accumulo.core.data.Val
 import org.apache.hadoop.io.WritableUtils;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.SummingCombiner with SummingCombiner.Type.VARLEN
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.SummingCombiner} with
+ *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#VARLEN}
  */
 public class NumSummation implements Aggregator {
   long sum = 0l;

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java Mon Mar  5 22:49:35 2012
@@ -19,8 +19,8 @@ package org.apache.accumulo.core.iterato
 import org.apache.accumulo.core.data.Value;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.MaxCombiner with MaxCombiner.Type.STRING
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.MaxCombiner} with
+ *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#STRING}
  */
 public class StringMax implements Aggregator {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java Mon Mar  5 22:49:35 2012
@@ -19,8 +19,8 @@ package org.apache.accumulo.core.iterato
 import org.apache.accumulo.core.data.Value;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.MinCombiner with MinCombiner.Type.STRING
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.MinCombiner} with
+ *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#STRING}
  */
 public class StringMin implements Aggregator {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java Mon Mar  5 22:49:35 2012
@@ -19,8 +19,8 @@ package org.apache.accumulo.core.iterato
 import org.apache.accumulo.core.data.Value;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.SummingCombiner with SummingCombiner.Type.STRING
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.SummingCombiner} with
+ *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#STRING}
  */
 public class StringSummation implements Aggregator {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/AgeOffFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/AgeOffFilter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/AgeOffFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/AgeOffFilter.java Mon Mar  5 22:49:35 2012
@@ -24,8 +24,7 @@ import org.apache.accumulo.core.data.Val
 import org.apache.accumulo.core.iterators.OptionDescriber;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.AgeOffFilter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.AgeOffFilter}
  **/
 public class AgeOffFilter implements Filter, OptionDescriber {
   private long threshold;

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnAgeOffFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnAgeOffFilter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnAgeOffFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnAgeOffFilter.java Mon Mar  5 22:49:35 2012
@@ -27,8 +27,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.ColumnAgeOffFilter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.ColumnAgeOffFilter}
  **/
 public class ColumnAgeOffFilter implements Filter, OptionDescriber {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnQualifierFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnQualifierFilter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnQualifierFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/ColumnQualifierFilter.java Mon Mar  5 22:49:35 2012
@@ -28,8 +28,7 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Value;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.system.ColumnQualifierFilter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.system.ColumnQualifierFilter}
  **/
 public class ColumnQualifierFilter implements Filter {
   private boolean scanColumns;

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/DeleteFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/DeleteFilter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/DeleteFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/DeleteFilter.java Mon Mar  5 22:49:35 2012
@@ -22,10 +22,7 @@ import org.apache.accumulo.core.data.Val
 /**
  * Caller sets up this filter for the rows that they want to match on and then this filter ignores those rows during scans and compactions.
  * 
- */
-/**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.Filter with negate flag set to <tt>true</tt>
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.Filter} with negate flag set to <tt>true</tt>
  **/
 public class DeleteFilter extends RegExFilter {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/Filter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/Filter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/Filter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/Filter.java Mon Mar  5 22:49:35 2012
@@ -22,8 +22,7 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Value;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.Filter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.Filter}
  **/
 public interface Filter {
   public void init(Map<String,String> options);

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/NoLabelFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/NoLabelFilter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/NoLabelFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/NoLabelFilter.java Mon Mar  5 22:49:35 2012
@@ -24,8 +24,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.security.ColumnVisibility;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.NoVisFilter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.ReqVisFilter}
  **/
 public class NoLabelFilter implements Filter, OptionDescriber {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/RegExFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/RegExFilter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/RegExFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/RegExFilter.java Mon Mar  5 22:49:35 2012
@@ -28,8 +28,7 @@ import org.apache.accumulo.core.iterator
 import org.apache.accumulo.core.util.ByteArrayBackedCharSequence;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.user.RegExFilter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.RegExFilter}
  **/
 public class RegExFilter implements Filter, OptionDescriber {
   

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/VisibilityFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/VisibilityFilter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/VisibilityFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/VisibilityFilter.java Mon Mar  5 22:49:35 2012
@@ -29,8 +29,7 @@ import org.apache.hadoop.io.Text;
 import org.apache.log4j.Logger;
 
 /**
- * @deprecated since 1.4
- * @use org.apache.accumulo.core.iterators.System.VisibilityFilter
+ * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.system.VisibilityFilter}
  **/
 public class VisibilityFilter implements Filter {
   private VisibilityEvaluator ve;

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RowFilter.java Mon Mar  5 22:49:35 2012
@@ -95,7 +95,7 @@ public abstract class RowFilter extends 
    * 
    * @param rowIterator
    *          - An iterator over the row.
-   * @return
+   * @return false if a row should be suppressed, otherwise true.
    * @throws IOException
    */
   public abstract boolean acceptRow(SortedKeyValueIterator<Key,Value> rowIterator) throws IOException;

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java Mon Mar  5 22:49:35 2012
@@ -49,7 +49,18 @@ public class SummingArrayCombiner extend
   private static final String CLASS_PREFIX = "class:";
   
   public static enum Type {
-    VARLEN, FIXEDLEN, STRING
+    /**
+     * indicates a variable-length encoding of a list of Longs using {@link SummingArrayCombiner.VarLongArrayEncoder}
+     */
+    VARLEN,
+    /**
+     * indicates a fixed-length (8 bytes for each Long) encoding of a list of Longs using {@link SummingArrayCombiner.FixedLongArrayEncoder}
+     */
+    FIXEDLEN,
+    /**
+     * indicates a string (comma-separated) representation of a list of Longs using {@link SummingArrayCombiner.StringArrayEncoder}
+     */
+    STRING
   }
   
   @Override

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Mon Mar  5 22:49:35 2012
@@ -1003,15 +1003,21 @@ public class Shell {
   }
   
   /**
-   * Return the formatter for this table, .
+   * Return the formatter for the current table.
    * 
-   * @param tableName
-   * @return The formatter class for the given table
+   * @return the formatter class for the current table
    */
   public Class<? extends Formatter> getFormatter() {
     return getFormatter(this.tableName);
   }
   
+  /**
+   * Return the formatter for the given table.
+   * 
+   * @param tableName
+   *          the table name
+   * @return the formatter class for the given table
+   */
   public Class<? extends Formatter> getFormatter(String tableName) {
     Class<? extends Formatter> formatter = FormatterCommand.getCurrentFormatter(tableName, this);
     

Modified: incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java Mon Mar  5 22:49:35 2012
@@ -100,8 +100,8 @@ public class StatsCombiner extends Combi
    * 
    * @param iterConfig
    *          Iterator settings to configure
-   * @param maxSize
-   *          Maximum set size
+   * @param base
+   *          The expected base/radix of the numbers.
    */
   public static void setRadix(IteratorSetting iterConfig, int base) {
     iterConfig.addOption(RADIX_OPTION, base + "");

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java Mon Mar  5 22:49:35 2012
@@ -112,7 +112,7 @@ public class WikipediaMapper extends Map
    * 
    * @param article
    * @param numPartitions
-   * @return
+   * @return The number of the partition for a given article.
    * @throws IllegalFormatException
    */
   public static int getPartitionId(Article article, int numPartitions) throws IllegalFormatException {

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java?rev=1297265&r1=1297264&r2=1297265&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/util/TextUtil.java Mon Mar  5 22:49:35 2012
@@ -62,9 +62,9 @@ public class TextUtil {
   /**
    * Appends the UTF-8 bytes of the given string to the given {@link Text}
    * 
-   * @param text
+   * @param t
    *          the Text to which to append
-   * @param string
+   * @param s
    *          the String to append
    */
   public static void textAppendNoNull(Text t, String s) {



Mime
View raw message