You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/06/24 23:34:25 UTC
svn commit: r1496226 [1/13] - in /accumulo/branches/ACCUMULO-CURATOR: ./
assemble/ conf/examples/1GB/native-standalone/
conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/
conf/examples/2GB/standalone/ conf/examples/3GB/native-standalone...
Author: vines
Date: Mon Jun 24 21:34:20 2013
New Revision: 1496226
URL: http://svn.apache.org/r1496226
Log:
Merging branch up to date
Added:
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/conf/Experimental.java
- copied unchanged from r1496190, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Experimental.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/conf/Interpolated.java
- copied unchanged from r1496190, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Interpolated.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/conf/Sensitive.java
- copied unchanged from r1496190, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Sensitive.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/RootTable.java
- copied unchanged from r1496190, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/RootTable.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
- copied unchanged from r1496190, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
- copied unchanged from r1496190, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
accumulo/branches/ACCUMULO-CURATOR/docs/src/main/latex/accumulo_user_manual/chapters/multivolume.tex
- copied unchanged from r1496190, accumulo/trunk/docs/src/main/latex/accumulo_user_manual/chapters/multivolume.tex
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/fs/
- copied from r1496190, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/fs/
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/FileUtil.java
- copied unchanged from r1496190, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FileUtil.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/resources/
- copied from r1496190, accumulo/trunk/test/src/main/resources/
accumulo/branches/ACCUMULO-CURATOR/test/src/test/java/org/apache/accumulo/test/VolumeTest.java
- copied unchanged from r1496190, accumulo/trunk/test/src/test/java/org/apache/accumulo/test/VolumeTest.java
Removed:
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreter.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/security/VisibilityInterpreterFactory.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/RoundRobinPartitioner.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/CountRowKeys.java
accumulo/branches/ACCUMULO-CURATOR/start/src/test/java/org/apache/commons/
accumulo/branches/ACCUMULO-CURATOR/test/src/test/resources/lib/
accumulo/branches/ACCUMULO-CURATOR/test/system/continuous/logs/
Modified:
accumulo/branches/ACCUMULO-CURATOR/ (props changed)
accumulo/branches/ACCUMULO-CURATOR/assemble/ (props changed)
accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/native-standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/native-standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/native-standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/native-standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-CURATOR/conf/examples/vfs-classloader/accumulo-site.xml
accumulo/branches/ACCUMULO-CURATOR/core/ (props changed)
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchWriter.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/conf/Property.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/data/Value.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/iterators/OptionDescriber.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/Merge.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/shell/commands/FlushCommand.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/shell/commands/OfflineCommand.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/shell/commands/OnlineCommand.java
accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/MetadataTableTest.java
accumulo/branches/ACCUMULO-CURATOR/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java
accumulo/branches/ACCUMULO-CURATOR/docs/src/main/latex/accumulo_user_manual/accumulo_user_manual.tex
accumulo/branches/ACCUMULO-CURATOR/examples/ (props changed)
accumulo/branches/ACCUMULO-CURATOR/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
accumulo/branches/ACCUMULO-CURATOR/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/branches/ACCUMULO-CURATOR/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
accumulo/branches/ACCUMULO-CURATOR/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
accumulo/branches/ACCUMULO-CURATOR/pom.xml (contents, props changed)
accumulo/branches/ACCUMULO-CURATOR/proxy/README (props changed)
accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
accumulo/branches/ACCUMULO-CURATOR/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
accumulo/branches/ACCUMULO-CURATOR/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
accumulo/branches/ACCUMULO-CURATOR/server/ (props changed)
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/Accumulo.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/ServerConstants.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilter.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/logger/LogReader.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/Master.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/TabletGroupWatcher.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/recovery/LogCloser.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/recovery/MapRLogCloser.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/recovery/RecoveryManager.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/MergeInfo.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataStateStore.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/SetGoalState.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/TabletStateStore.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/tableOps/CreateTable.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/metanalysis/FilterMeta.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/monitor/servlets/TablesServlet.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/SecurityConstants.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/handler/InsecurePermHandler.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/FileManager.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/MinorCompactor.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletIteratorEnvironment.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LogSorter.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/log/MultiReader.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecovery.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/Admin.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/FindOfflineTablets.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/RemoveEntriesForMissingFiles.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/TabletOperations.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
accumulo/branches/ACCUMULO-CURATOR/server/src/main/java/org/apache/accumulo/server/util/ZooKeeperMain.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/iterators/MetadataBulkLoadFilterTest.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/master/state/MergeInfoTest.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/master/state/RootTabletStateStoreTest.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/tabletserver/CheckTabletMetadataTest.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/tabletserver/log/MultiReaderTest.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/tabletserver/log/SortedLogRecoveryTest.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java
accumulo/branches/ACCUMULO-CURATOR/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
accumulo/branches/ACCUMULO-CURATOR/src/ (props changed)
accumulo/branches/ACCUMULO-CURATOR/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/BulkFileTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ScanTable.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerify.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Reindex.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java
accumulo/branches/ACCUMULO-CURATOR/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/VerifyIndex.java
accumulo/branches/ACCUMULO-CURATOR/test/src/test/java/org/apache/accumulo/test/AuditMessageTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
accumulo/branches/ACCUMULO-CURATOR/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
accumulo/branches/ACCUMULO-CURATOR/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
accumulo/branches/ACCUMULO-CURATOR/test/system/auto/TestUtils.py
accumulo/branches/ACCUMULO-CURATOR/test/system/auto/run.py
accumulo/branches/ACCUMULO-CURATOR/test/system/auto/simple/examples.py
accumulo/branches/ACCUMULO-CURATOR/test/system/auto/simple/readwrite.py
accumulo/branches/ACCUMULO-CURATOR/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
Propchange: accumulo/branches/ACCUMULO-CURATOR/
------------------------------------------------------------------------------
Reverse-merged /accumulo/trunk:r1478775
Merged /accumulo/trunk:r1491852-1496190
Merged /incubator/accumulo/branches/1.4:r1201899-1201901
Merged /accumulo/branches/1.5:r1488056-1488357,1488359-1494818,1495072,1495441
Merged /accumulo/branches/1.4:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398513,1398515-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1423628,1423630-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947,1495439
Propchange: accumulo/branches/ACCUMULO-CURATOR/assemble/
------------------------------------------------------------------------------
Reverse-merged /accumulo/trunk/assemble:r1478775
Merged /accumulo/trunk/assemble:r1491852-1496190
Merged /incubator/accumulo/branches/1.4/assemble:r1201899-1201901
Merged /accumulo/branches/1.4/assemble:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398513,1398515-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1423628,1423630-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947,1495439
Merged /accumulo/branches/1.5/assemble:r1488056-1488357,1488359-1492948,1493894,1494361,1494372,1495072,1495441
Modified: accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/native-standalone/accumulo-site.xml Mon Jun 24 21:34:20 2013
@@ -88,6 +88,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -98,15 +103,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -114,8 +114,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/standalone/accumulo-site.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/conf/examples/1GB/standalone/accumulo-site.xml Mon Jun 24 21:34:20 2013
@@ -88,6 +88,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -98,15 +103,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -114,8 +114,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/native-standalone/accumulo-site.xml Mon Jun 24 21:34:20 2013
@@ -78,6 +78,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -88,15 +93,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -104,8 +104,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/standalone/accumulo-site.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/conf/examples/2GB/standalone/accumulo-site.xml Mon Jun 24 21:34:20 2013
@@ -91,6 +91,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -101,15 +106,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -117,8 +117,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/native-standalone/accumulo-site.xml Mon Jun 24 21:34:20 2013
@@ -73,6 +73,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -83,15 +88,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -99,8 +99,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/standalone/accumulo-site.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/conf/examples/3GB/standalone/accumulo-site.xml Mon Jun 24 21:34:20 2013
@@ -78,6 +78,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -88,15 +93,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -104,8 +104,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/native-standalone/accumulo-site.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/native-standalone/accumulo-site.xml Mon Jun 24 21:34:20 2013
@@ -83,6 +83,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -93,15 +98,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -109,8 +109,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/standalone/accumulo-site.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/conf/examples/512MB/standalone/accumulo-site.xml Mon Jun 24 21:34:20 2013
@@ -89,6 +89,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -99,15 +104,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -115,8 +115,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-CURATOR/conf/examples/vfs-classloader/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/conf/examples/vfs-classloader/accumulo-site.xml?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/conf/examples/vfs-classloader/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-CURATOR/conf/examples/vfs-classloader/accumulo-site.xml Mon Jun 24 21:34:20 2013
@@ -83,6 +83,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -93,15 +98,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -109,9 +109,7 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
<!-- VFS ClassLoader Settings -->
Propchange: accumulo/branches/ACCUMULO-CURATOR/core/
------------------------------------------------------------------------------
Reverse-merged /accumulo/trunk/core:r1478775
Merged /accumulo/trunk/core:r1491852-1496190
Merged /incubator/accumulo/branches/1.4/core:r1201899-1201901
Merged /accumulo/branches/1.5/core:r1488056-1488357,1488359-1494818,1495072,1495441
Merged /accumulo/branches/1.4/core:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398513,1398515-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1423628,1423630-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947,1495439
Merged /accumulo/branches/1.4/src/core:r1356901-1358205,1491900,1494816
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/Constants.java Mon Jun 24 21:34:20 2013
@@ -18,26 +18,12 @@ package org.apache.accumulo.core;
import java.nio.charset.Charset;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.data.PartialKey;
-import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.util.ColumnFQ;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.Text;
public class Constants {
public static final Charset UTF8 = Charset.forName("UTF-8");
public static final String VERSION = FilteredConstants.VERSION;
- // versions should never be negative
- public static final Integer WIRE_VERSION = 2;
- public static final int DATA_VERSION = 5;
- public static final int PREV_DATA_VERSION = 4;
-
// Zookeeper locations
public static final String ZROOT = "/accumulo";
public static final String ZINSTANCES = "/instances";
@@ -51,15 +37,10 @@ public class Constants {
public static final String ZTABLE_COMPACT_ID = "/compact-id";
public static final String ZTABLE_COMPACT_CANCEL_ID = "/compact-cancel-id";
- public static final String ZROOT_TABLET = "/root_tablet";
- public static final String ZROOT_TABLET_LOCATION = ZROOT_TABLET + "/location";
- public static final String ZROOT_TABLET_FUTURE_LOCATION = ZROOT_TABLET + "/future_location";
- public static final String ZROOT_TABLET_LAST_LOCATION = ZROOT_TABLET + "/lastlocation";
- public static final String ZROOT_TABLET_WALOGS = ZROOT_TABLET + "/walogs";
-
public static final String ZMASTERS = "/masters";
public static final String ZMASTER_LOCK = ZMASTERS + "/lock";
public static final String ZMASTER_GOAL_STATE = ZMASTERS + "/goal_state";
+
public static final String ZGC = "/gc";
public static final String ZGC_LOCK = ZGC + "/lock";
@@ -68,12 +49,11 @@ public class Constants {
public static final String ZTSERVERS = "/tservers";
public static final String ZDEAD = "/dead";
- public static final String ZDEADTSERVERS = "/dead/tservers";
+ public static final String ZDEADTSERVERS = ZDEAD + "/tservers";
public static final String ZTRACERS = "/tracers";
public static final String ZPROBLEMS = "/problems";
- public static final String ZUSERS = "/users";
public static final String BULK_ARBITRATOR_TYPE = "bulkTx";
@@ -86,85 +66,29 @@ public class Constants {
public static final String ZHDFS_RESERVATIONS = "/hdfs_reservations";
public static final String ZRECOVERY = "/recovery";
- public static final String METADATA_TABLE_ID = "!0";
- public static final String METADATA_TABLE_NAME = "!METADATA";
+ /**
+ * Initial tablet directory name for the default tablet in all tables
+ */
public static final String DEFAULT_TABLET_LOCATION = "/default_tablet";
- public static final String TABLE_TABLET_LOCATION = "/table_info";
- public static final String ZTABLE_LOCKS = "/table_locks";
-
- // reserved keyspace is any row that begins with a tilde '~' character
- public static final Key METADATA_RESERVED_KEYSPACE_START_KEY = new Key(new Text(new byte[] {'~'}));
- public static final Key METADATA_RESERVED_KEYSPACE_STOP_KEY = new Key(new Text(new byte[] {'~' + 1}));
- public static final Range METADATA_RESERVED_KEYSPACE = new Range(METADATA_RESERVED_KEYSPACE_START_KEY, true, METADATA_RESERVED_KEYSPACE_STOP_KEY, false);
- public static final String METADATA_DELETE_FLAG_PREFIX = "~del";
- public static final String METADATA_DELETE_FLAG_FOR_METADATA_PREFIX = "!!" + METADATA_DELETE_FLAG_PREFIX;
- public static final Range METADATA_DELETES_KEYSPACE = new Range(new Key(new Text(METADATA_DELETE_FLAG_PREFIX)), true, new Key(new Text("~dem")), false);
- public static final Range METADATA_DELETES_FOR_METADATA_KEYSPACE = new Range(new Key(new Text(METADATA_DELETE_FLAG_FOR_METADATA_PREFIX)), true, new Key(new Text("!!~dem")), false);
- public static final String METADATA_BLIP_FLAG_PREFIX = "~blip"; // BLIP = bulk load in progress
- public static final Range METADATA_BLIP_KEYSPACE = new Range(new Key(new Text(METADATA_BLIP_FLAG_PREFIX)), true, new Key(new Text("~bliq")), false);
-
- public static final Text METADATA_SERVER_COLUMN_FAMILY = new Text("srv");
- public static final Text METADATA_TABLET_COLUMN_FAMILY = new Text("~tab"); // this needs to sort after all other column families for that tablet
- public static final Text METADATA_CURRENT_LOCATION_COLUMN_FAMILY = new Text("loc");
- public static final Text METADATA_FUTURE_LOCATION_COLUMN_FAMILY = new Text("future");
- public static final Text METADATA_LAST_LOCATION_COLUMN_FAMILY = new Text("last");
- public static final Text METADATA_BULKFILE_COLUMN_FAMILY = new Text("loaded"); // temporary marker that indicates a tablet loaded a bulk file
- public static final Text METADATA_CLONED_COLUMN_FAMILY = new Text("!cloned"); // temporary marker that indicates a tablet was successfully cloned
-
- // README : very important that prevRow sort last to avoid race conditions between
- // garbage collector and split
- public static final ColumnFQ METADATA_PREV_ROW_COLUMN = new ColumnFQ(METADATA_TABLET_COLUMN_FAMILY, new Text("~pr")); // this needs to sort after everything
- // else for that tablet
- public static final ColumnFQ METADATA_OLD_PREV_ROW_COLUMN = new ColumnFQ(METADATA_TABLET_COLUMN_FAMILY, new Text("oldprevrow"));
- public static final ColumnFQ METADATA_DIRECTORY_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("dir"));
- public static final ColumnFQ METADATA_TIME_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("time"));
- public static final ColumnFQ METADATA_FLUSH_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("flush"));
- public static final ColumnFQ METADATA_COMPACT_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("compact"));
- public static final ColumnFQ METADATA_SPLIT_RATIO_COLUMN = new ColumnFQ(METADATA_TABLET_COLUMN_FAMILY, new Text("splitRatio"));
- public static final ColumnFQ METADATA_LOCK_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("lock"));
-
- public static final Text METADATA_DATAFILE_COLUMN_FAMILY = new Text("file");
- public static final Text METADATA_SCANFILE_COLUMN_FAMILY = new Text("scan");
- public static final Text METADATA_LOG_COLUMN_FAMILY = new Text("log");
- public static final Text METADATA_CHOPPED_COLUMN_FAMILY = new Text("chopped");
- public static final ColumnFQ METADATA_CHOPPED_COLUMN = new ColumnFQ(METADATA_CHOPPED_COLUMN_FAMILY, new Text("chopped"));
-
- public static final Range NON_ROOT_METADATA_KEYSPACE = new Range(
- new Key(KeyExtent.getMetadataEntry(new Text(METADATA_TABLE_ID), null)).followingKey(PartialKey.ROW), true, METADATA_RESERVED_KEYSPACE_START_KEY, false);
- public static final Range METADATA_KEYSPACE = new Range(new Key(new Text(METADATA_TABLE_ID)), true, METADATA_RESERVED_KEYSPACE_START_KEY, false);
-
- public static final KeyExtent ROOT_TABLET_EXTENT = new KeyExtent(new Text(METADATA_TABLE_ID), KeyExtent.getMetadataEntry(new Text(METADATA_TABLE_ID), null),
- null);
- public static final Range METADATA_ROOT_TABLET_KEYSPACE = new Range(ROOT_TABLET_EXTENT.getMetadataEntry(), false, KeyExtent.getMetadataEntry(new Text(
- METADATA_TABLE_ID), null), true);
- public static final String VALUE_ENCODING = "UTF-8";
+ public static final String ZTABLE_LOCKS = "/table_locks";
public static final String BULK_PREFIX = "b-";
- public static final String OLD_BULK_PREFIX = "bulk_";
-
- // note: all times are in milliseconds
- public static final int SCAN_BATCH_SIZE = 1000; // this affects the table client caching of metadata
-
- public static final long MIN_MASTER_LOOP_TIME = 1000;
- public static final int MASTER_TABLETSERVER_CONNECTION_TIMEOUT = 3000;
- public static final long CLIENT_SLEEP_BEFORE_RECONNECT = 1000;
+ // this affects the table client caching of metadata
+ public static final int SCAN_BATCH_SIZE = 1000;
// Security configuration
public static final String PW_HASH_ALGORITHM = "SHA-256";
- // Representation of an empty set of authorizations
- // (used throughout the code, because scans of metadata table and many tests do not set record-level visibility)
- public static final Authorizations NO_AUTHS = new Authorizations();
-
- public static final int DEFAULT_MINOR_COMPACTION_MAX_SLEEP_TIME = 60 * 3; // in seconds
+ /**
+ * @deprecated since 1.6.0; Use {@link Authorizations#EMPTY} instead
+ */
+ @Deprecated
+ public static final Authorizations NO_AUTHS = Authorizations.EMPTY;
public static final int MAX_DATA_TO_PRINT = 64;
- public static final int CLIENT_RETRIES = 5;
- public static final int TSERV_MINC_MAXCONCURRENT_NUMWAITING_MULTIPLIER = 2;
public static final String CORE_PACKAGE_NAME = "org.apache.accumulo.core";
- public static final String OLD_PACKAGE_NAME = "cloudbase";
public static final String VALID_TABLE_NAME_REGEX = "^\\w+$";
public static final String MAPFILE_EXTENSION = "map";
public static final String GENERATED_TABLET_DIRECTORY_PREFIX = "t-";
@@ -174,38 +98,4 @@ public class Constants {
public static final String EXPORT_FILE = "exportMetadata.zip";
public static final String EXPORT_INFO_FILE = "accumulo_export_info.txt";
- public static String getBaseDir(final AccumuloConfiguration conf) {
- return conf.get(Property.INSTANCE_DFS_DIR);
- }
-
- public static String getTablesDir(final AccumuloConfiguration conf) {
- return getBaseDir(conf) + "/tables";
- }
-
- public static String getRecoveryDir(final AccumuloConfiguration conf) {
- return getBaseDir(conf) + "/recovery";
- }
-
- public static Path getDataVersionLocation(final AccumuloConfiguration conf) {
- return new Path(getBaseDir(conf) + "/version");
- }
-
- public static String getMetadataTableDir(final AccumuloConfiguration conf) {
- return getTablesDir(conf) + "/" + METADATA_TABLE_ID;
- }
-
- public static String getRootTabletDir(final AccumuloConfiguration conf) {
- return getMetadataTableDir(conf) + ZROOT_TABLET;
- }
-
-
- /**
- * @param conf
- * @return The write-ahead log directory.
- */
- public static String getWalDirectory(final AccumuloConfiguration conf) {
- return getBaseDir(conf) + "/wal";
- }
-
- public static final String AUDITLOG = "Audit";
}
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java Mon Jun 24 21:34:20 2013
@@ -114,12 +114,11 @@ public class ClientOpts extends Help {
@Parameter(names = {"-tc", "--tokenClass"}, description = "Token class")
public String tokenClassName = PasswordToken.class.getName();
-
+
@DynamicParameter(names = "-l",
description = "login properties in the format key=value. Reuse -l for each property (prompt for properties if this option is missing")
public Map<String,String> loginProps = new LinkedHashMap<String,String>();
-
public AuthenticationToken getToken() {
if (!loginProps.isEmpty()) {
Properties props = new Properties();
@@ -133,7 +132,7 @@ public class ClientOpts extends Help {
} catch (Exception e) {
throw new RuntimeException(e);
}
-
+
}
if (securePassword != null)
@@ -152,7 +151,7 @@ public class ClientOpts extends Help {
public String instance = null;
@Parameter(names = {"-auths", "--auths"}, converter = AuthConverter.class, description = "the authorizations to use when reading or writing")
- public Authorizations auths = Constants.NO_AUTHS;
+ public Authorizations auths = Authorizations.EMPTY;
@Parameter(names = "--debug", description = "turn on TRACE-level log messages")
public boolean debug = false;
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java Mon Jun 24 21:34:20 2013
@@ -264,6 +264,52 @@ public class IteratorSetting implements
}
/**
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((iteratorClass == null) ? 0 : iteratorClass.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + priority;
+ result = prime * result + ((properties == null) ? 0 : properties.hashCode());
+ return result;
+ }
+
+ /**
+ * @see java.lang.Object#equals()
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (!(obj instanceof IteratorSetting))
+ return false;
+ IteratorSetting other = (IteratorSetting) obj;
+ if (iteratorClass == null) {
+ if (other.iteratorClass != null)
+ return false;
+ } else if (!iteratorClass.equals(other.iteratorClass))
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ if (priority != other.priority)
+ return false;
+ if (properties == null) {
+ if (other.properties != null)
+ return false;
+ } else if (!properties.equals(other.properties))
+ return false;
+ return true;
+ }
+
+ /**
* @see java.lang.Object#toString()
*/
@Override
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java Mon Jun 24 21:34:20 2013
@@ -36,6 +36,7 @@ import org.apache.accumulo.core.util.Arg
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.OpTimer;
+import org.apache.accumulo.core.util.RootTable;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.curator.CuratorUtil;
@@ -176,7 +177,7 @@ public class ZooKeeperInstance implement
@Override
public String getRootTabletLocation() {
- String zRootLocPath = ZooUtil.getRoot(this) + Constants.ZROOT_TABLET_LOCATION;
+ String zRootLocPath = ZooUtil.getRoot(this) + RootTable.ZROOT_TABLET_LOCATION;
OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up root tablet location in zookeeper.");
ChildData loc = zooCache.get(zRootLocPath);
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java Mon Jun 24 21:34:20 2013
@@ -68,11 +68,6 @@ public class InstanceOperationsImpl impl
this.credentials = credentials;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#setProperty(java.lang.String, java.lang.String)
- */
@Override
public void setProperty(final String property, final String value) throws AccumuloException, AccumuloSecurityException {
ArgumentChecker.notNull(property, value);
@@ -84,11 +79,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#removeProperty(java.lang.String)
- */
@Override
public void removeProperty(final String property) throws AccumuloException, AccumuloSecurityException {
ArgumentChecker.notNull(property);
@@ -100,11 +90,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getSystemConfiguration()
- */
@Override
public Map<String,String> getSystemConfiguration() throws AccumuloException, AccumuloSecurityException {
return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
@@ -115,11 +100,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getSiteConfiguration()
- */
@Override
public Map<String,String> getSiteConfiguration() throws AccumuloException, AccumuloSecurityException {
return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
@@ -130,11 +110,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getTabletServers()
- */
@Override
public List<String> getTabletServers() {
ZooCache cache = ZooCache.getInstance(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());
@@ -154,12 +129,6 @@ public class InstanceOperationsImpl impl
return results;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getActiveScans(java.lang.String)
- */
-
@Override
public List<ActiveScan> getActiveScans(String tserver) throws AccumuloException, AccumuloSecurityException {
Client client = null;
@@ -187,11 +156,6 @@ public class InstanceOperationsImpl impl
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#testClassLoad(java.lang.String, java.lang.String)
- */
@Override
public boolean testClassLoad(final String className, final String asTypeName) throws AccumuloException, AccumuloSecurityException {
return ServerClient.execute(instance, new ClientExecReturn<Boolean,ClientService.Client>() {
@@ -202,11 +166,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getActiveCompactions(java.lang.String)
- */
@Override
public List<ActiveCompaction> getActiveCompactions(String tserver) throws AccumuloException, AccumuloSecurityException {
Client client = null;
@@ -230,11 +189,6 @@ public class InstanceOperationsImpl impl
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#ping(java.lang.String)
- */
@Override
public void ping(String tserver) throws AccumuloException {
TTransport transport = null;
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java Mon Jun 24 21:34:20 2013
@@ -94,6 +94,7 @@ import org.apache.accumulo.core.util.Met
import org.apache.accumulo.core.util.NamingThreadFactory;
import org.apache.accumulo.core.util.OpTimer;
import org.apache.accumulo.core.util.Pair;
+import org.apache.accumulo.core.util.RootTable;
import org.apache.accumulo.core.util.StringUtil;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.core.util.ThriftUtil;
@@ -154,7 +155,7 @@ public class TableOperationsImpl extends
@Override
public boolean exists(String tableName) {
ArgumentChecker.notNull(tableName);
- if (tableName.equals(Constants.METADATA_TABLE_NAME))
+ if (tableName.equals(MetadataTable.NAME) || tableName.equals(RootTable.NAME))
return true;
OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Checking if table " + tableName + "exists...");
@@ -542,6 +543,8 @@ public class TableOperationsImpl extends
ArgumentChecker.notNull(tableName);
String tableId = Tables.getTableId(instance, tableName);
+ if (RootTable.ID.equals(tableId))
+ return Collections.emptyList();
SortedSet<KeyExtent> tablets = new TreeSet<KeyExtent>();
Map<KeyExtent,String> locations = new TreeMap<KeyExtent,String>();
@@ -1203,7 +1206,6 @@ public class TableOperationsImpl extends
@Override
public List<DiskUsage> getDiskUsage(Set<String> tableNames) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-
List<TDiskUsage> diskUsages = null;
while (diskUsages == null) {
Pair<String,Client> pair = null;
@@ -1235,7 +1237,7 @@ public class TableOperationsImpl extends
ServerClient.close(pair.getSecond());
}
}
-
+
List<DiskUsage> finalUsages = new ArrayList<DiskUsage>();
for (TDiskUsage diskUsage : diskUsages) {
finalUsages.add(new DiskUsage(new TreeSet<String>(diskUsage.getTables()), diskUsage.getUsage()));
@@ -1274,7 +1276,6 @@ public class TableOperationsImpl extends
try {
FileSystem fs = FileUtil.getFileSystem(CachedConfiguration.getInstance(), instance.getConfiguration());
- ;
Map<String,String> props = getExportedProps(fs, new Path(importDir, Constants.EXPORT_FILE));
for (String propKey : props.keySet()) {
@@ -1322,7 +1323,6 @@ public class TableOperationsImpl extends
AccumuloSecurityException {
ArgumentChecker.notNull(tableName, className, asTypeName);
-
try {
return ServerClient.executeRaw(instance, new ClientExecReturn<Boolean,ClientService.Client>() {
@Override
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java Mon Jun 24 21:34:20 2013
@@ -44,6 +44,7 @@ import org.apache.accumulo.core.data.Ran
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.data.thrift.IterInfo;
import org.apache.accumulo.core.iterators.user.WholeRowIterator;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.thrift.TCredentials;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.util.MetadataTable;
@@ -65,8 +66,8 @@ public class MetadataLocationObtainer im
this.instance = instance;
locCols = new TreeSet<Column>();
- locCols.add(new Column(TextUtil.getBytes(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY), null, null));
- locCols.add(Constants.METADATA_PREV_ROW_COLUMN.toColumn());
+ locCols.add(new Column(TextUtil.getBytes(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY), null, null));
+ locCols.add(MetadataTable.PREV_ROW_COLUMN.toColumn());
columns = new ArrayList<Column>(locCols);
}
@@ -94,7 +95,7 @@ public class MetadataLocationObtainer im
Map<String,Map<String,String>> serverSideIteratorOptions = Collections.emptyMap();
boolean more = ThriftScanner.getBatchFromServer(credentials, range, src.tablet_extent, src.tablet_location, encodedResults, locCols,
- serverSideIteratorList, serverSideIteratorOptions, Constants.SCAN_BATCH_SIZE, Constants.NO_AUTHS, false, instance.getConfiguration());
+ serverSideIteratorList, serverSideIteratorOptions, Constants.SCAN_BATCH_SIZE, Authorizations.EMPTY, false, instance.getConfiguration());
decodeRows(encodedResults, results);
@@ -102,7 +103,7 @@ public class MetadataLocationObtainer im
range = new Range(results.lastKey().followingKey(PartialKey.ROW_COLFAM_COLQUAL_COLVIS_TIME), true, new Key(stopRow).followingKey(PartialKey.ROW), false);
encodedResults.clear();
more = ThriftScanner.getBatchFromServer(credentials, range, src.tablet_extent, src.tablet_location, encodedResults, locCols, serverSideIteratorList,
- serverSideIteratorOptions, Constants.SCAN_BATCH_SIZE, Constants.NO_AUTHS, false, instance.getConfiguration());
+ serverSideIteratorOptions, Constants.SCAN_BATCH_SIZE, Authorizations.EMPTY, false, instance.getConfiguration());
decodeRows(encodedResults, results);
}
@@ -178,7 +179,7 @@ public class MetadataLocationObtainer im
Map<KeyExtent,List<Range>> unscanned = new HashMap<KeyExtent,List<Range>>();
Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
try {
- TabletServerBatchReaderIterator.doLookup(tserver, tabletsRanges, failures, unscanned, rr, columns, credentials, opts, Constants.NO_AUTHS,
+ TabletServerBatchReaderIterator.doLookup(tserver, tabletsRanges, failures, unscanned, rr, columns, credentials, opts, Authorizations.EMPTY,
instance.getConfiguration());
if (failures.size() > 0) {
// invalidate extents in parents cache
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java Mon Jun 24 21:34:20 2013
@@ -60,6 +60,7 @@ import org.apache.accumulo.core.security
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.LocalityGroupUtil;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.commons.lang.NotImplementedException;
@@ -229,14 +230,24 @@ class OfflineIterator implements Iterato
if (currentExtent != null && !extent.isPreviousExtent(currentExtent))
throw new AccumuloException(" " + currentExtent + " is not previous extent " + extent);
-
- String tablesDir = Constants.getTablesDir(instance.getConfiguration());
+
+ String tablesDir = instance.getConfiguration().get(Property.INSTANCE_DFS_DIR) + "/tables";
+ String[] volumes = instance.getConfiguration().get(Property.INSTANCE_VOLUMES).split(",");
+ if (volumes.length > 1) {
+ tablesDir = volumes[0] + tablesDir;
+ }
List<String> absFiles = new ArrayList<String>();
for (String relPath : relFiles) {
- if (relPath.startsWith(".."))
- absFiles.add(tablesDir + relPath.substring(2));
- else
- absFiles.add(tablesDir + "/" + tableId + relPath);
+ if (relFiles.contains(":")) {
+ absFiles.add(relPath);
+ } else {
+ // handle old-style relative paths
+ if (relPath.startsWith("..")) {
+ absFiles.add(tablesDir + relPath.substring(2));
+ } else {
+ absFiles.add(tablesDir + "/" + tableId + relPath);
+ }
+ }
}
iter = createIterator(extent, absFiles);
@@ -246,7 +257,7 @@ class OfflineIterator implements Iterato
}
private Pair<KeyExtent,String> getTabletFiles(Range nextRange, List<String> relFiles) throws TableNotFoundException {
- Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS);
+ Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
scanner.setBatchSize(100);
scanner.setRange(nextRange);
@@ -260,16 +271,16 @@ class OfflineIterator implements Iterato
Entry<Key,Value> entry = row.next();
Key key = entry.getKey();
- if (key.getColumnFamily().equals(Constants.METADATA_DATAFILE_COLUMN_FAMILY)) {
+ if (key.getColumnFamily().equals(MetadataTable.DATAFILE_COLUMN_FAMILY)) {
relFiles.add(key.getColumnQualifier().toString());
}
- if (key.getColumnFamily().equals(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY)
- || key.getColumnFamily().equals(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY)) {
+ if (key.getColumnFamily().equals(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY)
+ || key.getColumnFamily().equals(MetadataTable.FUTURE_LOCATION_COLUMN_FAMILY)) {
location = entry.getValue().toString();
}
- if (Constants.METADATA_PREV_ROW_COLUMN.hasColumns(key)) {
+ if (MetadataTable.PREV_ROW_COLUMN.hasColumns(key)) {
extent = new KeyExtent(key.getRow(), entry.getValue());
}
Modified: accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java?rev=1496226&r1=1496225&r2=1496226&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java (original)
+++ accumulo/branches/ACCUMULO-CURATOR/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java Mon Jun 24 21:34:20 2013
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Instance;
@@ -30,6 +29,7 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.util.RootTable;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -42,22 +42,32 @@ public class RootTabletLocator extends T
}
@Override
- public void binMutations(List<Mutation> mutations, Map<String,TabletServerMutations> binnedMutations, List<Mutation> failures, TCredentials credentials) throws AccumuloException,
- AccumuloSecurityException, TableNotFoundException {
- throw new UnsupportedOperationException();
+ public void binMutations(List<Mutation> mutations, Map<String,TabletServerMutations> binnedMutations, List<Mutation> failures, TCredentials credentials)
+ throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+ String rootTabletLocation = instance.getRootTabletLocation();
+ if (rootTabletLocation != null) {
+ TabletServerMutations tsm = new TabletServerMutations();
+ for (Mutation mutation : mutations) {
+ tsm.addMutation(RootTable.EXTENT, mutation);
+ }
+ binnedMutations.put(rootTabletLocation, tsm);
+ } else {
+ failures.addAll(mutations);
+ }
}
@Override
- public List<Range> binRanges(List<Range> ranges, Map<String,Map<KeyExtent,List<Range>>> binnedRanges, TCredentials credentials) throws AccumuloException, AccumuloSecurityException,
- TableNotFoundException {
+ public List<Range> binRanges(List<Range> ranges, Map<String,Map<KeyExtent,List<Range>>> binnedRanges, TCredentials credentials) throws AccumuloException,
+ AccumuloSecurityException, TableNotFoundException {
String rootTabletLocation = instance.getRootTabletLocation();
if (rootTabletLocation != null) {
for (Range range : ranges) {
- TabletLocatorImpl.addRange(binnedRanges, rootTabletLocation, Constants.ROOT_TABLET_EXTENT, range);
+ TabletLocatorImpl.addRange(binnedRanges, rootTabletLocation, RootTable.EXTENT, range);
}
+ return Collections.emptyList();
}
- return Collections.emptyList();
+ return ranges;
}
@Override
@@ -73,14 +83,8 @@ public class RootTabletLocator extends T
public void invalidateCache() {}
@Override
- public TabletLocation locateTablet(Text row, boolean skipRow, boolean retry, TCredentials credentials) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
- if (skipRow) {
- row = new Text(row);
- row.append(new byte[] {0}, 0, 1);
- }
- if (!Constants.ROOT_TABLET_EXTENT.contains(row)) {
- throw new AccumuloException("Tried to locate row out side of root tablet " + row);
- }
+ public TabletLocation locateTablet(Text row, boolean skipRow, boolean retry, TCredentials credentials) throws AccumuloException, AccumuloSecurityException,
+ TableNotFoundException {
String location = instance.getRootTabletLocation();
// Always retry when finding the root tablet
while (retry && location == null) {
@@ -88,7 +92,7 @@ public class RootTabletLocator extends T
location = instance.getRootTabletLocation();
}
if (location != null)
- return new TabletLocation(Constants.ROOT_TABLET_EXTENT, location);
+ return new TabletLocation(RootTable.EXTENT, location);
return null;
}