accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1437726 [1/10] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB/native-standalone/ co...
Date Wed, 23 Jan 2013 20:52:04 GMT
Author: vines
Date: Wed Jan 23 20:51:59 2013
New Revision: 1437726

URL: http://svn.apache.org/viewvc?rev=1437726&view=rev
Log:
ACCUMULO-259 - merging up to r1437605


Added:
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/
      - copied from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/ConfiguratorBase.java
      - copied, changed from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/ConfiguratorBase.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/FileOutputConfigurator.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/FileOutputConfigurator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java
      - copied, changed from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/InputConfigurator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/OutputConfigurator.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/OutputConfigurator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/package-info.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/util/package-info.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/TransformingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ActiveCompactionIterator.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ActiveCompactionIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddAuthsCommand.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddAuthsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListCompactionsCommand.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ListCompactionsCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PingCommand.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PingCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PingIterator.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/PingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/BatchWriterConfigTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
      - copied unchanged from r1437607, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/TransformingIteratorTest.java
    accumulo/branches/ACCUMULO-259/proxy/   (props changed)
      - copied from r1437607, accumulo/trunk/proxy/
    accumulo/branches/ACCUMULO-259/proxy/README
      - copied unchanged from r1437607, accumulo/trunk/proxy/README
    accumulo/branches/ACCUMULO-259/proxy/examples/
      - copied from r1437607, accumulo/trunk/proxy/examples/
    accumulo/branches/ACCUMULO-259/proxy/examples/python/
      - copied from r1437607, accumulo/trunk/proxy/examples/python/
    accumulo/branches/ACCUMULO-259/proxy/examples/python/README
      - copied unchanged from r1437607, accumulo/trunk/proxy/examples/python/README
    accumulo/branches/ACCUMULO-259/proxy/examples/python/TestClient.py
      - copied unchanged from r1437607, accumulo/trunk/proxy/examples/python/TestClient.py
    accumulo/branches/ACCUMULO-259/proxy/examples/ruby/
      - copied from r1437607, accumulo/trunk/proxy/examples/ruby/
    accumulo/branches/ACCUMULO-259/proxy/examples/ruby/README
      - copied unchanged from r1437607, accumulo/trunk/proxy/examples/ruby/README
    accumulo/branches/ACCUMULO-259/proxy/examples/ruby/test_client.rb
      - copied unchanged from r1437607, accumulo/trunk/proxy/examples/ruby/test_client.rb
    accumulo/branches/ACCUMULO-259/proxy/pom.xml
      - copied unchanged from r1437607, accumulo/trunk/proxy/pom.xml
    accumulo/branches/ACCUMULO-259/proxy/proxy.properties
      - copied unchanged from r1437607, accumulo/trunk/proxy/proxy.properties
    accumulo/branches/ACCUMULO-259/proxy/src/
      - copied from r1437607, accumulo/trunk/proxy/src/
    accumulo/branches/ACCUMULO-259/proxy/src/main/
      - copied from r1437607, accumulo/trunk/proxy/src/main/
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/
      - copied from r1437607, accumulo/trunk/proxy/src/main/java/
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/
      - copied from r1437607, accumulo/trunk/proxy/src/main/java/org/
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/
      - copied from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/
      - copied from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/
      - copied from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/TestProxyClient.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/Util.java
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/Util.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/
      - copied from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
      - copied, changed from r1437607, accumulo/trunk/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
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Range.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UserPass.java
      - copied, changed from r1437607, accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UserPass.java
    accumulo/branches/ACCUMULO-259/proxy/src/main/scripts/
      - copied from r1437607, accumulo/trunk/proxy/src/main/scripts/
    accumulo/branches/ACCUMULO-259/proxy/src/main/scripts/generate-thrift.sh
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/main/scripts/generate-thrift.sh
    accumulo/branches/ACCUMULO-259/proxy/src/main/thrift/
      - copied from r1437607, accumulo/trunk/proxy/src/main/thrift/
    accumulo/branches/ACCUMULO-259/proxy/src/main/thrift/proxy.thrift
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/main/thrift/proxy.thrift
    accumulo/branches/ACCUMULO-259/proxy/src/test/
      - copied from r1437607, accumulo/trunk/proxy/src/test/
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/
      - copied from r1437607, accumulo/trunk/proxy/src/test/java/
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/
      - copied from r1437607, accumulo/trunk/proxy/src/test/java/org/
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/
      - copied from r1437607, accumulo/trunk/proxy/src/test/java/org/apache/
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/
      - copied from r1437607, accumulo/trunk/proxy/src/test/java/org/apache/accumulo/
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/
      - copied from r1437607, accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyInstanceOperations.java
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyInstanceOperations.java
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyReadWrite.java
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/TestProxySecurityOperations.java
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxySecurityOperations.java
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java
      - copied unchanged from r1437607, accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java
    accumulo/branches/ACCUMULO-259/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java
      - copied unchanged from r1437607, accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloConfig.java
Removed:
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ContextFactory.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/helloworld/InsertWithOutputFormat.java
    accumulo/branches/ACCUMULO-259/test/src/main/java/org/apache/accumulo/test/MacConfig.java
Modified:
    accumulo/branches/ACCUMULO-259/   (props changed)
    accumulo/branches/ACCUMULO-259/assemble/   (props changed)
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml
    accumulo/branches/ACCUMULO-259/core/   (props changed)
    accumulo/branches/ACCUMULO-259/core/pom.xml
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
    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/admin/ActiveScan.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.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/impl/OfflineScanner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.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/AccumuloInputFormat.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/MockInstanceOperations.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/data/ColumnUpdate.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/PartialKey.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.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/Combiner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/Filter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/IntersectingIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/LargeRowFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/user/VersioningIterator.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.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/util/shell/commands/DeleteCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InsertCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/InterpreterCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java
    accumulo/branches/ACCUMULO-259/core/src/main/thrift/tabletserver.thrift
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
    accumulo/branches/ACCUMULO-259/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
    accumulo/branches/ACCUMULO-259/docs/examples/README.helloworld
    accumulo/branches/ACCUMULO-259/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java
    accumulo/branches/ACCUMULO-259/examples/instamo/src/test/java/org/apache/accumulo/instamo/ExampleAccumuloUnitTest.java
    accumulo/branches/ACCUMULO-259/examples/simple/pom.xml
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/ReadWriteExample.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/combiner/StatsCombiner.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/dirlist/Viewer.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/FileDataQuery.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java
    accumulo/branches/ACCUMULO-259/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java
    accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/TStore.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/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
    accumulo/branches/ACCUMULO-259/packages/   (props changed)
    accumulo/branches/ACCUMULO-259/pom.xml
    accumulo/branches/ACCUMULO-259/server/   (props changed)
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/logger/LogReader.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/SecurityUtil.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/MinorCompactor.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/test/continuous/ContinuousMoru.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousVerify.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/continuous/GenSplits.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/FunctionalTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/functional/VisibilityTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/CopyTool.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/MapRedVerifyTool.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/Admin.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
    accumulo/branches/ACCUMULO-259/src/   (props changed)
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java
    accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
    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
    accumulo/branches/ACCUMULO-259/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java
    accumulo/branches/ACCUMULO-259/test/system/auto/simple/examples.py
    accumulo/branches/ACCUMULO-259/trace/pom.xml

