jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1407119 [1/9] - in /jackrabbit/oak/trunk: ./ oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/ oak-mk-perf/ oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/tasks/ oak-...
Date Thu, 08 Nov 2012 15:18:02 GMT
Author: mduerig
Date: Thu Nov  8 15:17:50 2012
New Revision: 1407119

URL: http://svn.apache.org/viewvc?rev=1407119&view=rev
Log:
OAK-424: MongoMicroKernel changes
Merge remote-tracking branch 'meteatamel/trunk' into trunk

Added:
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/tasks/
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/tasks/GenericWriteTask.java
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/Initializator.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/ConcurrentMicroKernelTestBase.java   (with props)
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelCollection.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MkCollection.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelInitializer.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/Initializator.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMicroKernelInitializer.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMkinitializator.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelConfigProvider.java   (with props)
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelOperation.java   (with props)
    jackrabbit/oak/trunk/oak-mk-perf/src/test/java/org/apache/jackrabbit/mk/tests/MkConcurrentAddNodes1CommitTest.java   (with props)
    jackrabbit/oak/trunk/oak-mk-perf/src/test/java/org/apache/jackrabbit/mk/tests/MkConcurrentAddNodesMultipleCommitTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk-test/src/test/resources/logback-test.xml   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/instruction/
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/instruction/Instruction.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/model/Instruction.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/instruction/InstructionVisitor.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/model/InstructionVisitor.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoNodeStore.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/BaseAction.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/AbstractQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchBranchBaseRevisionIdAction.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchCommitAction.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchCommitsAction.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchHeadRevisionIdAction.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/FetchNodesAction.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/ReadAndIncHeadRevisionAction.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/ReadAndIncHeadRevisionQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/SaveAndSetHeadRevisionAction.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/SaveAndSetHeadRevisionQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/SaveCommitAction.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/SaveCommitQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/action/SaveNodesAction.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/SaveNodesQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoBlobStore.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoGridFsBlobStore.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/BlobStoreMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/BaseCommand.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/AbstractCommand.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/CommitCommand.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/CommitCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/DefaultCommandExecutor.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/CommandExecutorImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/DiffCommand.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/GetHeadRevisionCommand.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/GetHeadRevisionCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/GetJournalCommand.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/GetNodesCommand.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/GetNodesCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/GetRevisionHistoryCommand.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/MergeCommand.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/NodeExistsCommand.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/NodeExistsCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/WaitForCommitCommand.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/GetBlobLengthCommandGridFS.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/GetBlobLengthCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/ReadBlobCommandGridFS.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/ReadBlobCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/WriteBlobCommandGridFS.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/WriteBlobCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/exception/
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/exception/ConflictingCommitException.java
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/ConflictingCommitException.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/exception/InconsistentNodeHierarchyException.java
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/InconsistentNodeHierarchyException.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/exception/
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/exception/NotFoundException.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/ConflictingCommitException.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/instruction/
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/instruction/AddNodeInstructionImpl.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/AddNodeInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/instruction/BaseInstruction.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/InconsistentNodeHierarchyException.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/instruction/CommitCommandInstructionVisitor.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/instruction/CopyNodeInstructionImpl.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/CopyNodeInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/instruction/MoveNodeInstructionImpl.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MoveNodeInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/instruction/RemoveNodeInstructionImpl.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/RemoveNodeInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/instruction/SetPropertyInstructionImpl.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/SetPropertyInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/CommitBuilder.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MongoBlob.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MongoCommit.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/model/CommitMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MongoNode.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/model/NodeMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MongoSync.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/model/HeadMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/tree/
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/tree/MongoNodeDelta.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/tree/MongoNodeState.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/tree/SimpleMongoNodeStore.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/osgi/MongoMicroKernelService.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/osgi/MongoMicroKernalService.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/util/NodeBuilder.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/builder/NodeBuilder.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mk/
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mk/blobs/
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/BaseMongoMicroKernelTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKBranchMergeTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKCommitAddTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKCommitCopyTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKCommitMoveTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKCommitRemoveTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKDiffTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetHeadRevisionTest.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/FetchHeadQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthGridFSTest.java
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/GetBlobLengthCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthTest.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/GetBlobLengthCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKLimitsTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKNodeExistsTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadGridFSTest.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/ReadBlobCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteGridFSTest.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/WriteBlobCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/SimpleNodeScenario.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/action/
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/action/FetchNodesActionTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/action/FetchValidCommitsActionTest.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/query/FetchValidCommitsQueryTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/action/SimpleNodeScenario.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/scenario/SimpleNodeScenario.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/CommitCommandTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentCommitCommandTest.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/ConcurrentCommitCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java   (with props)
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/model/
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/model/CommitBuilderTest.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/builder/CommitBuilderImplTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/util/
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/util/NodeBuilderTest.java   (contents, props changed)
      - copied, changed from r1407101, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/builder/NodeBuilderTest.java
