Permalink
Browse files

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

Conflicts:
	src/ee/indexes/indexkey.h
	src/ee/storage/persistenttable.cpp
  • Loading branch information...
jarulraj committed Apr 17, 2014
2 parents de4cfd8 + d0ae5e3 commit 2574afb56c047facf2731a9ad32ee1aa930bfa63
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='1800000'>
<condition property="timeoutLength" value="${timeoutLength}" else='300000'>
<isset property="timeoutLength"/>
</condition>
<run_junit timeout="${timeoutLength}" printsummary="yes" showoutput="yes">
View
@@ -41,10 +41,10 @@ def __init__(self, args):
self.LOG_LEVEL = "DEBUG"
self.VOLT_LOG_LEVEL = None
self.STORAGE_MMAP = False
self.ANTICACHE_BUILD = True
self.ANTICACHE_REVERSIBLE_LRU = True
self.ANTICACHE_NVM = True
self.ANTICACHE_DRAM = True
self.ANTICACHE_BUILD = False
self.ANTICACHE_REVERSIBLE_LRU = False
self.ANTICACHE_NVM = False
self.ANTICACHE_DRAM = False
self.ARIES= False
self.SNAPSHOT= False
@@ -85,11 +85,11 @@
private final BBContainer deserializerBufferOrigin = org.voltdb.utils.DBBPool.allocateDirect(1024 * 1024 * 10);
private FastDeserializer deserializer = new FastDeserializer(deserializerBufferOrigin.b);
private final BBContainer exceptionBufferOrigin = org.voltdb.utils.DBBPool.allocateDirect(1024 * 1024 * 20);
private final BBContainer exceptionBufferOrigin = org.voltdb.utils.DBBPool.allocateDirect(1024 * 1024 * 10);
private ByteBuffer exceptionBuffer = exceptionBufferOrigin.b;
// ARIES
private final BBContainer ariesLogBufferOrigin = org.voltdb.utils.DBBPool.allocateDirect(5 * 1024 * 1024 * 20);
private final BBContainer ariesLogBufferOrigin = org.voltdb.utils.DBBPool.allocateDirect(1024 * 1024 * 10);
private ByteBuffer ariesLogBuffer = ariesLogBufferOrigin.b;
/**
@@ -194,6 +194,9 @@ public void release() throws EEException {
deserializerBufferOrigin.discard();
exceptionBuffer = null;
exceptionBufferOrigin.discard();
ariesLogBuffer = null;
ariesLogBufferOrigin.discard();
if (trace.val) LOG.trace("Released Execution Engine.");
}
@@ -244,7 +244,7 @@ public void testCloneDatabase() throws Exception {
assertNotNull(clone_cluster);
for (Host catalog_host : catalog_cluster.getHosts()) {
Host clone_host = clone_cluster.getHosts().get(catalog_host.getName());
assertNotNull(clone_host);
//assertNotNull(clone_host);
checkFields(Host.class, catalog_host, clone_host);
} // FOR

0 comments on commit 2574afb

Please sign in to comment.