Propchange: accumulo/branches/ACCUMULO-259/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1433135-1437607

Propchange: accumulo/branches/ACCUMULO-259/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/assemble:r1433135-1437607

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/native-standalone/accumulo-site.xml Wed Jan 23 20:51:59 2013
@@ -98,6 +98,8 @@
     $ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
+    $ACCUMULO_HOME/proxy/target/classes/,
     $ACCUMULO_HOME/examples/target/classes/,
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,

Modified: accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/1GB/standalone/accumulo-site.xml Wed Jan 23 20:51:59 2013
@@ -93,6 +93,8 @@
     $ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
+    $ACCUMULO_HOME/proxy/target/classes/,
     $ACCUMULO_HOME/examples/target/classes/,
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/native-standalone/accumulo-site.xml Wed Jan 23 20:51:59 2013
@@ -88,6 +88,8 @@
     $ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
+    $ACCUMULO_HOME/proxy/target/classes/,
     $ACCUMULO_HOME/examples/target/classes/,
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,

Modified: accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/2GB/standalone/accumulo-site.xml Wed Jan 23 20:51:59 2013
@@ -88,6 +88,8 @@
     $ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
+    $ACCUMULO_HOME/proxy/target/classes/,
     $ACCUMULO_HOME/examples/target/classes/,
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/native-standalone/accumulo-site.xml Wed Jan 23 20:51:59 2013
@@ -83,6 +83,8 @@
     $ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
+    $ACCUMULO_HOME/proxy/target/classes/,
     $ACCUMULO_HOME/examples/target/classes/,
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,

Modified: accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/3GB/standalone/accumulo-site.xml Wed Jan 23 20:51:59 2013
@@ -83,6 +83,8 @@
     $ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
+    $ACCUMULO_HOME/proxy/target/classes/,
     $ACCUMULO_HOME/examples/target/classes/,
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/native-standalone/accumulo-site.xml Wed Jan 23 20:51:59 2013
@@ -93,6 +93,8 @@
     $ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
+    $ACCUMULO_HOME/proxy/target/classes/,
     $ACCUMULO_HOME/examples/target/classes/,
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,

Modified: accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-259/conf/examples/512MB/standalone/accumulo-site.xml Wed Jan 23 20:51:59 2013
@@ -93,6 +93,8 @@
     $ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
+    $ACCUMULO_HOME/fate/target/classes/,
+    $ACCUMULO_HOME/proxy/target/classes/,
     $ACCUMULO_HOME/examples/target/classes/,
 	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 	$ACCUMULO_HOME/lib/[^.].*.jar,

Propchange: accumulo/branches/ACCUMULO-259/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1433135-1437607

Modified: accumulo/branches/ACCUMULO-259/core/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/pom.xml?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/pom.xml (original)
+++ accumulo/branches/ACCUMULO-259/core/pom.xml Wed Jan 23 20:51:59 2013
@@ -44,7 +44,7 @@
         <artifactId>exec-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>generate-core-thrift</id>
+            <id>generate-thrift</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>exec</goal>
@@ -106,6 +106,14 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-client</artifactId>
         </dependency>
+        <dependency>
+          <groupId>commons-httpclient</groupId>
+          <artifactId>commons-httpclient</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.avro</groupId>
+          <artifactId>avro</artifactId>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnDefaultTable.java Wed Jan 23 20:51:59 2013
@@ -29,7 +29,7 @@ public class ClientOnDefaultTable extend
     this.defaultTable = table;
   }
   
-  @Parameter(names="--table", description="table to use")
+  @Parameter(names = "--table", description = "table to use")
   String tableName;
   
   public String getTableName() {
@@ -38,10 +38,15 @@ public class ClientOnDefaultTable extend
     return tableName;
   }
   
+  @Override
   public void setAccumuloConfigs(Job job) {
     super.setAccumuloConfigs(job);
-    AccumuloInputFormat.setInputInfo(job.getConfiguration(), user, getPassword(), getTableName(), auths);
-    AccumuloOutputFormat.setOutputInfo(job.getConfiguration(), user, getPassword(), true, getTableName());
+    AccumuloInputFormat.setConnectorInfo(job, getAccumuloToken());
+    AccumuloInputFormat.setInputTableName(job, getTableName());
+    AccumuloInputFormat.setScanAuthorizations(job, auths);
+    AccumuloOutputFormat.setConnectorInfo(job, getAccumuloToken());
+    AccumuloOutputFormat.setCreateTables(job, true);
+    AccumuloOutputFormat.setDefaultTableName(job, getTableName());
   }
