You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/07/30 23:51:47 UTC
[13/14] accumulo git commit: Merge branch 'ACCUMULO-3920'
Merge branch 'ACCUMULO-3920'
This closes #40
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da8d8a8d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da8d8a8d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da8d8a8d
Branch: refs/heads/master
Commit: da8d8a8dcb8a4803bcec56e4e9a8a28dcf5cc874
Parents: 6503223 cc3c011
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Jul 30 17:39:18 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Jul 30 17:39:18 2015 -0400
----------------------------------------------------------------------
core/src/main/findbugs/exclude-filter.xml | 1 +
.../apache/accumulo/core/cli/ClientOpts.java | 4 +-
.../core/client/ClientSideIteratorScanner.java | 2 +-
.../core/client/mapred/AbstractInputFormat.java | 12 +-
.../core/client/mapred/AccumuloInputFormat.java | 2 +-
.../mapred/AccumuloMultiTableInputFormat.java | 2 +-
.../client/mapred/AccumuloOutputFormat.java | 8 +-
.../client/mapred/AccumuloRowInputFormat.java | 2 +-
.../client/mapreduce/AbstractInputFormat.java | 12 +-
.../client/mapreduce/AccumuloInputFormat.java | 2 +-
.../AccumuloMultiTableInputFormat.java | 2 +-
.../client/mapreduce/AccumuloOutputFormat.java | 7 +-
.../mapreduce/AccumuloRowInputFormat.java | 2 +-
.../core/client/mapreduce/RangeInputSplit.java | 16 +-
.../core/client/mapreduce/impl/SplitUtils.java | 4 +-
.../mapreduce/lib/impl/ConfiguratorBase.java | 11 +-
.../mapreduce/lib/impl/InputConfigurator.java | 4 +-
.../mapreduce/lib/util/ConfiguratorBase.java | 6 +-
.../core/client/mock/IteratorAdapter.java | 36 +-
.../accumulo/core/client/mock/MockAccumulo.java | 10 +-
.../core/client/mock/MockBatchDeleter.java | 3 +
.../core/client/mock/MockBatchScanner.java | 4 +
.../core/client/mock/MockBatchWriter.java | 4 +
.../core/client/mock/MockConfiguration.java | 4 +
.../core/client/mock/MockConnector.java | 4 +
.../accumulo/core/client/mock/MockInstance.java | 3 +-
.../client/mock/MockInstanceOperations.java | 4 +
.../client/mock/MockMultiTableBatchWriter.java | 4 +
.../core/client/mock/MockNamespace.java | 4 +
.../client/mock/MockNamespaceOperations.java | 4 +
.../accumulo/core/client/mock/MockScanner.java | 4 +
.../core/client/mock/MockScannerBase.java | 4 +
.../client/mock/MockSecurityOperations.java | 4 +
.../accumulo/core/client/mock/MockTable.java | 4 +
.../core/client/mock/MockTableOperations.java | 4 +
.../accumulo/core/client/mock/MockUser.java | 4 +
.../client/mock/impl/MockTabletLocator.java | 4 +
.../accumulo/core/client/mock/package-info.java | 25 +
.../core/iterators/IteratorAdapter.java | 56 +++
.../core/replication/ReplicationTable.java | 4 +-
.../accumulo/core/util/DeprecationUtil.java | 61 +++
.../core/client/ClientSideIteratorTest.java | 131 -----
.../accumulo/core/client/admin/FindMaxTest.java | 111 -----
.../core/client/impl/ScannerImplTest.java | 10 +-
.../impl/TabletServerBatchReaderTest.java | 14 +-
.../mapred/AccumuloFileOutputFormatTest.java | 183 -------
.../client/mapred/AccumuloInputFormatTest.java | 178 +------
.../AccumuloMultiTableInputFormatTest.java | 145 +-----
.../client/mapred/AccumuloOutputFormatTest.java | 140 +-----
.../mapred/AccumuloRowInputFormatTest.java | 209 --------
.../core/client/mapred/RangeInputSplitTest.java | 5 +-
.../core/client/mapred/TokenFileTest.java | 178 -------
.../mapreduce/AccumuloFileOutputFormatTest.java | 171 -------
.../mapreduce/AccumuloInputFormatTest.java | 242 ----------
.../AccumuloMultiTableInputFormatTest.java | 143 +-----
.../mapreduce/AccumuloOutputFormatTest.java | 127 -----
.../mapreduce/AccumuloRowInputFormatTest.java | 204 --------
.../BadPasswordSplitsAccumuloInputFormat.java | 42 --
.../EmptySplitsAccumuloInputFormat.java | 45 --
.../client/mapreduce/RangeInputSplitTest.java | 5 +-
.../core/client/mapreduce/TokenFileTest.java | 171 -------
.../mapreduce/impl/BatchInputSplitTest.java | 6 +-
.../lib/impl/ConfiguratorBaseTest.java | 7 +-
.../core/client/mock/MockConnectorTest.java | 1 +
.../core/client/mock/MockNamespacesTest.java | 150 +++---
.../client/mock/MockTableOperationsTest.java | 57 ++-
.../core/client/mock/TestBatchScanner821.java | 12 +
.../core/client/mock/TransformIterator.java | 30 --
.../user/IntersectingIteratorTest.java | 67 +--
.../core/iterators/user/RegExFilterTest.java | 46 +-
.../core/iterators/user/RowFilterTest.java | 119 ++---
.../user/TransformingIteratorTest.java | 203 ++++----
.../core/metadata/MetadataServicerTest.java | 54 ++-
.../accumulo/core/security/CredentialsTest.java | 29 +-
.../examples/simple/dirlist/FileCount.java | 2 +-
.../examples/simple/dirlist/CountTest.java | 99 ----
.../simple/filedata/ChunkInputFormatTest.java | 304 ------------
.../simple/filedata/ChunkInputStreamTest.java | 90 +---
.../minicluster/MiniAccumuloCluster.java | 2 +-
.../impl/MiniAccumuloClusterImpl.java | 5 +-
.../org/apache/accumulo/proxy/ProxyServer.java | 4 +-
.../accumulo/server/AccumuloServerContext.java | 4 +-
.../server/cli/ClientOnDefaultTable.java | 4 +-
.../server/cli/ClientOnRequiredTable.java | 4 +-
.../apache/accumulo/server/cli/ClientOpts.java | 4 +-
.../accumulo/server/util/MetadataTableUtil.java | 29 +-
.../server/AccumuloServerContextTest.java | 4 +-
.../server/client/BulkImporterTest.java | 10 +-
.../master/balancer/TableLoadBalancerTest.java | 41 +-
.../problems/ProblemReportingIteratorTest.java | 16 +-
.../server/security/SystemCredentialsTest.java | 22 +-
.../apache/accumulo/server/util/CloneTest.java | 375 ---------------
.../server/util/ReplicationTableUtilTest.java | 6 +-
.../server/util/TabletIteratorTest.java | 107 -----
.../CloseWriteAheadLogReferencesTest.java | 175 -------
.../master/MasterClientServiceHandler.java | 7 +-
.../master/ReplicationOperationsImplTest.java | 452 -----------------
.../apache/accumulo/master/TestMergeState.java | 205 --------
.../replication/FinishedWorkUpdaterTest.java | 165 -------
.../RemoveCompleteReplicationRecordsTest.java | 327 -------------
.../replication/SequentialWorkAssignerTest.java | 328 +------------
.../master/replication/StatusMakerTest.java | 259 ----------
.../replication/UnorderedWorkAssignerTest.java | 172 +------
.../master/replication/WorkMakerTest.java | 171 +------
.../tserver/LargestFirstMemoryManagerTest.java | 14 +-
.../java/org/apache/accumulo/shell/Shell.java | 6 +-
.../apache/accumulo/shell/mock/MockShell.java | 6 +-
.../accumulo/shell/ShellSetInstanceTest.java | 8 +-
.../shell/commands/FormatterCommandTest.java | 190 --------
.../accumulo/test/AccumuloOutputFormatIT.java | 100 ----
.../accumulo/test/ClientSideIteratorIT.java | 144 ++++++
.../java/org/apache/accumulo/test/CloneIT.java | 390 +++++++++++++++
.../org/apache/accumulo/test/FindMaxIT.java | 113 +++++
.../org/apache/accumulo/test/ShellServerIT.java | 112 +++++
.../test/examples/simple/dirlist/CountIT.java | 101 ++++
.../simple/filedata/ChunkInputFormatIT.java | 319 ++++++++++++
.../simple/filedata/ChunkInputStreamIT.java | 174 +++++++
.../test/functional/AccumuloInputFormatIT.java | 212 --------
.../accumulo/test/functional/MergeIT.java | 78 +++
.../CloseWriteAheadLogReferencesIT.java | 184 +++++++
.../test/mapred/AccumuloFileOutputFormatIT.java | 204 ++++++++
.../test/mapred/AccumuloInputFormatIT.java | 195 ++++++++
.../mapred/AccumuloMultiTableInputFormatIT.java | 163 +++++++
.../test/mapred/AccumuloOutputFormatIT.java | 227 +++++++++
.../test/mapred/AccumuloRowInputFormatIT.java | 202 ++++++++
.../accumulo/test/mapred/TokenFileIT.java | 174 +++++++
.../mapreduce/AccumuloFileOutputFormatIT.java | 211 ++++++++
.../test/mapreduce/AccumuloInputFormatIT.java | 479 +++++++++++++++++++
.../AccumuloMultiTableInputFormatIT.java | 161 +++++++
.../test/mapreduce/AccumuloOutputFormatIT.java | 153 ++++++
.../mapreduce/AccumuloRowInputFormatIT.java | 197 ++++++++
.../accumulo/test/mapreduce/TokenFileIT.java | 167 +++++++
.../accumulo/test/master/MergeStateIT.java | 204 ++++++++
.../test/replication/FinishedWorkUpdaterIT.java | 173 +++++++
.../RemoveCompleteReplicationRecordsIT.java | 337 +++++++++++++
.../ReplicationOperationsImplIT.java | 447 +++++++++++++++++
.../replication/SequentialWorkAssignerIT.java | 368 ++++++++++++++
.../test/replication/StatusMakerIT.java | 249 ++++++++++
.../replication/UnorderedWorkAssignerIT.java | 238 +++++++++
.../accumulo/test/replication/WorkMakerIT.java | 209 ++++++++
.../accumulo/test/iterator/RegExTest.java | 103 ++--
141 files changed, 7233 insertions(+), 6764 deletions(-)
----------------------------------------------------------------------