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/01/25 15:49:05 UTC
svn commit: r1235776 - in /incubator/accumulo/branches/1.4/src:
core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java
Author: billie
Date: Wed Jan 25 14:49:05 2012
New Revision: 1235776
URL: http://svn.apache.org/viewvc?rev=1235776&view=rev
Log:
ACCUMULO-334 updated IteratorSetting javadocs
Modified:
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java?rev=1235776&r1=1235775&r2=1235776&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java Wed Jan 25 14:49:05 2012
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.client;
-import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -24,7 +23,6 @@ import java.util.Set;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.Pair;
@@ -128,7 +126,7 @@ public class IteratorSetting {
this.properties.clear();
addOptions(properties);
}
-
+
/**
* @return <tt>true</tt> if this iterator has configuration parameters.
*/
@@ -159,8 +157,6 @@ public class IteratorSetting {
* the distinguishing name for the iterator
* @param iteratorClass
* the fully qualified class name for the iterator
- * @param scopes
- * the scopes of the iterator
* @param properties
* any properties for the iterator
*/
@@ -186,6 +182,7 @@ public class IteratorSetting {
}
/**
+
* Constructs an iterator setting using the given class's SimpleName for the iterator name and configured for the specified scopes with the specified
* parameters.
*
@@ -193,8 +190,6 @@ public class IteratorSetting {
* the priority for the iterator @see {@link #setPriority(int)}
* @param iteratorClass
* the class for the iterator
- * @param scopes
- * the scopes of the iterator
* @param properties
* any properties for the iterator
*/
@@ -218,25 +213,6 @@ public class IteratorSetting {
}
/**
- * Constructs an iterator setting configured for the specified scopes with the specified parameters.
- *
- * @param priority
- * the priority for the iterator @see {@link #setPriority(int)}
- * @param name
- * the distinguishing name for the iterator
- * @param iteratorClass
- * the class for the iterator
- * @param scopes
- * the scopes of the iterator
- * @param properties
- * any properties for the iterator
- */
- public IteratorSetting(int priority, String name, Class<? extends SortedKeyValueIterator<Key,Value>> iteratorClass, EnumSet<IteratorScope> scopes,
- Map<String,String> properties) {
- this(priority, name, iteratorClass.getName(), properties);
- }
-
- /**
* Add another option to the iterator.
*
* @param option
@@ -308,7 +284,7 @@ public class IteratorSetting {
sb.append(properties);
return sb.toString();
}
-
+
/**
* A convenience class for passing column family and column qualifiers to iterator configuration methods.
*/
@@ -334,7 +310,7 @@ public class IteratorSetting {
return getFirst();
}
- public Text getColumnQualifierf() {
+ public Text getColumnQualifier() {
return getSecond();
}
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java?rev=1235776&r1=1235775&r2=1235776&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/BulkPlusOne.java Wed Jan 25 14:49:05 2012
@@ -79,7 +79,7 @@ public class BulkPlusOne extends BulkTes
List<Integer> rows = new ArrayList<Integer>(startRows);
rows.add(LOTS);
-
+
for (int i = 0; i < parts; i++) {
String fileName = dir + "/" + String.format("part_%d.", i) + RFile.EXTENSION;
FileSKVWriter f = FileOperations.getInstance().openWriter(fileName, fs, fs.getConf(), defaultConfiguration);
@@ -89,7 +89,7 @@ public class BulkPlusOne extends BulkTes
for (int j = start; j < end; j++) {
Text row = new Text(String.format(FMT, j));
for (Column col : COLNAMES) {
- f.append(new Key(row, col.getColumnFamily(), col.getColumnQualifierf()), value);
+ f.append(new Key(row, col.getColumnFamily(), col.getColumnQualifier()), value);
}
f.append(new Key(row, MARKER_CF, new Text(markerColumnFamily)), value);
}