-
+  
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOnRequiredTable.java Wed Jan 23 20:51:59 2013
@@ -24,13 +24,17 @@ import com.beust.jcommander.Parameter;
 
 public class ClientOnRequiredTable extends ClientOpts {
   
-  @Parameter(names={"-t", "--table"}, required=true, description="table to use")
+  @Parameter(names = {"-t", "--table"}, required = true, description = "table to use")
   public String tableName = null;
-
+  
   @Override
   public void setAccumuloConfigs(Job job) {
     super.setAccumuloConfigs(job);
-    AccumuloInputFormat.setInputInfo(job.getConfiguration(), user, getPassword(), tableName, auths);
-    AccumuloOutputFormat.setOutputInfo(job.getConfiguration(), user, getPassword(), true, tableName);
+    AccumuloInputFormat.setConnectorInfo(job, getAccumuloToken());
+    AccumuloInputFormat.setInputTableName(job, tableName);
+    AccumuloInputFormat.setScanAuthorizations(job, auths);
+    AccumuloOutputFormat.setConnectorInfo(job, getAccumuloToken());
+    AccumuloOutputFormat.setCreateTables(job, true);
+    AccumuloOutputFormat.setDefaultTableName(job, tableName);
   }
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java Wed Jan 23 20:51:59 2013
@@ -16,7 +16,6 @@
  */
 package org.apache.accumulo.core.cli;
 
-import java.nio.ByteBuffer;
 import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.TreeMap;
@@ -37,7 +36,6 @@ import org.apache.accumulo.core.conf.Def
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.core.security.tokens.AccumuloToken;
 import org.apache.accumulo.core.security.tokens.InstanceTokenWrapper;
 import org.apache.accumulo.core.security.tokens.UserPassToken;
 import org.apache.hadoop.conf.Configuration;
@@ -107,11 +105,11 @@ public class ClientOpts extends Help {
   @Parameter(names = "--password", converter = PasswordConverter.class, description = "Enter the connection password", password = true)
   public Password securePassword = null;
   
-  public byte[] getPassword() {
+  public UserPassToken getAccumuloToken() {
     if (securePassword == null) {
-      return password.value;
+      return new UserPassToken(user, password.value);
     }
-    return securePassword.value;
+    return new UserPassToken(user, securePassword.value);
   }
   
   @Parameter(names = {"-z", "--keepers"}, description = "Comma separated list of zookeeper hosts (host:port,host:port)")
@@ -150,6 +148,7 @@ public class ClientOpts extends Help {
     Trace.off();
   }
   
+  @Override
   public void parseArgs(String programName, String[] args, Object... others) {
     super.parseArgs(programName, args, others);
     startDebugLogging();
@@ -197,11 +196,7 @@ public class ClientOpts extends Help {
   }
   
   public Connector getConnector() throws AccumuloException, AccumuloSecurityException {
-    return getInstance().getConnector(this.user, this.getPassword());
-  }
-  
-  public AccumuloToken<?,?> getAccumuloToken() {
-    return new UserPassToken(user, ByteBuffer.wrap(getPassword()));
+    return getInstance().getConnector(this.getAccumuloToken());
   }
   
   public InstanceTokenWrapper getWrappedToken() {
@@ -209,8 +204,8 @@ public class ClientOpts extends Help {
   }
   
   public void setAccumuloConfigs(Job job) {
-    AccumuloInputFormat.setZooKeeperInstance(job.getConfiguration(), instance, zookeepers);
-    AccumuloOutputFormat.setZooKeeperInstance(job.getConfiguration(), instance, zookeepers);
+    AccumuloInputFormat.setZooKeeperInstance(job, instance, zookeepers);
+    AccumuloOutputFormat.setZooKeeperInstance(job, instance, zookeepers);
   }
   
 }

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=1437726&r1=1437725&r2=1437726&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 Wed Jan 23 20:51:59 2013
@@ -16,25 +16,43 @@
  */
 package org.apache.accumulo.core.client;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.util.StringUtils;
+
 /**
  * This object holds configuration settings used to instantiate a {@link BatchWriter}
  */
-public class BatchWriterConfig {
-  private long maxMemory = 50 * 1024 * 1024;
-  private long maxLatency = 120000;
-  private long timeout = Long.MAX_VALUE;
-  private int maxWriteThreads = 3;
+public class BatchWriterConfig implements Writable {
+  
+  private static final Long DEFAULT_MAX_MEMORY = 50 * 1024 * 1024l;
+  private Long maxMemory = null;
+  
+  private static final Long DEFAULT_MAX_LATENCY = 2 * 60 * 1000l;
+  private Long maxLatency = null;
+  
+  private static final Long DEFAULT_TIMEOUT = Long.MAX_VALUE;
+  private Long timeout = null;
+  
+  private static final Integer DEFAULT_MAX_WRITE_THREADS = 3;
+  private Integer maxWriteThreads = null;
   
   /**
    * 
    * @param maxMemory
-   *          size in bytes of the maximum memory to batch before writing. Defaults to 50M.
-   * @return
+   *          size in bytes of the maximum memory to batch before writing. Minimum 1K. Defaults to 50M.
    */
-
+  
   public BatchWriterConfig setMaxMemory(long maxMemory) {
+    if (maxMemory < 1024)
+      throw new IllegalArgumentException("Max memory is too low at " + maxMemory + ". Minimum 1K.");
     this.maxMemory = maxMemory;
     return this;
   }
@@ -47,11 +65,11 @@ public class BatchWriterConfig {
    *          Determines how maxLatency will be interpreted.
    * @return 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);
-
+    
     if (maxLatency == 0)
       this.maxLatency = Long.MAX_VALUE;
     else
@@ -67,7 +85,7 @@ public class BatchWriterConfig {
    * @param timeUnit
    * @return 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);
@@ -84,28 +102,86 @@ public class BatchWriterConfig {
    *          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
    */
-
+  
   public BatchWriterConfig setMaxWriteThreads(int maxWriteThreads) {
     if (maxWriteThreads <= 0)
       throw new IllegalArgumentException("Max threads must be positive " + maxWriteThreads);
-
+    
     this.maxWriteThreads = maxWriteThreads;
     return this;
   }
-
+  
   public long getMaxMemory() {
-    return maxMemory;
+    return maxMemory != null ? maxMemory : DEFAULT_MAX_MEMORY;
   }
   
   public long getMaxLatency(TimeUnit timeUnit) {
-    return timeUnit.convert(maxLatency, TimeUnit.MILLISECONDS);
+    return timeUnit.convert(maxLatency != null ? maxLatency : DEFAULT_MAX_LATENCY, TimeUnit.MILLISECONDS);
   }
   
   public long getTimeout(TimeUnit timeUnit) {
-    return timeUnit.convert(timeout, TimeUnit.MILLISECONDS);
+    return timeUnit.convert(timeout != null ? timeout : DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
   }
   
   public int getMaxWriteThreads() {
-    return maxWriteThreads;
+    return maxWriteThreads != null ? maxWriteThreads : DEFAULT_MAX_WRITE_THREADS;
+  }
+  
+  @Override
+  public void write(DataOutput out) throws IOException {
+    // write this out in a human-readable way
+    ArrayList<String> fields = new ArrayList<String>();
+    if (maxMemory != null)
+      addField(fields, "maxMemory", maxMemory);
+    if (maxLatency != null)
+      addField(fields, "maxLatency", maxLatency);
+    if (maxWriteThreads != null)
+      addField(fields, "maxWriteThreads", maxWriteThreads);
+    if (timeout != null)
+      addField(fields, "timeout", timeout);
+    String output = StringUtils.join(",", fields);
+    
+    byte[] bytes = output.getBytes(Charset.forName("UTF-8"));
+    byte[] len = String.format("%6s#", Integer.toString(bytes.length, 36)).getBytes("UTF-8");
+    if (len.length != 7)
+      throw new IllegalStateException("encoded length does not match expected value");
+    out.write(len);
+    out.write(bytes);
+  }
+  
+  private void addField(List<String> fields, String name, Object value) {
+    String key = StringUtils.escapeString(name, '\\', new char[] {',', '='});
+    String val = StringUtils.escapeString(String.valueOf(value), '\\', new char[] {',', '='});
+    fields.add(key + '=' + val);
+  }
+  
+  @Override
+  public void readFields(DataInput in) throws IOException {
+    byte[] len = new byte[7];
+    in.readFully(len);
+    String strLen = new String(len, Charset.forName("UTF-8"));
+    if (!strLen.endsWith("#"))
+      throw new IllegalStateException("length was not encoded correctly");
+    byte[] bytes = new byte[Integer.parseInt(strLen.substring(strLen.lastIndexOf(' ') + 1, strLen.length() - 1), 36)];
+    in.readFully(bytes);
+    
+    String strFields = new String(bytes, Charset.forName("UTF-8"));
+    String[] fields = StringUtils.split(strFields, '\\', ',');
+    for (String field : fields) {
+      String[] keyValue = StringUtils.split(field, '\\', '=');
+      String key = keyValue[0];
+      String value = keyValue[1];
+      if ("maxMemory".equals(key)) {
+        maxMemory = Long.valueOf(value);
+      } else if ("maxLatency".equals(key)) {
+        maxLatency = Long.valueOf(value);
+      } else if ("maxWriteThreads".equals(key)) {
+        maxWriteThreads = Integer.valueOf(value);
+      } else if ("timeout".equals(key)) {
+        timeout = Long.valueOf(value);
+      } else {
+        /* ignore any other properties */
+      }
+    }
   }
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveScan.java Wed Jan 23 20:51:59 2013
@@ -163,8 +163,15 @@ public class ActiveScan {
   /**
    * @return the authorizations being used for this scan
    */
-    
+  
   public Authorizations getAuthorizations() {
     return authorizations;
   }
+  
+  /**
+   * @return the time this scan has been idle in the tablet server
+   */
+  public long getIdleTime() {
+    return idle;
+  }
 }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperations.java Wed Jan 23 20:51:59 2013
@@ -78,6 +78,27 @@ public interface InstanceOperations {
   public List<ActiveScan> getActiveScans(String tserver) throws AccumuloException, AccumuloSecurityException;
   
   /**
+   * List the active compaction running on a tablet server
+   * 
+   * @param tserver
+   *          The tablet server address should be of the form <ip address>:<port>
+   * @return the list of active compactions
+   * @throws AccumuloException
+   * @throws AccumuloSecurityException
+   */
+  
+  public List<ActiveCompaction> getActiveCompactions(String tserver) throws AccumuloException, AccumuloSecurityException;
+  
+  /**
+   * Throws an exception if a tablet server can not be contacted.
+   * 
+   * @param tserver
+   *          The tablet server address should be of the form <ip address>:<port>
+   * @throws AccumuloException
+   */
+  public void ping(String tserver) throws AccumuloException;
+  
+  /**
    * Test to see if the instance can load the given class as the given type.
    * 
    * @param className

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java Wed Jan 23 20:51:59 2013
@@ -35,11 +35,14 @@ import org.apache.accumulo.core.client.i
 import org.apache.accumulo.core.client.impl.thrift.ConfigurationType;
 import org.apache.accumulo.core.master.thrift.MasterClientService;
 import org.apache.accumulo.core.security.tokens.InstanceTokenWrapper;
-import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
+import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
+import org.apache.thrift.TException;
+import org.apache.thrift.transport.TTransportException;
 
 /**
  * Provides a class for administering the accumulo instance
@@ -60,9 +63,6 @@ public class InstanceOperationsImpl impl
     this.credentials = credentials;
   }
   
-  /* (non-Javadoc)
-   * @see org.apache.accumulo.core.client.admin.InstanceOperations#setProperty(java.lang.String, java.lang.String)
-   */
   @Override
   public void setProperty(final String property, final String value) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(property, value);
@@ -74,9 +74,6 @@ public class InstanceOperationsImpl impl
     });
   }
   
-  /* (non-Javadoc)
-   * @see org.apache.accumulo.core.client.admin.InstanceOperations#removeProperty(java.lang.String)
-   */
   @Override
   public void removeProperty(final String property) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(property);
@@ -88,9 +85,6 @@ public class InstanceOperationsImpl impl
     });
   }
   
-  /* (non-Javadoc)
-   * @see org.apache.accumulo.core.client.admin.InstanceOperations#getSystemConfiguration()
-   */
   @Override
   public Map<String,String> getSystemConfiguration() throws AccumuloException, AccumuloSecurityException {
     return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
@@ -101,9 +95,6 @@ public class InstanceOperationsImpl impl
     });
   }
   
-  /* (non-Javadoc)
-   * @see org.apache.accumulo.core.client.admin.InstanceOperations#getSiteConfiguration()
-   */
   @Override
   public Map<String,String> getSiteConfiguration() throws AccumuloException, AccumuloSecurityException {
     return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
@@ -114,10 +105,6 @@ public class InstanceOperationsImpl impl
     });
   }
   
