accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1438312 [1/5] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/mapred/...
Date Fri, 25 Jan 2013 03:56:16 GMT
Author: vines
Date: Fri Jan 25 03:56:14 2013
New Revision: 1438312

URL: http://svn.apache.org/viewvc?rev=1438312&view=rev
Log:
ACCUMULO-259 - merged up to 1438309

Added:
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/
      - copied from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.java
      - copied unchanged from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloFileOutputFormat.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
      - copied unchanged from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
      - copied, changed from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
      - copied unchanged from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
      - copied, changed from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/
      - copied from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
      - copied, changed from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/FileOutputConfigurator.java
      - copied unchanged from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/FileOutputConfigurator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
      - copied, changed from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/OutputConfigurator.java
      - copied unchanged from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/OutputConfigurator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/package-info.java
      - copied unchanged from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/package-info.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
      - copied unchanged from r1438259, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
      - copied unchanged from r1438259, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
      - copied unchanged from r1438259, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java
      - copied unchanged from r1438259, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java
Removed:
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/constraints/ConstraintLoader.java
Modified:
    accumulo/branches/ACCUMULO-259/   (props changed)
    accumulo/branches/ACCUMULO-259/assemble/   (props changed)
    accumulo/branches/ACCUMULO-259/core/   (props changed)
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/Connector.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/PeekingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/NumSummationTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java   (props changed)
    accumulo/branches/ACCUMULO-259/packages/   (props changed)
    accumulo/branches/ACCUMULO-259/proxy/examples/python/TestClient.py
    accumulo/branches/ACCUMULO-259/proxy/examples/ruby/test_client.rb
    accumulo/branches/ACCUMULO-259/proxy/pom.xml
    accumulo/branches/ACCUMULO-259/proxy/proxy.properties
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/Util.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/thrift/proxy.thrift
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java
    accumulo/branches/ACCUMULO-259/server/   (props changed)
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/Accumulo.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/constraints/ConstraintChecker.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/FileManager.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
    accumulo/branches/ACCUMULO-259/src/   (props changed)
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/vfs/ContextManager.java
    accumulo/branches/ACCUMULO-259/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java

Propchange: accumulo/branches/ACCUMULO-259/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1437608-1438309

Propchange: accumulo/branches/ACCUMULO-259/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/assemble:r1437608-1438309

Propchange: accumulo/branches/ACCUMULO-259/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1437608-1438309

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java Fri Jan 25 03:56:14 2013
@@ -45,27 +45,45 @@ public class BatchWriterConfig implement
   private Integer maxWriteThreads = null;
   
   /**
+   * Sets the maximum memory to batch before writing. The smaller this value, the more frequently the {@link BatchWriter} will write.<br />
+   * If set to a value smaller than a single mutation, then it will {@link BatchWriter#flush()} after each added mutation. Must be non-negative.
+   * 
+   * <p>
+   * <b>Default:</b> 50M
    * 
    * @param maxMemory
-   *          size in bytes of the maximum memory to batch before writing. Minimum 1K. Defaults to 50M.
+   *          max size in bytes
+   * @throws IllegalArgumentException
+   *           if {@code maxMemory} is less than 0
+   * @return {@code this} to allow chaining of set methods
    */
-  
   public BatchWriterConfig setMaxMemory(long maxMemory) {
-    if (maxMemory < 1024)
-      throw new IllegalArgumentException("Max memory is too low at " + maxMemory + ". Minimum 1K.");
+    if (maxMemory < 0)
+      throw new IllegalArgumentException("Max memory must be non-negative.");
     this.maxMemory = maxMemory;
     return this;
   }
   
   /**
+   * Sets the maximum amount of time to hold the data in memory before flushing it to servers.<br />
+   * For no maximum, set to zero, or {@link Long#MAX_VALUE} with {@link TimeUnit#MILLISECONDS}.
+   * 
+   * <p>
+   * {@link TimeUnit#MICROSECONDS} or {@link TimeUnit#NANOSECONDS} will be truncated to the nearest {@link TimeUnit#MILLISECONDS}.<br />
+   * If this truncation would result in making the value zero when it was specified as non-zero, then a minimum value of one {@link TimeUnit#MILLISECONDS} will
+   * be used.
+   * 
+   * <p>
+   * <b>Default:</b> 120 seconds
+   * 
    * @param maxLatency
-   *          The maximum amount of time to hold data in memory before flushing it to servers. For no max set to zero or Long.MAX_VALUE with TimeUnit.MILLIS.
-   *          Defaults to 120 seconds.
+   *          the maximum latency, in the unit specified by the value of {@code timeUnit}
    * @param timeUnit
-   *          Determines how maxLatency will be interpreted.
-   * @return this to allow chaining of set methods
+   *          determines how {@code maxLatency} will be interpreted
+   * @throws IllegalArgumentException
+   *           if {@code maxLatency} is less than 0
+   * @return {@code this} to allow chaining of set methods
    */
