Repository: aurora Updated Branches: refs/heads/master 339840d38 -> aabb69281
Upgade h2 to 1.4.187. Bugs closed: AURORA-1311 Reviewed at https://reviews.apache.org/r/34046/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/aabb6928 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/aabb6928 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/aabb6928 Branch: refs/heads/master Commit: aabb69281b346f7c2462585920796adb5e06257a Parents: 339840d Author: Bill Farner <[email protected]> Authored: Mon May 11 11:47:50 2015 -0700 Committer: Bill Farner <[email protected]> Committed: Mon May 11 11:47:50 2015 -0700 ---------------------------------------------------------------------- build.gradle | 4 ++-- .../java/org/apache/aurora/scheduler/storage/db/DbModule.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/aabb6928/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 829b813..ec9b522 100644 --- a/build.gradle +++ b/build.gradle @@ -257,7 +257,7 @@ dependencies { compile "com.google.inject:guice:${guiceRev}" compile "com.google.inject.extensions:guice-assistedinject:${guiceRev}" compile 'com.google.protobuf:protobuf-java:2.5.0' - compile 'com.h2database:h2:1.4.177' + compile 'com.h2database:h2:1.4.187' compile "com.sun.jersey:jersey-core:${jerseyRev}" compile "com.sun.jersey:jersey-json:${jerseyRev}" compile "com.sun.jersey:jersey-server:${jerseyRev}" @@ -469,7 +469,7 @@ jmh { include = project.getProperty('benchmarks') } jmhVersion = '1.7.1' - jvmArgsPrepend = '-Xmx2g' + jvmArgsPrepend = '-Xmx3g' humanOutputFile = project.file("$jmhHumanOutputPath") resultsFile = project.file("$buildDir/reports/jmh/results.txt") } http://git-wip-us.apache.org/repos/asf/aurora/blob/aabb6928/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java b/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java index c8df88b..8859ca4 100644 --- a/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java +++ b/src/main/java/org/apache/aurora/scheduler/storage/db/DbModule.java @@ -81,7 +81,8 @@ public class DbModule extends PrivateModule { private DbModule(KeyFactory keyFactory, String jdbcSchema) { this.keyFactory = requireNonNull(keyFactory); - this.jdbcSchema = requireNonNull(jdbcSchema); + // We always disable the MvStore, as it is in beta as of this writing. + this.jdbcSchema = jdbcSchema + ";MV_STORE=false"; } public DbModule(KeyFactory keyFactory) {