Removed:
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/Initializator.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MkCollection.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMkinitializator.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/SCMkInitializator.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MKOperation.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MkConfigProvider.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/resources/remotePom.xml
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/BlobStore.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/AbstractCommand.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/model/Instruction.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/model/InstructionVisitor.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/CommitCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/ConflictingCommitException.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/GetBlobLengthCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/GetHeadRevisionCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/GetNodesCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/InconsistentNodeHierarchyException.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/NodeExistsCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/ReadBlobCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/command/WriteBlobCommandMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/BlobStoreMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/NodeStoreMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/builder/CommitBuilder.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/builder/NodeBuilder.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/CommandExecutorImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/AddNodeInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/AddPropertyInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/CommitImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/CopyNodeInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MoveNodeInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/RemoveNodeInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/SetPropertyInstructionImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/model/CommitCommandInstructionVisitor.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/model/CommitMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/model/HeadMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/model/NodeMongo.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/osgi/MongoMicroKernalService.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/AbstractQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/FetchHeadQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/FetchHeadRevisionQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/FetchNodeByPathQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/FetchNodesByPathAndDepthQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/FetchNodesForRevisionQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/FetchValidCommitsQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/FetchValidRevisionsQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/QueryUtils.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/ReadAndIncHeadRevisionQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/SaveAndSetHeadRevisionQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/SaveCommitQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/query/SaveNodesQuery.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/BaseMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/CommitCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/ConcurrentCommitCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/GetBlobLengthCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/GetHeadRevisionCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/GetNodesCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/NodeExistsCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/ReadBlobCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/WriteBlobCommandMongoTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/builder/CommitBuilderImplTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/builder/NodeBuilderTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/query/FetchNodesByPathAndDepthQueryTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/query/FetchNodesForRevisionQueryTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/query/FetchValidCommitsQueryTest.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/scenario/SimpleNodeScenario.java
Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
    jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
    jackrabbit/oak/trunk/oak-mk-perf/README
    jackrabbit/oak/trunk/oak-mk-perf/pom.xml
    jackrabbit/oak/trunk/oak-mk-perf/remotePom.xml
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelTestBase.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/BlobStoreFS.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Committer.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Configuration.java
    jackrabbit/oak/trunk/oak-mk-perf/src/main/resources/config.cfg
    jackrabbit/oak/trunk/oak-mk-perf/src/test/java/org/apache/jackrabbit/mk/tests/MKAddNodesRelativePathTest.java
    jackrabbit/oak/trunk/oak-mk-perf/src/test/java/org/apache/jackrabbit/mk/tests/MkAddNodesDifferentStructuresTest.java
    jackrabbit/oak/trunk/oak-mk-perf/src/test/java/org/apache/jackrabbit/mk/tests/MkAddNodesMultipleCommitsTest.java
    jackrabbit/oak/trunk/oak-mongomk-perf/pom.xml
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/BlobStoreFS.java
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/Config.java
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerf.java
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfClient.java
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/MicroKernelPerfMaster.java
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/PrepareEnvironment.java
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/perf/RandomJsopGenerator.java
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/performance/write/MultipleMksWriteNodesTest.java
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/performance/write/MultipleNodesTestBase.java
    jackrabbit/oak/trunk/oak-mongomk-perf/src/main/java/org/apache/jackrabbit/mongomk/performance/write/WriteNodesTest.java
    jackrabbit/oak/trunk/oak-mongomk-test/pom.xml
    jackrabbit/oak/trunk/oak-mongomk-test/src/test/java/org/apache/jackrabbit/mongomk/test/it/MongoMicroKernelFixture.java
    jackrabbit/oak/trunk/oak-mongomk/pom.xml
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/NodeStore.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/Command.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/CommandExecutor.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/model/Commit.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/model/Node.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoConnection.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/MongoMicroKernel.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/json/DefaultJsopHandler.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/json/JsonUtil.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/json/JsopParser.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/NodeImpl.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/util/MongoUtil.java
    jackrabbit/oak/trunk/oak-mongomk/src/main/resources/OSGI-INF/metatype/metatype.properties
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoAssert.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/InstructionAssert.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/NodeAssert.java
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/json/JsopParserTest.java
    jackrabbit/oak/trunk/pom.xml

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java?rev=1407119&r1=1407118&r2=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java Thu Nov  8 15:17:50 2012
@@ -193,7 +193,6 @@ class UserProvider extends AuthorizableB
             StringBuilder stmt = new StringBuilder();
             stmt.append("SELECT * FROM [").append(UserConstants.NT_REP_AUTHORIZABLE).append(']');
             stmt.append("WHERE [").append(UserConstants.REP_PRINCIPAL_NAME).append("] = $principalName");