-  
   public BatchWriterConfig setMaxLatency(long maxLatency, TimeUnit timeUnit) {
     if (maxLatency < 0)
       throw new IllegalArgumentException("Negative max latency not allowed " + maxLatency);
@@ -73,19 +91,31 @@ public class BatchWriterConfig implement
     if (maxLatency == 0)
       this.maxLatency = Long.MAX_VALUE;
     else
-      this.maxLatency = timeUnit.toMillis(maxLatency);
+      // make small, positive values that truncate to 0 when converted use the minimum millis instead
+      this.maxLatency = Math.max(1, timeUnit.toMillis(maxLatency));
     return this;
   }
   
   /**
+   * Sets the maximum amount of time an unresponsive server will be re-tried. When this timeout is exceeded, the {@link BatchWriter} should throw an exception.<br />
+   * For no timeout, set to zero, or {@link Long#MAX_VALUE} with {@link TimeUnit#MILLISECONDS}.
+   * 
+   * <p>
+   * {@link TimeUnit#MICROSECONDS} or {@link TimeUnit#NANOSECONDS} will be truncated to the nearest {@link TimeUnit#MILLISECONDS}.<br />
+   * If this truncation would result in making the value zero when it was specified as non-zero, then a minimum value of one {@link TimeUnit#MILLISECONDS} will
+   * be used.
+   * 
+   * <p>
+   * <b>Default:</b> {@link Long#MAX_VALUE} (no timeout)
    * 
    * @param timeout
-   *          The maximum amount of time an unresponsive server will be retried. When this timeout is exceeded, the BatchWriter should throw an exception. For
-   *          no timeout set to zero or Long.MAX_VALUE with TimeUnit.MILLIS. Defaults to no timeout.
+   *          the timeout, in the unit specified by the value of {@code timeUnit}
    * @param timeUnit
-   * @return this to allow chaining of set methods
+   *          determines how {@code timeout} will be interpreted
+   * @throws IllegalArgumentException
+   *           if {@code timeout} is less than 0
+   * @return {@code this} to allow chaining of set methods
    */
-  
   public BatchWriterConfig setTimeout(long timeout, TimeUnit timeUnit) {
     if (timeout < 0)
       throw new IllegalArgumentException("Negative timeout not allowed " + timeout);
@@ -93,16 +123,23 @@ public class BatchWriterConfig implement
     if (timeout == 0)
       timeout = Long.MAX_VALUE;
     else
-      this.timeout = timeUnit.toMillis(timeout);
+      // make small, positive values that truncate to 0 when converted use the minimum millis instead
+      this.timeout = Math.max(1, timeUnit.toMillis(timeout));
     return this;
   }
   
   /**
+   * Sets the maximum number of threads to use for writing data to the tablet servers.
+   * 
+   * <p>
+   * <b>Default:</b> 3
+   * 
    * @param maxWriteThreads
-   *          the maximum number of threads to use for writing data to the tablet servers. Defaults to 3.
-   * @return this to allow chaining of set methods
+   *          the maximum threads to use
+   * @throws IllegalArgumentException
+   *           if {@code maxWriteThreads} is non-positive
+   * @return {@code this} to allow chaining of set methods
    */
