ACCUMULO-3451 Format master branch (1.7.0-SNAPSHOT)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6bc67602 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6bc67602 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6bc67602 Branch: refs/heads/master Commit: 6bc67602c66f2cb88de5f7d8863701ac76309ab0 Parents: 44e2b2c Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jan 8 20:20:23 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jan 8 20:20:23 2015 -0500 ---------------------------------------------------------------------- .../accumulo/core/bloomfilter/BloomFilter.java | 106 +-- .../core/bloomfilter/DynamicBloomFilter.java | 124 ++-- .../accumulo/core/bloomfilter/Filter.java | 102 +-- .../accumulo/core/cli/BatchScannerOpts.java | 8 +- .../accumulo/core/cli/BatchWriterOpts.java | 18 +- .../accumulo/core/cli/ClientOnDefaultTable.java | 4 +- .../core/cli/ClientOnRequiredTable.java | 1 - .../apache/accumulo/core/cli/ClientOpts.java | 74 ++- .../java/org/apache/accumulo/core/cli/Help.java | 10 +- .../apache/accumulo/core/cli/ScannerOpts.java | 4 +- .../accumulo/core/client/AccumuloException.java | 12 +- .../core/client/AccumuloSecurityException.java | 34 +- .../accumulo/core/client/BatchDeleter.java | 10 +- .../accumulo/core/client/BatchScanner.java | 16 +- .../accumulo/core/client/BatchWriter.java | 33 +- .../accumulo/core/client/BatchWriterConfig.java | 11 +- .../core/client/ClientConfiguration.java | 9 +- .../core/client/ClientSideIteratorScanner.java | 68 +- .../accumulo/core/client/ConditionalWriter.java | 29 +- .../core/client/ConditionalWriterConfig.java | 1 + .../apache/accumulo/core/client/Connector.java | 46 +- .../apache/accumulo/core/client/Durability.java | 3 +- .../accumulo/core/client/IsolatedScanner.java | 107 +-- .../accumulo/core/client/IteratorSetting.java | 117 ++-- .../core/client/MultiTableBatchWriter.java | 22 +- .../core/client/MutationsRejectedException.java | 36 +- .../core/client/NamespaceExistsException.java | 2 +- .../core/client/NamespaceNotFoundException.java | 2 +- .../accumulo/core/client/RowIterator.java | 34 +- .../apache/accumulo/core/client/Scanner.java | 41 +- .../accumulo/core/client/ScannerBase.java | 43 +- .../core/client/TableDeletedException.java | 10 +- .../core/client/TableExistsException.java | 8 +- .../core/client/TableNotFoundException.java | 2 +- .../core/client/TableOfflineException.java | 6 +- .../accumulo/core/client/TimedOutException.java | 10 +- .../accumulo/core/client/ZooKeeperInstance.java | 6 +- .../core/client/admin/ActiveCompaction.java | 27 +- .../accumulo/core/client/admin/ActiveScan.java | 28 +- .../core/client/admin/CompactionConfig.java | 9 +- .../client/admin/CompactionStrategyConfig.java | 6 +- .../accumulo/core/client/admin/DiskUsage.java | 20 +- .../accumulo/core/client/admin/FindMax.java | 68 +- .../core/client/admin/InstanceOperations.java | 51 +- .../core/client/admin/NamespaceOperations.java | 46 +- .../client/admin/ReplicationOperations.java | 45 +- .../core/client/admin/SecurityOperations.java | 42 +- .../core/client/admin/TableOperations.java | 115 ++-- .../accumulo/core/client/admin/TimeType.java | 2 +- .../client/impl/AccumuloServerException.java | 10 +- .../core/client/impl/ActiveCompactionImpl.java | 1 - .../core/client/impl/ActiveScanImpl.java | 3 +- .../core/client/impl/BatchWriterImpl.java | 14 +- .../core/client/impl/CompressedIterators.java | 40 +- .../core/client/impl/ConditionalWriterImpl.java | 276 ++++---- .../core/client/impl/DurabilityImpl.java | 2 +- .../client/impl/InstanceOperationsImpl.java | 2 +- .../core/client/impl/IsolationException.java | 4 +- .../accumulo/core/client/impl/MasterClient.java | 16 +- .../client/impl/MultiTableBatchWriterImpl.java | 4 +- .../core/client/impl/OfflineScanner.java | 157 ++--- .../core/client/impl/ReplicationClient.java | 6 +- .../core/client/impl/RootTabletLocator.java | 32 +- .../accumulo/core/client/impl/ScannerImpl.java | 40 +- .../core/client/impl/ScannerIterator.java | 79 ++- .../core/client/impl/ScannerOptions.java | 69 +- .../accumulo/core/client/impl/ServerClient.java | 20 +- .../core/client/impl/TableOperationsHelper.java | 1 + .../core/client/impl/TableOperationsImpl.java | 17 +- .../accumulo/core/client/impl/Tables.java | 4 +- .../core/client/impl/TabletLocator.java | 70 +- .../core/client/impl/TabletLocatorImpl.java | 246 +++---- .../client/impl/TabletServerBatchDeleter.java | 8 +- .../client/impl/TabletServerBatchReader.java | 36 +- .../impl/TabletServerBatchReaderIterator.java | 226 +++---- .../client/impl/TabletServerBatchWriter.java | 370 +++++------ .../accumulo/core/client/impl/TabletType.java | 10 +- .../core/client/impl/ThriftScanner.java | 140 ++-- .../core/client/impl/TimeoutTabletLocator.java | 46 +- .../accumulo/core/client/impl/Translator.java | 50 +- .../accumulo/core/client/impl/Writer.java | 22 +- .../core/client/impl/ZookeeperLockChecker.java | 11 +- .../client/lexicoder/BigIntegerLexicoder.java | 33 +- .../core/client/lexicoder/BytesLexicoder.java | 8 +- .../core/client/lexicoder/DoubleLexicoder.java | 10 +- .../accumulo/core/client/lexicoder/Encoder.java | 3 +- .../core/client/lexicoder/IntegerLexicoder.java | 13 +- .../core/client/lexicoder/Lexicoder.java | 4 +- .../core/client/lexicoder/ListLexicoder.java | 20 +- .../core/client/lexicoder/LongLexicoder.java | 4 +- .../core/client/lexicoder/PairLexicoder.java | 37 +- .../core/client/lexicoder/ReverseLexicoder.java | 20 +- .../core/client/lexicoder/StringLexicoder.java | 8 +- .../core/client/lexicoder/TextLexicoder.java | 8 +- .../client/lexicoder/UIntegerLexicoder.java | 30 +- .../core/client/lexicoder/ULongLexicoder.java | 28 +- .../core/client/lexicoder/UUIDLexicoder.java | 14 +- .../core/client/lexicoder/impl/ByteUtils.java | 38 +- .../impl/FixedByteArrayOutputStream.java | 10 +- .../client/mapred/AccumuloFileOutputFormat.java | 48 +- .../core/client/mapred/AccumuloInputFormat.java | 13 +- .../mapred/AccumuloMultiTableInputFormat.java | 8 +- .../client/mapred/AccumuloOutputFormat.java | 2 +- .../client/mapred/AccumuloRowInputFormat.java | 6 +- .../core/client/mapred/InputFormatBase.java | 54 +- .../core/client/mapred/RangeInputSplit.java | 2 +- .../mapreduce/AccumuloFileOutputFormat.java | 48 +- .../client/mapreduce/AccumuloInputFormat.java | 6 +- .../AccumuloMultiTableInputFormat.java | 12 +- .../client/mapreduce/AccumuloOutputFormat.java | 2 +- .../mapreduce/AccumuloRowInputFormat.java | 6 +- .../core/client/mapreduce/InputFormatBase.java | 54 +- .../core/client/mapreduce/InputTableConfig.java | 44 +- .../core/client/mapreduce/RangeInputSplit.java | 2 +- .../mapreduce/lib/impl/ConfiguratorBase.java | 58 +- .../lib/impl/FileOutputConfigurator.java | 20 +- .../mapreduce/lib/impl/InputConfigurator.java | 68 +- .../mapreduce/lib/impl/OutputConfigurator.java | 25 +- .../client/mapreduce/lib/impl/package-info.java | 4 +- .../lib/partition/KeyRangePartitioner.java | 10 +- .../core/client/mock/IteratorAdapter.java | 10 +- .../accumulo/core/client/mock/MockAccumulo.java | 2 +- .../core/client/mock/MockBatchDeleter.java | 12 +- .../core/client/mock/MockBatchScanner.java | 12 +- .../core/client/mock/MockBatchWriter.java | 14 +- .../core/client/mock/MockConfiguration.java | 6 +- .../core/client/mock/MockConnector.java | 38 +- .../accumulo/core/client/mock/MockInstance.java | 4 +- .../client/mock/MockInstanceOperations.java | 5 +- .../client/mock/MockMultiTableBatchWriter.java | 10 +- .../client/mock/MockNamespaceOperations.java | 4 +- .../accumulo/core/client/mock/MockScanner.java | 34 +- .../core/client/mock/MockScannerBase.java | 24 +- .../accumulo/core/client/mock/MockTable.java | 36 +- .../accumulo/core/client/mock/MockUser.java | 2 +- .../core/client/replication/ReplicaSystem.java | 16 +- .../replication/ReplicaSystemFactory.java | 4 +- .../core/client/security/SecurityErrorCode.java | 2 +- .../security/tokens/AuthenticationToken.java | 78 +-- .../core/client/security/tokens/NullToken.java | 27 +- .../client/security/tokens/PasswordToken.java | 30 +- .../core/conf/AccumuloConfiguration.java | 203 +++--- .../accumulo/core/conf/ConfigSanityCheck.java | 39 +- .../accumulo/core/conf/ConfigurationCopy.java | 37 +- .../accumulo/core/conf/ConfigurationDocGen.java | 4 +- .../core/conf/ConfigurationObserver.java | 4 +- .../conf/CredentialProviderFactoryShim.java | 4 +- .../core/conf/DefaultConfiguration.java | 3 +- .../apache/accumulo/core/conf/Experimental.java | 2 +- .../apache/accumulo/core/conf/Interpolated.java | 2 +- .../org/apache/accumulo/core/conf/Property.java | 87 ++- .../apache/accumulo/core/conf/PropertyType.java | 5 +- .../apache/accumulo/core/conf/Sensitive.java | 2 +- .../accumulo/core/conf/SiteConfiguration.java | 42 +- .../accumulo/core/constraints/Constraint.java | 22 +- .../constraints/DefaultKeySizeConstraint.java | 14 +- .../accumulo/core/constraints/Violations.java | 48 +- .../accumulo/core/data/ArrayByteSequence.java | 84 +-- .../apache/accumulo/core/data/ByteSequence.java | 80 +-- .../org/apache/accumulo/core/data/Column.java | 82 +-- .../apache/accumulo/core/data/ColumnUpdate.java | 51 +- .../accumulo/core/data/ComparableBytes.java | 20 +- .../apache/accumulo/core/data/Condition.java | 124 ++-- .../accumulo/core/data/ConditionalMutation.java | 18 +- .../core/data/ConstraintViolationSummary.java | 39 +- .../java/org/apache/accumulo/core/data/Key.java | 520 ++++++++------- .../apache/accumulo/core/data/KeyExtent.java | 30 +- .../org/apache/accumulo/core/data/Mutation.java | 663 +++++++++++-------- .../apache/accumulo/core/data/PartialKey.java | 19 +- .../org/apache/accumulo/core/data/Range.java | 580 +++++++++------- .../org/apache/accumulo/core/data/Value.java | 26 +- .../accumulo/core/file/BloomFilterLayer.java | 190 +++--- .../accumulo/core/file/FileOperations.java | 76 +-- .../accumulo/core/file/FileSKVIterator.java | 8 +- .../accumulo/core/file/FileSKVWriter.java | 10 +- .../core/file/NoSuchMetaStoreException.java | 11 +- .../core/file/blockfile/ABlockReader.java | 19 +- .../core/file/blockfile/ABlockWriter.java | 16 +- .../core/file/blockfile/BlockFileReader.java | 18 +- .../core/file/blockfile/BlockFileWriter.java | 14 +- .../core/file/blockfile/cache/BlockCache.java | 14 +- .../core/file/blockfile/cache/CacheEntry.java | 6 +- .../core/file/blockfile/cache/CachedBlock.java | 29 +- .../file/blockfile/cache/CachedBlockQueue.java | 28 +- .../core/file/blockfile/cache/ClassSize.java | 120 ++-- .../core/file/blockfile/cache/HeapSize.java | 6 +- .../file/blockfile/cache/LruBlockCache.java | 242 +++---- .../file/blockfile/cache/SizeConstants.java | 18 +- .../file/blockfile/impl/CachableBlockFile.java | 250 +++---- .../file/keyfunctor/ColumnFamilyFunctor.java | 14 +- .../file/keyfunctor/ColumnQualifierFunctor.java | 10 +- .../core/file/keyfunctor/KeyFunctor.java | 4 +- .../core/file/keyfunctor/RowFunctor.java | 16 +- .../core/file/map/MapFileOperations.java | 70 +- .../accumulo/core/file/map/MapFileUtil.java | 2 +- .../accumulo/core/file/rfile/BlockIndex.java | 56 +- .../accumulo/core/file/rfile/CreateEmpty.java | 7 +- .../accumulo/core/file/rfile/IndexIterator.java | 20 +- .../core/file/rfile/MultiIndexIterator.java | 28 +- .../core/file/rfile/MultiLevelIndex.java | 336 +++++----- .../accumulo/core/file/rfile/PrintInfo.java | 20 +- .../apache/accumulo/core/file/rfile/RFile.java | 398 +++++------ .../core/file/rfile/RFileOperations.java | 32 +- .../accumulo/core/file/rfile/RelativeKey.java | 216 +++--- .../accumulo/core/file/rfile/SplitLarge.java | 21 +- .../accumulo/core/file/rfile/bcfile/BCFile.java | 60 +- .../bcfile/BoundedRangeFileInputStream.java | 38 +- .../core/file/rfile/bcfile/CompareUtils.java | 26 +- .../core/file/rfile/bcfile/Compression.java | 92 +-- .../rfile/bcfile/MetaBlockAlreadyExists.java | 6 +- .../rfile/bcfile/MetaBlockDoesNotExist.java | 6 +- .../core/file/rfile/bcfile/PrintInfo.java | 6 +- .../core/file/rfile/bcfile/RawComparable.java | 16 +- .../bcfile/SimpleBufferedOutputStream.java | 16 +- .../accumulo/core/file/rfile/bcfile/Utils.java | 100 +-- .../core/iterators/AggregatingIterator.java | 68 +- .../core/iterators/ColumnFamilyCounter.java | 28 +- .../accumulo/core/iterators/Combiner.java | 33 +- .../accumulo/core/iterators/DebugIterator.java | 25 +- .../apache/accumulo/core/iterators/DevNull.java | 32 +- .../iterators/FamilyIntersectingIterator.java | 4 +- .../apache/accumulo/core/iterators/Filter.java | 24 +- .../core/iterators/FirstEntryInRowIterator.java | 38 +- .../accumulo/core/iterators/GrepIterator.java | 4 +- .../core/iterators/IntersectingIterator.java | 4 +- .../IterationInterruptedException.java | 6 +- .../core/iterators/IteratorEnvironment.java | 12 +- .../accumulo/core/iterators/IteratorUtil.java | 118 ++-- .../accumulo/core/iterators/LargeRowFilter.java | 4 +- .../accumulo/core/iterators/LongCombiner.java | 50 +- .../core/iterators/OptionDescriber.java | 36 +- .../accumulo/core/iterators/OrIterator.java | 72 +- .../core/iterators/RowDeletingIterator.java | 4 +- .../core/iterators/SortedKeyIterator.java | 12 +- .../core/iterators/SortedKeyValueIterator.java | 36 +- .../core/iterators/SortedMapIterator.java | 55 +- .../core/iterators/TypedValueCombiner.java | 70 +- .../core/iterators/ValueFormatException.java | 4 +- .../core/iterators/VersioningIterator.java | 4 +- .../core/iterators/WholeRowIterator.java | 4 +- .../core/iterators/WrappingIterator.java | 26 +- .../core/iterators/aggregation/Aggregator.java | 4 +- .../iterators/aggregation/LongSummation.java | 12 +- .../aggregation/NumArraySummation.java | 24 +- .../iterators/aggregation/NumSummation.java | 20 +- .../core/iterators/aggregation/StringMax.java | 10 +- .../core/iterators/aggregation/StringMin.java | 10 +- .../iterators/aggregation/StringSummation.java | 10 +- .../conf/AggregatorConfiguration.java | 4 +- .../aggregation/conf/AggregatorSet.java | 4 +- .../accumulo/core/iterators/conf/ColumnSet.java | 42 +- .../iterators/conf/ColumnToClassMapping.java | 36 +- .../core/iterators/conf/ColumnUtil.java | 42 +- .../iterators/conf/PerColumnIteratorConfig.java | 22 +- .../system/ColumnFamilySkippingIterator.java | 30 +- .../iterators/system/ColumnQualifierFilter.java | 22 +- .../core/iterators/system/CountingIterator.java | 14 +- .../core/iterators/system/DeletingIterator.java | 28 +- .../iterators/system/LocalityGroupIterator.java | 30 +- .../core/iterators/system/MapFileIterator.java | 38 +- .../core/iterators/system/MultiIterator.java | 36 +- .../iterators/system/SequenceFileIterator.java | 42 +- .../core/iterators/system/StatsIterator.java | 16 +- .../iterators/system/TimeSettingIterator.java | 26 +- .../core/iterators/system/VisibilityFilter.java | 16 +- .../core/iterators/user/AgeOffFilter.java | 30 +- .../core/iterators/user/BigDecimalCombiner.java | 21 +- .../core/iterators/user/ColumnAgeOffFilter.java | 28 +- .../core/iterators/user/ColumnSliceFilter.java | 148 ++--- .../core/iterators/user/GrepIterator.java | 24 +- .../core/iterators/user/IndexedDocIterator.java | 56 +- .../iterators/user/IntersectingIterator.java | 108 +-- .../core/iterators/user/LargeRowFilter.java | 114 ++-- .../core/iterators/user/MaxCombiner.java | 2 +- .../core/iterators/user/MinCombiner.java | 2 +- .../core/iterators/user/RegExFilter.java | 68 +- .../core/iterators/user/ReqVisFilter.java | 4 +- .../iterators/user/RowDeletingIterator.java | 58 +- .../iterators/user/RowEncodingIterator.java | 12 +- .../accumulo/core/iterators/user/RowFilter.java | 40 +- .../iterators/user/SummingArrayCombiner.java | 48 +- .../core/iterators/user/SummingCombiner.java | 2 +- .../core/iterators/user/TimestampFilter.java | 56 +- .../iterators/user/TransformingIterator.java | 2 +- .../core/iterators/user/VersioningIterator.java | 38 +- .../core/iterators/user/VisibilityFilter.java | 24 +- .../user/WholeColumnFamilyIterator.java | 66 +- .../core/iterators/user/WholeRowIterator.java | 23 +- .../core/master/state/tables/TableState.java | 8 +- .../core/metadata/MetadataLocationObtainer.java | 68 +- .../core/metadata/MetadataServicer.java | 14 +- .../accumulo/core/metadata/RootTable.java | 2 +- .../core/metadata/ServicerForMetadataTable.java | 4 +- .../core/metadata/ServicerForRootTable.java | 8 +- .../core/metadata/ServicerForUserTables.java | 4 +- .../core/metadata/TableMetadataServicer.java | 46 +- .../core/metadata/schema/DataFileValue.java | 32 +- .../core/metadata/schema/MetadataSchema.java | 66 +- .../accumulo/core/protobuf/ProtobufUtil.java | 2 +- .../AccumuloReplicationReplayer.java | 2 +- .../ReplicationConfigurationUtil.java | 7 +- .../core/replication/ReplicationConstants.java | 2 +- .../core/replication/ReplicationSchema.java | 19 +- .../core/replication/ReplicationTarget.java | 16 +- .../accumulo/core/replication/StatusUtil.java | 21 +- .../core/replication/proto/Replication.java | 296 +++++---- .../accumulo/core/rpc/TBufferedSocket.java | 8 +- .../accumulo/core/rpc/TTimeoutTransport.java | 6 +- .../apache/accumulo/core/rpc/TraceProtocol.java | 2 +- .../core/security/AuthorizationContainer.java | 3 +- .../accumulo/core/security/Authorizations.java | 30 +- .../core/security/ColumnVisibility.java | 150 +++-- .../accumulo/core/security/Credentials.java | 19 +- .../core/security/NamespacePermission.java | 10 +- .../core/security/SystemPermission.java | 27 +- .../accumulo/core/security/TablePermission.java | 29 +- .../core/security/VisibilityConstraint.java | 29 +- .../core/security/VisibilityEvaluator.java | 66 +- .../core/security/VisibilityParseException.java | 11 +- .../security/crypto/BlockedOutputStream.java | 2 +- .../CachingHDFSSecretKeyEncryptionStrategy.java | 57 +- .../core/security/crypto/CryptoModule.java | 57 +- .../security/crypto/CryptoModuleFactory.java | 6 +- .../security/crypto/CryptoModuleParameters.java | 272 ++++---- .../security/crypto/DefaultCryptoModule.java | 232 ++++--- .../crypto/DefaultCryptoModuleUtils.java | 10 +- .../crypto/DiscardCloseOutputStream.java | 6 +- .../NonCachingSecretKeyEncryptionStrategy.java | 54 +- .../crypto/SecretKeyEncryptionStrategy.java | 10 +- .../core/tabletserver/log/LogEntry.java | 18 +- .../accumulo/core/trace/DistributedTrace.java | 23 +- .../org/apache/accumulo/core/trace/Span.java | 11 +- .../org/apache/accumulo/core/trace/Trace.java | 9 +- .../wrappers/RpcClientInvocationHandler.java | 8 +- .../wrappers/RpcServerInvocationHandler.java | 8 +- .../core/trace/wrappers/TraceCallable.java | 12 +- .../trace/wrappers/TraceExecutorService.java | 40 +- .../core/trace/wrappers/TraceRunnable.java | 16 +- .../accumulo/core/trace/wrappers/TraceWrap.java | 8 +- .../apache/accumulo/core/util/AddressUtil.java | 3 +- .../core/util/BadArgumentException.java | 2 +- .../org/apache/accumulo/core/util/Base64.java | 8 +- .../accumulo/core/util/ByteArrayComparator.java | 10 +- .../apache/accumulo/core/util/ByteArraySet.java | 14 +- .../accumulo/core/util/ByteBufferUtil.java | 10 +- .../accumulo/core/util/CachedConfiguration.java | 4 +- .../org/apache/accumulo/core/util/CleanUp.java | 18 +- .../org/apache/accumulo/core/util/ColumnFQ.java | 38 +- .../accumulo/core/util/ComparablePair.java | 10 +- .../apache/accumulo/core/util/CreateToken.java | 26 +- .../org/apache/accumulo/core/util/Daemon.java | 18 +- .../org/apache/accumulo/core/util/Duration.java | 10 +- .../org/apache/accumulo/core/util/Encoding.java | 11 +- .../apache/accumulo/core/util/FastFormat.java | 16 +- .../accumulo/core/util/LocalityGroupUtil.java | 88 +-- .../accumulo/core/util/LoggingRunnable.java | 4 +- .../apache/accumulo/core/util/MapCounter.java | 30 +- .../apache/accumulo/core/util/MonitorUtil.java | 2 +- .../accumulo/core/util/MutableByteSequence.java | 9 +- .../accumulo/core/util/NamingThreadFactory.java | 6 +- .../org/apache/accumulo/core/util/NumUtil.java | 10 +- .../org/apache/accumulo/core/util/OpTimer.java | 6 +- .../accumulo/core/util/PeekingIterator.java | 16 +- .../accumulo/core/util/ServerServices.java | 22 +- .../accumulo/core/util/SimpleThreadPool.java | 5 +- .../apache/accumulo/core/util/StopWatch.java | 26 +- .../org/apache/accumulo/core/util/TextUtil.java | 9 +- .../core/util/UnsynchronizedBuffer.java | 111 ++-- .../accumulo/core/util/UtilWaitThread.java | 2 +- .../apache/accumulo/core/util/Validator.java | 16 +- .../org/apache/accumulo/core/util/Version.java | 22 +- .../core/util/format/BinaryFormatter.java | 18 +- .../core/util/format/DateStringFormatter.java | 11 +- .../core/util/format/DefaultFormatter.java | 50 +- .../core/util/format/FormatterFactory.java | 4 +- .../accumulo/core/util/format/HexFormatter.java | 31 +- .../ShardedTableDistributionFormatter.java | 12 +- .../util/format/StatisticsDisplayFormatter.java | 16 +- .../util/interpret/DefaultScanInterpreter.java | 14 +- .../core/util/interpret/HexScanInterpreter.java | 2 +- .../core/util/interpret/ScanInterpreter.java | 8 +- .../org/apache/accumulo/core/volume/Volume.java | 14 +- .../core/volume/VolumeConfiguration.java | 4 +- .../apache/accumulo/core/volume/VolumeImpl.java | 3 +- .../org/apache/accumulo/core/cli/TestHelp.java | 6 +- .../core/client/BatchWriterConfigTest.java | 54 +- .../core/client/ClientSideIteratorTest.java | 18 +- .../core/client/IteratorSettingTest.java | 32 +- .../accumulo/core/client/RowIteratorTest.java | 12 +- .../accumulo/core/client/TestThrift1474.java | 12 +- .../accumulo/core/client/admin/FindMaxTest.java | 42 +- .../core/client/impl/ClientContextTest.java | 2 +- .../core/client/impl/ScannerImplTest.java | 6 +- .../core/client/impl/ScannerOptionsTest.java | 4 +- .../client/impl/TableOperationsHelperTest.java | 23 +- .../client/impl/ZookeeperLockCheckerTest.java | 9 +- .../lexicoder/BigIntegerLexicoderTest.java | 2 +- .../client/lexicoder/DoubleLexicoderTest.java | 2 +- .../client/lexicoder/ListLexicoderTest.java | 26 +- .../client/lexicoder/PairLexicoderTest.java | 2 +- .../client/lexicoder/UIntegerLexicoderTest.java | 2 +- .../client/mapred/AccumuloInputFormatTest.java | 2 +- .../client/mapred/AccumuloOutputFormatTest.java | 54 +- .../mapred/AccumuloRowInputFormatTest.java | 42 +- .../core/client/mapred/RangeInputSplitTest.java | 30 +- .../core/client/mapred/TokenFileTest.java | 2 +- .../mapreduce/AccumuloInputFormatTest.java | 2 +- .../mapreduce/AccumuloOutputFormatTest.java | 50 +- .../mapreduce/AccumuloRowInputFormatTest.java | 38 +- .../BadPasswordSplitsAccumuloInputFormat.java | 6 +- .../client/mapreduce/InputTableConfigTest.java | 31 +- .../core/client/mapreduce/TokenFileTest.java | 2 +- .../lib/impl/ConfiguratorBaseTest.java | 12 +- .../lib/partition/RangePartitionerTest.java | 16 +- .../core/client/mock/MockConnectorTest.java | 122 ++-- .../core/client/mock/MockNamespacesTest.java | 6 +- .../client/mock/MockTableOperationsTest.java | 1 - .../core/client/mock/TestBatchScanner821.java | 4 +- .../core/client/mock/TransformIterator.java | 2 - .../client/security/SecurityErrorCodeTest.java | 10 +- .../tokens/CredentialProviderTokenTest.java | 1 + .../security/tokens/PasswordTokenTest.java | 6 +- .../core/conf/AccumuloConfigurationTest.java | 12 +- .../core/conf/ConfigSanityCheckTest.java | 1 + .../core/conf/DefaultConfigurationTest.java | 6 +- .../core/conf/ObservableConfigurationTest.java | 12 +- .../accumulo/core/conf/PropertyTypeTest.java | 5 +- .../core/conf/SiteConfigurationTest.java | 13 +- .../DefaultKeySizeConstraintTest.java | 14 +- .../apache/accumulo/core/data/ColumnTest.java | 5 +- .../accumulo/core/data/ConditionTest.java | 14 +- .../data/ConstraintViolationSummaryTest.java | 15 +- .../accumulo/core/data/KeyExtentTest.java | 100 +-- .../org/apache/accumulo/core/data/KeyTest.java | 42 +- .../apache/accumulo/core/data/MutationTest.java | 233 ++++--- .../apache/accumulo/core/data/OldMutation.java | 190 +++--- .../apache/accumulo/core/data/ValueTest.java | 22 +- .../accumulo/core/file/FileOperationsTest.java | 8 +- .../blockfile/cache/TestCachedBlockQueue.java | 38 +- .../file/blockfile/cache/TestLruBlockCache.java | 228 +++---- .../core/file/rfile/BlockIndexTest.java | 59 +- .../core/file/rfile/CreateCompatTestFile.java | 28 +- .../core/file/rfile/MultiLevelIndexTest.java | 36 +- .../accumulo/core/file/rfile/RFileTest.java | 13 +- .../core/file/rfile/RelativeKeyTest.java | 74 +-- .../core/iterators/AggregatingIteratorTest.java | 280 ++++---- .../iterators/DefaultIteratorEnvironment.java | 18 +- .../iterators/FirstEntryInRowIteratorTest.java | 136 ++-- .../core/iterators/FirstEntryInRowTest.java | 33 +- .../core/iterators/IteratorUtilTest.java | 158 ++--- .../iterators/aggregation/NumSummationTest.java | 28 +- .../conf/AggregatorConfigurationTest.java | 16 +- .../ColumnFamilySkippingIteratorTest.java | 94 +-- .../core/iterators/system/ColumnFilterTest.java | 32 +- .../iterators/system/DeletingIteratorTest.java | 90 +-- .../iterators/system/MultiIteratorTest.java | 150 ++--- .../system/SourceSwitchingIteratorTest.java | 92 +-- .../system/TimeSettingIteratorTest.java | 32 +- .../iterators/system/VisibilityFilterTest.java | 10 +- .../iterators/user/BigDecimalCombinerTest.java | 1 - .../iterators/user/ColumnSliceFilterTest.java | 455 +++++++------ .../core/iterators/user/CombinerTest.java | 422 ++++++------ .../core/iterators/user/FilterTest.java | 142 ++-- .../core/iterators/user/GrepIteratorTest.java | 14 +- .../iterators/user/IndexedDocIteratorTest.java | 56 +- .../user/IntersectingIteratorTest.java | 48 +- .../core/iterators/user/LargeRowFilterTest.java | 88 +-- .../iterators/user/RowDeletingIteratorTest.java | 92 +-- .../core/iterators/user/RowFilterTest.java | 8 +- .../iterators/user/VersioningIteratorTest.java | 100 +-- .../iterators/user/VisibilityFilterTest.java | 82 +-- .../user/WholeColumnFamilyIteratorTest.java | 54 +- .../iterators/user/WholeRowIteratorTest.java | 54 +- .../core/metadata/MetadataServicerTest.java | 16 +- .../ReplicationConfigurationUtilTest.java | 8 +- .../core/replication/ReplicationTargetTest.java | 2 +- .../core/replication/StatusUtilTest.java | 2 +- .../core/replication/proto/StatusTest.java | 2 +- .../core/security/AuthenticationTokenTest.java | 8 +- .../core/security/AuthorizationsTest.java | 26 +- .../accumulo/core/security/CredentialsTest.java | 22 +- .../core/security/VisibilityEvaluatorTest.java | 34 +- .../core/security/crypto/CryptoTest.java | 168 ++--- .../accumulo/core/trace/PerformanceTest.java | 8 +- .../core/util/LocalityGroupUtilTest.java | 29 +- .../apache/accumulo/core/util/MergeTest.java | 36 +- .../org/apache/accumulo/core/util/PairTest.java | 6 +- .../accumulo/core/util/PartitionerTest.java | 66 +- .../apache/accumulo/core/util/TestVersion.java | 14 +- .../apache/accumulo/core/util/TextUtilTest.java | 4 +- .../core/util/format/DefaultFormatterTest.java | 2 +- .../core/util/format/HexFormatterTest.java | 1 - .../accumulo/examples/simple/client/Flush.java | 2 +- .../simple/client/RandomBatchScanner.java | 84 +-- .../simple/client/RandomBatchWriter.java | 8 +- .../simple/client/ReadWriteExample.java | 2 +- .../examples/simple/client/RowOperations.java | 70 +- .../simple/client/SequentialBatchWriter.java | 18 +- .../simple/client/TraceDumpExample.java | 62 +- .../examples/simple/client/TracingExample.java | 6 +- .../examples/simple/combiner/StatsCombiner.java | 30 +- .../constraints/AlphaNumKeyConstraint.java | 30 +- .../simple/constraints/MaxMutationSize.java | 6 +- .../constraints/NumericValueConstraint.java | 24 +- .../examples/simple/dirlist/FileCount.java | 113 ++-- .../examples/simple/dirlist/Ingest.java | 37 +- .../examples/simple/dirlist/QueryUtil.java | 61 +- .../examples/simple/dirlist/Viewer.java | 47 +- .../examples/simple/filedata/ChunkCombiner.java | 56 +- .../simple/filedata/ChunkInputFormat.java | 4 +- .../simple/filedata/ChunkInputStream.java | 52 +- .../simple/filedata/FileDataIngest.java | 105 ++- .../examples/simple/filedata/FileDataQuery.java | 12 +- .../examples/simple/filedata/KeyUtil.java | 8 +- .../simple/filedata/VisibilityCombiner.java | 32 +- .../helloworld/InsertWithBatchWriter.java | 10 +- .../examples/simple/helloworld/ReadData.java | 14 +- .../simple/isolation/InterferenceTest.java | 69 +- .../examples/simple/mapreduce/TableToFile.java | 2 +- .../simple/mapreduce/TeraSortIngest.java | 14 +- .../simple/mapreduce/TokenFileWordCount.java | 4 +- .../examples/simple/mapreduce/WordCount.java | 6 +- .../simple/mapreduce/bulk/SetupTable.java | 8 +- .../simple/mapreduce/bulk/VerifyIngest.java | 32 +- .../examples/simple/reservations/ARS.java | 104 +-- .../examples/simple/shard/ContinuousQuery.java | 64 +- .../accumulo/examples/simple/shard/Index.java | 48 +- .../accumulo/examples/simple/shard/Query.java | 14 +- .../accumulo/examples/simple/shard/Reverse.java | 20 +- .../examples/simple/shell/DebugCommand.java | 2 +- .../simple/shell/MyAppShellExtension.java | 10 +- .../examples/simple/dirlist/CountTest.java | 12 +- .../simple/filedata/ChunkCombinerTest.java | 90 ++- .../simple/filedata/ChunkInputStreamTest.java | 122 ++-- .../examples/simple/filedata/KeyUtilTest.java | 5 +- .../org/apache/accumulo/fate/AdminUtil.java | 88 +-- .../org/apache/accumulo/fate/AgeOffStore.java | 66 +- .../org/apache/accumulo/fate/ReadOnlyRepo.java | 4 +- .../org/apache/accumulo/fate/ReadOnlyStore.java | 6 +- .../apache/accumulo/fate/ReadOnlyTStore.java | 35 +- .../java/org/apache/accumulo/fate/Repo.java | 8 +- .../accumulo/fate/StackOverflowException.java | 6 +- .../java/org/apache/accumulo/fate/TStore.java | 12 +- .../java/org/apache/accumulo/fate/ZooStore.java | 127 ++-- .../apache/accumulo/fate/util/AddressUtil.java | 2 +- .../org/apache/accumulo/fate/util/Daemon.java | 18 +- .../accumulo/fate/util/LoggingRunnable.java | 6 +- .../accumulo/fate/util/UtilWaitThread.java | 2 +- .../zookeeper/DistributedReadWriteLock.java | 74 +-- .../fate/zookeeper/IZooReaderWriter.java | 2 +- .../fate/zookeeper/TransactionWatcher.java | 13 +- .../accumulo/fate/zookeeper/ZooCache.java | 58 +- .../fate/zookeeper/ZooCacheFactory.java | 9 +- .../apache/accumulo/fate/zookeeper/ZooLock.java | 240 +++---- .../fate/zookeeper/ZooReaderWriter.java | 1 - .../accumulo/fate/zookeeper/ZooReservation.java | 22 +- .../accumulo/fate/zookeeper/ZooSession.java | 22 +- .../apache/accumulo/fate/AgeOffStoreTest.java | 66 +- .../apache/accumulo/fate/ReadOnlyStoreTest.java | 5 +- .../org/apache/accumulo/fate/SimpleStore.java | 34 +- .../accumulo/fate/util/AddressUtilTest.java | 4 +- .../zookeeper/DistributedReadWriteLockTest.java | 28 +- .../fate/zookeeper/TransactionWatcherTest.java | 27 +- .../fate/zookeeper/ZooCacheFactoryTest.java | 10 +- .../accumulo/fate/zookeeper/ZooCacheTest.java | 33 +- .../fate/zookeeper/ZooReaderWriterTest.java | 2 +- .../accumulo/fate/zookeeper/ZooSessionTest.java | 4 +- .../apache/accumulo/plugin/CustomFilter.java | 6 +- .../org/apache/accumulo/plugin/PluginIT.java | 18 +- .../maven/plugin/AbstractAccumuloMojo.java | 6 +- .../apache/accumulo/maven/plugin/StopMojo.java | 2 +- .../apache/accumulo/cluster/RemoteShell.java | 3 +- .../standalone/StandaloneClusterControl.java | 2 +- .../minicluster/MiniAccumuloConfig.java | 54 +- .../minicluster/MiniAccumuloInstance.java | 2 +- .../minicluster/MiniAccumuloRunner.java | 16 +- .../impl/ZooKeeperBindException.java | 3 +- .../MiniAccumuloClusterStartStopTest.java | 4 +- .../minicluster/impl/CleanShutdownMacTest.java | 2 +- .../impl/MiniAccumuloClusterImplTest.java | 3 +- .../java/org/apache/accumulo/proxy/Proxy.java | 32 +- .../org/apache/accumulo/proxy/ProxyServer.java | 352 +++++----- .../apache/accumulo/proxy/TestProxyClient.java | 56 +- .../java/org/apache/accumulo/proxy/Util.java | 18 +- .../org/apache/accumulo/server/Accumulo.java | 44 +- .../org/apache/accumulo/server/ServerOpts.java | 6 +- .../server/cli/ClientOnDefaultTable.java | 3 +- .../server/cli/ClientOnRequiredTable.java | 4 +- .../apache/accumulo/server/cli/ClientOpts.java | 2 +- .../accumulo/server/client/BulkImporter.java | 264 ++++---- .../accumulo/server/client/HdfsZooInstance.java | 2 +- .../accumulo/server/conf/ConfigSanityCheck.java | 4 +- .../server/conf/NamespaceConfWatcher.java | 5 +- .../server/conf/ServerConfiguration.java | 4 +- .../server/conf/ServerConfigurationFactory.java | 16 +- .../accumulo/server/conf/TableConfWatcher.java | 15 +- .../server/conf/TableParentConfiguration.java | 1 + .../server/data/ServerColumnUpdate.java | 2 +- .../accumulo/server/data/ServerMutation.java | 9 +- .../org/apache/accumulo/server/fs/FileRef.java | 24 +- .../server/fs/PerTableVolumeChooser.java | 8 +- .../server/fs/PreferredVolumeChooser.java | 11 +- .../apache/accumulo/server/fs/ViewFSUtils.java | 2 +- .../accumulo/server/fs/VolumeChooser.java | 4 +- .../accumulo/server/fs/VolumeManager.java | 3 +- .../accumulo/server/fs/VolumeManagerImpl.java | 4 +- .../apache/accumulo/server/fs/VolumeUtil.java | 4 +- .../apache/accumulo/server/init/Initialize.java | 2 +- .../iterators/MetadataBulkLoadFilter.java | 24 +- .../accumulo/server/log/SortedLogState.java | 6 +- .../master/balancer/ChaoticLoadBalancer.java | 21 +- .../server/master/balancer/TabletBalancer.java | 51 +- .../server/master/recovery/RecoveryPath.java | 12 +- .../server/master/state/Assignment.java | 2 +- .../server/master/state/ClosableIterator.java | 3 +- .../server/master/state/CurrentState.java | 8 +- .../server/master/state/DeadServerList.java | 10 +- .../server/master/state/DistributedStore.java | 10 +- .../master/state/DistributedStoreException.java | 8 +- .../accumulo/server/master/state/MergeInfo.java | 30 +- .../server/master/state/MergeState.java | 2 +- .../server/master/state/MetaDataStateStore.java | 26 +- .../master/state/MetaDataTableScanner.java | 32 +- .../master/state/RootTabletStateStore.java | 8 +- .../server/master/state/TServerInstance.java | 51 +- .../master/state/TabletLocationState.java | 25 +- .../server/master/state/TabletMigration.java | 4 +- .../server/master/state/TabletServerState.java | 18 +- .../master/state/TabletStateChangeIterator.java | 30 +- .../server/master/state/TabletStateStore.java | 22 +- .../accumulo/server/master/state/ZooStore.java | 20 +- .../master/state/ZooTabletStateStore.java | 37 +- .../master/tableOps/UserCompactionConfig.java | 5 +- .../server/metrics/AbstractMetricsImpl.java | 3 +- .../server/metrics/MetricsConfiguration.java | 66 +- .../accumulo/server/metrics/ThriftMetrics.java | 1 - .../server/monitor/DedupedLogEvent.java | 18 +- .../accumulo/server/monitor/LogService.java | 6 +- .../accumulo/server/problems/ProblemReport.java | 82 +-- .../problems/ProblemReportingIterator.java | 24 +- .../server/problems/ProblemReports.java | 118 ++-- .../DistributedWorkQueueWorkAssignerHelper.java | 5 +- .../server/replication/ReplicationUtil.java | 11 +- .../server/replication/StatusCombiner.java | 4 +- .../server/replication/WorkAssigner.java | 1 - .../replication/ZooKeeperInitialization.java | 3 +- .../server/rpc/ClientInfoProcessorFactory.java | 2 +- .../apache/accumulo/server/rpc/RpcWrapper.java | 1 + .../server/rpc/TNonblockingServerSocket.java | 14 +- .../security/AuditedSecurityOperation.java | 23 +- .../server/security/SecurityOperation.java | 56 +- .../accumulo/server/security/SecurityUtil.java | 12 +- .../server/security/SystemCredentials.java | 4 +- .../server/security/handler/Authenticator.java | 22 +- .../server/security/handler/Authorizor.java | 14 +- .../security/handler/InsecureAuthenticator.java | 37 +- .../security/handler/InsecurePermHandler.java | 70 +- .../security/handler/PermissionHandler.java | 9 +- .../server/security/handler/ZKPermHandler.java | 10 +- .../server/security/handler/ZKSecurityTool.java | 32 +- .../accumulo/server/tables/TableManager.java | 2 +- .../accumulo/server/tables/TableObserver.java | 4 +- .../accumulo/server/tablets/TabletTime.java | 104 +-- .../server/tablets/UniqueNameAllocator.java | 26 +- .../tabletserver/LargestFirstMemoryManager.java | 88 ++- .../server/tabletserver/MemoryManager.java | 16 +- .../server/tabletserver/TabletState.java | 6 +- .../server/util/ActionStatsUpdator.java | 6 +- .../org/apache/accumulo/server/util/Admin.java | 105 +-- .../accumulo/server/util/ChangeSecret.java | 22 +- .../accumulo/server/util/CleanZookeeper.java | 19 +- .../apache/accumulo/server/util/DefaultMap.java | 8 +- .../accumulo/server/util/DeleteZooInstance.java | 14 +- .../accumulo/server/util/DumpZookeeper.java | 23 +- .../accumulo/server/util/FileSystemMonitor.java | 44 +- .../apache/accumulo/server/util/FileUtil.java | 236 +++---- .../org/apache/accumulo/server/util/Halt.java | 10 +- .../accumulo/server/util/ListInstances.java | 89 +-- .../accumulo/server/util/ListVolumesUsed.java | 2 +- .../accumulo/server/util/LocalityCheck.java | 14 +- .../accumulo/server/util/LoginProperties.java | 14 +- .../server/util/MasterMetadataUtil.java | 101 +-- .../accumulo/server/util/MetadataTableUtil.java | 15 +- .../accumulo/server/util/RandomWriter.java | 30 +- .../accumulo/server/util/RandomizeVolumes.java | 3 +- .../util/RemoveEntriesForMissingFiles.java | 2 +- .../accumulo/server/util/RestoreZookeeper.java | 18 +- .../accumulo/server/util/SendLogToChainsaw.java | 2 +- .../accumulo/server/util/SystemPropUtil.java | 6 +- .../accumulo/server/util/TableInfoUtil.java | 10 +- .../accumulo/server/util/TablePropUtil.java | 14 +- .../accumulo/server/util/TabletIterator.java | 136 ++-- .../accumulo/server/util/TabletOperations.java | 18 +- .../accumulo/server/util/TabletServerLocks.java | 23 +- .../server/util/VerifyTabletAssignments.java | 58 +- .../accumulo/server/util/ZooKeeperMain.java | 8 +- .../org/apache/accumulo/server/util/ZooZap.java | 45 +- .../server/util/time/BaseRelativeTime.java | 16 +- .../accumulo/server/util/time/ProvidesTime.java | 2 +- .../accumulo/server/util/time/RelativeTime.java | 14 +- .../accumulo/server/util/time/SimpleTimer.java | 63 +- .../accumulo/server/util/time/SystemTime.java | 6 +- .../server/zookeeper/DistributedWorkQueue.java | 56 +- .../server/zookeeper/TransactionWatcher.java | 12 +- .../accumulo/server/zookeeper/ZooCache.java | 4 +- .../accumulo/server/zookeeper/ZooLock.java | 6 +- .../server/zookeeper/ZooReaderWriter.java | 6 +- .../apache/accumulo/server/AccumuloTest.java | 2 + .../accumulo/server/ServerConstantsTest.java | 2 +- .../apache/accumulo/server/ServerOptsTest.java | 3 +- .../server/client/BulkImporterTest.java | 24 +- .../server/conf/NamespaceConfigurationTest.java | 21 +- .../server/conf/TableConfigurationTest.java | 12 +- .../conf/ZooConfigurationFactoryTest.java | 15 +- .../constraints/MetadataConstraintsTest.java | 89 ++- .../server/data/ServerMutationTest.java | 27 +- .../apache/accumulo/server/fs/FileRefTest.java | 4 +- .../apache/accumulo/server/fs/FileTypeTest.java | 2 +- .../accumulo/server/fs/ViewFSUtilsTest.java | 11 +- .../server/fs/VolumeManagerImplTest.java | 3 +- .../accumulo/server/fs/VolumeUtilTest.java | 14 +- .../iterators/MetadataBulkLoadFilterTest.java | 39 +- .../balancer/ChaoticLoadBalancerTest.java | 33 +- .../balancer/DefaultLoadBalancerTest.java | 51 +- .../master/balancer/TableLoadBalancerTest.java | 32 +- .../server/master/state/MergeInfoTest.java | 16 +- .../master/state/TabletLocationStateTest.java | 14 +- .../server/problems/ProblemReportTest.java | 20 +- .../server/replication/StatusCombinerTest.java | 4 +- .../ZooKeeperInitializationTest.java | 2 +- .../server/security/SystemCredentialsTest.java | 8 +- .../security/handler/ZKAuthenticatorTest.java | 22 +- .../accumulo/server/tablets/MillisTimeTest.java | 16 +- .../accumulo/server/tablets/TabletTimeTest.java | 11 +- .../accumulo/server/util/AdminCommandsTest.java | 5 +- .../apache/accumulo/server/util/CloneTest.java | 230 +++---- .../accumulo/server/util/DefaultMapTest.java | 12 +- .../accumulo/server/util/FileInfoTest.java | 3 +- .../accumulo/server/util/FileUtilTest.java | 168 ++--- .../server/util/ReplicationTableUtilTest.java | 2 +- .../accumulo/server/util/TServerUtilsTest.java | 10 +- .../server/util/TabletIteratorTest.java | 34 +- .../server/util/time/BaseRelativeTimeTest.java | 25 +- .../server/util/time/SimpleTimerTest.java | 9 +- .../accumulo/gc/GarbageCollectionAlgorithm.java | 2 +- .../gc/GarbageCollectionEnvironment.java | 19 +- .../accumulo/gc/SimpleGarbageCollector.java | 4 +- .../accumulo/gc/GarbageCollectionTest.java | 3 +- .../gc/SimpleGarbageCollectorOptsTest.java | 3 +- .../accumulo/master/EventCoordinator.java | 16 +- .../accumulo/master/FateServiceHandler.java | 4 +- .../accumulo/master/TabletGroupWatcher.java | 116 ++-- .../master/metrics/ReplicationMetricsMBean.java | 16 +- .../master/recovery/RecoveryManager.java | 4 +- .../MasterReplicationCoordinator.java | 3 +- .../replication/SequentialWorkAssigner.java | 8 +- .../accumulo/master/replication/WorkDriver.java | 2 +- .../accumulo/master/state/MergeStats.java | 28 +- .../accumulo/master/state/SetGoalState.java | 4 +- .../accumulo/master/state/TableCounts.java | 8 +- .../accumulo/master/state/TableStats.java | 14 +- .../accumulo/master/tableOps/BulkImport.java | 13 +- .../accumulo/master/tableOps/CloneTable.java | 4 +- .../accumulo/master/tableOps/CompactRange.java | 4 +- .../accumulo/master/tableOps/CreateTable.java | 4 +- .../accumulo/master/tableOps/ExportTable.java | 112 ++-- .../accumulo/master/tableOps/MasterRepo.java | 14 +- .../accumulo/master/tableOps/TableRangeOp.java | 9 +- .../accumulo/master/tableOps/TraceRepo.java | 20 +- .../apache/accumulo/master/tableOps/Utils.java | 6 +- .../master/tserverOps/ShutdownTServer.java | 16 +- .../apache/accumulo/master/DefaultMapTest.java | 9 +- .../apache/accumulo/master/TestMergeState.java | 2 +- ...tributedWorkQueueWorkAssignerHelperTest.java | 2 +- .../MasterReplicationCoordinatorTest.java | 2 +- .../master/replication/StatusMakerTest.java | 2 +- .../accumulo/master/state/MergeInfoTest.java | 10 +- .../master/state/RootTabletStateStoreTest.java | 40 +- .../org/apache/accumulo/monitor/Monitor.java | 6 +- .../accumulo/monitor/ZooKeeperStatus.java | 30 +- .../monitor/servlets/GcStatusServlet.java | 12 +- .../accumulo/monitor/servlets/JSONServlet.java | 22 +- .../accumulo/monitor/servlets/LogServlet.java | 12 +- .../monitor/servlets/MasterServlet.java | 27 +- .../monitor/servlets/ProblemServlet.java | 46 +- .../accumulo/monitor/servlets/ShellServlet.java | 38 +- .../monitor/servlets/TServersServlet.java | 70 +- .../monitor/servlets/TablesServlet.java | 34 +- .../accumulo/monitor/servlets/VisServlet.java | 52 +- .../accumulo/monitor/servlets/XMLServlet.java | 38 +- .../monitor/servlets/trace/ListType.java | 10 +- .../servlets/trace/NullKeyValueIterator.java | 6 +- .../monitor/servlets/trace/NullScanner.java | 46 +- .../monitor/servlets/trace/ShowTrace.java | 18 +- .../servlets/trace/ShowTraceLinkType.java | 4 +- .../monitor/servlets/trace/Summary.java | 30 +- .../accumulo/monitor/util/TableColumn.java | 10 +- .../apache/accumulo/monitor/util/TableRow.java | 18 +- .../monitor/util/celltypes/CellType.java | 8 +- .../monitor/util/celltypes/CompactionsType.java | 12 +- .../monitor/util/celltypes/DateTimeType.java | 12 +- .../monitor/util/celltypes/DurationType.java | 10 +- .../monitor/util/celltypes/NumberType.java | 26 +- .../monitor/util/celltypes/PercentageType.java | 12 +- .../util/celltypes/PreciseNumberType.java | 3 +- .../util/celltypes/ProgressChartType.java | 14 +- .../monitor/util/celltypes/StringType.java | 4 +- .../monitor/util/celltypes/TServerLinkType.java | 12 +- .../monitor/util/celltypes/TableLinkType.java | 14 +- .../monitor/util/celltypes/TableStateType.java | 8 +- .../accumulo/monitor/ShowTraceLinkTypeTest.java | 8 +- .../accumulo/monitor/ZooKeeperStatusTest.java | 14 +- .../monitor/servlets/trace/SummaryTest.java | 2 +- .../util/celltypes/PreciseNumberTypeTest.java | 3 +- .../accumulo/tracer/AsyncSpanReceiver.java | 46 +- .../accumulo/tracer/SendSpansViaThrift.java | 22 +- .../org/apache/accumulo/tracer/SpanTree.java | 10 +- .../org/apache/accumulo/tracer/TraceDump.java | 18 +- .../apache/accumulo/tracer/TraceFormatter.java | 27 +- .../org/apache/accumulo/tracer/TraceServer.java | 6 +- .../org/apache/accumulo/tracer/TracerTest.java | 49 +- .../server/GarbageCollectionLogger.java | 10 +- .../tserver/BulkFailedCopyProcessor.java | 3 +- .../accumulo/tserver/CompactionQueue.java | 54 +- .../tserver/ConditionalMutationSet.java | 10 +- .../apache/accumulo/tserver/FileManager.java | 214 +++--- .../accumulo/tserver/HoldTimeoutException.java | 2 +- .../apache/accumulo/tserver/InMemoryMap.java | 280 ++++---- .../org/apache/accumulo/tserver/MemKey.java | 26 +- .../org/apache/accumulo/tserver/MemValue.java | 18 +- .../accumulo/tserver/MinorCompactionReason.java | 2 +- .../org/apache/accumulo/tserver/Mutations.java | 6 +- .../org/apache/accumulo/tserver/NativeMap.java | 12 +- .../org/apache/accumulo/tserver/RowLocks.java | 68 +- .../tserver/TConstraintViolationException.java | 2 +- .../org/apache/accumulo/tserver/TLevel.java | 8 +- .../tserver/TabletIteratorEnvironment.java | 26 +- .../accumulo/tserver/TabletMutations.java | 2 +- .../apache/accumulo/tserver/TabletServer.java | 16 +- .../tserver/TabletServerResourceManager.java | 4 +- .../accumulo/tserver/TabletStatsKeeper.java | 36 +- .../accumulo/tserver/TooManyFilesException.java | 4 +- .../accumulo/tserver/TservConstraintEnv.java | 2 +- .../apache/accumulo/tserver/WriteTracker.java | 8 +- .../tserver/compaction/CompactionPlan.java | 5 +- .../tserver/compaction/CompactionStrategy.java | 10 +- .../compaction/SizeLimitCompactionStrategy.java | 2 +- .../tserver/constraints/ConstraintChecker.java | 28 +- .../constraints/UnsatisfiableConstraint.java | 10 +- .../tserver/data/ServerConditionalMutation.java | 11 +- .../apache/accumulo/tserver/log/DfsLogger.java | 12 +- .../accumulo/tserver/log/LocalWALRecovery.java | 12 +- .../accumulo/tserver/log/SortedLogRecovery.java | 51 +- .../tserver/log/TabletServerLogger.java | 2 +- .../accumulo/tserver/logger/LogFileKey.java | 22 +- .../accumulo/tserver/logger/LogFileValue.java | 25 +- .../tserver/mastermessage/MasterMessage.java | 4 +- .../mastermessage/SplitReportMessage.java | 10 +- .../mastermessage/TabletStatusMessage.java | 8 +- .../tserver/metrics/TabletServerMBean.java | 30 +- .../replication/AccumuloReplicaSystem.java | 12 +- .../replication/ReplicationServicerHandler.java | 3 +- .../tserver/replication/ReplicationWorker.java | 2 +- .../accumulo/tserver/scan/LookupTask.java | 8 +- .../accumulo/tserver/scan/NextBatchTask.java | 4 +- .../accumulo/tserver/scan/ScanRunState.java | 2 +- .../apache/accumulo/tserver/scan/ScanTask.java | 2 +- .../tserver/session/ConditionalSession.java | 6 +- .../tserver/session/MultiScanSession.java | 5 +- .../accumulo/tserver/session/ScanSession.java | 7 +- .../accumulo/tserver/session/Session.java | 8 +- .../tserver/session/SessionManager.java | 5 +- .../accumulo/tserver/session/UpdateSession.java | 8 +- .../apache/accumulo/tserver/tablet/Batch.java | 4 +- .../accumulo/tserver/tablet/CommitSession.java | 4 +- .../accumulo/tserver/tablet/CompactionInfo.java | 6 +- .../tserver/tablet/CompactionRunner.java | 2 +- .../tserver/tablet/CompactionStats.java | 18 +- .../tserver/tablet/CompactionWatcher.java | 18 +- .../accumulo/tserver/tablet/Compactor.java | 6 +- .../tserver/tablet/CountingIterator.java | 2 +- .../apache/accumulo/tserver/tablet/KVEntry.java | 2 +- .../tserver/tablet/MinorCompactionTask.java | 6 +- .../accumulo/tserver/tablet/MinorCompactor.java | 42 +- .../apache/accumulo/tserver/tablet/Rate.java | 10 +- .../accumulo/tserver/tablet/RootFiles.java | 2 +- .../accumulo/tserver/tablet/ScanBatch.java | 2 +- .../accumulo/tserver/tablet/ScanDataSource.java | 10 +- .../accumulo/tserver/tablet/ScanOptions.java | 6 +- .../apache/accumulo/tserver/tablet/Scanner.java | 6 +- .../accumulo/tserver/tablet/SplitInfo.java | 8 +- .../accumulo/tserver/tablet/SplitRowSpec.java | 2 +- .../apache/accumulo/tserver/tablet/Tablet.java | 4 +- .../tserver/tablet/TabletClosedException.java | 2 +- .../tserver/tablet/TabletCommitter.java | 2 +- .../accumulo/tserver/tablet/TabletMemory.java | 6 +- .../LargestFirstMemoryManagerTest.java | 142 ++-- .../tserver/CheckTabletMetadataTest.java | 53 +- .../accumulo/tserver/CountingIteratorTest.java | 2 +- .../accumulo/tserver/InMemoryMapTest.java | 12 +- .../tserver/TabletServerSyncCheckTest.java | 1 - .../tserver/TservConstraintEnvTest.java | 12 +- .../tserver/compaction/CompactionPlanTest.java | 3 +- .../SizeLimitCompactionStrategyTest.java | 2 +- .../constraints/ConstraintCheckerTest.java | 13 +- .../accumulo/tserver/log/DfsLoggerTest.java | 20 +- .../tserver/log/SortedLogRecoveryTest.java | 4 +- .../tserver/log/TestUpgradePathForWALogs.java | 2 +- .../accumulo/tserver/logger/LogFileTest.java | 13 +- .../replication/AccumuloReplicaSystemTest.java | 14 +- .../BatchWriterReplicationReplayerTest.java | 5 +- .../replication/ReplicationProcessorTest.java | 5 +- .../accumulo/tserver/tablet/RootFilesTest.java | 3 +- .../accumulo/tserver/tablet/TabletTest.java | 4 +- .../java/org/apache/accumulo/shell/Shell.java | 5 +- .../accumulo/shell/ShellCommandException.java | 18 +- .../apache/accumulo/shell/ShellExtension.java | 8 +- .../apache/accumulo/shell/ShellOptionsJC.java | 11 +- .../org/apache/accumulo/shell/ShellUtil.java | 2 +- .../java/org/apache/accumulo/shell/Token.java | 32 +- .../accumulo/shell/commands/AboutCommand.java | 8 +- .../commands/ActiveCompactionIterator.java | 38 +- .../shell/commands/ActiveScanIterator.java | 40 +- .../shell/commands/AddAuthsCommand.java | 12 +- .../shell/commands/AddSplitsCommand.java | 26 +- .../shell/commands/AuthenticateCommand.java | 10 +- .../shell/commands/ClasspathCommand.java | 4 +- .../accumulo/shell/commands/ClearCommand.java | 8 +- .../shell/commands/CloneTableCommand.java | 30 +- .../accumulo/shell/commands/CompactCommand.java | 26 +- .../accumulo/shell/commands/ConfigCommand.java | 4 +- .../shell/commands/ConstraintCommand.java | 2 +- .../shell/commands/CreateNamespaceCommand.java | 2 +- .../shell/commands/CreateTableCommand.java | 4 +- .../shell/commands/CreateUserCommand.java | 12 +- .../accumulo/shell/commands/DebugCommand.java | 10 +- .../accumulo/shell/commands/DeleteCommand.java | 26 +- .../shell/commands/DeleteManyCommand.java | 22 +- .../shell/commands/DeleteNamespaceCommand.java | 2 +- .../shell/commands/DeleteRowsCommand.java | 8 +- .../shell/commands/DeleteScanIterCommand.java | 22 +- .../shell/commands/DeleteShellIterCommand.java | 22 +- .../accumulo/shell/commands/EGrepCommand.java | 10 +- .../shell/commands/ExecfileCommand.java | 10 +- .../accumulo/shell/commands/ExitCommand.java | 4 +- .../shell/commands/ExportTableCommand.java | 26 +- .../shell/commands/ExtensionCommand.java | 28 +- .../accumulo/shell/commands/FateCommand.java | 38 +- .../accumulo/shell/commands/FlushCommand.java | 12 +- .../shell/commands/FormatterCommand.java | 17 +- .../shell/commands/GetAuthsCommand.java | 8 +- .../shell/commands/GetGroupsCommand.java | 12 +- .../shell/commands/GetSplitsCommand.java | 36 +- .../accumulo/shell/commands/GrantCommand.java | 2 +- .../accumulo/shell/commands/GrepCommand.java | 28 +- .../accumulo/shell/commands/HelpCommand.java | 16 +- .../accumulo/shell/commands/HiddenCommand.java | 10 +- .../accumulo/shell/commands/HistoryCommand.java | 10 +- .../shell/commands/ImportDirectoryCommand.java | 12 +- .../shell/commands/ImportTableCommand.java | 14 +- .../accumulo/shell/commands/InsertCommand.java | 47 +- .../shell/commands/InterpreterCommand.java | 8 +- .../shell/commands/ListCompactionsCommand.java | 30 +- .../shell/commands/ListIterCommand.java | 2 +- .../shell/commands/ListScansCommand.java | 30 +- .../shell/commands/ListShellIterCommand.java | 18 +- .../accumulo/shell/commands/MaxRowCommand.java | 14 +- .../accumulo/shell/commands/MergeCommand.java | 10 +- .../accumulo/shell/commands/NoTableCommand.java | 6 +- .../accumulo/shell/commands/OfflineCommand.java | 13 +- .../accumulo/shell/commands/OnlineCommand.java | 12 +- .../accumulo/shell/commands/PasswdCommand.java | 19 +- .../accumulo/shell/commands/PingCommand.java | 33 +- .../accumulo/shell/commands/PingIterator.java | 14 +- .../shell/commands/QuotedStringTokenizer.java | 16 +- .../shell/commands/RenameNamespaceCommand.java | 2 +- .../shell/commands/RenameTableCommand.java | 2 +- .../accumulo/shell/commands/RevokeCommand.java | 2 +- .../accumulo/shell/commands/ScanCommand.java | 90 +-- .../accumulo/shell/commands/ScriptCommand.java | 58 +- .../shell/commands/SetAuthsCommand.java | 12 +- .../shell/commands/SetGroupsCommand.java | 22 +- .../accumulo/shell/commands/SetIterCommand.java | 28 +- .../shell/commands/SetScanIterCommand.java | 23 +- .../shell/commands/SetShellIterCommand.java | 19 +- .../ShellPluginConfigurationCommand.java | 57 +- .../accumulo/shell/commands/SleepCommand.java | 8 +- .../commands/SystemPermissionsCommand.java | 4 +- .../accumulo/shell/commands/TableCommand.java | 13 +- .../accumulo/shell/commands/TableOperation.java | 4 +- .../shell/commands/TablePermissionsCommand.java | 4 +- .../accumulo/shell/commands/TraceCommand.java | 8 +- .../accumulo/shell/commands/UserCommand.java | 12 +- .../shell/commands/UserPermissionsCommand.java | 3 +- .../accumulo/shell/commands/UsersCommand.java | 4 +- .../accumulo/shell/commands/WhoAmICommand.java | 4 +- .../accumulo/shell/format/DeleterFormatter.java | 8 +- .../apache/accumulo/shell/mock/MockShell.java | 31 +- .../accumulo/shell/PasswordConverterTest.java | 24 +- .../apache/accumulo/shell/ShellConfigTest.java | 17 +- .../org/apache/accumulo/shell/ShellTest.java | 9 +- .../apache/accumulo/shell/ShellUtilTest.java | 7 +- .../shell/commands/DeleteTableCommandTest.java | 2 +- .../shell/commands/DropUserCommandTest.java | 9 +- .../shell/commands/FormatterCommandTest.java | 72 +- .../shell/commands/HistoryCommandTest.java | 1 - .../shell/format/DeleterFormatterTest.java | 1 - .../java/org/apache/accumulo/start/Main.java | 6 +- .../org/apache/accumulo/start/TestMain.java | 8 +- .../start/classloader/AccumuloClassLoader.java | 68 +- .../vfs/AccumuloReloadingVFSClassLoader.java | 36 +- .../classloader/vfs/AccumuloVFSClassLoader.java | 22 +- .../start/classloader/vfs/ContextManager.java | 82 +-- .../start/classloader/vfs/MiniDFSUtil.java | 8 +- .../vfs/PostDelegatingVFSClassLoader.java | 8 +- .../classloader/vfs/ReloadingClassLoader.java | 2 +- .../classloader/vfs/UniqueFileReplicator.java | 2 +- .../vfs/providers/HdfsFileAttributes.java | 61 +- .../providers/HdfsFileContentInfoFactory.java | 36 +- .../vfs/providers/HdfsFileObject.java | 515 +++++++------- .../vfs/providers/HdfsFileProvider.java | 81 +-- .../vfs/providers/HdfsFileSystem.java | 87 +-- .../providers/HdfsFileSystemConfigBuilder.java | 35 +- .../vfs/providers/HdfsRandomAccessContent.java | 76 +-- .../AccumuloReloadingVFSClassLoaderTest.java | 7 +- .../classloader/vfs/ContextManagerTest.java | 2 +- .../providers/ReadOnlyHdfsFileProviderTest.java | 76 +-- .../apache/accumulo/test/AccumuloDFSBase.java | 6 +- start/src/test/java/test/Test.java | 6 +- .../accumulo/test/BulkImportDirectory.java | 9 +- .../org/apache/accumulo/test/CreateRFiles.java | 57 +- .../apache/accumulo/test/CreateRandomRFile.java | 28 +- .../accumulo/test/EstimateInMemMapOverhead.java | 152 ++--- .../accumulo/test/FaultyConditionalWriter.java | 19 +- .../apache/accumulo/test/GetMasterStats.java | 6 +- .../apache/accumulo/test/IMMLGBenchmark.java | 63 +- .../org/apache/accumulo/test/ListTables.java | 2 +- .../accumulo/test/NativeMapConcurrencyTest.java | 94 +-- .../accumulo/test/NativeMapPerformanceTest.java | 72 +- .../accumulo/test/NativeMapStressTest.java | 124 ++-- .../apache/accumulo/test/NullBatchWriter.java | 12 +- .../accumulo/test/QueryMetadataTable.java | 54 +- .../apache/accumulo/test/TestBinaryRows.java | 88 +-- .../org/apache/accumulo/test/TestIngest.java | 156 ++--- .../apache/accumulo/test/TestRandomDeletes.java | 41 +- .../org/apache/accumulo/test/VerifyIngest.java | 1 - .../apache/accumulo/test/WrongTabletTest.java | 4 +- .../test/continuous/ContinuousBatchWalker.java | 82 +-- .../test/continuous/ContinuousIngest.java | 121 ++-- .../test/continuous/ContinuousMoru.java | 60 +- .../test/continuous/ContinuousQuery.java | 20 +- .../test/continuous/ContinuousScanner.java | 36 +- .../continuous/ContinuousStatsCollector.java | 64 +- .../test/continuous/ContinuousVerify.java | 2 +- .../test/continuous/ContinuousWalk.java | 88 +-- .../accumulo/test/continuous/GenSplits.java | 24 +- .../accumulo/test/continuous/Histogram.java | 64 +- .../test/continuous/PrintScanTimeHistogram.java | 27 +- .../accumulo/test/continuous/TimeBinner.java | 62 +- .../test/continuous/UndefinedAnalyzer.java | 2 +- .../accumulo/test/functional/BadCombiner.java | 4 +- .../accumulo/test/functional/BadIterator.java | 6 +- .../test/functional/CacheTestClean.java | 8 +- .../test/functional/CacheTestReader.java | 26 +- .../test/functional/CacheTestWriter.java | 68 +- .../accumulo/test/functional/DropModIter.java | 10 +- .../test/functional/SlowConstraint.java | 8 +- .../accumulo/test/functional/SlowIterator.java | 4 +- .../accumulo/test/functional/ZombieTServer.java | 4 +- .../metadata/MetadataBatchScanTest.java | 116 ++-- .../performance/scan/CollectTabletStats.java | 264 ++++---- .../test/performance/thrift/NullTserver.java | 3 +- .../accumulo/test/randomwalk/Environment.java | 20 +- .../accumulo/test/randomwalk/Fixture.java | 6 +- .../accumulo/test/randomwalk/Framework.java | 40 +- .../apache/accumulo/test/randomwalk/Module.java | 3 +- .../apache/accumulo/test/randomwalk/Node.java | 16 +- .../apache/accumulo/test/randomwalk/State.java | 45 +- .../apache/accumulo/test/randomwalk/Test.java | 2 +- .../accumulo/test/randomwalk/bulk/Setup.java | 16 +- .../accumulo/test/randomwalk/bulk/Verify.java | 24 +- .../test/randomwalk/concurrent/AddSplits.java | 12 +- .../test/randomwalk/concurrent/Apocalypse.java | 4 +- .../test/randomwalk/concurrent/BatchScan.java | 16 +- .../test/randomwalk/concurrent/BatchWrite.java | 14 +- .../test/randomwalk/concurrent/BulkImport.java | 44 +- .../concurrent/ChangeAuthorizations.java | 12 +- .../concurrent/ChangePermissions.java | 38 +- .../randomwalk/concurrent/CheckBalance.java | 8 +- .../test/randomwalk/concurrent/Compact.java | 14 +- .../concurrent/ConcurrentFixture.java | 28 +- .../test/randomwalk/concurrent/CreateTable.java | 10 +- .../test/randomwalk/concurrent/CreateUser.java | 8 +- .../test/randomwalk/concurrent/DeleteRange.java | 12 +- .../test/randomwalk/concurrent/DeleteTable.java | 10 +- .../test/randomwalk/concurrent/DropUser.java | 8 +- .../randomwalk/concurrent/IsolatedScan.java | 12 +- .../test/randomwalk/concurrent/ListSplits.java | 10 +- .../test/randomwalk/concurrent/Merge.java | 12 +- .../randomwalk/concurrent/OfflineTable.java | 12 +- .../test/randomwalk/concurrent/RenameTable.java | 20 +- .../test/randomwalk/concurrent/ScanTable.java | 10 +- .../test/randomwalk/concurrent/Setup.java | 18 +- .../test/randomwalk/concurrent/Shutdown.java | 10 +- .../test/randomwalk/concurrent/StartAll.java | 4 +- .../randomwalk/concurrent/StopTabletServer.java | 10 +- .../test/randomwalk/conditional/Compact.java | 2 +- .../test/randomwalk/conditional/Flush.java | 2 +- .../test/randomwalk/conditional/Init.java | 14 +- .../test/randomwalk/conditional/Merge.java | 2 +- .../test/randomwalk/conditional/Setup.java | 6 +- .../test/randomwalk/conditional/Split.java | 2 +- .../test/randomwalk/conditional/TearDown.java | 2 +- .../test/randomwalk/conditional/Transfer.java | 8 +- .../test/randomwalk/conditional/Utils.java | 3 +- .../test/randomwalk/conditional/Verify.java | 3 +- .../accumulo/test/randomwalk/image/Commit.java | 6 +- .../test/randomwalk/image/ImageFixture.java | 44 +- .../test/randomwalk/image/ScanMeta.java | 54 +- .../accumulo/test/randomwalk/image/TableOp.java | 14 +- .../accumulo/test/randomwalk/image/Verify.java | 50 +- .../accumulo/test/randomwalk/image/Write.java | 30 +- .../test/randomwalk/multitable/Commit.java | 10 +- .../test/randomwalk/multitable/CopyTool.java | 16 +- .../test/randomwalk/multitable/DropTable.java | 10 +- .../multitable/MultiTableFixture.java | 18 +- .../randomwalk/multitable/OfflineTable.java | 10 +- .../test/randomwalk/multitable/Write.java | 24 +- .../randomwalk/security/AlterSystemPerm.java | 20 +- .../test/randomwalk/security/AlterTable.java | 24 +- .../randomwalk/security/AlterTablePerm.java | 56 +- .../test/randomwalk/security/Authenticate.java | 28 +- .../test/randomwalk/security/ChangePass.java | 36 +- .../test/randomwalk/security/CreateTable.java | 22 +- .../test/randomwalk/security/CreateUser.java | 18 +- .../test/randomwalk/security/DropTable.java | 33 +- .../test/randomwalk/security/DropUser.java | 22 +- .../randomwalk/security/SecurityFixture.java | 74 +-- .../randomwalk/security/SecurityHelper.java | 80 +-- .../test/randomwalk/security/SetAuths.java | 31 +- .../test/randomwalk/security/TableOp.java | 74 +-- .../test/randomwalk/security/Validate.java | 42 +- .../randomwalk/security/WalkingSecurity.java | 2 +- .../test/randomwalk/sequential/BatchVerify.java | 40 +- .../test/randomwalk/sequential/Commit.java | 8 +- .../randomwalk/sequential/MapRedVerify.java | 16 +- .../randomwalk/sequential/MapRedVerifyTool.java | 24 +- .../sequential/SequentialFixture.java | 26 +- .../test/randomwalk/sequential/Write.java | 10 +- .../test/randomwalk/shard/BulkInsert.java | 73 +- .../test/randomwalk/shard/CloneIndex.java | 12 +- .../accumulo/test/randomwalk/shard/Commit.java | 4 +- .../test/randomwalk/shard/CompactFilter.java | 24 +- .../accumulo/test/randomwalk/shard/Delete.java | 18 +- .../test/randomwalk/shard/DeleteSomeDocs.java | 30 +- .../test/randomwalk/shard/DeleteWord.java | 38 +- .../test/randomwalk/shard/ExportIndex.java | 40 +- .../accumulo/test/randomwalk/shard/Flush.java | 10 +- .../accumulo/test/randomwalk/shard/Grep.java | 36 +- .../accumulo/test/randomwalk/shard/Insert.java | 64 +- .../accumulo/test/randomwalk/shard/Merge.java | 6 +- .../accumulo/test/randomwalk/shard/Reindex.java | 24 +- .../accumulo/test/randomwalk/shard/Search.java | 36 +- .../test/randomwalk/shard/ShardFixture.java | 4 +- .../test/randomwalk/shard/SortTool.java | 18 +- .../accumulo/test/randomwalk/shard/Split.java | 6 +- .../test/randomwalk/shard/VerifyIndex.java | 24 +- .../test/randomwalk/unit/CreateTable.java | 2 +- .../test/randomwalk/unit/DeleteTable.java | 2 +- .../accumulo/test/randomwalk/unit/Ingest.java | 2 +- .../accumulo/test/randomwalk/unit/Scan.java | 2 +- .../accumulo/test/randomwalk/unit/Verify.java | 2 +- .../ReplicationTablesPrinterThread.java | 2 +- .../test/replication/merkle/MerkleTreeNode.java | 2 +- .../replication/merkle/RangeSerialization.java | 4 +- .../replication/merkle/cli/CompareTables.java | 6 +- .../replication/merkle/cli/ComputeRootHash.java | 2 +- .../replication/merkle/cli/GenerateHashes.java | 3 +- .../accumulo/test/scalability/Ingest.java | 47 +- .../apache/accumulo/test/scalability/Run.java | 34 +- .../accumulo/test/scalability/ScaleTest.java | 26 +- .../accumulo/test/stress/random/DataWriter.java | 6 +- .../test/stress/random/IntArgValidator.java | 6 +- .../test/stress/random/RandomByteArrays.java | 4 +- .../test/stress/random/RandomMutations.java | 9 +- .../test/stress/random/RandomWithinRange.java | 11 +- .../accumulo/test/stress/random/Scan.java | 48 +- .../accumulo/test/stress/random/ScanOpts.java | 13 +- .../accumulo/test/stress/random/Stream.java | 10 +- .../accumulo/test/stress/random/Write.java | 69 +- .../test/stress/random/WriteOptions.java | 80 ++- .../test/stress/random/package-info.java | 9 +- .../accumulo/fate/zookeeper/ZooLockTest.java | 16 +- .../accumulo/proxy/ProxyDurabilityIT.java | 22 +- .../apache/accumulo/proxy/SimpleProxyIT.java | 9 +- .../proxy/TestProxyInstanceOperations.java | 22 +- .../accumulo/proxy/TestProxyReadWrite.java | 172 ++--- .../proxy/TestProxySecurityOperations.java | 42 +- .../proxy/TestProxyTableOperations.java | 56 +- .../server/security/SystemCredentialsIT.java | 7 +- .../accumulo/test/AssignmentThreadsIT.java | 12 +- .../apache/accumulo/test/BalanceFasterIT.java | 12 +- .../accumulo/test/BulkImportVolumeIT.java | 1 - .../accumulo/test/ConditionalWriterIT.java | 8 +- .../accumulo/test/InterruptibleScannersIT.java | 7 +- .../accumulo/test/KeyValueEqualityIT.java | 3 +- .../apache/accumulo/test/MetaGetsReadersIT.java | 14 +- .../org/apache/accumulo/test/NamespacesIT.java | 2 +- .../accumulo/test/NoMutationRecoveryIT.java | 8 +- .../test/RecoveryCompactionsAreFlushesIT.java | 9 +- .../test/RewriteTabletDirectoriesIT.java | 2 +- .../org/apache/accumulo/test/ShellServerIT.java | 2 +- .../test/TableConfigurationUpdateIT.java | 7 +- .../accumulo/test/TabletServerGivesUpIT.java | 10 +- .../org/apache/accumulo/test/TotalQueuedIT.java | 14 +- .../test/TraceRepoDeserializationTest.java | 32 +- .../accumulo/test/VerifySerialRecoveryIT.java | 21 +- .../test/functional/BackupMasterIT.java | 2 +- .../BalanceInPresenceOfOfflineTableIT.java | 12 +- .../test/functional/BinaryStressIT.java | 4 +- .../accumulo/test/functional/BloomFilterIT.java | 6 +- .../apache/accumulo/test/functional/BulkIT.java | 8 +- .../test/functional/ChaoticBalancerIT.java | 4 +- .../test/functional/DeleteEverythingIT.java | 2 +- .../functional/DeleteTableDuringSplitIT.java | 5 +- .../functional/DeletedTablesDontFlushIT.java | 2 +- .../accumulo/test/functional/DurabilityIT.java | 26 +- .../accumulo/test/functional/ExamplesIT.java | 10 +- .../test/functional/FunctionalTestUtils.java | 7 +- .../test/functional/HalfDeadTServerIT.java | 4 +- .../test/functional/LateLastContactIT.java | 7 +- .../accumulo/test/functional/LogicalTimeIT.java | 3 +- .../accumulo/test/functional/MaxOpenIT.java | 2 +- .../test/functional/MetadataMaxFilesIT.java | 8 +- .../test/functional/MetadataSplitIT.java | 6 +- .../test/functional/MonitorLoggingIT.java | 4 +- .../accumulo/test/functional/NativeMapIT.java | 2 +- .../functional/RecoveryWithEmptyRFileIT.java | 16 +- .../test/functional/RestartStressIT.java | 4 +- .../accumulo/test/functional/RowDeleteIT.java | 4 +- .../accumulo/test/functional/ScanIdIT.java | 52 +- .../test/functional/SessionDurabilityIT.java | 2 +- .../accumulo/test/functional/ShutdownIT.java | 18 +- .../test/functional/SplitRecoveryIT.java | 90 +-- .../test/functional/WatchTheWatchCountIT.java | 5 +- .../test/functional/WriteAheadLogIT.java | 2 +- .../test/functional/ZookeeperRestartIT.java | 14 +- .../accumulo/test/iterator/RegExTest.java | 52 +- .../test/replication/CyclicReplicationIT.java | 8 +- ...bageCollectorCommunicatesWithTServersIT.java | 2 +- .../replication/MultiTserverReplicationIT.java | 2 +- ...UnusedWalDoesntCloseReplicationStatusIT.java | 3 +- .../apache/accumulo/test/util/CertUtils.java | 5 +- .../trace/instrument/CloudtraceSpan.java | 30 +- .../accumulo/trace/instrument/CountSampler.java | 2 +- .../accumulo/trace/instrument/Sampler.java | 4 +- .../apache/accumulo/trace/instrument/Span.java | 2 +- 1257 files changed, 19525 insertions(+), 19345 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java b/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java index 0cef8d3..4726e83 100644 --- a/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/bloomfilter/BloomFilter.java @@ -2,30 +2,30 @@ * * Copyright (c) 2005, European Commission project OneLab under contract 034819 (http://www.one-lab.org) * All rights reserved. - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following * conditions are met: - * - Redistributions of source code must retain the above copyright + * - Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the distribution. * - Neither the name of the University Catholique de Louvain - UCL - * nor the names of its contributors may be used to endorse or - * promote products derived from this software without specific prior + * nor the names of its contributors may be used to endorse or + * promote products derived from this software without specific prior * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ @@ -70,29 +70,29 @@ import org.apache.log4j.Logger; * of elements. The receiver uses the filter to test whether various elements are members of the set. Though the filter will occasionally return a false * positive, it will never return a false negative. When creating the filter, the sender can choose its desired point in a trade-off between the false positive * rate and the size. - * + * * <p> * Originally created by <a href="http://www.one-lab.org";>European Commission One-Lab Project 034819</a>. - * + * * @see Filter The general behavior of a filter - * + * * @see <a href="http://portal.acm.org/citation.cfm?id=362692&dl=ACM&coll=portal";>Space/Time Trade-Offs in Hash Coding with Allowable Errors</a> */ public class BloomFilter extends Filter { private static final Logger log = Logger.getLogger(BloomFilter.class); private static final byte[] bitvalues = new byte[] {(byte) 0x01, (byte) 0x02, (byte) 0x04, (byte) 0x08, (byte) 0x10, (byte) 0x20, (byte) 0x40, (byte) 0x80}; - + /** The bit vector. */ BitSet bits; - + /** Default constructor - use with readFields */ public BloomFilter() { super(); } - + /** * Constructor - * + * * @param vectorSize * The vector size of <i>this</i> filter. * @param nbHash @@ -102,44 +102,44 @@ public class BloomFilter extends Filter { */ public BloomFilter(final int vectorSize, final int nbHash, final int hashType) { super(vectorSize, nbHash, hashType); - + bits = new BitSet(this.vectorSize); } - + @Override public boolean add(final Key key) { if (key == null) { throw new NullPointerException("key cannot be null"); } - + int[] h = hash.hash(key); hash.clear(); - + boolean bitsSet = false; for (int i = 0; i < nbHash; i++) { bitsSet |= !bits.get(h[i]); bits.set(h[i]); } - + return bitsSet; } - + @Override public void and(final Filter filter) { if (filter == null || !(filter instanceof BloomFilter) || filter.vectorSize != this.vectorSize || filter.nbHash != this.nbHash) { throw new IllegalArgumentException("filters cannot be and-ed"); } - + this.bits.and(((BloomFilter) filter).bits); } - + @Override public boolean membershipTest(final Key key) { if (key == null) { throw new NullPointerException("key cannot be null"); } - + int[] h = hash.hash(key); hash.clear(); for (int i = 0; i < nbHash; i++) { @@ -149,12 +149,12 @@ public class BloomFilter extends Filter { } return true; } - + @Override public void not() { bits.flip(0, vectorSize - 1); } - + @Override public void or(final Filter filter) { if (filter == null || !(filter instanceof BloomFilter) || filter.vectorSize != this.vectorSize || filter.nbHash != this.nbHash) { @@ -162,7 +162,7 @@ public class BloomFilter extends Filter { } bits.or(((BloomFilter) filter).bits); } - + @Override public void xor(final Filter filter) { if (filter == null || !(filter instanceof BloomFilter) || filter.vectorSize != this.vectorSize || filter.nbHash != this.nbHash) { @@ -170,47 +170,47 @@ public class BloomFilter extends Filter { } bits.xor(((BloomFilter) filter).bits); } - + @Override public String toString() { return bits.toString(); } - + /** * @return size of the the bloomfilter */ public int getVectorSize() { return this.vectorSize; } - + // Writable - + @Override public void write(final DataOutput out) throws IOException { super.write(out); - + ByteArrayOutputStream boas = new ByteArrayOutputStream(); ObjectOutputStream oos = new ObjectOutputStream(boas); - + oos.writeObject(bits); oos.flush(); oos.close(); out.write(boas.toByteArray()); } - + @Override public void readFields(final DataInput in) throws IOException { - + super.readFields(in); - + bits = new BitSet(this.vectorSize); byte[] bytes = null; - + if (super.getSerialVersion() != super.getVersion()) { bytes = new byte[getNBytes()]; in.readFully(bytes); } - + if (super.getSerialVersion() == super.getVersion()) { // ByteArrayInputStream bais = new ByteArrayInputStream(bytes); // ObjectInputStream ois = new ObjectInputStream(bais); @@ -222,7 +222,7 @@ public class BloomFilter extends Filter { throw new IOException("BloomFilter tried to deserialize as bitset: " + e); } // can not close ois, it would close in - + } else { for (int i = 0, byteIndex = 0, bitIndex = 0; i < vectorSize; i++, bitIndex++) { if (bitIndex == 8) { @@ -234,12 +234,12 @@ public class BloomFilter extends Filter { } } } - + } - + /* @return number of bytes needed to hold bit vector */ private int getNBytes() { return (vectorSize + 7) / 8; } - + }// end class
