You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2012/03/06 15:30:41 UTC
svn commit: r1297496 - in /incubator/accumulo/trunk: ./ src/core/
src/core/src/main/java/org/apache/accumulo/core/client/admin/
src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/
src/core/src/main/java/org/apache/accumulo/core/client/moc...
Author: billie
Date: Tue Mar 6 14:30:40 2012
New Revision: 1297496
URL: http://svn.apache.org/viewvc?rev=1297496&view=rev
Log:
ACCUMULO-441 ACCUMULO-411 merged javadoc fixes back to trunk
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/src/core/ (props changed)
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
incubator/accumulo/trunk/src/server/ (props changed)
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 6 14:30:40 2012
@@ -1,3 +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:1201902-1296495
+/incubator/accumulo/branches/1.4:1201902-1297273
Propchange: incubator/accumulo/trunk/src/core/
('svn:mergeinfo' removed)
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java Tue Mar 6 14:30:40 2012
@@ -86,6 +86,8 @@ 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
* @throws AccumuloException
@@ -409,8 +411,7 @@ public interface TableOperations {
AccumuloSecurityException;
/**
- * @deprecated Since 1.4
- * @see #importDirectory(String, String, String, boolean)
+ * @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/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java Tue Mar 6 14:30:40 2012
@@ -27,9 +27,9 @@ import org.apache.accumulo.core.data.Val
import org.apache.accumulo.core.file.FileOperations;
import org.apache.accumulo.core.file.FileSKVWriter;
import org.apache.accumulo.core.file.rfile.RFile;
+import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapreduce.JobContext;
import org.apache.hadoop.mapreduce.RecordWriter;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
@@ -107,27 +107,27 @@ public class AccumuloFileOutputFormat ex
}
private static int getBlockSize(Configuration conf) {
- return conf.getInt(BLOCK_SIZE,
- (int) AccumuloConfiguration.getDefaultConfiguration().getMemoryInBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
+ return conf.getInt(BLOCK_SIZE, (int) AccumuloConfiguration.getDefaultConfiguration().getMemoryInBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
}
/**
- *
- * @param job
- * @return The Accumulo instance.
- *
- * @deprecated since 1.4, use {@link #setBlockSize(Configuration, int)} no other configurations are used by OutputFormat
+ * @param conf
+ * @param instanceName
+ * @param zooKeepers
*/
- protected static Instance getInstance(JobContext job) {
- return getInstance(job.getConfiguration());
+ 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");
+ conf.setBoolean(INSTANCE_HAS_BEEN_SET, true);
+
+ ArgumentChecker.notNull(instanceName, zooKeepers);
+ conf.set(INSTANCE_NAME, instanceName);
+ conf.set(ZOOKEEPERS, zooKeepers);
}
/**
- *
* @param conf
* @return The Accumulo instance.
- *
- * @deprecated since 1.4, use {@link #setBlockSize(Configuration, int)} no other configurations are used by OutputFormat
*/
protected static Instance getInstance(Configuration conf) {
return new ZooKeeperInstance(conf.get(INSTANCE_NAME), conf.get(ZOOKEEPERS));
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java Tue Mar 6 14:30:40 2012
@@ -115,8 +115,7 @@ public class MockTable {
}
/**
- * @deprecated since 1.4
- * @see TableOperations#attachIterator(String tableName, IteratorSetting setting)
+ * @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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java Tue Mar 6 14:30:40 2012
@@ -35,8 +35,7 @@ import org.apache.log4j.Logger;
/**
* This iterator wraps another iterator. It automatically aggregates.
*
- * @deprecated since 1.4
- * @see 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java Tue Mar 6 14:30:40 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java Tue Mar 6 14:30:40 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java Tue Mar 6 14:30:40 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java Tue Mar 6 14:30:40 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java Tue Mar 6 14:30:40 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java Tue Mar 6 14:30:40 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java Tue Mar 6 14:30:40 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java Tue Mar 6 14:30:40 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java Tue Mar 6 14:30:40 2012
@@ -19,8 +19,7 @@ package org.apache.accumulo.core.iterato
import org.apache.accumulo.core.data.Value;
/**
- * @deprecated since 1.4
- * @see 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java Tue Mar 6 14:30:40 2012
@@ -22,8 +22,8 @@ import org.apache.accumulo.core.data.Val
import org.apache.log4j.Logger;
/**
- * @deprecated since 1.4
- * @see 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java Tue Mar 6 14:30:40 2012
@@ -26,8 +26,8 @@ import org.apache.accumulo.core.data.Val
import org.apache.hadoop.io.WritableUtils;
/**
- * @deprecated since 1.4
- * @see 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java Tue Mar 6 14:30:40 2012
@@ -26,8 +26,8 @@ import org.apache.accumulo.core.data.Val
import org.apache.hadoop.io.WritableUtils;
/**
- * @deprecated since 1.4
- * @see 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java Tue Mar 6 14:30:40 2012
@@ -19,8 +19,8 @@ package org.apache.accumulo.core.iterato
import org.apache.accumulo.core.data.Value;
/**
- * @deprecated since 1.4
- * @see 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java Tue Mar 6 14:30:40 2012
@@ -19,8 +19,8 @@ package org.apache.accumulo.core.iterato
import org.apache.accumulo.core.data.Value;
/**
- * @deprecated since 1.4
- * @see 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java Tue Mar 6 14:30:40 2012
@@ -19,8 +19,8 @@ package org.apache.accumulo.core.iterato
import org.apache.accumulo.core.data.Value;
/**
- * @deprecated since 1.4
- * @see 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/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java Tue Mar 6 14:30:40 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/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1297496&r1=1297495&r2=1297496&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Tue Mar 6 14:30:40 2012
@@ -948,14 +948,21 @@ public class Shell extends ShellOptions
}
/**
- * Return the formatter for this table, .
+ * Return the formatter for the current table.
*
- * @return The formatter class for this 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);
Propchange: incubator/accumulo/trunk/src/server/
('svn:mergeinfo' removed)