From: Martin Zaun Date: January 11 2011 8:12pm Subject: bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:4049 to 4050) List-Archive: http://lists.mysql.com/commits/128466 Message-Id: <201101112013.p0BJEqdD005714@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0532011837==" --===============0532011837== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 4050 Martin Zaun 2011-01-11 [merge] crund - merge from ndb-7.1-dbg64 to ndb-7.1 added: storage/ndb/test/crund/config_samples/crundResult.properties modified: storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java 4049 Martin Zaun 2011-01-11 [merge] crund - merge from ndb-7.1-opt64 to ndb-7.1 modified: storage/ndb/test/crund/config_samples/crundRun.properties storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundDriver.java storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/JpaLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbApiLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbJTieLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjLoad.java storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java storage/ndb/test/crund/src/crundndb/CrundDriver.cpp storage/ndb/test/crund/src/crundndb/CrundDriver.hpp storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.hpp storage/ndb/test/crund/src/crundndb/NdbApiDriver.cpp storage/ndb/test/crund/src/crundndb/NdbApiDriver.hpp storage/ndb/test/crund/src/crundndb/com_mysql_cluster_crund_NdbApiLoad.cpp === added file 'storage/ndb/test/crund/config_samples/crundResult.properties' --- a/storage/ndb/test/crund/config_samples/crundResult.properties 1970-01-01 00:00:00 +0000 +++ b/storage/ndb/test/crund/config_samples/crundResult.properties 2011-01-11 20:09:57 +0000 @@ -0,0 +1,2 @@ +# the number of warmup iterations to be skipped for result aggregation +nWarmupRuns=5 === modified file 'storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java' --- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java 2011-01-11 17:40:55 +0000 +++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/ResultProcessor.java 2011-01-11 20:09:57 +0000 @@ -121,8 +121,7 @@ public class ResultProcessor { // result processor settings protected final Properties props = new Properties(); - protected int warmupRuns; - protected int hotRuns; + protected int nWarmupRuns; // result processor resources protected ResultReporter reporter; @@ -169,7 +168,7 @@ public class ResultProcessor { } if (propFileNames.size() == 0) { - // XXX propFileNames.add("crundResult.properties"); + propFileNames.add("crundResult.properties"); } if (ilogFileNames.size() == 0) { @@ -223,6 +222,7 @@ public class ResultProcessor { int lineNo = 1; String line; + int nIgnored = nWarmupRuns; while (true) { line = ilog.readLine(); if (line == null) { @@ -280,7 +280,7 @@ public class ResultProcessor { + ": " + e); throw new ParseException(msg, 0); } - if (nTxOps == 0) { + if (nval == 1) { nTxOps = n; } else if (nTxOps != n) { String msg = ("line # " + lineNo @@ -289,7 +289,14 @@ public class ResultProcessor { + ", found: " + n); throw new ParseException(msg, 0); } - + + // skip warmup runs + if (nval <= nIgnored) { + nval--; + nIgnored--; + continue; + } + // parse values for (int i = 1; i < values.length; i++) { long l; @@ -396,10 +403,10 @@ public class ResultProcessor { final StringBuilder msg = new StringBuilder(); final String eol = System.getProperty("line.separator"); - warmupRuns = parseInt("warmupRuns", 0); - if (warmupRuns < 0) { - msg.append("[ignored] warmupRuns: " + warmupRuns + eol); - warmupRuns = 0; + nWarmupRuns = parseInt("nWarmupRuns", 0); + if (nWarmupRuns < 0) { + msg.append("[ignored] nWarmupRuns: " + nWarmupRuns + eol); + nWarmupRuns = 0; } if (msg.length() == 0) { @@ -414,7 +421,7 @@ public class ResultProcessor { protected void printProperties() { out.println(); out.println("result processor settings ..."); - out.println("warmupRuns: " + warmupRuns); + out.println("nWarmupRuns: " + nWarmupRuns); } // ---------------------------------------------------------------------- --===============0532011837== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/martin.zaun@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: martin.zaun@stripped # target_branch: file:///Users/mz/mysql/ndb-7.1/ # testament_sha1: 9f74757b285a722fcf3b5331f16b8ef186990ff1 # timestamp: 2011-01-11 12:12:05 -0800 # source_branch: file:///Users/mz/mysql/ndb-7.1-opt1/ # base_revision_id: martin.zaun@stripped\ # 531fsxh2mejvn7t4 # # Begin bundle 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 SRWJzbMcHDSTUaAFKpSdaf+LuSKcKEgKfsLfgA== --===============0532011837==--