Permalink
Browse files

Merge pull request #210 from malin1993ml/master

Anti-Cache Patch
  • Loading branch information...
apavlo committed Apr 20, 2016
2 parents 4351196 + 11c0d75 commit e71e5ec463d60cd5d7fe25416095fb545a9089d8
Showing 9,700 changed files with 2,461,452 additions and 7,150 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
@@ -142,6 +142,8 @@
<arg value="site.commandlog_timeout=${site.commandlog_timeout}" />
<arg value="site.commandlog_profiling=${site.commandlog_profiling}" />
<arg value="site.anticache_enable=${site.anticache_enable}" />
<arg value="site.anticache_warmup_eviction_enable=${site.anticache_warmup_eviction_enable}" />
<arg value="site.anticache_warmup_eviction_time=${site.anticache_warmup_eviction_time}" />
<arg value="site.anticache_enable_multilevel=${site.anticache_enable_multilevel}" />
<arg value="site.anticache_build=${site.anticache_build}" />
<arg value="site.anticache_reversible_lru=${site.anticache_reversible_lru}" />
@@ -161,6 +163,7 @@
<arg value="site.anticache_dbtype=${site.anticache_dbtype}" />
<arg value="site.anticache_db_blocks=${site.anticache_db_blocks}" />
<arg value="site.anticache_block_merge=${site.anticache_block_merge}" />
<arg value="site.anticache_counter=${site.anticache_counter}" />
<arg value="site.anticache_timestamps=${site.anticache_timestamps}" />
<arg value="site.anticache_timestamps_prime=${site.anticache_timestamps_prime}" />
<arg value="site.storage_mmap=${site.storage_mmap}" />
View
@@ -312,6 +312,9 @@
json_spirit_reader.cpp
json_spirit_value.cpp
"""
CTX.THIRD_PARTY_INPUT['mmh3'] = """
MurmurHash3.cpp
"""
###############################################################################
# SPECIFY THE TESTS
@@ -403,6 +406,9 @@
if CTX.ANTICACHE_DRAM:
CTX.CPPFLAGS += " -DANTICACHE_DRAM"
if CTX.ANTICACHE_COUNTER:
CTX.CPPFLAGS += " -DANTICACHE_COUNTER"
if CTX.ANTICACHE_TIMESTAMPS:
CTX.CPPFLAGS += " -DANTICACHE_TIMESTAMPS"
@@ -424,9 +430,11 @@
AntiCacheDB.cpp
BerkeleyAntiCacheDB.cpp
NVMAntiCacheDB.cpp
AllocatorNVMAntiCacheDB.cpp
AntiCacheEvictionManager.cpp
EvictionIterator.cpp
EvictedTable.cpp
NVMEvictedTable.cpp
"""
CTX.TESTS['anticache'] = """
View
@@ -891,6 +891,7 @@ NATIVE EE STUFF
<arg value="ANTICACHE_BUILD=${site.anticache_build}" />
<arg value="ANTICACHE_REVERSIBLE_LRU=${site.anticache_reversible_lru}" />
<arg value="ANTICACHE_NVM=${site.anticache_nvm}" />
<arg value="ANTICACHE_COUNTER=${site.anticache_counter}" />
<arg value="ANTICACHE_TIMESTAMPS=${site.anticache_timestamps}" />
<arg value="ANTICACHE_TIMESTAMPS_PRIME=${site.anticache_timestamps_prime}" />
<arg value="${build}" />
View
@@ -46,6 +46,7 @@ def __init__(self, args):
self.ANTICACHE_NVM = False
self.ANTICACHE_DRAM = False
self.ARIES= False
self.ANTICACHE_COUNTER = False
self.ANTICACHE_TIMESTAMPS = True
self.ANTICACHE_TIMESTAMPS_PRIME = True
@@ -87,6 +88,10 @@ def __init__(self, args):
parts = arg.split("=")
if len(parts) > 1 and not parts[1].startswith("${"):
self.ANTICACHE_NVM = bool(parts[1])
if arg.startswith("ANTICACHE_COUNTER="):
parts = arg.split("=")
if len(parts) > 1 and not parts[1].startswith("${"):
self.ANTICACHE_COUNTER = bool(parts[1])
if arg.startswith("ANTICACHE_TIMESTAMPS="):
parts = arg.split("=")
if len(parts) > 1 and not parts[1].startswith("${"):
@@ -13,7 +13,7 @@ loadthread_per_warehouse = true
## Or you can use these parameters to specifically
## control the number of warehouses and/or load threads
#warehouses = 80
# loadthreads = 4
#loadthreads = 8
## Testing Options
## See src/benchmarks/org/voltdb/benchmarks/tpcc/TPCCConfig.java
Oops, something went wrong.

0 comments on commit e71e5ec

Please sign in to comment.