-  /* (non-Javadoc)
-   * @see org.apache.accumulo.core.client.admin.InstanceOperations#getTabletServers()
-   */
-  
   @Override
   public List<String> getTabletServers() {
     ZooCache cache = ZooCache.getInstance(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());
@@ -137,33 +124,33 @@ public class InstanceOperationsImpl impl
     return results;
   }
   
-  /* (non-Javadoc)
-   * @see org.apache.accumulo.core.client.admin.InstanceOperations#getActiveScans(java.lang.String)
-   */
-  
   @Override
   public List<ActiveScan> getActiveScans(String tserver) throws AccumuloException, AccumuloSecurityException {
-    List<org.apache.accumulo.core.tabletserver.thrift.ActiveScan> tas = ThriftUtil.execute(tserver, instance.getConfiguration(),
-        new ClientExecReturn<List<org.apache.accumulo.core.tabletserver.thrift.ActiveScan>,TabletClientService.Client>() {
-          @Override
-          public List<org.apache.accumulo.core.tabletserver.thrift.ActiveScan> execute(TabletClientService.Client client) throws Exception {
-            return client.getActiveScans(Tracer.traceInfo(), credentials.toThrift());
-          }
-        });
-    List<ActiveScan> as = new ArrayList<ActiveScan>();
-    for (org.apache.accumulo.core.tabletserver.thrift.ActiveScan activeScan : tas) {
-      try {
-        as.add(new ActiveScan(instance, activeScan));
-      } catch (TableNotFoundException e) {
-        throw new AccumuloException(e);
+    Client client = null;
+    try {
+      client = ThriftUtil.getTServerClient(tserver, instance.getConfiguration());
+      
+      List<ActiveScan> as = new ArrayList<ActiveScan>();
+      for (org.apache.accumulo.core.tabletserver.thrift.ActiveScan activeScan : client.getActiveScans(Tracer.traceInfo(), credentials.toThrift())) {
+        try {
+          as.add(new ActiveScan(instance, activeScan));
+        } catch (TableNotFoundException e) {
+          throw new AccumuloException(e);
+        }
       }
+      return as;
+    } catch (TTransportException e) {
+      throw new AccumuloException(e);
+    } catch (ThriftSecurityException e) {
+      throw new AccumuloSecurityException(e.user, e.code, e);
+    } catch (TException e) {
+      throw new AccumuloException(e);
+    } finally {
+      if (client != null)
+        ThriftUtil.returnClient(client);
     }
-    return as;
   }
   
-  /* (non-Javadoc)
-   * @see org.apache.accumulo.core.client.admin.InstanceOperations#testClassLoad(java.lang.String, java.lang.String)
-   */
   @Override
   public boolean testClassLoad(final String className, final String asTypeName) throws AccumuloException, AccumuloSecurityException {
     return ServerClient.execute(instance, new ClientExecReturn<Boolean,ClientService.Client>() {
@@ -173,4 +160,46 @@ public class InstanceOperationsImpl impl
       }
     });
   }
+  
+  @Override
+  public List<ActiveCompaction> getActiveCompactions(String tserver) throws AccumuloException, AccumuloSecurityException {
+    Client client = null;
+    try {
+      client = ThriftUtil.getTServerClient(tserver, instance.getConfiguration());
+      
+      List<ActiveCompaction> as = new ArrayList<ActiveCompaction>();
+      for (org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction activeCompaction : client.getActiveCompactions(Tracer.traceInfo(), credentials.toThrift())) {
+        as.add(new ActiveCompaction(instance, activeCompaction));
+      }
+      return as;
+    } catch (TTransportException e) {
+      throw new AccumuloException(e);
+    } catch (ThriftSecurityException e) {
+      throw new AccumuloSecurityException(e.user, e.code, e);
+    } catch (TException e) {
+      throw new AccumuloException(e);
+    } finally {
+      if (client != null)
+        ThriftUtil.returnClient(client);
+    }
+  }
+  
+  @Override
+  public void ping(String tserver) throws AccumuloException {
+    Client client = null;
+    try {
+      client = ThriftUtil.getTServerClient(tserver, instance.getConfiguration());
+      client.getTabletServerStatus(Tracer.traceInfo(), credentials.toThrift());
+    } catch (TTransportException e) {
+      throw new AccumuloException(e);
+    } catch (ThriftSecurityException e) {
+      throw new AccumuloException(e);
+    } catch (TException e) {
+      throw new AccumuloException(e);
+    } finally {
+      if (client != null) {
+        ThriftUtil.returnClient(client);
+      }
+    }
+  }
 }

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=1437726&r1=1437725&r2=1437726&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 Wed Jan 23 20:51:59 2013
@@ -87,8 +87,23 @@ public interface SecurityOperations {
    *           if a general error occurs
    * @throws AccumuloSecurityException
    *           if the user does not have permission to ask
+   * @deprecated @since 1.5, use {@link #authenticateUser(AccumuloToken)}
    */
   public boolean authenticateUser(String user, byte[] password) throws AccumuloException, AccumuloSecurityException;
+
+  /**
+   * Verify an AccumuloToken is valid
+   * 
+   * @param token
+   *          the AccumuloToken to authenticate
+   * @return true if the user asking is allowed to know and the specified user/password is valid, false otherwise
+   * @throws AccumuloException
+   *           if a general error occurs
+   * @throws AccumuloSecurityException
+   *           if the user does not have permission to ask
+   *  @since 1.5
+   */
+  public boolean authenticateUser(AccumuloToken<?,?> token) throws AccumuloException, AccumuloSecurityException;
   
   /**
    * Set the user's password

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=1437726&r1=1437725&r2=1437726&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 Wed Jan 23 20:51:59 2013
@@ -188,13 +188,30 @@ public class SecurityOperationsImpl impl
    *           if a general error occurs
    * @throws AccumuloSecurityException
    *           if the user does not have permission to ask
+   * @deprecated since 1.5, use {@link #authenticateUser(AccumuloToken)}
    */
   public boolean authenticateUser(final String user, final byte[] password) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, password);
+    return authenticateUser(new UserPassToken(user, password));
+  }
+  
+  /**
+   * Verify a username/password combination is valid
+   * 
+   * @param token
+   *          the AccumuloToken of the principal to authenticate
+   * @return true if the user asking is allowed to know and the specified AccumuloToken is valid, false otherwise
+   * @throws AccumuloException
+   *           if a general error occurs
+   * @throws AccumuloSecurityException
+   *           if the user does not have permission to ask
+   */
+  public boolean authenticateUser(final AccumuloToken<?,?> token2) throws AccumuloException, AccumuloSecurityException {
+    ArgumentChecker.notNull(token2);
     return execute(new ClientExecReturn<Boolean,ClientService.Client>() {
       @Override
       public Boolean execute(ClientService.Client client) throws Exception {
-        return client.authenticateUser(Tracer.traceInfo(), token.toThrift(), TokenHelper.wrapper(token.getToken()));
+        return client.authenticateUser(Tracer.traceInfo(), token.toThrift(), TokenHelper.wrapper(token2));
       }
     });
   }