-
             Result result = root.getQueryEngine().executeQuery(stmt.toString(),
                     Query.JCR_SQL2, 1, 0,
                     Collections.singletonMap("principalName", PropertyValues.newString(principal.getName())),

Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java?rev=1407119&r1=1407118&r2=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java Thu Nov  8 15:17:50 2012
@@ -1238,12 +1238,12 @@ public class MicroKernelIT extends Abstr
 
     @Test
     public void testSmallBlob() {
-        testBlobs(1234, 8 * 1024);
+        testBlobs(1024, 1024);
     }
 
     @Test
     public void testMediumBlob() {
-        testBlobs(1234567, 8 * 1024);
+        testBlobs(1024 * 1024, 8 * 1024);
     }
 
     @Test

Modified: jackrabbit/oak/trunk/oak-mk-perf/README
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/README?rev=1407119&r1=1407118&r2=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/README (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/README Thu Nov  8 15:17:50 2012
@@ -1,22 +1,75 @@
 This module contains performance tests for microkernel instances.
-The tests can be launched locally by calling directly the remote profile from the pom file using the following commands:
-	mvn clean test -Premote -Poak   - for launching the tests against the oak microkernel or
-	mvn clean test -Premote -Psc - for launching the tests against the mongodb microkernel.
-	
-More than that the tests can be launched remotely, for example on an mongodb cluster.In this case the pom file uploads 
-the tests to the remote machine, runs them and collects the results.Use the following commands to remotely run the tests:
-
-mvn clean process-test-classes -Plocal -Psc(or -Poak the microkernel used in tests) -Dpass=<ssh-password for the remote machine>	
-
-Tests:
-- MkAddNodesDifferentStructuresTest
-	- builds Jsop diffs (for adding nodes) in different structures - all on the same line, in a pyramid structure etc.All the nodes 
-	are added in the same commit operation.
-	
-- MkAddNodesMultipleCommitsTest
-	- builds a Jsop diff for adding nodes as a pyramid structure.The nodes are added in separate commit operations (all in one commit,
-	or each 3 nodes in a commit etc.)
-	
-- MkAddNodesRelativePathTest	
-	- add nodes to a node structure.Each node is added in a separate commit and all the nodes are referenced using the relative path to 
-	the corresponding parent node.
\ No newline at end of file
+
+1. Usage
+
+    The tests can be launched locally by calling directly the remote profile from the pom file using the following commands:
+        mvn clean test -Premote -Poakmk   - for launching the tests against the oak microkernel or
+        mvn clean test -Premote -Pmongomk - for launching the tests against the mongodb microkernel.
+        
+    More than that the tests can be launched remotely, for example on an mongodb cluster.In this case the pom file uploads 
+    the tests to the remote machine, runs them and collects the results.Use the following commands to remotely run the tests:
+    
+        mvn clean process-test-classes -Plocal -Pmongomk(or -Poakmk the microkernel used in tests) -Dremotehost=<remotehost> -Dpass=<ssh-password for the remote machine>   
+
+2. The test environment (mongodb cluster)
+    
+    For measuring the performance of the sharedcloud microkernel, I created a mongodb cluster in amazon cloud with the following components:
+        - 2 shards ( in the same time, replica sets) - each of it with 2 nodes installed on different platforms
+        - 3 configuration servers all of them installed on one platform
+        - 1 mongos instance
+        
+        The sharding is enabled and I'm using the following sharding key : {"path" :1, "revId":1}.I changed also the chunk size from 64 to 8 (MB).
+
+
+3.Tests
+
+    All the tests bellow were launched remotely on amazon cloud for both types of microkernel (oak and sharedcloud).The tests are all executed on the platform where the mongos instance is installed.
+        
+    MkAddNodesDifferentStructuresTest.testWriteNodesSameLevel 
+    Creates 100000 nodes, all having the same parent node.All the nodes are added in a single microkernel commit.    
+    oakmk 6.1    mongomk 11.4
+    
+    MkAddNodesDifferentStructuresTest.testWriteNodes10Children 
+    Creates 100000 nodes, in a pyramid tree structure.All of the nodes have 10 children.All the nodes are added in a single microkernel commit. 
+    oakmk 3.6    mongomk 12.3
+    MkAddNodesDifferentStructuresTest.testWriteNodes100Children 
+    Creates 100000 nodes, in a pyramid tree structure.All of the nodes have 100 children.All the nodes are added in a single microkernel commit. 
+    oakmk 2.8    mongomk 11.1
+    
+    MkAddNodesDifferentStructuresTest.testWriteNodes1000Children 
+    Creates 100000 nodes, in a pyramid tree structure.All of the nodes have 1000 children.All the nodes are added in a single microkernel commit. 
+    oakmk 2.7    mongomk 11.9
+    
+    MkAddNodesDifferentStructuresTest.testWriteNodes1Child
+    Creates 100 nodes, each node has only one child, so each of it is on a different tree level.All the nodes are added in a single microkernel commit.
+    oakmk 0.008  mongomk 0.5
+    
+    MkAddNodesMultipleCommitsTest.testWriteNodesAllNodes1Commit
+    Create 10000 nodes, in a pyramid tree structure.All of the nodes have 100 children.Only one microkernel commit is performed for adding the nodes.
+    oakmk 0.14   mongomk 1.4 
+    
+    MkAddNodesMultipleCommitsTest.testWriteNodes50NodesPerCommit
+    Create 10000 nodes, in a pyramid tree structure.All of the nodes have 100 children.The nodes are added in chunks of 50 nodes per commit.
+    oakmk 0.41   mongomk Failure
+    
+    MkAddNodesMultipleCommitsTest.testWriteNodes1000NodesPerCommit   
+    Create 10000 nodes, in a pyramid tree structure.All of the nodes have 100 children.The nodes are added in chunks of 1000 nodes per commit.
+    oakmk 0.2    mongomk 3.5
+    
+    MkAddNodesMultipleCommitsTest.testWriteNodes1NodePerCommit
+    Create 10000 nodes, in a pyramid tree structure.All of the nodes have 100 children.Each node is individually added.
+    oakmk 8.3    mongomk Failure
+    
+    MKAddNodesRelativePathTest.testWriteNodesSameLevel
+    Create 1000 nodes, all on the same level.Each node is individually added (in a separate commit).Each node is added using the relative paths in the microkernel commit method.
+    oakmk 3  mongomk 150
+    
+    MKAddNodesRelativePathTest.testWriteNodes10Children 
+    Create 1000 nodes, each of them having exactly 10 children.Each node is individually added (in a separate commit).Each node is added using the relative paths in the microkernel commit method. 
+    oakmk 4.2    mongomk Failure
+    
+    MKAddNodesRelativePathTest.testWriteNodes100Children 
+    Create 1000 nodes, each of them having exactly 100 children.Each node is individually added (in a separate commit).Each node is added using the relative paths in the microkernel commit method. 
+    oakmk 4.1    mongomk Failure
+    
+    

Modified: jackrabbit/oak/trunk/oak-mk-perf/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/pom.xml?rev=1407119&r1=1407118&r2=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/pom.xml Thu Nov  8 15:17:50 2012
@@ -1,147 +1,162 @@
 <?xml version="1.0"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-	license agreements. See the NOTICE file distributed with this work for additional 
-	information regarding copyright ownership. The ASF licenses this file to 
-	You under the Apache License, Version 2.0 (the "License"); you may not use 
-	this file except in compliance with the License. You may obtain a copy of 
-	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. -->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+    license agreements. See the NOTICE file distributed with this work for additional
+    information regarding copyright ownership. The ASF licenses this file to
+    You under the Apache License, Version 2.0 (the "License"); you may not use
+    this file except in compliance with the License. You may obtain a copy of
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+    by applicable law or agreed to in writing, software distributed under the
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+    OF ANY KIND, either express or implied. See the License for the specific
+    language governing permissions and limitations under the License. -->
 
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.jackrabbit</groupId>
-		<artifactId>jackrabbit-oak</artifactId>
-		<version>0.5-SNAPSHOT</version>
-	</parent>
-	<artifactId>oak-mk-perf</artifactId>
-	<name>oak-mk-perf</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<profiles>
-		<profile>
-			<id>oak</id>
-			<properties>
-				<user>qe1</user>
-				<mktype>oak</mktype>
-			</properties>
-		</profile>
-		<profile>
-			<id>sc</id>
-			<properties>
-				<user>qe</user>
-				<mktype>sc</mktype>
-			</properties>
-		</profile>
-		<profile>
-			<id>local</id>
-			<build>
-				<plugins>
-
-					<plugin>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<configuration>
-							<outputDirectory> ${project.build.outputDirectory}</outputDirectory>
-						</configuration>
-						<executions>
-							<execution>
-								<id>unpack-dependencies</id>
-								<phase>process-resources</phase>
-								<goals>
-									<goal>unpack-dependencies</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-
-					<plugin>
-						<groupId>org.evolvis.maven.plugins.remote-testing</groupId>
-						<artifactId>remote-testing-plugin</artifactId>
-						<version>0.6</version>
-						<configuration>
-							<testMachine>ec2-107-22-9-190.compute-1.amazonaws.com</testMachine>
-							<username>${user}</username>
-							<password>${pass}</password>
-							<display>0</display>
-							<!--<keyFile>/home/rogoz/private-key-file</keyFile> -->
-							<remoteFolder>/home/${user}/tests/</remoteFolder>
-							<pomfile>${basedir}/remotePom.xml</pomfile>
-						</configuration>
-						<executions>
-							<execution>
-								<id>remote testing</id>
-								<goals>
-									<goal>clean</goal>
-									<goal>test</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.surefire</groupId>
-							<artifactId>surefire-junit47</artifactId>
-							<version>2.12.3</version>
-						</dependency>
-					</dependencies>
-					<argLine>-Xmx2024m</argLine>
-					<testFailureIgnore>true</testFailureIgnore>
-					<includes>
-						<include>**/*Test.java</include>
-					</includes>
-					<systemPropertyVariables>
-						<mk.type>${mktype}</mk.type>
-					</systemPropertyVariables>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-
-		</dependency>
-		<dependency>
-			<groupId>org.apache.jackrabbit</groupId>
-			<artifactId>oak-mongomk</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.jackrabbit</groupId>
-			<artifactId>oak-mk</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<version>1.3.158</version>
-		</dependency>
-	</dependencies>
-
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>maven-repo.evolvis.org</id>
-			<url>http://maven-repo.evolvis.org/releases/</url>
-		</pluginRepository>
-	</pluginRepositories>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-oak</artifactId>
+        <version>0.6-SNAPSHOT</version>
+    </parent>
+    <artifactId>oak-mk-perf</artifactId>
+    <name>oak-mk-perf</name>
+    <url>http://maven.apache.org</url>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <profiles>
+        <profile>
+            <id>oakmk</id>
+            <properties>
+                <user>qe1</user>
+                <mktype>oakmk</mktype>
+            </properties>
+        </profile>
+        <profile>
+            <id>mongomk</id>
+            <properties>
+                <user>qe</user>
+                <mktype>mongomk</mktype>
+            </properties>
+        </profile>
+        <profile>
+            <id>local</id>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.outputDirectory}</outputDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>unpack-dependencies</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>unpack-dependencies</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.evolvis.maven.plugins.remote-testing</groupId>
+                        <artifactId>remote-testing-plugin</artifactId>
+                        <version>0.6</version>
+                        <configuration>
+                            <testMachine>${remotehost}</testMachine>
+                            <username>${user}</username>
+                            <password>${pass}</password>
+                            <display>0</display>
+                            <!--<keyFile>/home/rogoz/private-key-file</keyFile> -->
+                            <remoteFolder>/home/${user}/tests/</remoteFolder>
+                            <pomfile>${basedir}/remotePom.xml</pomfile>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>remote testing</id>
+                                <goals>
+                                    <goal>clean</goal>
+                                    <goal>test</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.maven.surefire</groupId>
+                            <artifactId>surefire-junit47</artifactId>
+                            <version>2.12.3</version>
+                        </dependency>
+                    </dependencies>
+                    <argLine>-Xmx2024m</argLine>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <systemPropertyVariables>
+                        <mk.type>${mktype}</mk.type>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+
+        </dependency>
+        <!--
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-mongomk</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+         -->
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-mk</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.3.158</version>
+        </dependency>
+        <dependency>
+            <groupId>com.cedarsoft.commons</groupId>
+            <artifactId>test-utils</artifactId>
+            <version>5.0.9</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>maven-cobertura-plugin</artifactId>
+                    <groupId>maven-plugins</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>maven-findbugs-plugin</artifactId>
+                    <groupId>maven-plugins</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>maven-repo.evolvis.org</id>
+            <url>http://maven-repo.evolvis.org/releases/</url>
+        </pluginRepository>
+    </pluginRepositories>
 
 </project>

Modified: jackrabbit/oak/trunk/oak-mk-perf/remotePom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/remotePom.xml?rev=1407119&r1=1407118&r2=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/remotePom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/remotePom.xml Thu Nov  8 15:17:50 2012
@@ -1,63 +1,57 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  -->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    You under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.adobe.sharedcloud</groupId>
-	<artifactId>remote-sharedcloud-oak-performance</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>remote-oak-mk-perf</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
-	<name>remote-sharedcloud-oak-performance</name>
-	<url>http://maven.apache.org</url>
+    <name>remote-sharedcloud-oak-performance</name>
+    <url>http://maven.apache.org</url>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<profiles>
-		<profile>
-			<id>remote</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<version>2.10</version>
-						<dependencies>
-							<dependency>
-								<groupId>org.apache.maven.surefire</groupId>
-								<artifactId>surefire-junit47</artifactId>
-								<version>2.12.3</version>
-							</dependency>
-						</dependencies>
-						<configuration>
-							<systemPropertyVariables>
-								<mk.type>${env.mktype}</mk.type>
-							</systemPropertyVariables>
-							<testFailureIgnore>false</testFailureIgnore>
-							<argLine>-Xmx1024m</argLine>
-							<includes>
-								<include>**/*Test.java</include>
-							</includes>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <profiles>
+        <profile>
+            <id>remote</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.10</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-junit47</artifactId>
+                                <version>2.12.3</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <mk.type>${env.mktype}</mk.type>
+                            </systemPropertyVariables>
+                            <testFailureIgnore>false</testFailureIgnore>
+                            <argLine>-Xmx4056m</argLine>
+                            <includes>
+                                <include>**/*Test.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Copied: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/tasks/GenericWriteTask.java (from r1407101, jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/Initializator.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/tasks/GenericWriteTask.java?p2=jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/tasks/GenericWriteTask.java&p1=jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/Initializator.java&r1=1407101&r2=1407119&rev=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/Initializator.java (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/tasks/GenericWriteTask.java Thu Nov  8 15:17:50 2012
@@ -14,18 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jackrabbit.mk.testing;
+package org.apache.jackrabbit.mk.tasks;
 
 import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.util.Configuration;
+import org.apache.jackrabbit.mk.util.Committer;
 
-/**
- * Interface for microkernel initialization.
- * @author rogoz
- *
- */
-public interface Initializator {
+public class GenericWriteTask implements Runnable {
+
+    MicroKernel mk;
+    Committer committer;
+    String diff;
+    int nodesPerCommit;
+ 
+    public GenericWriteTask(MicroKernel mk, String diff, int nodesPerCommit) {
+        this.mk = mk;
+        this.diff = diff;
+        this.nodesPerCommit = nodesPerCommit;
+        committer = new Committer();
+    }
 
-	public MicroKernel init(Configuration conf) throws Exception;
-	public String getType();
+    @Override
+    public void run() {
+        committer.addNodes(mk, diff, nodesPerCommit);
+    }
 }

Added: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/ConcurrentMicroKernelTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/ConcurrentMicroKernelTestBase.java?rev=1407119&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/ConcurrentMicroKernelTestBase.java (added)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/ConcurrentMicroKernelTestBase.java Thu Nov  8 15:17:50 2012
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.mk.testing;
+
+import java.util.ArrayList;
+
+import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.mk.util.Chronometer;
+import org.apache.jackrabbit.mk.util.Configuration;
+import org.apache.jackrabbit.mk.util.MicroKernelConfigProvider;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+public class ConcurrentMicroKernelTestBase {
+    public static int mkNumber = 3;
+    public ArrayList<MicroKernel> mks;
+    public Chronometer chronometer;
+    static MicroKernelInitializer initializator;
+    static Configuration conf;
+
+
+    /**
+     * Loads the corresponding microkernel initialization class and the
+     * microkernel configuration.The method searches for the <b>mk.type</b>
+     * system property in order to initialize the proper microkernel.By default,
+     * the oak microkernel will be instantiated.
+     *
+     * @throws Exception
+     */
+    @BeforeClass
+    public static void beforeSuite() throws Exception {
+
+        // FIXME - Add back
+        initializator = new OakMicroKernelInitializer();
+        //String mktype = System.getProperty("mk.type");
+        //initializator = (mktype == null || mktype.equals("oakmk")) ? new OakMicroKernelInitializer()
+        //        : new MongoMicroKernelInitializer();
+        System.out.println("Tests will run against ***"
+                + initializator.getType() + "***");
+        conf = MicroKernelConfigProvider.readConfig();
+    }
+
+    /**
+     * Creates a microkernel collection with only one microkernel.
+     *
+     * @throws Exception
+     */
+    @Before
+    public void beforeTest() throws Exception {
+        mks = new MicroKernelCollection(initializator, conf, mkNumber)
+                .getMicroKernels();
+        chronometer = new Chronometer();
+    }
+
+}

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/ConcurrentMicroKernelTestBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/ConcurrentMicroKernelTestBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Copied: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelCollection.java (from r1407101, jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MkCollection.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelCollection.java?p2=jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelCollection.java&p1=jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MkCollection.java&r1=1407101&r2=1407119&rev=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MkCollection.java (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelCollection.java Thu Nov  8 15:17:50 2012
@@ -24,44 +24,33 @@ import org.apache.jackrabbit.mk.util.Con
 /**
  * Represents a collection of microkernels.
  * 
- * @author rogoz
+ * 
  * 
  */
-public class MkCollection {
-	ArrayList<MicroKernel> mks;
-
-	/**
-	 * Initialize a collection of mks.Each mk can have a particular
-	 * configuration.
-	 * 
-	 * @param initializator
-	 * @param conf
-	 * @throws Exception
-	 */
-	public MkCollection(Initializator initializator, Configuration conf[],
-			int size) throws Exception {
-		mks = new ArrayList<MicroKernel>();
-		for (int i = 0; i < size; i++) {
-			mks.add(initializator.init(conf[i]));
-		}
-	}
-
-	/**
-	 * Initialize a collection of mks.All mks have the same configuration.
-	 * 
-	 * @param initializator
-	 * @param conf
-	 * @throws Exception
-	 */
-	public MkCollection(Initializator initializator, Configuration conf,
-			int size) throws Exception {
-		mks = new ArrayList<MicroKernel>();
-		for (int i = 0; i < size; i++) {
-			mks.add(initializator.init(conf));
-		}
-	}
+public class MicroKernelCollection {
+    ArrayList<MicroKernel> mks;
 
-	public ArrayList<MicroKernel> getMicroKernels() {
-		return mks;
-	}
+    /**
+     * Initialize a collection of microkernels.All microkernels have the same
+     * configuration.
+     * 
+     * @param initializator
+     *            The initialization class of a particular microkernel type.
+     * @param conf
+     *            The microkernel configuration data.
+     * @throws Exception
+     */
+    public MicroKernelCollection(MicroKernelInitializer initializator,
+            Configuration conf, int size) throws Exception {
+        mks = initializator.init(conf, size);
+        }
+    
+    /**
+     * Returns a microkernel collection.
+     * 
+     * @return An array of initialized microkernels.
+     */
+    public ArrayList<MicroKernel> getMicroKernels() {
+        return mks;
+    }
 }

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelCollection.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelCollection.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Copied: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelInitializer.java (from r1407101, jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/Initializator.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelInitializer.java?p2=jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelInitializer.java&p1=jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/Initializator.java&r1=1407101&r2=1407119&rev=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/Initializator.java (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelInitializer.java Thu Nov  8 15:17:50 2012
@@ -16,16 +16,18 @@
  */
 package org.apache.jackrabbit.mk.testing;
 
+import java.util.ArrayList;
+
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.mk.util.Configuration;
 
 /**
  * Interface for microkernel initialization.
- * @author rogoz
- *
+ * 
+ * 
+ * 
  */
-public interface Initializator {
-
-	public MicroKernel init(Configuration conf) throws Exception;
-	public String getType();
+public interface MicroKernelInitializer {
+    public ArrayList<MicroKernel> init(Configuration conf,int mksNumber) throws Exception;
+    public String getType();
 }

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelInitializer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelInitializer.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Modified: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelTestBase.java?rev=1407119&r1=1407118&r2=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelTestBase.java (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/MicroKernelTestBase.java Thu Nov  8 15:17:50 2012
@@ -19,45 +19,55 @@ package org.apache.jackrabbit.mk.testing
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.mk.util.Chronometer;
 import org.apache.jackrabbit.mk.util.Configuration;
-import org.apache.jackrabbit.mk.util.MkConfigProvider;
+import org.apache.jackrabbit.mk.util.MicroKernelConfigProvider;
 import org.junit.Before;
 import org.junit.BeforeClass;
 
-
 /**
- * Base class for tests that are using only one microkernel instance.
- * @author rogoz
+ * The test base class for tests that are using only one microkernel instance.
+ *
+ *
  *
  */
 public class MicroKernelTestBase {
 
-	static Initializator initializator;
-	public MicroKernel mk;
-	public static Configuration conf;
-	public Chronometer chronometer;
-
-	/**
-	 * Creates a microkernel collection with only one microkernel.
-	 * 
-	 * @throws Exception
-	 */
-	@BeforeClass
-	public static void beforeSuite() throws Exception {
-		
-		String mktype = System.getProperty("mk.type");
-		initializator = (mktype == null || mktype.equals("oak")) ? new OakMkinitializator()
-				: new SCMkInitializator();
-	/*	initializator = new SCMkInitializator(); */
-		System.out.println("Tests will run against ***"+initializator.getType()+"***");
-		conf = MkConfigProvider.readConfig();
-	}
-
-	@Before
-	public void beforeTest() throws Exception {
-
-		mk = (new MkCollection(initializator, conf, 1)).getMicroKernels()
-				.get(0);
-		chronometer = new Chronometer();
-	}
+    static MicroKernelInitializer initializator;
+    public MicroKernel mk;
+    public static Configuration conf;
+    public Chronometer chronometer;
+
+    /**
+     * Loads the corresponding microkernel initialization class and the
+     * microkernel configuration.The method searches for the <b>mk.type</b>
+     * system property in order to initialize the proper microkernel.By default,
+     * the oak microkernel will be instantiated.
+     *
+     * @throws Exception
+     */
+    @BeforeClass
+    public static void beforeSuite() throws Exception {
+
+        // FIXME - Add back
+        initializator = new OakMicroKernelInitializer();
+        //String mktype = System.getProperty("mk.type");
+        //initializator = (mktype == null || mktype.equals("oakmk")) ? new OakMicroKernelInitializer()
+        //        : new MongoMicroKernelInitializer();
+        System.out.println("Tests will run against ***"
+                + initializator.getType() + "***");
+        conf = MicroKernelConfigProvider.readConfig();
+    }
+
+    /**
+     * Creates a microkernel collection with only one microkernel.
+     *
+     * @throws Exception
+     */
+    @Before
+    public void beforeTest() throws Exception {
+
+        mk = (new MicroKernelCollection(initializator, conf, 1))
+                .getMicroKernels().get(0);
+        chronometer = new Chronometer();
+    }
 
 }

Copied: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMicroKernelInitializer.java (from r1407101, jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMkinitializator.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMicroKernelInitializer.java?p2=jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMicroKernelInitializer.java&p1=jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMkinitializator.java&r1=1407101&r2=1407119&rev=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMkinitializator.java (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMicroKernelInitializer.java Thu Nov  8 15:17:50 2012
@@ -16,31 +16,38 @@
  */
 package org.apache.jackrabbit.mk.testing;
 
+import java.util.ArrayList;
+
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.mk.core.MicroKernelImpl;
 import org.apache.jackrabbit.mk.core.Repository;
 import org.apache.jackrabbit.mk.util.Configuration;
 
 /**
- * Initialize an oak microkernel.
- * 
- * @author rogoz
- * 
+ * Initialize a {@code MicroKernelImpl}.A new {@code Repository} is created for
+ * each initialization.
  */
-public class OakMkinitializator implements Initializator {
+public class OakMicroKernelInitializer implements MicroKernelInitializer {
+
+
+
+    @Override
+    public ArrayList<MicroKernel> init(Configuration conf, int mksNumber)
+            throws Exception {
+        ArrayList<MicroKernel> mks = new ArrayList<MicroKernel>();
+        Repository rep = new Repository(conf.getStoragePath()
+                + System.currentTimeMillis());
+        rep.init();
+        for (int i = 0; i < mksNumber; i++) {
+            mks.add(new MicroKernelImpl(rep));
+        }
+        return mks;
+    }
+    
+    public String getType() {
+        // TODO Auto-generated method stub
+        return "Oak Microkernel";
+    }
 
-	public MicroKernel init(Configuration conf) throws Exception {
-		// TODO use configuration
-		Repository rep = new Repository(conf.getStoragePath()
-				+ System.currentTimeMillis());
-		rep.init();
-		MicroKernel mk = new MicroKernelImpl(rep);
-		return mk;
-	}
-
-	public String getType() {
-		// TODO Auto-generated method stub
-		return "Oak Microkernel";
-	}
 
 }

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMicroKernelInitializer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/testing/OakMicroKernelInitializer.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Modified: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/BlobStoreFS.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/BlobStoreFS.java?rev=1407119&r1=1407118&r2=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/BlobStoreFS.java (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/BlobStoreFS.java Thu Nov  8 15:17:50 2012
@@ -19,32 +19,29 @@ package org.apache.jackrabbit.mk.util;
 import java.io.File;
 import java.io.InputStream;
 
-import org.apache.jackrabbit.mongomk.api.BlobStore;
-
-
+import org.apache.jackrabbit.mk.blobs.BlobStore;
 
 public class BlobStoreFS implements BlobStore {
 
+    public BlobStoreFS(String rootPath) {
+        File rootDir = new File(rootPath);
+        if (!rootDir.isDirectory()) {
+            rootDir.mkdirs();
+        }
+
+    }
+
+    public long getBlobLength(String blobId) throws Exception {
+        return 0;
+    }
+
+    public int readBlob(String blobId, long blobOffset, byte[] buffer,
+            int bufferOffset, int length) throws Exception {
+        return 0;
+    }
+
+    public String writeBlob(InputStream is) throws Exception {
+        return null;
+    }
 
-   public BlobStoreFS(String rootPath) {
-       File rootDir = new File(rootPath);
-       if (!rootDir.isDirectory()) {
-           rootDir.mkdirs();
-       }
-
-
-   }
-
-   public long getBlobLength(String blobId) throws Exception {
-       return 0;
-   }
-
-   public int readBlob(String blobId, long blobOffset, byte[] buffer, int bufferOffset, int length) throws Exception {
-       return 0;
-   }
-
-   public String writeBlob(InputStream is) throws Exception {
-       return null;
-   }
-   
 }
\ No newline at end of file

Modified: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Committer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Committer.java?rev=1407119&r1=1407118&r2=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Committer.java (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Committer.java Thu Nov  8 15:17:50 2012
@@ -20,47 +20,90 @@ import org.apache.jackrabbit.mk.api.Micr
 
 public class Committer {
 
-	/**
-	 * Add nodes to the repository.
-	 * 
-	 * @param mk
-	 *            Microkernel that is performing the action.
-	 * @param diff
-	 *            The diff that is commited.All the nodes must have the absolute
-	 *            path.
-	 * @param nodesPerCommit
-	 *            Number of nodes per commit.
-	 */
-	public void addNodes(MicroKernel mk, String diff, int nodesPerCommit) {
-
-		if (nodesPerCommit == 0) {
-			mk.commit("", diff.toString(), null, "");
-			return;
-		}
-		String[] string = diff.split(System.getProperty("line.separator"));
-		int i = 0;
-		StringBuilder finalCommit = new StringBuilder();
-		for (String line : string) {
-			finalCommit.append(line);
-			i++;
-			if (i == nodesPerCommit) {
-				mk.commit("", finalCommit.toString(), null, "");
-				finalCommit.setLength(0);
-				i = 0;
-			}
-		}
-	}
-
-	/**
-	 * Add a node to repository.
-	 * 
-	 * @param mk
-	 *            Microkernel that is performing the action.
-	 * @param parentPath
-	 * @param name
-	 *            Name of the node.
-	 */
-	public void addNode(MicroKernel mk, String parentPath, String name) {
-		mk.commit(parentPath, "+\"" + name + "\" : {} \n", null, "");
-	}
+    /**
+     * Add nodes to the repository.
+     * 
+     * @param mk
+     *            The microkernel that is performing the action.
+     * @param diff
+     *            The diff that is commited.All the nodes must be define by
+     *            their absolute path.
+     * @param nodesPerCommit
+     *            Number of nodes per commit.
+     */
+    public void addNodes(MicroKernel mk, String diff, int nodesPerCommit) {
+
+        if (nodesPerCommit == 0) {
+            mk.commit("", diff.toString(), null, "");
+            return;
+        }
+        String[] string = diff.split(System.getProperty("line.separator"));
+        int i = 0;
+        StringBuilder finalCommit = new StringBuilder();
+        for (String line : string) {
+            finalCommit.append(line);
+            i++;
+            if (i == nodesPerCommit) {
+                mk.commit("", finalCommit.toString(), null, "");
+                finalCommit.setLength(0);
+                i = 0;
+            }
+        }
+        if (finalCommit.length() > 0)
+            mk.commit("", finalCommit.toString(), null, "");
+    }
+
+    /**
+     * Add an empty node to repository.
+     * 
+     * @param mk
+     *            Microkernel that is performing the action.
+     * @param parentPath
+     * @param name
+     *            Name of the node.
+     */
+    public void addNode(MicroKernel mk, String parentPath, String name) {
+        mk.commit(parentPath, "+\"" + name + "\" : {} \n", null, "");
+    }
+
+    /**
+     * Recursively builds a pyramid tree structure.Each node is added in a
+     * separate commit.
+     * 
+     * @param mk
+     *            Microkernel used for adding nodes.
+     * @param startingPoint
+     *            The path where the node will be added.
+     * @param index
+     * @param numberOfChildren
+     *            Number of children per level.
+     * @param nodesNumber
+     *            Total nodes number.
+     * @param nodePrefixName
+     *            The node's name prefix.The complete node name is
+     *            prefix+indexNumber.
+     **/
+    public void addPyramidStructure(MicroKernel mk, String startingPoint,
+            int index, int numberOfChildren, long nodesNumber,
+            String nodePrefixName) {
+        // if all the nodes are on the same level
+        if (numberOfChildren == 0) {
+            for (long i = 0; i < nodesNumber; i++) {
+                addNode(mk, startingPoint, nodePrefixName + i);
+                // System.out.println("Created node " + i);
+            }
+            return;
+        }
+        if (index >= nodesNumber)
+            return;
+        addNode(mk, startingPoint, nodePrefixName + index);
+        for (int i = 1; i <= numberOfChildren; i++) {
+            if (!startingPoint.endsWith("/"))
+                startingPoint = startingPoint + "/";
+            addPyramidStructure(mk, startingPoint + nodePrefixName + index,
+                    index * numberOfChildren + i, numberOfChildren,
+                    nodesNumber, nodePrefixName);
+        }
+
+    }
 }

Modified: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Configuration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Configuration.java?rev=1407119&r1=1407118&r2=1407119&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Configuration.java (original)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/Configuration.java Thu Nov  8 15:17:50 2012
@@ -20,39 +20,36 @@ import java.util.Properties;
 
 public class Configuration {
 
-	    
-	    private static final String MK_TYPE="mk.type";
-	    private static final String HOST = "hostname";
-	    private static final String MONGO_PORT = "mongo.port";
-	    private static final String STORAGE_PATH = "storage.path";
-	    private static final String DATABASE="mongo.database";
-	    
-	    private final Properties properties;
-
-	    public Configuration(Properties properties) {
-	        this.properties = properties;
-	    }
-
-	    public String getMkType() {
-	        return properties.getProperty(MK_TYPE);
-	    }
-
-	    public String getHost() {
-	        return properties.getProperty(HOST);
-	    }
-
-	    public int getMongoPort() {
-	        return Integer.parseInt(properties.getProperty(MONGO_PORT));
-	    }
-	    
-	    public String getStoragePath() {
-	        return properties.getProperty(STORAGE_PATH);
-	    }
-
-		public String getMongoDatabase() {
-			
-			return properties.getProperty(DATABASE);
-		}
-}
+    private static final String MK_TYPE = "mk.type";
+    private static final String HOST = "hostname";
+    private static final String MONGO_PORT = "mongo.port";
+    private static final String STORAGE_PATH = "storage.path";
+    private static final String DATABASE = "mongo.database";
+
+    private final Properties properties;
+
+    public Configuration(Properties properties) {
+        this.properties = properties;
+    }
+
+    public String getMkType() {
+        return properties.getProperty(MK_TYPE);
+    }
+
+    public String getHost() {
+        return properties.getProperty(HOST);
+    }
+
+    public int getMongoPort() {
+        return Integer.parseInt(properties.getProperty(MONGO_PORT));
+    }
+
+    public String getStoragePath() {
+        return properties.getProperty(STORAGE_PATH);
+    }
 
+    public String getMongoDatabase() {
 
+        return properties.getProperty(DATABASE);
+    }
+}

Added: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelConfigProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelConfigProvider.java?rev=1407119&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelConfigProvider.java (added)
+++ jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelConfigProvider.java Thu Nov  8 15:17:50 2012
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.mk.util;
+
+import java.io.InputStream;
+import java.util.Properties;
+
+public class MicroKernelConfigProvider {
+
+    /**
+     * Read the mk configuration from file.
+     * 
+     * @param resourcePath
+     * @return
+     * @throws Exception
+     */
+    public static Configuration readConfig(String resourcePath)
+            throws Exception {
+
+        InputStream is = MicroKernelConfigProvider.class
+                .getResourceAsStream(resourcePath);
+
+        Properties properties = new Properties();
+        properties.load(is);
+        is.close();
+        return new Configuration(properties);
+    }
+
+    /**
+     * Read the mk configuration from config.cfg.
+     * 
+     * @param resourcePath
+     * @return
+     * @throws Exception
+     */
+    public static Configuration readConfig() throws Exception {
+
+        InputStream is = MicroKernelConfigProvider.class
+                .getResourceAsStream("/config.cfg");
+
+        Properties properties = new Properties();
+        properties.load(is);
+        // System.out.println(properties.toString());
+        is.close();
+        return new Configuration(properties);
+    }
+
+}

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelConfigProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jackrabbit/oak/trunk/oak-mk-perf/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelConfigProvider.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL



Mime
View raw message