Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0AADFC131 for ; Sat, 26 Jan 2013 21:05:13 +0000 (UTC) Received: (qmail 56327 invoked by uid 500); 26 Jan 2013 21:05:12 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 56300 invoked by uid 500); 26 Jan 2013 21:05:12 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 56287 invoked by uid 99); 26 Jan 2013 21:05:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2013 21:05:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2013 21:05:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E14E9238896F; Sat, 26 Jan 2013 21:04:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1438962 [1/5] - in /accumulo/trunk: conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB/native-standalone/ conf/examples/3GB/standalone/ co... Date: Sat, 26 Jan 2013 21:04:33 -0000 To: commits@accumulo.apache.org From: ctubbsii@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130126210448.E14E9238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctubbsii Date: Sat Jan 26 21:04:27 2013 New Revision: 1438962 URL: http://svn.apache.org/viewvc?rev=1438962&view=rev Log: ACCUMULO-655 Moved server.test package to the test module. Left back the FastFormat class (now in util), which was used in server code. Updated docs and scripts to reflect new package names. Added: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FastFormat.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateRandomRFile.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateTestTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/ListTables.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/ListTables.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapStressTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NullBatchWriter.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestMultiTableIngest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java - copied, changed from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/WrongTabletTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ - copied from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ - copied from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/ - copied from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/ - copied from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/scalability/ - copied from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/scalability/ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/iterator/ - copied from r1438948, accumulo/trunk/server/src/test/java/org/apache/accumulo/server/test/iterator/ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/randomwalk/ - copied from r1438948, accumulo/trunk/server/src/test/java/org/apache/accumulo/server/test/randomwalk/ Removed: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/logger/metrics/ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/ accumulo/trunk/server/src/test/java/org/apache/accumulo/server/test/iterator/ accumulo/trunk/server/src/test/java/org/apache/accumulo/server/test/randomwalk/ Modified: accumulo/trunk/conf/examples/1GB/native-standalone/log4j.properties accumulo/trunk/conf/examples/1GB/standalone/log4j.properties accumulo/trunk/conf/examples/2GB/native-standalone/log4j.properties accumulo/trunk/conf/examples/2GB/standalone/log4j.properties accumulo/trunk/conf/examples/3GB/native-standalone/log4j.properties accumulo/trunk/conf/examples/3GB/standalone/log4j.properties accumulo/trunk/conf/examples/512MB/native-standalone/log4j.properties accumulo/trunk/conf/examples/512MB/standalone/log4j.properties accumulo/trunk/docs/examples/README.maxmutation accumulo/trunk/docs/examples/README.shard accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java accumulo/trunk/server/src/main/resources/randomwalk/Basic.xml accumulo/trunk/server/src/main/resources/randomwalk/Simple.xml accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/GenSplits.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BadCombiner.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BadIterator.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BulkFileTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CacheTestClean.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/FateStarvationTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/MaxOpenTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/NativeMapTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/RunTests.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ScanIteratorTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ScanSessionTimeOutTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SlowConstraint.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SlowIterator.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/VisibilityTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Fixture.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Framework.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Node.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/Test.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkMinusOne.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkPlusOne.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/BulkTest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Compact.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/ConsistencyCheck.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Merge.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Setup.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Split.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchWrite.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BulkImport.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangeAuthorizations.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckPermission.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CloneTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Compact.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ConcurrentFixture.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateUser.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteRange.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DeleteTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/DropUser.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Merge.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/OfflineTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/RenameTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ScanTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Setup.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StartAll.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/StopTabletServer.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Commit.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Verify.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/image/Write.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Commit.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/DropTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/OfflineTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/Write.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterSystemPerm.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTablePerm.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropUser.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SetAuths.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/BatchVerify.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Commit.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerify.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/Write.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CloneIndex.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Commit.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/CompactFilter.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Delete.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Flush.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Insert.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Reindex.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Split.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/VerifyIndex.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/unit/CreateTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/unit/DeleteTable.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/unit/Ingest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/unit/Scan.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/unit/Verify.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/scalability/Ingest.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/scalability/Run.java accumulo/trunk/test/src/main/java/org/apache/accumulo/test/scalability/ScaleTest.java accumulo/trunk/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java accumulo/trunk/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java accumulo/trunk/test/system/auto/JavaTest.py accumulo/trunk/test/system/auto/README accumulo/trunk/test/system/auto/TestCombinerX.jar accumulo/trunk/test/system/auto/TestCombinerY.jar accumulo/trunk/test/system/auto/TestUtils.py accumulo/trunk/test/system/auto/simple/addSplit.py accumulo/trunk/test/system/auto/simple/baditerminc.py accumulo/trunk/test/system/auto/simple/batchScanSplit.py accumulo/trunk/test/system/auto/simple/batchWriterFlush.py accumulo/trunk/test/system/auto/simple/binary.py accumulo/trunk/test/system/auto/simple/bloom.py accumulo/trunk/test/system/auto/simple/bulk.py accumulo/trunk/test/system/auto/simple/bulkFile.py accumulo/trunk/test/system/auto/simple/bulkSplitOptimization.py accumulo/trunk/test/system/auto/simple/combiner.py accumulo/trunk/test/system/auto/simple/compaction.py accumulo/trunk/test/system/auto/simple/concurrency.py accumulo/trunk/test/system/auto/simple/constraint.py accumulo/trunk/test/system/auto/simple/createAndUse.py accumulo/trunk/test/system/auto/simple/delete.py accumulo/trunk/test/system/auto/simple/deleteEverything.py accumulo/trunk/test/system/auto/simple/deleterows.py accumulo/trunk/test/system/auto/simple/dynamicThreadPools.py accumulo/trunk/test/system/auto/simple/examples.py accumulo/trunk/test/system/auto/simple/fateStartvation.py accumulo/trunk/test/system/auto/simple/gc.py accumulo/trunk/test/system/auto/simple/largeRow.py accumulo/trunk/test/system/auto/simple/logicalTime.py accumulo/trunk/test/system/auto/simple/maxOpen.py accumulo/trunk/test/system/auto/simple/merge.py accumulo/trunk/test/system/auto/simple/nativeMap.py accumulo/trunk/test/system/auto/simple/range.py accumulo/trunk/test/system/auto/simple/readwrite.py accumulo/trunk/test/system/auto/simple/rowDelete.py accumulo/trunk/test/system/auto/simple/scanIter.py accumulo/trunk/test/system/auto/simple/scanSessionTimeout.py accumulo/trunk/test/system/auto/simple/security.py accumulo/trunk/test/system/auto/simple/serverSideError.py accumulo/trunk/test/system/auto/simple/shutdown.py accumulo/trunk/test/system/auto/simple/simpleBalancer.py accumulo/trunk/test/system/auto/simple/sparseColumnFamily.py accumulo/trunk/test/system/auto/simple/splitRecovery.py accumulo/trunk/test/system/auto/simple/tablets.py accumulo/trunk/test/system/auto/simple/timeout.py accumulo/trunk/test/system/auto/simple/visibility.py accumulo/trunk/test/system/auto/simple/zooCacheTest.py accumulo/trunk/test/system/auto/stress/batchWrite.py accumulo/trunk/test/system/auto/stress/manyScanners.py accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py accumulo/trunk/test/system/auto/stress/weird.py accumulo/trunk/test/system/bench/lib/IngestBenchmark.py accumulo/trunk/test/system/continuous/README accumulo/trunk/test/system/continuous/report.pl accumulo/trunk/test/system/continuous/run-moru.sh accumulo/trunk/test/system/continuous/run-verify.sh accumulo/trunk/test/system/continuous/start-batchwalkers.sh accumulo/trunk/test/system/continuous/start-ingest.sh accumulo/trunk/test/system/continuous/start-scanners.sh accumulo/trunk/test/system/continuous/start-stats.sh accumulo/trunk/test/system/continuous/start-walkers.sh accumulo/trunk/test/system/continuous/stop-batchwalkers.sh accumulo/trunk/test/system/continuous/stop-ingest.sh accumulo/trunk/test/system/continuous/stop-scanners.sh accumulo/trunk/test/system/continuous/stop-stats.sh accumulo/trunk/test/system/continuous/stop-walkers.sh accumulo/trunk/test/system/randomwalk/bin/start-local.sh accumulo/trunk/test/system/randomwalk/conf/modules/Bulk.xml accumulo/trunk/test/system/randomwalk/conf/modules/Concurrent.xml accumulo/trunk/test/system/randomwalk/conf/modules/Image.xml accumulo/trunk/test/system/randomwalk/conf/modules/MultiTable.xml accumulo/trunk/test/system/randomwalk/conf/modules/Security.xml accumulo/trunk/test/system/randomwalk/conf/modules/Sequential.xml accumulo/trunk/test/system/randomwalk/conf/modules/Shard.xml accumulo/trunk/test/system/randomwalk/conf/modules/unit/Basic.xml accumulo/trunk/test/system/randomwalk/conf/modules/unit/Simple.xml accumulo/trunk/test/system/scalability/README accumulo/trunk/test/system/scalability/run.py accumulo/trunk/test/system/test1/README accumulo/trunk/test/system/test1/ingest_test.sh accumulo/trunk/test/system/test1/ingest_test_2.sh accumulo/trunk/test/system/test1/ingest_test_3.sh accumulo/trunk/test/system/test1/verify_test.sh accumulo/trunk/test/system/test1/verify_test_2.sh accumulo/trunk/test/system/test2/README accumulo/trunk/test/system/test2/concurrent.sh accumulo/trunk/test/system/test3/bigrow.sh accumulo/trunk/test/system/test4/README accumulo/trunk/test/system/test4/bulk_import_test.sh accumulo/trunk/test/system/upgrade_test.sh Modified: accumulo/trunk/conf/examples/1GB/native-standalone/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/native-standalone/log4j.properties?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/conf/examples/1GB/native-standalone/log4j.properties (original) +++ accumulo/trunk/conf/examples/1GB/native-standalone/log4j.properties Sat Jan 26 21:04:27 2013 @@ -24,7 +24,7 @@ log4j.logger.org.mortbay.log=WARN,A1 log4j.logger.org.apache.hadoop.io.compress=WARN,A1 # hide junk from TestRandomDeletes -log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1 +log4j.logger.org.apache.accumulo.test.TestRandomDeletes=WARN,A1 # hide junk from VFS log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1 Modified: accumulo/trunk/conf/examples/1GB/standalone/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/standalone/log4j.properties?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/conf/examples/1GB/standalone/log4j.properties (original) +++ accumulo/trunk/conf/examples/1GB/standalone/log4j.properties Sat Jan 26 21:04:27 2013 @@ -24,7 +24,7 @@ log4j.logger.org.mortbay.log=WARN,A1 log4j.logger.org.apache.hadoop.io.compress=WARN,A1 # hide junk from TestRandomDeletes -log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1 +log4j.logger.org.apache.accumulo.test.TestRandomDeletes=WARN,A1 # hide junk from VFS log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1 Modified: accumulo/trunk/conf/examples/2GB/native-standalone/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/native-standalone/log4j.properties?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/conf/examples/2GB/native-standalone/log4j.properties (original) +++ accumulo/trunk/conf/examples/2GB/native-standalone/log4j.properties Sat Jan 26 21:04:27 2013 @@ -24,7 +24,7 @@ log4j.logger.org.mortbay.log=WARN,A1 log4j.logger.org.apache.hadoop.io.compress=WARN,A1 # hide junk from TestRandomDeletes -log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1 +log4j.logger.org.apache.accumulo.test.TestRandomDeletes=WARN,A1 # hide junk from VFS log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1 Modified: accumulo/trunk/conf/examples/2GB/standalone/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/standalone/log4j.properties?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/conf/examples/2GB/standalone/log4j.properties (original) +++ accumulo/trunk/conf/examples/2GB/standalone/log4j.properties Sat Jan 26 21:04:27 2013 @@ -24,7 +24,7 @@ log4j.logger.org.mortbay.log=WARN,A1 log4j.logger.org.apache.hadoop.io.compress=WARN,A1 # hide junk from TestRandomDeletes -log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1 +log4j.logger.org.apache.accumulo.test.TestRandomDeletes=WARN,A1 # hide junk from VFS log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1 Modified: accumulo/trunk/conf/examples/3GB/native-standalone/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/native-standalone/log4j.properties?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/conf/examples/3GB/native-standalone/log4j.properties (original) +++ accumulo/trunk/conf/examples/3GB/native-standalone/log4j.properties Sat Jan 26 21:04:27 2013 @@ -24,7 +24,7 @@ log4j.logger.org.mortbay.log=WARN,A1 log4j.logger.org.apache.hadoop.io.compress=WARN,A1 # hide junk from TestRandomDeletes -log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1 +log4j.logger.org.apache.accumulo.test.TestRandomDeletes=WARN,A1 # hide junk from VFS log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1 Modified: accumulo/trunk/conf/examples/3GB/standalone/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/standalone/log4j.properties?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/conf/examples/3GB/standalone/log4j.properties (original) +++ accumulo/trunk/conf/examples/3GB/standalone/log4j.properties Sat Jan 26 21:04:27 2013 @@ -24,7 +24,7 @@ log4j.logger.org.mortbay.log=WARN,A1 log4j.logger.org.apache.hadoop.io.compress=WARN,A1 # hide junk from TestRandomDeletes -log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1 +log4j.logger.org.apache.accumulo.test.TestRandomDeletes=WARN,A1 # hide junk from VFS log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1 Modified: accumulo/trunk/conf/examples/512MB/native-standalone/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/native-standalone/log4j.properties?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/conf/examples/512MB/native-standalone/log4j.properties (original) +++ accumulo/trunk/conf/examples/512MB/native-standalone/log4j.properties Sat Jan 26 21:04:27 2013 @@ -24,7 +24,7 @@ log4j.logger.org.mortbay.log=WARN,A1 log4j.logger.org.apache.hadoop.io.compress=WARN,A1 # hide junk from TestRandomDeletes -log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1 +log4j.logger.org.apache.accumulo.test.TestRandomDeletes=WARN,A1 # hide junk from VFS log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1 Modified: accumulo/trunk/conf/examples/512MB/standalone/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/standalone/log4j.properties?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/conf/examples/512MB/standalone/log4j.properties (original) +++ accumulo/trunk/conf/examples/512MB/standalone/log4j.properties Sat Jan 26 21:04:27 2013 @@ -24,7 +24,7 @@ log4j.logger.org.mortbay.log=WARN,A1 log4j.logger.org.apache.hadoop.io.compress=WARN,A1 # hide junk from TestRandomDeletes -log4j.logger.org.apache.accumulo.server.test.TestRandomDeletes=WARN,A1 +log4j.logger.org.apache.accumulo.test.TestRandomDeletes=WARN,A1 # hide junk from VFS log4j.logger.org.apache.commons.vfs2.impl.DefaultFileSystemManager=WARN,A1 Modified: accumulo/trunk/docs/examples/README.maxmutation URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.maxmutation?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/docs/examples/README.maxmutation (original) +++ accumulo/trunk/docs/examples/README.maxmutation Sat Jan 26 21:04:27 2013 @@ -42,6 +42,6 @@ Now the table will reject any mutation t working memory of the tablet server. The following command attempts to ingest a single row with 10000 columns, which exceeds the memory limit: - $ ./bin/accumulo org.apache.accumulo.server.test.TestIngest -i instance -z zookeepers -u username -p password --rows 1 --cols 10000 + $ ./bin/accumulo org.apache.accumulo.test.TestIngest -i instance -z zookeepers -u username -p password --rows 1 --cols 10000 ERROR : Constraint violates : ConstraintViolationSummary(constrainClass:org.apache.accumulo.examples.simple.constraints.MaxMutationSize, violationCode:0, violationDescription:mutation exceeded maximum size of 188160, numberOfViolatingMutations:1) Modified: accumulo/trunk/docs/examples/README.shard URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.shard?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/docs/examples/README.shard (original) +++ accumulo/trunk/docs/examples/README.shard Sat Jan 26 21:04:27 2013 @@ -41,9 +41,9 @@ The following command queries the index /local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/security/ColumnVisibilityTest.java /local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/client/mock/MockConnectorTest.java /local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/security/VisibilityEvaluatorTest.java - /local/username/workspace/accumulo/src/server/src/main/java/accumulo/server/test/functional/RowDeleteTest.java + /local/username/workspace/accumulo/src/server/src/main/java/accumulo/test/functional/RowDeleteTest.java /local/username/workspace/accumulo/src/server/src/test/java/accumulo/server/logger/TestLogWriter.java - /local/username/workspace/accumulo/src/server/src/main/java/accumulo/server/test/functional/DeleteEverythingTest.java + /local/username/workspace/accumulo/src/server/src/main/java/accumulo/test/functional/DeleteEverythingTest.java /local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/data/KeyExtentTest.java /local/username/workspace/accumulo/src/server/src/test/java/accumulo/server/constraints/MetadataConstraintsTest.java /local/username/workspace/accumulo/src/core/src/test/java/accumulo/core/iterators/WholeRowIteratorTest.java Modified: accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java URL: http://svn.apache.org/viewvc/accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java (original) +++ accumulo/trunk/examples/instamo/src/main/java/org/apache/accumulo/instamo/MapReduceExample.java Sat Jan 26 21:04:27 2013 @@ -19,8 +19,8 @@ package org.apache.accumulo.instamo; import java.io.File; import java.util.UUID; -import org.apache.accumulo.server.test.continuous.ContinuousIngest; -import org.apache.accumulo.server.test.continuous.ContinuousVerify; +import org.apache.accumulo.test.continuous.ContinuousIngest; +import org.apache.accumulo.test.continuous.ContinuousVerify; import org.apache.accumulo.test.MiniAccumuloCluster; import org.apache.commons.io.FileUtils; Modified: accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java (original) +++ accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Sat Jan 26 21:04:27 2013 @@ -51,7 +51,7 @@ import org.apache.accumulo.proxy.thrift. import org.apache.accumulo.proxy.thrift.TablePermission; import org.apache.accumulo.proxy.thrift.TimeType; import org.apache.accumulo.proxy.thrift.UserPass; -import org.apache.accumulo.server.test.functional.SlowIterator; +import org.apache.accumulo.test.functional.SlowIterator; import org.apache.accumulo.test.MiniAccumuloCluster; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/ImportTable.java Sat Jan 26 21:04:27 2013 @@ -57,7 +57,7 @@ import org.apache.accumulo.server.securi import org.apache.accumulo.server.security.SecurityConstants; import org.apache.accumulo.server.security.SecurityOperation; import org.apache.accumulo.server.tabletserver.UniqueNameAllocator; -import org.apache.accumulo.server.test.FastFormat; +import org.apache.accumulo.server.util.FastFormat; import org.apache.accumulo.server.util.MetadataTable; import org.apache.accumulo.server.util.TablePropUtil; import org.apache.hadoop.fs.FileStatus; @@ -72,7 +72,7 @@ import org.apache.log4j.Logger; class ImportedTableInfo implements Serializable { private static final long serialVersionUID = 1L; - + public String exportDir; public String user; public String tableName; @@ -99,13 +99,13 @@ class FinishImportTable extends MasterRe public Repo call(long tid, Master env) throws Exception { env.getFileSystem().delete(new Path(tableInfo.importDir, "mappings.txt"), true); - + TableManager.getInstance().transitionTableState(tableInfo.tableId, TableState.ONLINE); Utils.unreserveTable(tableInfo.tableId, tid, true); Utils.unreserveHdfsDirectory(new Path(tableInfo.exportDir).toString(), tid); - + env.getEventCoordinator().event("Imported table %s ", tableInfo.tableName); Logger.getLogger(FinishImportTable.class).debug("Imported table " + tableInfo.tableId + " " + tableInfo.tableName); @@ -180,7 +180,7 @@ class PopulateMetadataTable extends Mast try { Map map = new HashMap(); - + String line = null; while ((line = in.readLine()) != null) { String sa[] = line.split(":", 2); @@ -191,9 +191,9 @@ class PopulateMetadataTable extends Mast } finally { in.close(); } - + } - + @Override public Repo call(long tid, Master master) throws Exception { @@ -201,12 +201,12 @@ class PopulateMetadataTable extends Mast BatchWriter mbw = null; ZipInputStream zis = null; - + try { FileSystem fs = master.getFileSystem(); mbw = master.getConnector().createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); - + zis = new ZipInputStream(fs.open(path)); Map fileNameMappings = readMappingFile(fs, tableInfo); @@ -307,9 +307,9 @@ class MapImportFileNames extends MasterR public Repo call(long tid, Master environment) throws Exception { Path path = new Path(tableInfo.importDir, "mappings.txt"); - + BufferedWriter mappingsWriter = null; - + try { FileSystem fs = environment.getFileSystem(); @@ -355,10 +355,10 @@ class MapImportFileNames extends MasterR "Error writing mapping file " + path + " " + ioe.getMessage()); } finally { if (mappingsWriter != null) - try{ + try { mappingsWriter.close(); - }catch(IOException ioe){ - log.warn("Failed to close "+path, ioe); + } catch (IOException ioe) { + log.warn("Failed to close " + path, ioe); } } } @@ -381,13 +381,13 @@ class CreateImportDir extends MasterRepo @Override public Repo call(long tid, Master environment) throws Exception { - + UniqueNameAllocator namer = UniqueNameAllocator.getInstance(); Path directory = new Path(ServerConstants.getTablesDir() + "/" + tableInfo.tableId); Path newBulkDir = new Path(directory, Constants.BULK_PREFIX + namer.getNextName()); - + tableInfo.importDir = newBulkDir.toString(); return new MapImportFileNames(tableInfo); @@ -420,7 +420,7 @@ class ImportPopulateZookeeper extends Ma "Error reading table props from " + path + " " + ioe.getMessage()); } } - + @Override public Repo call(long tid, Master env) throws Exception { // reserve the table name in zookeeper or fail @@ -517,7 +517,7 @@ public class ImportTable extends MasterR @Override public Repo call(long tid, Master env) throws Exception { checkVersions(env); - + // first step is to reserve a table id.. if the machine fails during this step // it is ok to retry... the only side effect is that a table id may not be used // or skipped @@ -533,18 +533,18 @@ public class ImportTable extends MasterR Utils.idLock.unlock(); } } - + public void checkVersions(Master env) throws ThriftTableOperationException { Path path = new Path(tableInfo.exportDir, Constants.EXPORT_FILE); ZipInputStream zis = null; - + try { zis = new ZipInputStream(env.getFileSystem().open(path)); Integer exportVersion = null; Integer dataVersion = null; - + ZipEntry zipEntry; while ((zipEntry = zis.getNextEntry()) != null) { if (zipEntry.getName().equals(Constants.EXPORT_INFO_FILE)) { @@ -573,7 +573,7 @@ public class ImportTable extends MasterR if (dataVersion == null || dataVersion > Constants.DATA_VERSION) throw new ThriftTableOperationException(null, tableInfo.tableName, TableOperation.IMPORT, TableOperationExceptionType.OTHER, "Incompatible data version " + exportVersion); - + } catch (IOException ioe) { log.warn(ioe.getMessage(), ioe); throw new ThriftTableOperationException(null, tableInfo.tableName, TableOperation.IMPORT, TableOperationExceptionType.OTHER, Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/UniqueNameAllocator.java Sat Jan 26 21:04:27 2013 @@ -21,7 +21,7 @@ import java.util.Random; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.server.client.HdfsZooInstance; -import org.apache.accumulo.server.test.FastFormat; +import org.apache.accumulo.server.util.FastFormat; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; /** Copied: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FastFormat.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FastFormat.java?p2=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FastFormat.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/FastFormat.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/FastFormat.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.server.util; public class FastFormat { // this 7 to 8 times faster than String.format("%s%06d",prefix, num) Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java (original) +++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java Sat Jan 26 21:04:27 2013 @@ -78,7 +78,7 @@ import org.apache.accumulo.server.client import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.accumulo.server.master.state.TServerInstance; import org.apache.accumulo.server.security.SecurityConstants; -import org.apache.accumulo.server.test.FastFormat; +import org.apache.accumulo.server.util.FastFormat; import org.apache.accumulo.server.trace.TraceFileSystem; import org.apache.accumulo.server.zookeeper.ZooLock; import org.apache.accumulo.server.zookeeper.ZooReaderWriter; @@ -247,7 +247,8 @@ public class MetadataTable extends org.a } } - public static void updateTabletDataFile(long tid, KeyExtent extent, Map estSizes, String time, InstanceTokenWrapper credentials, ZooLock zooLock) { + public static void updateTabletDataFile(long tid, KeyExtent extent, Map estSizes, String time, InstanceTokenWrapper credentials, + ZooLock zooLock) { Mutation m = new Mutation(extent.getMetadataEntry()); byte[] tidBytes = Long.toString(tid).getBytes(); @@ -401,7 +402,7 @@ public class MetadataTable extends org.a byte[] tidBytes = Long.toString(entry.getValue()).getBytes(); m.put(Constants.METADATA_BULKFILE_COLUMN_FAMILY, new Text(entry.getKey()), new Value(tidBytes)); } - + update(credentials, zooLock, m); } @@ -415,8 +416,8 @@ public class MetadataTable extends org.a update(credentials, zooLock, m); } - public static void finishSplit(Text metadataEntry, Map datafileSizes, List highDatafilesToRemove, InstanceTokenWrapper credentials, - ZooLock zooLock) { + public static void finishSplit(Text metadataEntry, Map datafileSizes, List highDatafilesToRemove, + InstanceTokenWrapper credentials, ZooLock zooLock) { Mutation m = new Mutation(metadataEntry); Constants.METADATA_SPLIT_RATIO_COLUMN.putDelete(m); Constants.METADATA_OLD_PREV_ROW_COLUMN.putDelete(m); @@ -433,8 +434,8 @@ public class MetadataTable extends org.a update(credentials, zooLock, m); } - public static void finishSplit(KeyExtent extent, Map datafileSizes, List highDatafilesToRemove, InstanceTokenWrapper credentials, - ZooLock zooLock) { + public static void finishSplit(KeyExtent extent, Map datafileSizes, List highDatafilesToRemove, + InstanceTokenWrapper credentials, ZooLock zooLock) { finishSplit(extent.getMetadataEntry(), datafileSizes, highDatafilesToRemove, credentials, zooLock); } @@ -468,7 +469,7 @@ public class MetadataTable extends org.a TServerInstance self = getTServerInstance(address, zooLock); self.putLastLocation(m); - + // remove the old location if (lastLocation != null && !lastLocation.equals(self)) lastLocation.clearLastLocation(m); @@ -614,8 +615,8 @@ public class MetadataTable extends org.a } } - public static KeyExtent fixSplit(Text metadataEntry, SortedMap columns, TServerInstance tserver, InstanceTokenWrapper credentials, ZooLock lock) - throws AccumuloException { + public static KeyExtent fixSplit(Text metadataEntry, SortedMap columns, TServerInstance tserver, InstanceTokenWrapper credentials, + ZooLock lock) throws AccumuloException { log.warn("Incomplete split " + metadataEntry + " attempting to fix"); Value oper = columns.get(Constants.METADATA_OLD_PREV_ROW_COLUMN); @@ -726,6 +727,7 @@ public class MetadataTable extends org.a public int tabletId; public Collection logSet; + @Override public String toString() { return extent.toString() + " " + filename + " (" + tabletId + ")"; } @@ -809,8 +811,8 @@ public class MetadataTable extends org.a return e; } - public static Pair,SortedMap> getFileAndLogEntries(InstanceTokenWrapper credentials, KeyExtent extent) throws KeeperException, - InterruptedException, IOException { + public static Pair,SortedMap> getFileAndLogEntries(InstanceTokenWrapper credentials, KeyExtent extent) + throws KeeperException, InterruptedException, IOException { ArrayList result = new ArrayList(); TreeMap sizes = new TreeMap(); @@ -1227,7 +1229,7 @@ public class MetadataTable extends org.a } return ret; } - + public static void addBulkLoadInProgressFlag(String path) { Mutation m = new Mutation(Constants.METADATA_BLIP_FLAG_PREFIX + path); Modified: accumulo/trunk/server/src/main/resources/randomwalk/Basic.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/resources/randomwalk/Basic.xml?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/resources/randomwalk/Basic.xml (original) +++ accumulo/trunk/server/src/main/resources/randomwalk/Basic.xml Sat Jan 26 21:04:27 2013 @@ -17,7 +17,7 @@ --> - + Modified: accumulo/trunk/server/src/main/resources/randomwalk/Simple.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/resources/randomwalk/Simple.xml?rev=1438962&r1=1438961&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/resources/randomwalk/Simple.xml (original) +++ accumulo/trunk/server/src/main/resources/randomwalk/Simple.xml Sat Jan 26 21:04:27 2013 @@ -17,7 +17,7 @@ --> - + Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/BulkImportDirectory.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/BulkImportDirectory.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.io.IOException; import java.util.ArrayList; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateRFiles.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRFiles.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateRandomRFile.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateRandomRFile.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateRandomRFile.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateRandomRFile.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.io.IOException; import java.util.Arrays; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateTestTable.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateTestTable.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/CreateTestTable.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/CreateTestTable.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.Map.Entry; import java.util.TreeSet; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/EstimateInMemMapOverhead.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.Collections; import java.util.TreeMap; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GCLotsOfCandidatesTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import org.apache.accumulo.core.Constants; import org.apache.accumulo.server.cli.ClientOpts; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/GetMasterStats.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.io.IOException; import java.util.Map.Entry; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/ListTables.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/ListTables.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/ListTables.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/ListTables.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/ListTables.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/ListTables.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/ListTables.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.Map.Entry; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapConcurrencyTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapConcurrencyTest.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.Iterator; import java.util.Map.Entry; @@ -23,6 +23,7 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.server.tabletserver.NativeMap; +import org.apache.accumulo.server.util.FastFormat; import org.apache.hadoop.io.Text; import com.beust.jcommander.JCommander; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapPerformanceTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapPerformanceTest.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.Collections; import java.util.Iterator; @@ -29,6 +29,7 @@ import org.apache.accumulo.core.data.Mut import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.server.tabletserver.NativeMap; +import org.apache.accumulo.server.util.FastFormat; import org.apache.hadoop.io.Text; public class NativeMapPerformanceTest { Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapStressTest.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapStressTest.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NativeMapStressTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NativeMapStressTest.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.ArrayList; import java.util.HashMap; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NullBatchWriter.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NullBatchWriter.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NullBatchWriter.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/NullBatchWriter.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/NullBatchWriter.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.MutationsRejectedException; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/QueryMetadataTable.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.ArrayList; import java.util.HashSet; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestBinaryRows.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestBinaryRows.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.Iterator; import java.util.Map.Entry; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestIngest.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.Map.Entry; import java.util.Random; @@ -46,6 +46,7 @@ import org.apache.accumulo.core.util.Cac import org.apache.accumulo.fate.zookeeper.ZooReader; import org.apache.accumulo.server.cli.ClientOnDefaultTable; import org.apache.accumulo.server.conf.ServerConfiguration; +import org.apache.accumulo.server.util.FastFormat; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.io.Text; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestMultiTableIngest.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestMultiTableIngest.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestMultiTableIngest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestMultiTableIngest.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.ArrayList; import java.util.Map.Entry; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/TestRandomDeletes.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/TestRandomDeletes.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.ArrayList; import java.util.Map.Entry; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import java.util.Arrays; import java.util.Iterator; Copied: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java (from r1438948, accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/WrongTabletTest.java) URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java?p2=accumulo/trunk/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java&p1=accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/WrongTabletTest.java&r1=1438948&r2=1438962&rev=1438962&view=diff ============================================================================== --- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/WrongTabletTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/WrongTabletTest.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test; +package org.apache.accumulo.test; import org.apache.accumulo.cloudtrace.instrument.Tracer; import org.apache.accumulo.server.cli.ClientOpts; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.util.ArrayList; import java.util.HashSet; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousIngest.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.io.BufferedReader; import java.io.IOException; @@ -39,7 +39,7 @@ import org.apache.accumulo.core.client.T import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.ColumnVisibility; -import org.apache.accumulo.server.test.FastFormat; +import org.apache.accumulo.server.util.FastFormat; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.io.IOException; import java.util.Random; @@ -30,7 +30,7 @@ import org.apache.accumulo.core.data.Ran import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.util.CachedConfiguration; -import org.apache.accumulo.server.test.continuous.ContinuousIngest.BaseOpts; +import org.apache.accumulo.test.continuous.ContinuousIngest.BaseOpts; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousQuery.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.util.Map.Entry; import java.util.Random; @@ -25,7 +25,7 @@ import org.apache.accumulo.core.client.S import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.server.test.continuous.ContinuousIngest.BaseOpts; +import org.apache.accumulo.test.continuous.ContinuousIngest.BaseOpts; import org.apache.hadoop.io.Text; import com.beust.jcommander.Parameter; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousScanner.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.util.Iterator; import java.util.Map.Entry; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousStatsCollector.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.util.HashMap; import java.util.Map; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.io.IOException; import java.util.ArrayList; @@ -30,7 +30,7 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.util.CachedConfiguration; -import org.apache.accumulo.server.test.continuous.ContinuousWalk.BadChecksumException; +import org.apache.accumulo.test.continuous.ContinuousWalk.BadChecksumException; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.LongWritable; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.io.BufferedReader; import java.io.IOException; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/GenSplits.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/GenSplits.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/GenSplits.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/GenSplits.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.util.List; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/Histogram.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.io.BufferedOutputStream; import java.io.FileOutputStream; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/PrintScanTimeHistogram.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.io.BufferedReader; import java.io.FileNotFoundException; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/TimeBinner.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.io.BufferedReader; import java.io.InputStreamReader; Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java?rev=1438962&r1=1438948&r2=1438962&view=diff ============================================================================== --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java Sat Jan 26 21:04:27 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.accumulo.server.test.continuous; +package org.apache.accumulo.test.continuous; import java.io.BufferedReader; import java.io.File;