@@ -219,7 +236,7 @@ public class SecurityOperationsImpl impl
         client.changePassword(Tracer.traceInfo(), token.toThrift(), TokenHelper.wrapper(newToken));
       }
     });
-    if (!(this.token instanceof PasswordUpdatable) || !(newToken instanceof PasswordUpdatable))
+    if (!(this.token.getToken() instanceof PasswordUpdatable) || !(newToken instanceof PasswordUpdatable))
       throw new AccumuloException("The AccumuloToken type cannot be dynamically adjusted. Please create a new token and reconnect");
     if (this.token.getPrincipal().equals(newToken.getPrincipal())) {
       PasswordUpdatable upt = (PasswordUpdatable) this.token.getToken();

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java Wed Jan 23 20:51:59 2013
@@ -116,7 +116,6 @@ class OfflineIterator implements Iterato
   private ArrayList<SortedKeyValueIterator<Key,Value>> readers;
   
   /**
-   * @param offlineScanner
    * @param instance
    * @param credentials
    * @param authorizations

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java Wed Jan 23 20:51:59 2013
@@ -32,6 +32,7 @@ import org.apache.accumulo.core.client.T
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.security.tokens.AccumuloToken;
 import org.apache.accumulo.core.security.tokens.InstanceTokenWrapper;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.hadoop.io.Text;
@@ -92,6 +93,10 @@ public abstract class TabletLocator {
   
   private static final Text ROOT_TABLET_MDE = KeyExtent.getMetadataEntry(new Text(Constants.METADATA_TABLE_ID), null);
   
+  public static synchronized TabletLocator getInstance(Instance instance, AccumuloToken<?,?> credentials, Text tableId) {
+    return getInstance(instance, new InstanceTokenWrapper(credentials, instance.getInstanceID()), tableId);
+  }
+  
   public static synchronized TabletLocator getInstance(Instance instance, InstanceTokenWrapper credentials, Text tableId) {
     LocatorKey key = new LocatorKey(instance.getInstanceID(), tableId);
     

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1437726&r1=1437725&r2=1437726&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java Wed Jan 23 20:51:59 2013
@@ -74,7 +74,6 @@ import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 
-
 public class TabletServerBatchReaderIterator implements Iterator<Entry<Key,Value>> {
   
   private static final Logger log = Logger.getLogger(TabletServerBatchReaderIterator.class);
@@ -100,9 +99,9 @@ public class TabletServerBatchReaderIter
   private Map<String,TimeoutTracker> timeoutTrackers;
   private Set<String> timedoutServers;
   private long timeout;
-
+  
   private TabletLocator locator;
-
+  
   public interface ResultReceiver {
     void receive(List<Entry<Key,Value>> entries);
   }
@@ -147,11 +146,11 @@ public class TabletServerBatchReaderIter
     resultsQueue = new ArrayBlockingQueue<List<Entry<Key,Value>>>(numThreads);
     
     this.locator = new TimeoutTabletLocator(TabletLocator.getInstance(instance, credentials, new Text(table)), timeout);
-
+    
     timeoutTrackers = Collections.synchronizedMap(new HashMap<String,TabletServerBatchReaderIterator.TimeoutTracker>());
     timedoutServers = Collections.synchronizedSet(new HashSet<String>());
     this.timeout = timeout;
-
+    
     if (options.fetchedColumns.size() > 0) {
       ArrayList<Range> ranges2 = new ArrayList<Range>(ranges.size());
       for (Range range : ranges) {
@@ -189,7 +188,6 @@ public class TabletServerBatchReaderIter
     }
   }
   
-
   @Override
   public boolean hasNext() {
     synchronized (nextLock) {
@@ -213,7 +211,7 @@ public class TabletServerBatchReaderIter
         
         if (queryThreadPool.isShutdown())
           throw new RuntimeException("scanner closed");
-
+        
         batchIterator = batch.iterator();
         return batch != LAST_BATCH;
       } catch (InterruptedException e) {
@@ -348,6 +346,7 @@ public class TabletServerBatchReaderIter
       this.semaphoreSize = semaphoreSize;
     }
     
+    @Override
     public void run() {
       String threadName = Thread.currentThread().getName();
       Thread.currentThread().setName(threadName + " looking up " + tabletsRanges.size() + " ranges at " + tsLocation);
@@ -448,7 +447,7 @@ public class TabletServerBatchReaderIter
       // all servers have timed out
       throw new TimedOutException(timedoutServers);
     }
-
+    
     // when there are lots of threads and a few tablet servers
     // it is good to break request to tablet servers up, the
     // following code determines if this is the case
@@ -478,7 +477,7 @@ public class TabletServerBatchReaderIter
         }
       }
     }
-
+    
     // randomize tabletserver order... this will help when there are multiple
     // batch readers and writers running against accumulo
     List<String> locations = new ArrayList<String>(binnedRanges.keySet());
@@ -564,11 +563,11 @@ public class TabletServerBatchReaderIter
       this.server = server;
       this.badServers = badServers;
     }
-
+    
     TimeoutTracker(long timeOut) {
       this.timeOut = timeOut;
     }
-
+    
     void startingScan() {
       activityTime = System.currentTimeMillis();
     }
@@ -594,13 +593,12 @@ public class TabletServerBatchReaderIter
     }
     
     /**
-     * @return
      */
     public long getTimeOut() {
       return timeOut;
     }
   }
