Permalink
Browse files

Merge branch 'master' of github.com:jarulraj/h-store

Conflicts:
	src/ee/execution/VoltDBEngine.cpp
  • Loading branch information...
jarulraj committed Mar 19, 2014
2 parents d3524a0 + 99d4fcb commit 65e9d808c6b127433c095bb8419b74be189df6ad
View
@@ -1424,7 +1424,7 @@ TEST CASES
<target name='junitclass'
description="Run one junit suite (i.e, -Djunitclass=TestSQLFeaturesSuite)">
<condition property="timeoutLength" value="${timeoutLength}" else='600000'>
<condition property="timeoutLength" value="${timeoutLength}" else='1800000'>
<isset property="timeoutLength"/>
</condition>
<run_junit timeout="${timeoutLength}" printsummary="yes" showoutput="yes">
@@ -414,6 +414,7 @@ static public Test suite() {
builder.setGlobalConfParameter("site.commandlog_timeout", 10);
builder.setGlobalConfParameter("site.snapshot", true);
builder.setGlobalConfParameter("site.anticache_enable", false);
TPCCProjectBuilder project = new TPCCProjectBuilder();
@@ -192,6 +192,8 @@ static public Test suite() {
builder.setGlobalConfParameter("site.aries", true);
builder.setGlobalConfParameter("site.aries_forward_only", false);
builder.setGlobalConfParameter("site.anticache_enable", false);
TPCCProjectBuilder project = new TPCCProjectBuilder();
project.addAllDefaults();
@@ -73,7 +73,7 @@
// YCSB
private static final String PREFIX = "ycsb";
private static int NUM_TRANSACTIONS = 1000;
private static int NUM_TRANSACTIONS = 100000;
private static final String projectJAR = "logical_" + PREFIX + ".jar";
@@ -450,6 +450,7 @@ static public Test suite() {
// COMMAND LOG
builder.setGlobalConfParameter("site.commandlog_enable", true);
builder.setGlobalConfParameter("site.commandlog_timeout", 10);
builder.setGlobalConfParameter("site.anticache_enable", false);
builder.setGlobalConfParameter("site.snapshot", true);
@@ -206,7 +206,8 @@ static public Test suite() {
// PHYSICAL
builder.setGlobalConfParameter("site.aries", true);
builder.setGlobalConfParameter("site.aries_forward_only", false);
builder.setGlobalConfParameter("site.anticache_enable", false);
YCSBProjectBuilder project = new YCSBProjectBuilder();
project.addAllDefaults();

0 comments on commit 65e9d80

Please sign in to comment.