Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E38C10F29 for ; Thu, 24 Oct 2013 12:27:29 +0000 (UTC) Received: (qmail 26807 invoked by uid 500); 24 Oct 2013 12:27:29 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 26788 invoked by uid 500); 24 Oct 2013 12:27:28 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 26776 invoked by uid 99); 24 Oct 2013 12:27:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Oct 2013 12:27:27 +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; Thu, 24 Oct 2013 12:27:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CCF02238896F; Thu, 24 Oct 2013 12:27:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1535350 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark: BenchmarkRunner.java ManyUserReadTest.java Date: Thu, 24 Oct 2013 12:27:05 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131024122705.CCF02238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Thu Oct 24 12:27:05 2013 New Revision: 1535350 URL: http://svn.apache.org/r1535350 Log: OAK-527: benchmark tests Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyUserReadTest.java Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1535350&r1=1535349&r2=1535350&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java Thu Oct 24 12:27:05 2013 @@ -67,6 +67,9 @@ public class BenchmarkRunner { OptionSpec report = parser.accepts("report", "Whether to output intermediate results") .withOptionalArg().ofType(Boolean.class) .defaultsTo(Boolean.FALSE); + OptionSpec randomUser = parser.accepts("randomUser", "Whether to use a random user to read.") + .withOptionalArg().ofType(Boolean.class) + .defaultsTo(Boolean.FALSE); OptionSpec csvFile = parser.accepts("csvFile", "File to write a CSV version of the benchmark data.") .withOptionalArg().ofType(File.class); @@ -145,7 +148,8 @@ public class BenchmarkRunner { runAsAdmin.value(options), itemsToRead.value(options), bgReaders.value(options), - report.value(options)), + report.value(options), + randomUser.value(options)), ReadManyTest.linear("LinearReadEmpty", 1, ReadManyTest.EMPTY), ReadManyTest.linear("LinearReadFiles", 1, ReadManyTest.FILES), ReadManyTest.linear("LinearReadNodes", 1, ReadManyTest.NODES), Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyUserReadTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyUserReadTest.java?rev=1535350&r1=1535349&r2=1535350&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyUserReadTest.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ManyUserReadTest.java Thu Oct 24 12:27:05 2013 @@ -35,9 +35,11 @@ public class ManyUserReadTest extends Re private final int numberOfUsers = 1000; private final int numberOfMembers = 10; + private final boolean randomUser; - protected ManyUserReadTest(boolean runAsAdmin, int itemsToRead, int bgReaders, boolean doReport) { + protected ManyUserReadTest(boolean runAsAdmin, int itemsToRead, int bgReaders, boolean doReport, boolean randomUser) { super(runAsAdmin, itemsToRead, bgReaders, doReport); + this.randomUser = randomUser; } @Override @@ -97,7 +99,7 @@ public class ManyUserReadTest extends Re if (runAsAdmin) { return loginWriter(); } else { - String userId = "user" + getIndex(); + String userId = (randomUser) ? "user"+getIndex() : "user1"; SimpleCredentials sc = new SimpleCredentials(userId, userId.toCharArray()); return login(sc); }