-
+  
   static void doLookup(String server, Map<KeyExtent,List<Range>> requested, Map<KeyExtent,List<Range>> failures, Map<KeyExtent,List<Range>> unscanned,
       ResultReceiver receiver, List<Column> columns, InstanceTokenWrapper credentials, ScannerOptions options, Authorizations authorizations, AccumuloConfiguration conf)
       throws IOException, AccumuloSecurityException, AccumuloServerException {
@@ -632,11 +630,9 @@ public class TabletServerBatchReaderIter
         client = ThriftUtil.getTServerClient(server, conf, timeoutTracker.getTimeOut());
       else
         client = ThriftUtil.getTServerClient(server, conf);
-
+      
       try {
         
-
-
         OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Starting multi scan, tserver=" + server + "  #tablets=" + requested.size() + "  #ranges="
             + sumSizes(requested.values()) + " ssil=" + options.serverSideIteratorList + " ssio=" + options.serverSideIteratorOptions);
         
@@ -662,16 +658,16 @@ public class TabletServerBatchReaderIter
         
         if (entries.size() > 0)
           receiver.receive(entries);
-
+        
         if (entries.size() > 0 || scanResult.fullScans.size() > 0)
           timeoutTracker.madeProgress();
-
+        
         trackScanning(failures, unscanned, scanResult);
         
         while (scanResult.more) {
           
           timeoutTracker.check();
-
+          
           opTimer.start("Continuing multi scan, scanid=" + imsr.scanID);
           scanResult = client.continueMultiScan(Tracer.traceInfo(), imsr.scanID);
           opTimer.stop("Got more multi scan results, #results=" + scanResult.results.size() + (scanResult.more ? "  scanID=" + imsr.scanID : "")
@@ -687,7 +683,7 @@ public class TabletServerBatchReaderIter
           
           if (entries.size() > 0 || scanResult.fullScans.size() > 0)
             timeoutTracker.madeProgress();
-
+          
           trackScanning(failures, unscanned, scanResult);
         }
         

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=1437726&r1=1437725&r2=1437726&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 Wed Jan 23 20:51:59 2013
@@ -18,28 +18,28 @@ package org.apache.accumulo.core.client.
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Map.Entry;
 
 import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.mapreduce.util.FileOutputConfigurator;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.file.FileOperations;
 import org.apache.accumulo.core.file.FileSKVWriter;
+import org.apache.accumulo.core.file.rfile.RFile;
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.OutputFormat;
 import org.apache.hadoop.mapreduce.RecordWriter;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+import org.apache.log4j.Logger;
 
 /**
  * This class allows MapReduce jobs to write output in the Accumulo data file format.<br />
@@ -52,66 +52,33 @@ import org.apache.hadoop.mapreduce.lib.o
  * supported at this time.
  */
 public class AccumuloFileOutputFormat extends FileOutputFormat<Key,Value> {
-  private static final String PREFIX = AccumuloOutputFormat.class.getSimpleName() + ".";
-  private static final String ACCUMULO_PROPERTY_PREFIX = PREFIX + "accumuloProperties.";
+  
+  private static final Class<?> CLASS = AccumuloFileOutputFormat.class;
+  protected static final Logger log = Logger.getLogger(CLASS);
   
   /**
    * This helper method provides an AccumuloConfiguration object constructed from the Accumulo defaults, and overridden with Accumulo properties that have been
-   * stored in the Job's configuration
+   * stored in the Job's configuration.
    * 
+   * @param context
+   *          the Hadoop context for the configured job
    * @since 1.5.0
    */
   protected static AccumuloConfiguration getAccumuloConfiguration(JobContext context) {
-    ConfigurationCopy acuConf = new ConfigurationCopy(AccumuloConfiguration.getDefaultConfiguration());
-    for (Entry<String,String> entry : context.getConfiguration())
-      if (entry.getKey().startsWith(ACCUMULO_PROPERTY_PREFIX))
-        acuConf.set(Property.getPropertyByKey(entry.getKey().substring(ACCUMULO_PROPERTY_PREFIX.length())), entry.getValue());
-    return acuConf;
-  }
-  
-  /**
-   * The supported Accumulo properties we set in this OutputFormat, that change the behavior of the RecordWriter.<br />
-   * These properties correspond to the supported public static setter methods available to this class.
-   * 
-   * @since 1.5.0
-   */
-  protected static boolean isSupportedAccumuloProperty(Property property) {
-    switch (property) {
-      case TABLE_FILE_COMPRESSION_TYPE:
-      case TABLE_FILE_COMPRESSED_BLOCK_SIZE:
-      case TABLE_FILE_BLOCK_SIZE:
-      case TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX:
-      case TABLE_FILE_REPLICATION:
-        return true;
-      default:
-        return false;
-    }
+    return FileOutputConfigurator.getAccumuloConfiguration(CLASS, context.getConfiguration());
   }
   
   /**
-   * Helper for transforming Accumulo configuration properties into something that can be stored safely inside the Hadoop Job configuration.
+   * Sets the compression type to use for data blocks. Specifying a compression may require additional libraries to be available to your Job.
    * 
-   * @since 1.5.0
-   */
-  protected static <T> void setAccumuloProperty(Job job, Property property, T value) {
-    if (isSupportedAccumuloProperty(property)) {
-      String val = String.valueOf(value);
-      if (property.getType().isValidFormat(val))
-        job.getConfiguration().set(ACCUMULO_PROPERTY_PREFIX + property.getKey(), val);
-      else
-        throw new IllegalArgumentException("Value is not appropriate for property type '" + property.getType() + "'");
-    } else
-      throw new IllegalArgumentException("Unsupported configuration property " + property.getKey());
-  }
-  
-  /**
+   * @param job
+   *          the Hadoop job instance to be configured
    * @param compressionType
-   *          The type of compression to use. One of "none", "gz", "lzo", or "snappy". Specifying a compression may require additional libraries to be available
-   *          to your Job.
+   *          one of "none", "gz", "lzo", or "snappy"
    * @since 1.5.0
    */
   public static void setCompressionType(Job job, String compressionType) {
-    setAccumuloProperty(job, Property.TABLE_FILE_COMPRESSION_TYPE, compressionType);
+    FileOutputConfigurator.setCompressionType(CLASS, job.getConfiguration(), compressionType);
   }
   
   /**
@@ -121,38 +88,54 @@ public class AccumuloFileOutputFormat ex
    * <p>
    * Making this value smaller may increase seek performance, but at the cost of increasing the size of the indexes (which can also affect seek performance).
    * 
+   * @param job
+   *          the Hadoop job instance to be configured
+   * @param dataBlockSize
+   *          the block size, in bytes
    * @since 1.5.0
    */
   public static void setDataBlockSize(Job job, long dataBlockSize) {
-    setAccumuloProperty(job, Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE, dataBlockSize);
+    FileOutputConfigurator.setDataBlockSize(CLASS, job.getConfiguration(), dataBlockSize);
   }
   
   /**
-   * Sets the size for file blocks in the file system; file blocks are managed, and replicated, by the underlying file system
+   * Sets the size for file blocks in the file system; file blocks are managed, and replicated, by the underlying file system.
    * 
+   * @param job
+   *          the Hadoop job instance to be configured
+   * @param fileBlockSize
+   *          the block size, in bytes
    * @since 1.5.0
    */
   public static void setFileBlockSize(Job job, long fileBlockSize) {
-    setAccumuloProperty(job, Property.TABLE_FILE_BLOCK_SIZE, fileBlockSize);
+    FileOutputConfigurator.setFileBlockSize(CLASS, job.getConfiguration(), fileBlockSize);
   }
   
   /**
    * Sets the size for index blocks within each file; smaller blocks means a deeper index hierarchy within the file, while larger blocks mean a more shallow
    * index hierarchy within the file. This can affect the performance of queries.
    * 
+   * @param job
+   *          the Hadoop job instance to be configured
+   * @param indexBlockSize
+   *          the block size, in bytes
    * @since 1.5.0
    */
   public static void setIndexBlockSize(Job job, long indexBlockSize) {
-    setAccumuloProperty(job, Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX, indexBlockSize);
+    FileOutputConfigurator.setIndexBlockSize(CLASS, job.getConfiguration(), indexBlockSize);
   }
   
   /**
    * Sets the file system replication factor for the resulting file, overriding the file system default.
    * 
+   * @param job
+   *          the Hadoop job instance to be configured
+   * @param replication
+   *          the number of replicas for produced files
    * @since 1.5.0
    */
   public static void setReplication(Job job, int replication) {
-    setAccumuloProperty(job, Property.TABLE_FILE_REPLICATION, replication);
+    FileOutputConfigurator.setReplication(CLASS, job.getConfiguration(), replication);
   }
   
   @Override
@@ -165,7 +148,7 @@ public class AccumuloFileOutputFormat ex
     final Path file = this.getDefaultWorkFile(context, "." + extension);
     
     final LRUMap validVisibilities = new LRUMap(1000);
-
+    
     return new RecordWriter<Key,Value>() {
       FileSKVWriter out = null;
       
@@ -184,7 +167,7 @@ public class AccumuloFileOutputFormat ex
           new ColumnVisibility(cv);
           validVisibilities.put(new ArrayByteSequence(Arrays.copyOf(cv, cv.length)), Boolean.TRUE);
         }
-
+        
         if (out == null) {
           out = FileOperations.getInstance().openWriter(file.toString(), file.getFileSystem(conf), conf, acuConf);
           out.startDefaultLocalityGroup();
@@ -199,44 +182,13 @@ public class AccumuloFileOutputFormat ex
   // ----------------------------------------------------------------------------------------------------
   
   /**
-   * @deprecated since 1.5.0;
-   */
-  @SuppressWarnings("unused")
-  @Deprecated
-  private static final String FILE_TYPE = PREFIX + "file_type";
-  
-  /**
-   * @deprecated since 1.5.0;
-   */
-  @SuppressWarnings("unused")
-  @Deprecated
-  private static final String BLOCK_SIZE = PREFIX + "block_size";
-  
-  /**
-   * @deprecated since 1.5.0;
-   */
-  @Deprecated
-  private static final String INSTANCE_HAS_BEEN_SET = PREFIX + "instanceConfigured";
-  
-  /**
-   * @deprecated since 1.5.0;
-   */
-  @Deprecated
-  private static final String INSTANCE_NAME = PREFIX + "instanceName";
-  
-  /**
-   * @deprecated since 1.5.0;
-   */
-  @Deprecated
-  private static final String ZOOKEEPERS = PREFIX + "zooKeepers";
-  
-  /**
-   * @deprecated since 1.5.0; Retrieve the relevant block size from {@link #getAccumuloConfiguration(JobContext)}
+   * @deprecated since 1.5.0; Retrieve the relevant block size from {@link #getAccumuloConfiguration(JobContext)} and configure hadoop's
+   *             io.seqfile.compress.blocksize with the same value. No longer needed, as {@link RFile} does not use this field.
    */
   @Deprecated
   protected static void handleBlockSize(Configuration conf) {
     conf.setInt("io.seqfile.compress.blocksize",
-        (int) AccumuloConfiguration.getDefaultConfiguration().getMemoryInBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
+        (int) FileOutputConfigurator.getAccumuloConfiguration(CLASS, conf).getMemoryInBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
   }
   
   /**
@@ -250,29 +202,25 @@ public class AccumuloFileOutputFormat ex
    */
   @Deprecated
   public static void setBlockSize(Configuration conf, int blockSize) {
-    conf.set(ACCUMULO_PROPERTY_PREFIX + Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), String.valueOf(blockSize));
+    FileOutputConfigurator.setDataBlockSize(CLASS, conf, blockSize);
   }
   
   /**
-   * @deprecated since 1.5.0; This OutputFormat does not communicate with Accumulo. If this is needed, subclasses must implement their own configuration.
+   * @deprecated since 1.5.0; This {@link OutputFormat} does not communicate with Accumulo. If this is needed, subclasses must implement their own
+   *             configuration.
    */
   @Deprecated
   public static void setZooKeeperInstance(Configuration conf, String instanceName, String zooKeepers) {
-    if (conf.getBoolean(INSTANCE_HAS_BEEN_SET, false))
-      throw new IllegalStateException("Instance info can only be set once per job");
-    conf.setBoolean(INSTANCE_HAS_BEEN_SET, true);
-    
-    ArgumentChecker.notNull(instanceName, zooKeepers);
-    conf.set(INSTANCE_NAME, instanceName);
-    conf.set(ZOOKEEPERS, zooKeepers);
+    FileOutputConfigurator.setZooKeeperInstance(CLASS, conf, instanceName, zooKeepers);
   }
   
   /**
-   * @deprecated since 1.5.0; This OutputFormat does not communicate with Accumulo. If this is needed, subclasses must implement their own configuration.
+   * @deprecated since 1.5.0; This {@link OutputFormat} does not communicate with Accumulo. If this is needed, subclasses must implement their own
+   *             configuration.
    */
   @Deprecated
   protected static Instance getInstance(Configuration conf) {
-    return new ZooKeeperInstance(conf.get(INSTANCE_NAME), conf.get(ZOOKEEPERS));
+    return FileOutputConfigurator.getInstance(CLASS, conf);
   }
   
 }



Mime
View raw message