Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a12b3741 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a12b3741 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a12b3741 Branch: refs/heads/master Commit: a12b3741a0703bd8ebeb5b8ff6dddd4aa7f21a9a Parents: 497a884 e59649b Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Jan 20 11:36:13 2016 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Jan 20 11:36:13 2016 -0500 ---------------------------------------------------------------------- assemble/build.sh | 4 +- .../core/bloomfilter/DynamicBloomFilter.java | 4 +- .../accumulo/core/client/BatchWriterConfig.java | 10 +- .../core/client/ConditionalWriterConfig.java | 4 +- .../accumulo/core/client/ScannerBase.java | 2 - .../core/client/lexicoder/FloatLexicoder.java | 61 +++ .../client/mapred/AccumuloFileOutputFormat.java | 4 +- .../mapreduce/AccumuloFileOutputFormat.java | 4 +- .../lib/impl/FileOutputConfigurator.java | 4 +- .../lib/util/FileOutputConfigurator.java | 4 +- .../security/tokens/AuthenticationToken.java | 2 +- .../org/apache/accumulo/core/conf/Property.java | 6 +- .../core/constraints/VisibilityConstraint.java | 1 - .../java/org/apache/accumulo/core/data/Key.java | 2 +- .../org/apache/accumulo/core/data/Range.java | 6 +- .../file/blockfile/cache/CachedBlockQueue.java | 2 +- .../core/file/blockfile/cache/ClassSize.java | 4 +- .../file/blockfile/impl/CachableBlockFile.java | 4 +- .../accumulo/core/file/rfile/bcfile/Utils.java | 35 +- .../core/iterators/IteratorEnvironment.java | 2 - .../iterators/system/SynchronizedIterator.java | 2 +- .../user/WholeColumnFamilyIterator.java | 4 +- .../core/metadata/ServicerForMetadataTable.java | 2 +- .../core/metadata/ServicerForRootTable.java | 2 +- .../core/metadata/ServicerForUserTables.java | 2 +- .../core/metadata/schema/MetadataSchema.java | 2 +- .../core/replication/ReplicationSchema.java | 6 +- .../accumulo/core/sample/RowColumnSampler.java | 4 +- .../core/security/ColumnVisibility.java | 8 +- .../core/security/VisibilityEvaluator.java | 60 ++- .../security/crypto/CryptoModuleParameters.java | 7 +- .../org/apache/accumulo/core/util/OpTimer.java | 7 +- .../core/util/UnsynchronizedBuffer.java | 4 +- .../core/util/format/BinaryFormatter.java | 41 +- .../core/util/format/DateFormatSupplier.java | 95 +++++ .../core/util/format/DateStringFormatter.java | 57 +-- .../core/util/format/DefaultFormatter.java | 99 +++-- .../accumulo/core/util/format/Formatter.java | 2 +- .../core/util/format/FormatterConfig.java | 115 ++++++ .../core/util/format/FormatterFactory.java | 8 +- .../accumulo/core/util/format/HexFormatter.java | 8 +- .../accumulo/core/conf/config-header.html | 12 +- .../client/lexicoder/FloatLexicoderTest.java | 45 +++ .../core/security/VisibilityEvaluatorTest.java | 37 +- .../core/util/UnsynchronizedBufferTest.java | 56 +++ .../util/format/DateFormatSupplierTest.java | 74 ++++ .../util/format/DateStringFormatterTest.java | 29 +- .../core/util/format/DefaultFormatterTest.java | 62 ++- .../core/util/format/FormatterConfigTest.java | 81 ++++ .../core/util/format/FormatterFactoryTest.java | 5 +- .../core/util/format/HexFormatterTest.java | 6 +- .../ShardedTableDistributionFormatterTest.java | 4 +- .../format/StatisticsDisplayFormatterTest.java | 4 +- docs/src/main/asciidoc/chapters/clients.txt | 2 +- .../examples/simple/filedata/ChunkCombiner.java | 18 +- pom.xml | 390 ++++++++++--------- .../apache/accumulo/server/ServerConstants.java | 2 +- .../server/master/balancer/GroupBalancer.java | 4 +- .../master/balancer/RegexGroupBalancer.java | 6 +- .../server/replication/StatusFormatter.java | 18 +- .../server/rpc/CustomNonBlockingServer.java | 63 ++- .../server/security/SecurityOperation.java | 6 +- .../server/security/UserImpersonation.java | 2 +- .../server/security/SystemCredentialsTest.java | 2 +- .../replication/SequentialWorkAssigner.java | 2 +- .../monitor/servlets/DefaultServlet.java | 2 +- .../monitor/servlets/ReplicationServlet.java | 2 +- .../monitor/servlets/TablesServlet.java | 4 +- .../apache/accumulo/tracer/TraceFormatter.java | 22 +- .../tserver/compaction/CompactionStrategy.java | 6 +- .../tserver/session/ConditionalSession.java | 3 +- .../tserver/session/MultiScanSession.java | 4 +- .../accumulo/tserver/session/ScanSession.java | 8 +- .../accumulo/tserver/session/Session.java | 4 +- .../tserver/session/SessionManager.java | 61 ++- .../apache/accumulo/tserver/tablet/Scanner.java | 68 +++- .../java/org/apache/accumulo/shell/Shell.java | 19 +- .../shell/commands/DeleteManyCommand.java | 5 +- .../shell/commands/GetSplitsCommand.java | 6 +- .../accumulo/shell/commands/GrepCommand.java | 6 +- .../shell/commands/NamespacesCommand.java | 2 +- .../accumulo/shell/commands/ScanCommand.java | 31 +- .../accumulo/shell/commands/TablesCommand.java | 2 +- .../accumulo/shell/format/DeleterFormatter.java | 11 +- .../org/apache/accumulo/shell/ShellTest.java | 96 ++++- .../shell/format/DeleterFormatterTest.java | 20 +- .../test/ArbitraryTablePropertiesIT.java | 2 +- .../org/apache/accumulo/test/CleanWalIT.java | 2 +- .../test/CreateTableWithNewTableConfigIT.java | 2 +- .../test/DetectDeadTabletServersIT.java | 2 +- .../org/apache/accumulo/test/ExistingMacIT.java | 2 +- .../test/MasterRepairsDualAssignmentIT.java | 2 +- .../apache/accumulo/test/MetaRecoveryIT.java | 2 +- .../accumulo/test/MultiTableRecoveryIT.java | 2 +- .../test/RecoveryCompactionsAreFlushesIT.java | 2 +- .../org/apache/accumulo/test/ShellServerIT.java | 9 +- .../accumulo/test/TabletServerGivesUpIT.java | 2 +- .../test/TabletServerHdfsRestartIT.java | 2 +- .../accumulo/test/VerifySerialRecoveryIT.java | 2 +- .../apache/accumulo/test/VolumeChooserIT.java | 2 +- .../java/org/apache/accumulo/test/VolumeIT.java | 2 +- .../test/functional/BinaryStressIT.java | 2 +- .../accumulo/test/functional/CleanTmpIT.java | 2 +- .../accumulo/test/functional/CompactionIT.java | 2 +- .../accumulo/test/functional/DurabilityIT.java | 2 +- .../test/functional/GarbageCollectorIT.java | 2 +- .../accumulo/test/functional/KerberosIT.java | 2 +- .../test/functional/KerberosRenewalIT.java | 2 +- .../test/functional/MasterFailoverIT.java | 2 +- .../accumulo/test/functional/ReadWriteIT.java | 2 +- .../accumulo/test/functional/RestartIT.java | 2 +- .../test/functional/RestartStressIT.java | 2 +- .../accumulo/test/functional/ScanIdIT.java | 11 +- .../test/functional/ScanSessionTimeOutIT.java | 15 +- .../test/functional/SessionDurabilityIT.java | 2 +- .../accumulo/test/functional/WALSunnyDayIT.java | 2 +- .../test/functional/WriteAheadLogIT.java | 2 +- .../test/functional/ZookeeperRestartIT.java | 2 +- .../accumulo/test/proxy/ProxyDurabilityIT.java | 4 +- ...bageCollectorCommunicatesWithTServersIT.java | 2 +- .../replication/MultiInstanceReplicationIT.java | 2 +- .../test/replication/ReplicationIT.java | 3 +- .../UnorderedWorkAssignerReplicationIT.java | 2 +- .../test/replication/merkle/package-info.java | 9 +- .../replication/merkle/skvi/DigestIterator.java | 2 +- .../test/functional/SessionBlockVerifyIT.java | 176 +++++++++ 126 files changed, 1713 insertions(+), 592 deletions(-) ----------------------------------------------------------------------
