Merge branch '1.6.0-SNAPSHOT'
Conflicts:
core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c92a63f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c92a63f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c92a63f
Branch: refs/heads/master
Commit: 0c92a63f97f5a596ba286401aea37cbe8cf63afc
Parents: 7903d09 5bd4e27
Author: Eric Newton <[email protected]>
Authored: Wed Jan 8 18:33:05 2014 -0500
Committer: Eric Newton <[email protected]>
Committed: Wed Jan 8 18:33:05 2014 -0500
----------------------------------------------------------------------
.../accumulo/core/client/BatchDeleter.java | 2 +-
.../accumulo/core/client/BatchWriter.java | 8 +-
.../accumulo/core/client/ConditionalWriter.java | 8 +-
.../apache/accumulo/core/client/Instance.java | 24 +--
.../accumulo/core/client/IsolatedScanner.java | 5 +-
.../core/client/MultiTableBatchWriter.java | 8 +-
.../core/client/MutationsRejectedException.java | 15 +-
.../apache/accumulo/core/client/Scanner.java | 18 +-
.../accumulo/core/client/ScannerBase.java | 22 +--
.../core/client/admin/InstanceOperations.java | 18 +-
.../core/client/admin/NamespaceOperations.java | 38 ++--
.../core/client/admin/SecurityOperations.java | 42 ++---
.../core/client/admin/TableOperations.java | 94 +++++-----
.../core/client/admin/TableOperationsImpl.java | 22 ++-
.../core/client/impl/ConditionalWriterImpl.java | 8 +-
.../client/impl/MultiTableBatchWriterImpl.java | 14 +-
.../accumulo/core/client/impl/Tables.java | 4 +-
.../core/client/impl/TabletLocatorImpl.java | 9 +-
.../client/impl/TabletServerBatchWriter.java | 8 +-
.../accumulo/core/client/impl/Translator.java | 4 +-
.../core/client/mapred/AbstractInputFormat.java | 9 +-
.../client/mapreduce/AbstractInputFormat.java | 7 +-
.../core/client/mapreduce/RangeInputSplit.java | 5 +-
.../security/tokens/AuthenticationToken.java | 6 +-
.../core/client/security/tokens/NullToken.java | 3 -
.../client/security/tokens/PasswordToken.java | 2 +-
.../core/conf/AccumuloConfiguration.java | 2 +-
.../accumulo/core/conf/ConfigSanityCheck.java | 2 +-
.../apache/accumulo/core/conf/PropertyType.java | 5 +-
.../accumulo/core/constraints/Constraint.java | 2 +-
.../apache/accumulo/core/data/ColumnUpdate.java | 6 +-
.../apache/accumulo/core/data/Condition.java | 2 +-
.../accumulo/core/data/ConditionalMutation.java | 2 +-
.../apache/accumulo/core/data/KeyExtent.java | 2 +-
.../org/apache/accumulo/core/data/Range.java | 2 +-
.../accumulo/core/file/FileSKVIterator.java | 10 +-
.../org/apache/accumulo/core/file/FileUtil.java | 7 +-
.../core/file/blockfile/ABlockReader.java | 12 +-
.../core/file/blockfile/ABlockWriter.java | 10 +-
.../core/file/blockfile/BlockFileReader.java | 10 +-
.../core/file/blockfile/BlockFileWriter.java | 8 +-
.../core/file/blockfile/cache/BlockCache.java | 10 +-
.../core/file/blockfile/cache/CacheEntry.java | 4 +-
.../core/file/blockfile/cache/HeapSize.java | 2 +-
.../file/blockfile/cache/LruBlockCache.java | 8 +
.../file/keyfunctor/ColumnFamilyFunctor.java | 4 +-
.../core/file/keyfunctor/KeyFunctor.java | 4 +-
.../core/file/keyfunctor/RowFunctor.java | 4 +-
.../accumulo/core/file/rfile/BlockIndex.java | 13 ++
.../core/file/rfile/MultiLevelIndex.java | 15 +-
.../apache/accumulo/core/file/rfile/RFile.java | 2 +-
.../accumulo/core/file/rfile/bcfile/BCFile.java | 4 +-
.../core/file/rfile/bcfile/CompareUtils.java | 2 +-
.../core/file/rfile/bcfile/RawComparable.java | 6 +-
.../core/iterators/OptionDescriber.java | 6 +-
.../core/iterators/TypedValueCombiner.java | 6 +-
.../iterators/system/InterruptibleIterator.java | 2 +-
.../core/iterators/user/AgeOffFilter.java | 4 +-
.../core/iterators/user/TimestampFilter.java | 4 +-
.../iterators/user/TransformingIterator.java | 2 +-
.../core/iterators/user/VisibilityFilter.java | 6 -
.../core/security/AuthorizationContainer.java | 2 +-
.../accumulo/core/security/Authorizations.java | 2 +-
.../core/security/crypto/CryptoModule.java | 8 +-
.../crypto/SecretKeyEncryptionStrategy.java | 4 +-
.../SecretKeyEncryptionStrategyContext.java | 16 +-
.../apache/accumulo/core/trace/SpanTree.java | 2 +-
.../apache/accumulo/core/util/CreateToken.java | 1 -
.../accumulo/core/util/format/Formatter.java | 2 +-
.../core/util/interpret/ScanInterpreter.java | 10 +-
.../apache/accumulo/core/util/shell/Shell.java | 5 +-
.../accumulo/core/cli/TestClientOpts.java | 12 +-
.../core/client/IteratorSettingTest.java | 2 +-
.../file/blockfile/cache/TestLruBlockCache.java | 15 +-
.../accumulo/core/file/rfile/RFileTest.java | 23 +--
.../iterators/user/BigDecimalCombinerTest.java | 6 +-
.../simple/client/RandomBatchScanner.java | 8 +-
.../simple/client/RandomBatchWriter.java | 10 +-
.../examples/simple/client/RowOperations.java | 28 +--
.../org/apache/accumulo/fate/AgeOffStore.java | 2 +-
.../java/org/apache/accumulo/fate/Fate.java | 3 +-
.../java/org/apache/accumulo/fate/TStore.java | 20 +-
.../zookeeper/DistributedReadWriteLock.java | 1 -
.../accumulo/fate/zookeeper/IZooReader.java | 16 +-
.../fate/zookeeper/IZooReaderWriter.java | 32 ++--
.../fate/zookeeper/TransactionWatcher.java | 8 +-
.../accumulo/fate/zookeeper/ZooCache.java | 2 +-
.../apache/accumulo/fate/zookeeper/ZooLock.java | 2 -
.../fate/zookeeper/ZooReaderWriter.java | 3 +-
.../accumulo/fate/zookeeper/ZooReservation.java | 6 +-
.../accumulo/fate/zookeeper/ZooSession.java | 6 +-
.../minicluster/MiniAccumuloCluster.java | 4 +-
.../accumulo/minicluster/ProcessReference.java | 5 +-
.../minicluster/MiniAccumuloClusterGCTest.java | 2 +-
pom.xml | 3 +-
.../java/org/apache/accumulo/proxy/Proxy.java | 3 +-
.../org/apache/accumulo/proxy/ProxyServer.java | 9 +-
.../org/apache/accumulo/server/Accumulo.java | 2 +-
.../server/conf/NamespaceConfiguration.java | 7 +-
.../server/conf/TableConfiguration.java | 7 +-
.../accumulo/server/fs/VolumeManagerImpl.java | 2 +-
.../server/master/recovery/LogCloser.java | 2 +-
.../server/master/state/Assignment.java | 1 -
.../server/master/state/DistributedStore.java | 8 +-
.../server/master/state/MetaDataStateStore.java | 3 -
.../master/state/RootTabletStateStore.java | 3 -
.../server/master/state/TabletStateStore.java | 2 -
.../server/metrics/MetricsConfiguration.java | 16 +-
.../server/metrics/ThriftMetricsMBean.java | 22 +--
.../server/problems/ProblemReports.java | 6 +-
.../server/security/handler/Authenticator.java | 22 +--
.../server/security/handler/Authorizor.java | 16 +-
.../security/handler/InsecureAuthenticator.java | 5 -
.../security/handler/InsecurePermHandler.java | 12 --
.../security/handler/PermissionHandler.java | 40 ++--
.../accumulo/server/util/DumpZookeeper.java | 2 -
.../apache/accumulo/server/util/FileUtil.java | 1 -
.../accumulo/server/util/time/ProvidesTime.java | 2 +-
.../gc/GarbageCollectWriteAheadLogs.java | 1 +
.../master/recovery/RecoveryManager.java | 2 +-
.../accumulo/master/tableOps/BulkImport.java | 3 -
.../accumulo/master/tableOps/TableRangeOp.java | 2 +-
.../accumulo/monitor/EmbeddedWebServer.java | 8 +-
.../monitor/servlets/OperationServlet.java | 4 +-
.../accumulo/monitor/servlets/VisServlet.java | 2 +-
.../monitor/servlets/trace/ListType.java | 2 +-
.../org/apache/accumulo/tserver/Compactor.java | 2 +-
.../tserver/ConditionalMutationSet.java | 2 +-
.../apache/accumulo/tserver/InMemoryMap.java | 14 +-
.../apache/accumulo/tserver/TabletServer.java | 2 +-
.../tserver/metrics/TabletServerMBean.java | 30 +--
.../metrics/TabletServerMinCMetricsMBean.java | 22 +--
.../metrics/TabletServerScanMetricsMBean.java | 22 +--
.../metrics/TabletServerUpdateMetricsMBean.java | 52 +++---
.../vfs/AccumuloReloadingVFSClassLoader.java | 5 +-
.../vfs/FinalCloseDefaultFileSystemManager.java | 2 +-
.../start/classloader/vfs/MiniDFSUtil.java | 22 ++-
.../vfs/PostDelegatingVFSClassLoader.java | 14 +-
.../classloader/vfs/UniqueFileReplicator.java | 13 +-
.../vfs/providers/HdfsFileSystem.java | 182 +++++++++----------
.../apache/accumulo/test/IMMLGBenchmark.java | 8 +-
.../test/continuous/UndefinedAnalyzer.java | 4 +-
.../metadata/MetadataBatchScanTest.java | 4 +-
.../apache/accumulo/test/randomwalk/Module.java | 2 +-
.../accumulo/test/randomwalk/bulk/Setup.java | 2 +-
.../test/randomwalk/concurrent/AddSplits.java | 2 +-
.../test/randomwalk/concurrent/BatchScan.java | 2 +-
.../test/randomwalk/concurrent/BatchWrite.java | 4 +-
.../randomwalk/concurrent/CheckBalance.java | 2 +-
.../test/randomwalk/concurrent/Setup.java | 2 +-
.../accumulo/test/randomwalk/image/Commit.java | 2 +-
.../test/randomwalk/image/ImageFixture.java | 6 +-
.../test/randomwalk/image/ScanMeta.java | 2 +-
.../accumulo/test/randomwalk/image/Write.java | 2 +-
.../test/randomwalk/multitable/Commit.java | 2 +-
.../multitable/MultiTableFixture.java | 6 +-
.../randomwalk/security/SecurityHelper.java | 2 +-
.../randomwalk/security/WalkingSecurity.java | 2 +-
.../test/randomwalk/sequential/BatchVerify.java | 2 +-
.../test/randomwalk/sequential/Commit.java | 2 +-
.../randomwalk/sequential/MapRedVerifyTool.java | 2 +-
.../sequential/SequentialFixture.java | 4 +-
.../test/randomwalk/sequential/Write.java | 2 +-
.../test/randomwalk/shard/BulkInsert.java | 4 +-
.../accumulo/test/randomwalk/shard/Insert.java | 2 +-
.../test/randomwalk/shard/ShardFixture.java | 4 +-
.../apache/accumulo/test/scalability/Run.java | 1 -
.../accumulo/test/scalability/ScaleTest.java | 2 +-
.../accumulo/test/ConditionalWriterIT.java | 12 +-
.../apache/accumulo/test/TableOperationsIT.java | 2 +-
.../apache/accumulo/trace/instrument/Span.java | 2 +-
.../trace/instrument/receivers/LogSpans.java | 4 +-
172 files changed, 798 insertions(+), 768 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c92a63f/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
----------------------------------------------------------------------
diff --cc
core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index 9ffe065,6d20cb0..e0b6b32
---
a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@@ -30,21 -30,9 +30,21 @@@ import org.apache.accumulo.core.client.
import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
import org.apache.log4j.Logger;
+/**
+ * A configuration object.
+ */
public abstract class AccumuloConfiguration implements
Iterable<Entry<String,String>> {
+ /**
+ * A filter for properties, based on key.
+ */
- public static interface PropertyFilter {
+ public interface PropertyFilter {
+ /**
+ * Determines whether to accept a property based on its key.
+ *
+ * @param key property key
+ * @return true to accept property (pass filter)
+ */
boolean accept(String key);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c92a63f/core/src/main/java/org/apache/accumulo/core/conf/ConfigSanityCheck.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c92a63f/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c92a63f/core/src/main/java/org/apache/accumulo/core/data/ColumnUpdate.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c92a63f/core/src/main/java/org/apache/accumulo/core/data/Condition.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c92a63f/core/src/main/java/org/apache/accumulo/core/data/Range.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c92a63f/pom.xml
----------------------------------------------------------------------