-  
   public BatchWriterConfig setMaxWriteThreads(int maxWriteThreads) {
     if (maxWriteThreads <= 0)
       throw new IllegalArgumentException("Max threads must be positive " + maxWriteThreads);

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/Connector.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/Connector.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/Connector.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/Connector.java Fri Jan 25 03:56:14 2013
@@ -46,6 +46,7 @@ public class Connector {
    *           when a user's credentials are invalid
    * @see Instance#getConnector(String user, byte[] password)
    */
+  @Deprecated
   public Connector(Instance instance, String user, byte[] password) throws AccumuloException, AccumuloSecurityException {
     impl = instance.getConnector(user, password);
   }
@@ -54,6 +55,7 @@ public class Connector {
    * @see Instance#getConnector(String user, byte[] password)
    * @deprecated Not for client use
    */
+  @Deprecated
   public Connector() {
     impl = null;
   }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java Fri Jan 25 03:56:14 2013
@@ -252,6 +252,7 @@ public class ZooKeeperInstance implement
   /**
    * @deprecated Use {@link #lookupInstanceName(org.apache.accumulo.fate.zookeeper.ZooCache, UUID)} instead
    */
+  @Deprecated
   public static String lookupInstanceName(org.apache.accumulo.core.zookeeper.ZooCache zooCache, UUID instanceId) {
     return lookupInstanceName((ZooCache) zooCache, instanceId);
   }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java Fri Jan 25 03:56:14 2013
@@ -47,6 +47,7 @@ public interface SecurityOperations {
    *           if the user does not have permission to create a user
    * @deprecated Use {@link #createUser(String,byte[])} instead
    */
+  @Deprecated
   public void createUser(String user, byte[] password, Authorizations authorizations) throws AccumuloException, AccumuloSecurityException;
 
   /**

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java Fri Jan 25 03:56:14 2013
@@ -109,6 +109,7 @@ public class SecurityOperationsImpl impl
    *           if the user does not have permission to create a user
    * @deprecated Use {@link #createUser(AccumuloToken)} instead
    */
+  @Deprecated
   public void createUser(final String user, final byte[] password, final Authorizations authorizations) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, password, authorizations);
     createUser(new UserPassToken(user, password), authorizations);

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java Fri Jan 25 03:56:14 2013
@@ -311,6 +311,7 @@ public interface TableOperations {
    * 
    * @deprecated As of release 1.4, replaced by {@link #flush(String, Text, Text, boolean)}
    */
+  @Deprecated
   public void flush(String tableName) throws AccumuloException, AccumuloSecurityException;
   
   /**

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java Fri Jan 25 03:56:14 2013
@@ -129,7 +129,7 @@ public abstract class TableOperationsHel
       for (Entry<String,String> property : this.getProperties(tableName)) {
         if (property.getKey().startsWith(scopeStr)) {
           if (property.getKey().equals(nameStr))
-            throw new IllegalArgumentException("iterator name conflict for " + setting.getName() + ": " + property.getKey() + "=" + property.getValue());
+            throw new AccumuloException(new IllegalArgumentException("iterator name conflict for " + setting.getName() + ": " + property.getKey() + "=" + property.getValue()));
           if (property.getKey().startsWith(optStr))
             optionConflicts.put(property.getKey(), property.getValue());
           if (property.getKey().contains(".opt."))
@@ -139,14 +139,14 @@ public abstract class TableOperationsHel
             throw new AccumuloException("Bad value for existing iterator setting: " + property.getKey() + "=" + property.getValue());
           try {
             if (Integer.parseInt(parts[0]) == setting.getPriority())
-              throw new IllegalArgumentException("iterator priority conflict: " + property.getKey() + "=" + property.getValue());
+              throw new AccumuloException(new IllegalArgumentException("iterator priority conflict: " + property.getKey() + "=" + property.getValue()));
           } catch (NumberFormatException e) {
             throw new AccumuloException("Bad value for existing iterator setting: " + property.getKey() + "=" + property.getValue());
           }
         }
       }
       if (optionConflicts.size() > 0)
-        throw new IllegalArgumentException("iterator options conflict for " + setting.getName() + ": " + optionConflicts);
+        throw new AccumuloException(new IllegalArgumentException("iterator options conflict for " + setting.getName() + ": " + optionConflicts));
     }
   }
   

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java Fri Jan 25 03:56:14 2013
@@ -621,6 +621,12 @@ public class TableOperationsImpl extends
     if (flush)
       _flush(srcTableId, null, null, true);
     
+    if (propertiesToExclude == null)
+      propertiesToExclude = Collections.emptySet();
+    
+    if (propertiesToSet == null)
+      propertiesToSet = Collections.emptyMap();
+    
     if (!Collections.disjoint(propertiesToExclude, propertiesToSet.keySet()))
       throw new IllegalArgumentException("propertiesToSet and propertiesToExclude not disjoint");
     
@@ -660,6 +666,7 @@ public class TableOperationsImpl extends
   /**
    * @deprecated since 1.4 {@link #flush(String, Text, Text, boolean)}
    */
+  @Deprecated
   public void flush(String tableName) throws AccumuloException, AccumuloSecurityException {
     try {
       flush(tableName, null, null, false);

Copied: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java (from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java)
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java?p2=accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java&p1=accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java&r1=1438259&r2=1438312&rev=1438312&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java Fri Jan 25 03:56:14 2013
@@ -40,6 +40,7 @@ import org.apache.accumulo.core.data.Key
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.security.ColumnVisibility;
 import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.security.tokens.AccumuloToken;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.mapred.JobConf;
@@ -57,7 +58,7 @@ import org.apache.log4j.Logger;
  * The user must specify the following via static configurator methods:
  * 
  * <ul>
- * <li>{@link AccumuloOutputFormat#setConnectorInfo(JobConf, String, byte[])}
+ * <li>{@link AccumuloOutputFormat#setConnectorInfo(JobConf, AccumuloToken)}
  * <li>{@link AccumuloOutputFormat#setZooKeeperInstance(JobConf, String, String)} OR {@link AccumuloOutputFormat#setMockInstance(JobConf, String)}
  * </ul>
  * 
@@ -73,14 +74,12 @@ public class AccumuloOutputFormat implem
    * 
    * @param job
    *          the Hadoop job instance to be configured
-   * @param user
-   *          a valid Accumulo user name (user must have Table.CREATE permission if {@link #setCreateTables(JobConf, boolean)} is set to true)
-   * @param passwd
-   *          the user's password
+   * @param token
+   *          a valid AccumuloToken (user must have Table.CREATE permission if {@link #setCreateTables(JobConf, boolean)} is set to true)
    * @since 1.5.0
    */
-  public static void setConnectorInfo(JobConf job, String user, byte[] passwd) {
-    OutputConfigurator.setConnectorInfo(CLASS, job, user, passwd);
+  public static void setConnectorInfo(JobConf job, AccumuloToken<?,?> token) {
+    OutputConfigurator.setConnectorInfo(CLASS, job, token);
   }
   
   /**
@@ -90,37 +89,24 @@ public class AccumuloOutputFormat implem
    *          the Hadoop context for the configured job
    * @return true if the connector has been configured, false otherwise
    * @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, byte[])
+   * @see #setConnectorInfo(JobConf, AccumuloToken)
    */
   protected static Boolean isConnectorInfoSet(JobConf job) {
     return OutputConfigurator.isConnectorInfoSet(CLASS, job);
   }
   
   /**
-   * Gets the user name from the configuration.
+   * Gets the AccumuloToken from the configuration. WARNING: The serlaized token 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.
    * 
    * @param job
    *          the Hadoop context for the configured job
-   * @return the user name
+   * @return the decoded user token
    * @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, byte[])
+   * @see #setConnectorInfo(JobConf, AccumuloToken)
    */
-  protected static String getUsername(JobConf job) {
-    return OutputConfigurator.getUsername(CLASS, job);
-  }
-  
-  /**
-   * Gets the password from the configuration. 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.
-   * 
-   * @param job
-   *          the Hadoop context for the configured job
-   * @return the decoded user password
-   * @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, byte[])
-   */
-  protected static byte[] getPassword(JobConf job) {
-    return OutputConfigurator.getPassword(CLASS, job);
+  protected static AccumuloToken<?,?> getToken(JobConf job) {
+    return OutputConfigurator.getToken(CLASS, job);
   }
   
   /**
@@ -335,7 +321,7 @@ public class AccumuloOutputFormat implem
       this.defaultTableName = (tname == null) ? null : new Text(tname);
       
       if (!simulate) {
-        this.conn = getInstance(job).getConnector(getUsername(job), getPassword(job));
+        this.conn = getInstance(job).getConnector(getToken(job));
         mtbw = conn.createMultiTableBatchWriter(getBatchWriterOptions(job));
       }
     }
@@ -469,8 +455,8 @@ public class AccumuloOutputFormat implem
       throw new IOException("Connector info has not been set.");
     try {
       // if the instance isn't configured, it will complain here
-      Connector c = getInstance(job).getConnector(getUsername(job), getPassword(job));
-      if (!c.securityOperations().authenticateUser(getUsername(job), getPassword(job)))
+      Connector c = getInstance(job).getConnector(getToken(job));
+      if (!c.securityOperations().authenticateUser(getToken(job)))
         throw new IOException("Unable to authenticate user");
     } catch (AccumuloException e) {
       throw new IOException(e);

Copied: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java (from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java)
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java?p2=accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java&p1=accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java&r1=1438259&r2=1438312&rev=1438312&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java Fri Jan 25 03:56:14 2013
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.client.
 
 import java.io.IOException;
 import java.net.InetAddress;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -54,7 +53,7 @@ import org.apache.accumulo.core.data.Ran
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
+import org.apache.accumulo.core.security.tokens.AccumuloToken;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.hadoop.io.Text;
@@ -86,14 +85,12 @@ public abstract class InputFormatBase<K,
    * 
    * @param job
    *          the Hadoop job instance to be configured
-   * @param user
-   *          a valid Accumulo user name (user must have Table.CREATE permission)
-   * @param passwd
-   *          the user's password
+   * @param token
+   *          a valid AccumuloToken (user must have Table.CREATE permission)
    * @since 1.5.0
    */
-  public static void setConnectorInfo(JobConf job, String user, byte[] passwd) {
-    InputConfigurator.setConnectorInfo(CLASS, job, user, passwd);
+  public static void setConnectorInfo(JobConf job, AccumuloToken<?,?> token) {
+    InputConfigurator.setConnectorInfo(CLASS, job, token);
   }
   
   /**
@@ -103,37 +100,24 @@ public abstract class InputFormatBase<K,
    *          the Hadoop context for the configured job
    * @return true if the connector has been configured, false otherwise
    * @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, byte[])
+   * @see #setConnectorInfo(JobConf, AccumuloToken)
    */
   protected static Boolean isConnectorInfoSet(JobConf job) {
     return InputConfigurator.isConnectorInfoSet(CLASS, job);
   }
   
   /**
-   * Gets the user name from the configuration.
+   * Gets the AccumuloToken from the configuration. WARNING: The serialized token 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.
    * 
    * @param job
    *          the Hadoop context for the configured job
-   * @return the user name
+   * @return the decoded user Token
    * @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, byte[])
+   * @see #setConnectorInfo(JobConf, AccumuloToken)
    */
-  protected static String getUsername(JobConf job) {
-    return InputConfigurator.getUsername(CLASS, job);
-  }
-  
-  /**
-   * Gets the password from the configuration. 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.
-   * 
-   * @param job
-   *          the Hadoop context for the configured job
-   * @return the decoded user password
-   * @since 1.5.0
-   * @see #setConnectorInfo(JobConf, String, byte[])
-   */
-  protected static byte[] getPassword(JobConf job) {
-    return InputConfigurator.getPassword(CLASS, job);
+  protected static AccumuloToken<?,?> getToken(JobConf job) {
+    return InputConfigurator.getToken(CLASS, job);
   }
   
   /**
@@ -541,18 +525,16 @@ public abstract class InputFormatBase<K,
       split = (RangeInputSplit) inSplit;
       log.debug("Initializing input split: " + split.getRange());
       Instance instance = getInstance(job);
-      String user = getUsername(job);
-      byte[] password = getPassword(job);
+      AccumuloToken<?,?> token = getToken(job);
       Authorizations authorizations = getScanAuthorizations(job);
       
       try {
-        log.debug("Creating connector with user: " + user);
-        Connector conn = instance.getConnector(user, password);
+        log.debug("Creating connector with user: " + token.getPrincipal());
+        Connector conn = instance.getConnector(token);
         log.debug("Creating scanner for table: " + getInputTableName(job));
         log.debug("Authorizations are: " + authorizations);
         if (isOfflineScan(job)) {
-          scanner = new OfflineScanner(instance, new AuthInfo(user, ByteBuffer.wrap(password), instance.getInstanceID()), Tables.getTableId(instance,
-              getInputTableName(job)), authorizations);
+          scanner = new OfflineScanner(instance, token, Tables.getTableId(instance, getInputTableName(job)), authorizations);
         } else {
           scanner = conn.createScanner(getInputTableName(job), authorizations);
         }
@@ -613,7 +595,7 @@ public abstract class InputFormatBase<K,
     Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
     
     Instance instance = getInstance(job);
-    Connector conn = instance.getConnector(getUsername(job), getPassword(job));
+    Connector conn = instance.getConnector(getToken(job));
     String tableId = Tables.getTableId(instance, tableName);
     
     if (Tables.getTableState(instance, tableId) != TableState.OFFLINE) {

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java Fri Jan 25 03:56:14 2013
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.client.mapreduce.util.FileOutputConfigurator;
+import org.apache.accumulo.core.client.mapreduce.lib.util.FileOutputConfigurator;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.ArrayByteSequence;

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java Fri Jan 25 03:56:14 2013
@@ -34,7 +34,7 @@ import org.apache.accumulo.core.client.M
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.client.mapreduce.util.OutputConfigurator;
+import org.apache.accumulo.core.client.mapreduce.lib.util.OutputConfigurator;
 import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.data.ColumnUpdate;
 import org.apache.accumulo.core.data.KeyExtent;

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java Fri Jan 25 03:56:14 2013
@@ -50,6 +50,7 @@ public class AccumuloRowInputFormat exte
   @Override
   public RecordReader<Text,PeekingIterator<Entry<Key,Value>>> createRecordReader(InputSplit split, TaskAttemptContext context) throws IOException,
       InterruptedException {
+    log.setLevel(getLogLevel(context));
     return new RecordReaderBase<Text,PeekingIterator<Entry<Key,Value>>>() {
       RowIterator rowIterator;
       

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Fri Jan 25 03:56:14 2013
@@ -51,7 +51,7 @@ import org.apache.accumulo.core.client.Z
 import org.apache.accumulo.core.client.impl.OfflineScanner;
 import org.apache.accumulo.core.client.impl.Tables;
 import org.apache.accumulo.core.client.impl.TabletLocator;
-import org.apache.accumulo.core.client.mapreduce.util.InputConfigurator;
+import org.apache.accumulo.core.client.mapreduce.lib.util.InputConfigurator;
 import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.Key;
@@ -84,7 +84,7 @@ import org.apache.log4j.Logger;
  * Subclasses must implement a {@link #createRecordReader(InputSplit, TaskAttemptContext)} to provide a {@link RecordReader} for K,V.
  * <p>
  * A static base class, RecordReaderBase, is provided to retrieve Accumulo {@link Key}/{@link Value} pairs, but one must implement its
- * RecordReaderBase.nextKeyValue() to transform them to the desired generic types K,V.
+ * {@link RecordReaderBase#nextKeyValue()} to transform them to the desired generic types K,V.
  * <p>
  * See {@link AccumuloInputFormat} for an example implementation.
  */
@@ -113,7 +113,7 @@ public abstract class InputFormatBase<K,
    *          the Hadoop context for the configured job
    * @return true if the connector has been configured, false otherwise
    * @since 1.5.0
-   * @see #setConnectorInfo(Job, String, byte[])
+   * @see #setConnectorInfo(Job, AccumuloToken)
    */
   protected static Boolean isConnectorInfoSet(JobContext context) {
     return InputConfigurator.isConnectorInfoSet(CLASS, context.getConfiguration());
@@ -126,7 +126,7 @@ public abstract class InputFormatBase<K,
    *          the Hadoop context for the configured job
    * @return the user name
    * @since 1.5.0
-   * @see #setConnectorInfo(Job, String, byte[])
+   * @see #setConnectorInfo(Job, AccumuloToken)
    */
   protected static AccumuloToken<?,?> getToken(JobContext context) {
     return InputConfigurator.getToken(CLASS, context.getConfiguration());
@@ -823,6 +823,11 @@ public abstract class InputFormatBase<K,
       this.setLocations(split.getLocations());
     }
     
+    protected RangeInputSplit(String table, Range range, String[] locations) {
+      this.range = range;
+      this.locations = locations;
+    }
+    
     public Range getRange() {
       return range;
     }
@@ -870,11 +875,6 @@ public abstract class InputFormatBase<K,
       return 0f;
     }
     
-    RangeInputSplit(String table, Range range, String[] locations) {
-      this.range = range;
-      this.locations = locations;
-    }
-    
     /**
      * This implementation of length is only an estimate, it does not provide exact values. Do not have your code rely on this return value.
      */

Copied: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java (from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java)
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java?p2=accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java&p1=accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java&r1=1438259&r2=1438312&rev=1438312&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java Fri Jan 25 03:56:14 2013
@@ -16,13 +16,12 @@
  */
 package org.apache.accumulo.core.client.mapreduce.lib.util;
 
-import java.nio.charset.Charset;
-
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.mock.MockInstance;
+import org.apache.accumulo.core.security.tokens.AccumuloToken;
+import org.apache.accumulo.core.security.tokens.TokenHelper;
 import org.apache.accumulo.core.util.ArgumentChecker;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.log4j.Level;
@@ -39,7 +38,7 @@ public class ConfiguratorBase {
    * @since 1.5.0
    */
   public static enum ConnectorInfo {
-    IS_CONFIGURED, USER_NAME, PASSWORD
+    IS_CONFIGURED, TOKEN
   }
   
   /**
@@ -81,20 +80,17 @@ public class ConfiguratorBase {
    *          the class whose name will be used as a prefix for the property configuration key
    * @param conf
    *          the Hadoop configuration object to configure
-   * @param user
-   *          a valid Accumulo user name
-   * @param passwd
-   *          the user's password
+   * @param token
+   *          a valid AccumuloToken
    * @since 1.5.0
    */
-  public static void setConnectorInfo(Class<?> implementingClass, Configuration conf, String user, byte[] passwd) {
+  public static void setConnectorInfo(Class<?> implementingClass, Configuration conf, AccumuloToken<?,?> token) {
     if (isConnectorInfoSet(implementingClass, conf))
       throw new IllegalStateException("Connector info for " + implementingClass.getSimpleName() + " can only be set once per job");
     
-    ArgumentChecker.notNull(user, passwd);
+    ArgumentChecker.notNull(token);
     conf.setBoolean(enumToConfKey(implementingClass, ConnectorInfo.IS_CONFIGURED), true);
-    conf.set(enumToConfKey(implementingClass, ConnectorInfo.USER_NAME), user);
-    conf.set(enumToConfKey(implementingClass, ConnectorInfo.PASSWORD), new String(Base64.encodeBase64(passwd), Charset.forName("UTF-8")));
+    conf.set(enumToConfKey(implementingClass, ConnectorInfo.TOKEN), TokenHelper.asBase64String(token));
   }
   
   /**
@@ -112,34 +108,19 @@ public class ConfiguratorBase {
   }
   
   /**
-   * Gets the user name from the configuration.
-   * 
-   * @param implementingClass
-   *          the class whose name will be used as a prefix for the property configuration key
-   * @param conf
-   *          the Hadoop configuration object to configure
-   * @return the user name
-   * @since 1.5.0
-   * @see #setConnectorInfo(Class, Configuration, String, byte[])
-   */
-  public static String getUsername(Class<?> implementingClass, Configuration conf) {
-    return conf.get(enumToConfKey(implementingClass, ConnectorInfo.USER_NAME));
-  }
-  
-  /**
-   * Gets the password from the configuration. 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.
+   * Gets the AccumuloToken from the configuration. WARNING: The serialized Token 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.
    * 
    * @param implementingClass
    *          the class whose name will be used as a prefix for the property configuration key
    * @param conf
    *          the Hadoop configuration object to configure
-   * @return the decoded user password
+   * @return the AccumuloToken
    * @since 1.5.0
-   * @see #setConnectorInfo(Class, Configuration, String, byte[])
+   * @see #setConnectorInfo(Class, Configuration, AccumuloToken)
    */
-  public static byte[] getPassword(Class<?> implementingClass, Configuration conf) {
-    return Base64.decodeBase64(conf.get(enumToConfKey(implementingClass, ConnectorInfo.PASSWORD), "").getBytes(Charset.forName("UTF-8")));
+  public static AccumuloToken<?,?> getToken(Class<?> implementingClass, Configuration conf) {
+    return TokenHelper.fromBase64String(conf.get(enumToConfKey(implementingClass, ConnectorInfo.TOKEN)));
   }
   
   /**

Copied: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java (from r1438259, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java)
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java?p2=accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java&p1=accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java&r1=1438259&r2=1438312&rev=1438312&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java Fri Jan 25 03:56:14 2013
@@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -47,7 +46,7 @@ import org.apache.accumulo.core.data.Ran
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.TablePermission;
-import org.apache.accumulo.core.security.thrift.AuthInfo;
+import org.apache.accumulo.core.security.tokens.AccumuloToken;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.TextUtil;
@@ -481,11 +480,9 @@ public class InputConfigurator extends C
     if ("MockInstance".equals(instanceType))
       return new MockTabletLocator();
     Instance instance = getInstance(implementingClass, conf);
-    String username = getUsername(implementingClass, conf);
-    byte[] password = getPassword(implementingClass, conf);
+    AccumuloToken<?,?> token = getToken(implementingClass, conf);
     String tableName = getInputTableName(implementingClass, conf);
-    return TabletLocator.getInstance(instance, new AuthInfo(username, ByteBuffer.wrap(password), instance.getInstanceID()),
-        new Text(Tables.getTableId(instance, tableName)));
+    return TabletLocator.getInstance(instance, token, new Text(Tables.getTableId(instance, tableName)));
   }
   
   // InputFormat doesn't have the equivalent of OutputFormat's checkOutputSpecs(JobContext job)
@@ -508,10 +505,10 @@ public class InputConfigurator extends C
       throw new IOException("Instance info has not been set.");
     // validate that we can connect as configured
     try {
-      Connector c = getInstance(implementingClass, conf).getConnector(getUsername(implementingClass, conf), getPassword(implementingClass, conf));
-      if (!c.securityOperations().authenticateUser(getUsername(implementingClass, conf), getPassword(implementingClass, conf)))
+      Connector c = getInstance(implementingClass, conf).getConnector(getToken(implementingClass, conf));
+      if (!c.securityOperations().authenticateUser(getToken(implementingClass, conf)))
         throw new IOException("Unable to authenticate user");
-      if (!c.securityOperations().hasTablePermission(getUsername(implementingClass, conf), getInputTableName(implementingClass, conf), TablePermission.READ))
+      if (!c.securityOperations().hasTablePermission(getToken(implementingClass, conf).getPrincipal(), getInputTableName(implementingClass, conf), TablePermission.READ))
         throw new IOException("Unable to access table");
       
       if (!conf.getBoolean(enumToConfKey(implementingClass, Features.USE_LOCAL_ITERATORS), false)) {

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java Fri Jan 25 03:56:14 2013
@@ -42,6 +42,7 @@ public class MockSecurityOperations impl
   /**
    * @deprecated Use {@link #createUser(AccumuloToken)} instead
    */
+  @Deprecated
   @Override
   public void createUser(String user, byte[] password, Authorizations authorizations) throws AccumuloException, AccumuloSecurityException {
     createUser(new UserPassToken(user, password), authorizations);

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java Fri Jan 25 03:56:14 2013
@@ -137,6 +137,7 @@ public abstract class AccumuloConfigurat
    * 
    * @deprecated not for client use
    */
+  @Deprecated
   public static synchronized AccumuloConfiguration getSiteConfiguration() {
     return SiteConfiguration.getInstance(getDefaultConfiguration());
   }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java Fri Jan 25 03:56:14 2013
@@ -280,11 +280,11 @@ public class BloomFilterLayer {
     }
     
     /**
-     * Checks if this MyMapFile has the indicated key. The membership test is performed using a Bloom filter, so the result has always non-zero probability of
+     * Checks if this {@link RFile} contains keys from this range. The membership test is performed using a Bloom filter, so the result has always non-zero probability of
      * false positives.
      * 
-     * @param key
-     *          key to check
+     * @param range
+     *          range of keys to check
      * @return false iff key doesn't exist, true if key probably exists.
      * @throws IOException
      */

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java Fri Jan 25 03:56:14 2013
@@ -159,7 +159,6 @@ public final class BCFile {
       /**
        * Current size of compressed data.
        * 
-       * @return
        * @throws IOException
        */
       long getCompressedSize() throws IOException {

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java Fri Jan 25 03:56:14 2013
@@ -877,7 +877,6 @@ public class TFile {
      *          the input key
      * @param greater
      *          boolean flag
-     * @return
      * @throws IOException
      */
     Location getBlockContainsKey(RawComparable key, boolean greater) throws IOException {

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java Fri Jan 25 03:56:14 2013
@@ -38,6 +38,7 @@ import org.apache.log4j.Logger;
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.Combiner}
  */
 
+@Deprecated
 public class AggregatingIterator implements SortedKeyValueIterator<Key,Value>, OptionDescriber {
   
   private SortedKeyValueIterator<Key,Value> iterator;

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/FamilyIntersectingIterator.java Fri Jan 25 03:56:14 2013
@@ -23,6 +23,7 @@ import org.apache.accumulo.core.iterator
  * 
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.IndexedDocIterator}
  */
+@Deprecated
 public class FamilyIntersectingIterator extends IndexedDocIterator {
   
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/GrepIterator.java Fri Jan 25 03:56:14 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
  * 
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.GrepIterator}
  */
+@Deprecated
 public class GrepIterator extends org.apache.accumulo.core.iterators.user.GrepIterator {
   
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/IntersectingIterator.java Fri Jan 25 03:56:14 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
  * 
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.IntersectingIterator}
  */
+@Deprecated
 public class IntersectingIterator extends org.apache.accumulo.core.iterators.user.IntersectingIterator {
   
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LargeRowFilter.java Fri Jan 25 03:56:14 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
  * 
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.LargeRowFilter}
  */
+@Deprecated
 public class LargeRowFilter extends org.apache.accumulo.core.iterators.user.LargeRowFilter {
   
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/RowDeletingIterator.java Fri Jan 25 03:56:14 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
  * 
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.RowDeletingIterator}
  */
+@Deprecated
 public class RowDeletingIterator extends org.apache.accumulo.core.iterators.user.RowDeletingIterator {
   
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java Fri Jan 25 03:56:14 2013
@@ -24,6 +24,7 @@ import org.apache.accumulo.core.data.Val
  * 
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.VersioningIterator}
  */
+@Deprecated
 public class VersioningIterator extends org.apache.accumulo.core.iterators.user.VersioningIterator {
   public VersioningIterator() {}
   

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/WholeRowIterator.java Fri Jan 25 03:56:14 2013
@@ -21,6 +21,7 @@ package org.apache.accumulo.core.iterato
  * 
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.WholeRowIterator}
  */
+@Deprecated
 public class WholeRowIterator extends org.apache.accumulo.core.iterators.user.WholeRowIterator {
   
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/Aggregator.java Fri Jan 25 03:56:14 2013
@@ -21,6 +21,7 @@ import org.apache.accumulo.core.data.Val
 /**
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.Combiner}
  */
+@Deprecated
 public interface Aggregator {
   void reset();
   

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java Fri Jan 25 03:56:14 2013
@@ -25,6 +25,7 @@ import org.apache.log4j.Logger;
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.SummingCombiner} with
  *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#FIXEDLEN}
  */
+@Deprecated
 public class LongSummation implements Aggregator {
   private static final Logger log = Logger.getLogger(LongSummation.class);
   long sum = 0;

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java Fri Jan 25 03:56:14 2013
@@ -29,6 +29,7 @@ import org.apache.hadoop.io.WritableUtil
  * @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}
  */
+@Deprecated
 public class NumArraySummation implements Aggregator {
   long[] sum = new long[0];
   

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java Fri Jan 25 03:56:14 2013
@@ -29,6 +29,7 @@ import org.apache.hadoop.io.WritableUtil
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.SummingCombiner} with
  *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#VARLEN}
  */
+@Deprecated
 public class NumSummation implements Aggregator {
   long sum = 0l;
   

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java Fri Jan 25 03:56:14 2013
@@ -22,6 +22,7 @@ import org.apache.accumulo.core.data.Val
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.MaxCombiner} with
  *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#STRING}
  */
+@Deprecated
 public class StringMax implements Aggregator {
   
   long max = Long.MIN_VALUE;

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java Fri Jan 25 03:56:14 2013
@@ -22,6 +22,7 @@ import org.apache.accumulo.core.data.Val
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.MinCombiner} with
  *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#STRING}
  */
+@Deprecated
 public class StringMin implements Aggregator {
   
   long min = Long.MAX_VALUE;

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java Fri Jan 25 03:56:14 2013
@@ -22,6 +22,7 @@ import org.apache.accumulo.core.data.Val
  * @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.SummingCombiner} with
  *             {@link org.apache.accumulo.core.iterators.LongCombiner.Type#STRING}
  */
+@Deprecated
 public class StringSummation implements Aggregator {
   
   long sum = 0;

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfiguration.java Fri Jan 25 03:56:14 2013
@@ -22,6 +22,7 @@ import org.apache.hadoop.io.Text;
 /**
  * @deprecated since 1.4
  */
+@Deprecated
 public class AggregatorConfiguration extends PerColumnIteratorConfig {
   
   public AggregatorConfiguration(Text columnFamily, String aggClassName) {

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java Fri Jan 25 03:56:14 2013
@@ -25,6 +25,7 @@ import org.apache.accumulo.core.iterator
 /**
  * @deprecated since 1.4
  */
+@Deprecated
 public class AggregatorSet extends ColumnToClassMapping<Aggregator> {
   public AggregatorSet(Map<String,String> opts) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
     super(opts, Aggregator.class);

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/conf/PerColumnIteratorConfig.java Fri Jan 25 03:56:14 2013
@@ -24,6 +24,7 @@ import org.apache.hadoop.io.Text;
  * @see org.apache.accumulo.core.client.IteratorSetting.Column
  * @see org.apache.accumulo.core.iterators.Combiner#setColumns(org.apache.accumulo.core.client.IteratorSetting, java.util.List)
  */
+@Deprecated
 public class PerColumnIteratorConfig {
   
   private String parameter;

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java Fri Jan 25 03:56:14 2013
@@ -607,7 +607,7 @@ abstract public class TransformingIterat
   
   /**
    * Indicates the prefix of keys that will be transformed by this iterator. In other words, this is the part of the key that will <i>not</i> be transformed by
-   * this iterator. For example, if this method returns ROW_COLFAM, then {@link #transformKey(Key)} may be changing the column qualifier, column visibility, or
+   * this iterator. For example, if this method returns ROW_COLFAM, then {@link #transformKeys()} may be changing the column qualifier, column visibility, or
    * timestamp, but it won't be changing the row or column family.
    * 
    * @return the part of the key this iterator is not transforming

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java Fri Jan 25 03:56:14 2013
@@ -75,6 +75,7 @@ public class ColumnFQ implements Compara
   /**
    * @deprecated since 1.5, use {@link #fetch(ScannerBase)} instead
    */
+  @Deprecated
   public static void fetch(ScannerBase sb, ColumnFQ cfq) {
     sb.fetchColumn(cfq.colf, cfq.colq);
   }
@@ -82,6 +83,7 @@ public class ColumnFQ implements Compara
   /**
    * @deprecated since 1.5, use {@link #put(Mutation, Value)} instead
    */
+  @Deprecated
   public static void put(Mutation m, ColumnFQ cfq, Value v) {
     m.put(cfq.colf, cfq.colq, v);
   }
@@ -89,6 +91,7 @@ public class ColumnFQ implements Compara
   /**
    * @deprecated since 1.5, use {@link #putDelete(Mutation)} instead
    */
+  @Deprecated
   public static void putDelete(Mutation m, ColumnFQ cfq) {
     m.putDelete(cfq.colf, cfq.colq);
   }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/PeekingIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/PeekingIterator.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/PeekingIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/PeekingIterator.java Fri Jan 25 03:56:14 2013
@@ -19,6 +19,8 @@ package org.apache.accumulo.core.util;
 import java.util.Iterator;
 
 public class PeekingIterator<E> implements Iterator<E> {
+  
+  boolean isInitialized;
   Iterator<E> source;
   E top;
   
@@ -28,13 +30,39 @@ public class PeekingIterator<E> implemen
       top = source.next();
     else
       top = null;
+    isInitialized = true;
+  }
+  
+  /**
+   * Creates an uninitialized instance. This should be used in conjunction with {@link #initialize(Iterator)}.
+   */
+  public PeekingIterator() {
+    isInitialized = false;
+  }
+  
+  /**
+   * Initializes this iterator, to be used with {@link #PeekingIterator()}.
+   */
+  public PeekingIterator<E> initialize(Iterator<E> source) {
+    this.source = source;
+    if (source.hasNext())
+      top = source.next();
+    else
+      top = null;
+    isInitialized = true;
+    return this;
   }
   
   public E peek() {
+    if (!isInitialized)
+      throw new IllegalStateException("Iterator has not yet been initialized");
     return top;
   }
   
+  @Override
   public E next() {
+    if (!isInitialized)
+      throw new IllegalStateException("Iterator has not yet been initialized");
     E lastPeeked = top;
     if (source.hasNext())
       top = source.next();
@@ -43,12 +71,15 @@ public class PeekingIterator<E> implemen
     return lastPeeked;
   }
   
+  @Override
   public void remove() {
     throw new UnsupportedOperationException();
   }
   
   @Override
   public boolean hasNext() {
+    if (!isInitialized)
+      throw new IllegalStateException("Iterator has not yet been initialized");
     return top != null;
   }
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Fri Jan 25 03:56:14 2013
@@ -353,6 +353,7 @@ public class Shell extends ShellOptions 
   /**
    * @deprecated Not for client use
    */
+  @Deprecated
   private static Instance getDefaultInstance(AccumuloConfiguration conf) {
     String keepers = conf.get(Property.INSTANCE_ZK_HOST);
     Path instanceDir = new Path(conf.get(Property.INSTANCE_DFS_DIR), "instance_id");

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java Fri Jan 25 03:56:14 2013
@@ -24,6 +24,7 @@ import org.apache.zookeeper.Watcher;
  * 
  * @deprecated since 1.5, replaced by {@link org.apache.accumulo.fate.zookeeper.ZooCache}
  */
+@Deprecated
 public class ZooCache extends org.apache.accumulo.fate.zookeeper.ZooCache {
   public ZooCache(String zooKeepers, int sessionTimeout) {
     super(zooKeepers, sessionTimeout);

Modified: accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java Fri Jan 25 03:56:14 2013
@@ -63,19 +63,21 @@ public class BatchWriterConfigTest {
   }
   
   @Test
-  public void testZeroTimeoutAndLatency() {
+  public void testZeroValues() {
     BatchWriterConfig bwConfig = new BatchWriterConfig();
     bwConfig.setMaxLatency(0, TimeUnit.MILLISECONDS);
     bwConfig.setTimeout(0, TimeUnit.MILLISECONDS);
+    bwConfig.setMaxMemory(0);
     
     assertEquals(Long.MAX_VALUE, bwConfig.getMaxLatency(TimeUnit.MILLISECONDS));
     assertEquals(Long.MAX_VALUE, bwConfig.getTimeout(TimeUnit.MILLISECONDS));
+    assertEquals(0, bwConfig.getMaxMemory());
   }
   
   @Test(expected = IllegalArgumentException.class)
-  public void testMaxMemoryTooLow() {
+  public void testNegativeMaxMemory() {
     BatchWriterConfig bwConfig = new BatchWriterConfig();
-    bwConfig.setMaxMemory(1024 - 1);
+    bwConfig.setMaxMemory(-1);
   }
   
   @Test(expected = IllegalArgumentException.class)
@@ -84,6 +86,27 @@ public class BatchWriterConfigTest {
     bwConfig.setMaxLatency(-1, TimeUnit.DAYS);
   }
   
+  @Test
+  public void testTinyTimeConversions() {
+    BatchWriterConfig bwConfig = new BatchWriterConfig();
+    bwConfig.setMaxLatency(999, TimeUnit.MICROSECONDS);
+    bwConfig.setTimeout(999, TimeUnit.MICROSECONDS);
+    
+    assertEquals(1000, bwConfig.getMaxLatency(TimeUnit.MICROSECONDS));
+    assertEquals(1000, bwConfig.getTimeout(TimeUnit.MICROSECONDS));
+    assertEquals(1, bwConfig.getMaxLatency(TimeUnit.MILLISECONDS));
+    assertEquals(1, bwConfig.getTimeout(TimeUnit.MILLISECONDS));
+    
+    bwConfig.setMaxLatency(10, TimeUnit.NANOSECONDS);
+    bwConfig.setTimeout(10, TimeUnit.NANOSECONDS);
+    
+    assertEquals(1000000, bwConfig.getMaxLatency(TimeUnit.NANOSECONDS));
+    assertEquals(1000000, bwConfig.getTimeout(TimeUnit.NANOSECONDS));
+    assertEquals(1, bwConfig.getMaxLatency(TimeUnit.MILLISECONDS));
+    assertEquals(1, bwConfig.getTimeout(TimeUnit.MILLISECONDS));
+    
+  }
+  
   @Test(expected = IllegalArgumentException.class)
   public void testNegativeTimeout() {
     BatchWriterConfig bwConfig = new BatchWriterConfig();



Mime
View raw message