提交 83ae2037 authored 作者: Thomas Mueller's avatar Thomas Mueller

benchmark

上级 2ae44585
...@@ -71,16 +71,20 @@ public class TestPerformance { ...@@ -71,16 +71,20 @@ public class TestPerformance {
private void test(String[] args) throws Exception { private void test(String[] args) throws Exception {
boolean init = false; boolean init = false;
int dbId = -1; int dbId = -1;
boolean exit = false;
String out = "benchmark.html"; String out = "benchmark.html";
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
if (args[i].equals("-db")) { String arg = args[i];
if ("-db".equals(arg)) {
dbId = Integer.parseInt(args[++i]); dbId = Integer.parseInt(args[++i]);
} else if (args[i].equals("-init")) { } else if ("-init".equals(arg)) {
init = true; init = true;
} else if (args[i].equals("-out")) { } else if ("-out".equals(arg)) {
out = args[++i]; out = args[++i];
} else if (args[i].equals("-trace")) { } else if ("-trace".equals(arg)) {
trace = true; trace = true;
} else if ("-exit".equals(arg)) {
exit = true;
} }
} }
openResults(init); openResults(init);
...@@ -205,7 +209,9 @@ public class TestPerformance { ...@@ -205,7 +209,9 @@ public class TestPerformance {
// } // }
// writer.println("</table>"); // writer.println("</table>");
// System.exit(0); if (exit) {
System.exit(0);
}
} }
private void testAll(ArrayList dbs, ArrayList tests, int size) throws Exception { private void testAll(ArrayList dbs, ArrayList tests, int size) throws Exception {
...@@ -216,7 +222,7 @@ public class TestPerformance { ...@@ -216,7 +222,7 @@ public class TestPerformance {
// calls garbage collection // calls garbage collection
TestBase.getMemoryUsed(); TestBase.getMemoryUsed();
Database db = (Database) dbs.get(i); Database db = (Database) dbs.get(i);
System.out.println("Testing performance of " + db.getName()); System.out.println("Testing the performance of " + db.getName());
db.startServer(); db.startServer();
Connection conn = db.openNewConnection(); Connection conn = db.openNewConnection();
runDatabase(db, tests, 1); runDatabase(db, tests, 1);
......
...@@ -66,7 +66,7 @@ public class Build extends BuildBase { ...@@ -66,7 +66,7 @@ public class Build extends BuildBase {
exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "2"}); exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "2"});
exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "3", "-out", "pe.html"}); exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "3", "-out", "pe.html"});
exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-init", "-db", "4"}); exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-init", "-db", "4"});
exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "5"}); exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "5", "-exit"});
exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "6"}); exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "6"});
exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "7"}); exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "7"});
exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "8", "-out", "ps.html"}); exec("java", new String[]{"-Xmx128m", "-cp", cp, "org.h2.test.bench.TestPerformance", "-db", "8", "-out", "ps.html"});
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论