Permalink
Browse files

Merge branch 'master' into anticache

Conflicts:
	src/frontend/edu/brown/hstore/cmdlog/CommandLogWriter.java
  • Loading branch information...
apavlo committed Jul 9, 2014
2 parents 1c51980 + ec94ed7 commit ff8777876484bffb7f996a2a23bf4bf3ca661e9f
Showing with 19,676 additions and 3,505 deletions.
  1. +1 −0 .gitignore
  2. +12 −0 build-common.xml
  3. +24 −4 build.py
  4. +49 −8 build.xml
  5. +26 −3 buildtools.py
  6. +6 −0 properties/benchmarks/articles.properties
  7. +9 −0 properties/benchmarks/simple.properties
  8. +1 −1 properties/benchmarks/tpcc.properties
  9. +6 −0 properties/benchmarks/users.properties
  10. +3 −0 properties/benchmarks/ycsb.properties
  11. +188 −0 scripts/anticache/articles.sh
  12. +181 −0 scripts/anticache/tpcc.sh
  13. +175 −0 scripts/anticache/users.sh
  14. +24 −28 scripts/anticache/ycsb.sh
  15. +8 −0 src/benchmarks/edu/brown/api/BenchmarkCompiler.java
  16. +6 −1 src/benchmarks/edu/brown/api/BenchmarkConfig.java
  17. +15 −3 src/benchmarks/edu/brown/api/BenchmarkController.java
  18. +1 −1 src/benchmarks/edu/brown/api/PeriodicEvictionThread.java
  19. +216 −0 src/benchmarks/edu/brown/benchmark/articles/ArticlesClient.java
  20. +32 −0 src/benchmarks/edu/brown/benchmark/articles/ArticlesConstants.java
  21. +205 −0 src/benchmarks/edu/brown/benchmark/articles/ArticlesLoader.java
  22. +43 −0 src/benchmarks/edu/brown/benchmark/articles/ArticlesProjectBuilder.java
  23. +94 −0 src/benchmarks/edu/brown/benchmark/articles/ArticlesUtil.java
  24. +88 −0 src/benchmarks/edu/brown/benchmark/articles/articles-ddl.sql
  25. +56 −0 src/benchmarks/edu/brown/benchmark/articles/articles.mappings
  26. +78 −0 src/benchmarks/edu/brown/benchmark/articles/procedures/AddComment.java
  27. +57 −0 src/benchmarks/edu/brown/benchmark/articles/procedures/GetArticle.java
  28. +18 −0 src/benchmarks/edu/brown/benchmark/articles/procedures/GetComments.java
  29. +19 −0 src/benchmarks/edu/brown/benchmark/articles/procedures/UpdateUserInfo.java
  30. +1 −0 src/benchmarks/edu/brown/benchmark/simple/README.txt
  31. +162 −0 src/benchmarks/edu/brown/benchmark/simple/SimpleClient.java
  32. +155 −0 src/benchmarks/edu/brown/benchmark/simple/SimpleLoader.java
  33. +30 −0 src/benchmarks/edu/brown/benchmark/simple/SimpleProjectBuilder.java
  34. +19 −0 src/benchmarks/edu/brown/benchmark/simple/procedures/GetData.java
  35. +6 −0 src/benchmarks/edu/brown/benchmark/simple/simple-ddl.sql
  36. +11 −0 src/benchmarks/edu/brown/benchmark/simple/simple.mappings
  37. +164 −0 src/benchmarks/edu/brown/benchmark/users/UsersClient.java
  38. +23 −0 src/benchmarks/edu/brown/benchmark/users/UsersConstants.java
  39. +83 −0 src/benchmarks/edu/brown/benchmark/users/UsersLoader.java
  40. +35 −0 src/benchmarks/edu/brown/benchmark/users/UsersProjectBuilder.java
  41. +94 −0 src/benchmarks/edu/brown/benchmark/users/UsersUtil.java
  42. +19 −0 src/benchmarks/edu/brown/benchmark/users/procedures/GetComments.java
  43. +46 −0 src/benchmarks/edu/brown/benchmark/users/procedures/GetUsers.java
  44. +32 −0 src/benchmarks/edu/brown/benchmark/users/users-ddl.sql
  45. +2 −0 src/benchmarks/edu/brown/benchmark/users/users.mappings
  46. +2 −1 src/benchmarks/edu/brown/benchmark/voter/voter-ddl.sql
  47. +14 −17 src/benchmarks/edu/brown/benchmark/ycsb/YCSBClient.java
  48. +2 −4 src/benchmarks/edu/brown/benchmark/ycsb/YCSBLoader.java
  49. +1 −1 src/benchmarks/org/voltdb/benchmark/tpcc/TPCCClient.java
  50. +4 −4 src/benchmarks/org/voltdb/benchmark/tpcc/TPCCProjectBuilder.java
  51. +1 −0 src/catgen/spec.txt
  52. +326 −37 src/ee/anticache/AntiCacheDB.cpp
  53. +146 −20 src/ee/anticache/AntiCacheDB.h
  54. +794 −13 src/ee/anticache/AntiCacheEvictionManager.cpp
  55. +9 −3 src/ee/anticache/AntiCacheEvictionManager.h
  56. +0 −1 src/ee/anticache/EvictedTable.cpp
  57. +4 −2 src/ee/anticache/EvictedTupleAccessException.cpp
  58. +2 −1 src/ee/anticache/EvictedTupleAccessException.h
  59. +9 −2 src/ee/anticache/UnknownBlockAccessException.cpp
  60. +1 −0 src/ee/anticache/UnknownBlockAccessException.h
  61. +6 −0 src/ee/catalog/table.cpp
  62. +3 −0 src/ee/catalog/table.h
  63. +3 −1 src/ee/common/DefaultTupleSerializer.cpp
  64. +6 −0 src/ee/common/ExportSerializeIo.h
  65. +234 −0 src/ee/common/MMAPMemoryManager.cpp
  66. +94 −0 src/ee/common/MMAPMemoryManager.h
  67. +221 −0 src/ee/common/MMAP_Pool.hpp
  68. +20 −4 src/ee/common/NValue.cpp
  69. +308 −125 src/ee/common/NValue.hpp
  70. +294 −180 src/ee/common/Pool.hpp
  71. +164 −0 src/ee/common/STLMMAPAllocator.h
  72. +94 −0 src/ee/common/StringRef.cpp
  73. +73 −0 src/ee/common/StringRef.h
  74. +69 −0 src/ee/common/ThreadLocalPool.h
  75. +1 −1 src/ee/common/Topend.h
  76. +5 −5 src/ee/common/TupleSchema.cpp
  77. +14 −1 src/ee/common/ValueFactory.hpp
  78. +10 −9 src/ee/common/ValuePeeker.hpp
  79. +16 −0 src/ee/common/debuglog.h
  80. +144 −64 src/ee/common/executorcontext.hpp
  81. +54 −0 src/ee/common/serializeio.h
  82. +84 −72 src/ee/common/tabletuple.h
  83. +60 −3 src/ee/common/types.cpp
  84. +5 −2 src/ee/common/types.h
  85. +0 −1 src/ee/execution/IPCTopend.h
  86. +0 −1 src/ee/execution/JNITopend.h
  87. +802 −288 src/ee/execution/VoltDBEngine.cpp
  88. +161 −21 src/ee/execution/VoltDBEngine.h
  89. +0 −1 src/ee/executors/aggregateexecutor.hpp
  90. +128 −1 src/ee/executors/deleteexecutor.cpp
  91. +15 −11 src/ee/executors/indexscanexecutor.cpp
  92. +54 −0 src/ee/executors/insertexecutor.cpp
  93. +4 −0 src/ee/executors/projectionexecutor.cpp
  94. +1 −1 src/ee/executors/seqscanexecutor.cpp
  95. +109 −1 src/ee/executors/updateexecutor.cpp
  96. +4 −0 src/ee/expressions/expressionutil.cpp
  97. +5 −5 src/ee/indexes/indexkey.h
  98. +192 −0 src/ee/logging/AriesLogProxy.cpp
  99. +66 −0 src/ee/logging/AriesLogProxy.h
  100. +1 −0 src/ee/logging/LogDefs.h
  101. +24 −1 src/ee/logging/LogManager.cpp
  102. +35 −7 src/ee/logging/LogManager.h
  103. +20 −0 src/ee/logging/Logger.h
  104. +550 −0 src/ee/logging/Logrecord.cpp
  105. +196 −0 src/ee/logging/Logrecord.h
  106. +5 −0 src/ee/logging/StdoutLogProxy.h
  107. +24 −10 src/ee/storage/MaterializedViewMetadata.cpp
  108. +1 −1 src/ee/storage/PersistentTableUndoUpdateAction.cpp
  109. +7 −6 src/ee/storage/ReadWriteTracker.cpp
  110. +3 −3 src/ee/storage/ReadWriteTracker.h
  111. +3 −1 src/ee/storage/TableCatalogDelegate.cpp
  112. +131 −0 src/ee/storage/mmap_persistenttable.cpp
  113. +145 −0 src/ee/storage/mmap_persistenttable.h
  114. +234 −309 src/ee/storage/persistenttable.cpp
  115. +73 −30 src/ee/storage/persistenttable.h
  116. +52 −1 src/ee/storage/table.cpp
  117. +21 −0 src/ee/storage/table.h
  118. +69 −45 src/ee/storage/tablefactory.cpp
  119. +5 −3 src/ee/storage/tablefactory.h
  120. +4 −3 src/ee/storage/tableutil.cpp
  121. +0 −1 src/ee/voltdbipc.cpp
  122. +201 −3 src/ee/voltdbjni.cpp
  123. +18 −0 src/frontend/edu/brown/catalog/CatalogUtil.java
  124. +2 −1 src/frontend/edu/brown/catalog/conflicts/ConflictSetCalculator.java
  125. +99 −30 src/frontend/edu/brown/hstore/AntiCacheManager.java
  126. +1 −0 src/frontend/edu/brown/hstore/HStore.java
  127. +113 −7 src/frontend/edu/brown/hstore/HStoreCoordinator.java
  128. +323 −8 src/frontend/edu/brown/hstore/HStoreSite.java
  129. +244 −22 src/frontend/edu/brown/hstore/PartitionExecutor.java
  130. +22 −3 src/frontend/edu/brown/hstore/TransactionInitializer.java
  131. +2 −2 src/frontend/edu/brown/hstore/TransactionQueueManager.java
  132. +3 −3 src/frontend/edu/brown/hstore/callbacks/RemoteFinishCallback.java
  133. +5 −2 src/frontend/edu/brown/hstore/callbacks/RemoteWorkCallback.java
  134. +42 −8 src/frontend/edu/brown/hstore/cmdlog/CommandLogReader.java
  135. +217 −97 src/frontend/edu/brown/hstore/cmdlog/CommandLogWriter.java
  136. +22 −3 src/frontend/edu/brown/hstore/cmdlog/LogEntry.java
  137. +100 −5 src/frontend/edu/brown/hstore/conf/HStoreConf.java
  138. +83 −0 src/frontend/edu/brown/hstore/txns/AbstractTransaction.java
  139. +4 −0 src/frontend/edu/brown/hstore/txns/DependencyTracker.java
  140. +10 −64 src/frontend/edu/brown/hstore/txns/LocalTransaction.java
  141. +14 −0 src/frontend/edu/brown/hstore/txns/RemoteTransaction.java
  142. +11 −4 src/frontend/edu/brown/statistics/ProcedureStatistics.java
  143. +3 −1 src/frontend/edu/brown/utils/ProjectType.java
  144. +190 −0 src/frontend/edu/brown/workload/WorkloadAnalyzer.java
  145. +23 −0 src/frontend/org/voltdb/AriesLog.java
  146. +324 −0 src/frontend/org/voltdb/AriesLogNative.java
  147. +1 −1 src/frontend/org/voltdb/CatalogContext.java
  148. +24 −0 src/frontend/org/voltdb/ClientResponseImpl.java
  149. +123 −42 src/frontend/org/voltdb/SnapshotSaveAPI.java
  150. +78 −43 src/frontend/org/voltdb/SnapshotSiteProcessor.java
  151. +63 −1 src/frontend/org/voltdb/VoltProcedure.java
  152. +13 −0 src/frontend/org/voltdb/catalog/Table.java
  153. +1 −0 src/frontend/org/voltdb/client/ClientImpl.java
  154. +1 −0 src/frontend/org/voltdb/compiler/ProjectFileSchema.xsd
  155. +22 −1 src/frontend/org/voltdb/compiler/VoltCompiler.java
  156. +33 −4 src/frontend/org/voltdb/compiler/VoltProjectBuilder.java
  157. +2 −2 src/frontend/org/voltdb/compiler/projectfile/ClassdependenciesType.java
  158. +30 −4 src/frontend/org/voltdb/compiler/projectfile/DatabaseType.java
  159. +3 −3 src/frontend/org/voltdb/compiler/projectfile/EvictablesType.java
  160. +7 −7 src/frontend/org/voltdb/compiler/projectfile/ExportsType.java
  161. +5 −5 src/frontend/org/voltdb/compiler/projectfile/GroupsType.java
  162. +70 −70 src/frontend/org/voltdb/compiler/projectfile/ObjectFactory.java
  163. +4 −4 src/frontend/org/voltdb/compiler/projectfile/PartitionsType.java
  164. +7 −7 src/frontend/org/voltdb/compiler/projectfile/ProceduresType.java
  165. +2 −2 src/frontend/org/voltdb/compiler/projectfile/ProjectType.java
  166. +3 −3 src/frontend/org/voltdb/compiler/projectfile/SchemasType.java
  167. +3 −3 src/frontend/org/voltdb/compiler/projectfile/SecurityType.java
  168. +6 −6 src/frontend/org/voltdb/compiler/projectfile/SnapshotType.java
  169. +7 −7 src/frontend/org/voltdb/compiler/projectfile/UsersType.java
  170. +4 −4 src/frontend/org/voltdb/compiler/projectfile/VerticalpartitionsType.java
  171. +9 −1 src/frontend/org/voltdb/exceptions/EvictedTupleAccessException.java
  172. +1 −16 src/frontend/org/voltdb/exceptions/UnknownBlockAccessException.java
  173. +2 −1 src/frontend/org/voltdb/jni/EELoggers.java
  174. +76 −5 src/frontend/org/voltdb/jni/ExecutionEngine.java
  175. +45 −0 src/frontend/org/voltdb/jni/ExecutionEngineIPC.java
  176. +111 −4 src/frontend/org/voltdb/jni/ExecutionEngineJNI.java
  177. +49 −0 src/frontend/org/voltdb/jni/MockExecutionEngine.java
  178. +27 −0 src/frontend/org/voltdb/logging/Level.java
  179. +160 −0 src/frontend/org/voltdb/logging/VoltLog4jLogger.java
  180. +173 −0 src/frontend/org/voltdb/logging/VoltLogger.java
  181. +110 −0 src/frontend/org/voltdb/logging/VoltUtilLoggingLogger.java
  182. +23 −6 src/frontend/org/voltdb/sysprocs/AdHoc.java
  183. +25 −4 src/frontend/org/voltdb/sysprocs/EvictTuples.java
  184. +15 −5 src/frontend/org/voltdb/sysprocs/SnapshotDelete.java
  185. +7 −4 src/frontend/org/voltdb/sysprocs/SnapshotRegistry.java
  186. +515 −556 src/frontend/org/voltdb/sysprocs/SnapshotRestore.java
  187. +115 −137 src/frontend/org/voltdb/sysprocs/SnapshotSave.java
  188. +93 −209 src/frontend/org/voltdb/sysprocs/SnapshotScan.java
  189. +5 −17 src/frontend/org/voltdb/sysprocs/SnapshotStatus.java
  190. +6 −0 src/frontend/org/voltdb/sysprocs/SysProcFragmentId.java
  191. +20 −1 src/frontend/org/voltdb/sysprocs/saverestore/ClusterSaveFileState.java
  192. +2 −2 ...frontend/org/voltdb/regressionsuites → src/frontend/org/voltdb/sysprocs}/saverestore/MatView.java
  193. +82 −93 src/frontend/org/voltdb/sysprocs/saverestore/PartitionedTableSaveFileState.java
  194. +115 −80 src/frontend/org/voltdb/sysprocs/saverestore/ReplicatedTableSaveFileState.java
  195. +48 −10 ...rg/voltdb/regressionsuites → src/frontend/org/voltdb/sysprocs}/saverestore/SaveRestoreSelect.java
  196. +259 −0 src/frontend/org/voltdb/sysprocs/saverestore/SaveRestoreTestProjectBuilder.java
  197. +16 −3 src/frontend/org/voltdb/sysprocs/saverestore/SnapshotUtil.java
  198. +172 −141 src/frontend/org/voltdb/sysprocs/saverestore/TableSaveFile.java
  199. +18 −0 src/frontend/org/voltdb/sysprocs/saverestore/TableSaveFileState.java
  200. 0 ...ltdb/regressionsuites → src/frontend/org/voltdb/sysprocs}/saverestore/saverestore-altered-ddl.sql
  201. +9 −0 src/frontend/org/voltdb/sysprocs/saverestore/saverestore-ddl-partitioned.sql
  202. +9 −0 src/frontend/org/voltdb/sysprocs/saverestore/saverestore-ddl-replicated.sql
  203. 0 ...d/org/voltdb/regressionsuites → src/frontend/org/voltdb/sysprocs}/saverestore/saverestore-ddl.sql
  204. +94 −0 src/frontend/org/voltdb/utils/SnapshotVerifier.java
  205. +1,196 −52 src/protorpc/edu/brown/hstore/Hstoreservice.java
  206. +22 −0 src/protorpc/edu/brown/hstore/hstoreservice.proto
  207. +25 −1 tests/ee/anticache/anticachedb_test.cpp
  208. +1 −1 tests/ee/harness_test.cpp
  209. +153 −0 tests/ee/indexes/index_multikey_test.cpp
  210. +8 −7 tests/ee/logging/logging_test.cpp
  211. +219 −0 tests/ee/storage/mmap_persistent_table_test.cpp
  212. +35 −7 tests/ee/storage/persistent_table_log_test.cpp
  213. +21 −0 tests/frontend/edu/brown/catalog/TestCatalogUtil2.java
  214. +25 −0 tests/frontend/edu/brown/hstore/MockAntiCacheManager.java
  215. +27 −0 tests/frontend/edu/brown/hstore/MockHStoreCoordinator.java
  216. +45 −0 tests/frontend/edu/brown/hstore/MockHStoreSite.java
  217. +406 −0 tests/frontend/edu/brown/hstore/TestAntiCacheBatching.java
  218. +12 −25 tests/frontend/edu/brown/hstore/TestAntiCacheManager.java
  219. +398 −0 tests/frontend/edu/brown/hstore/TestAntiCacheManagerDistributedTxn.java
  220. +0 −1 tests/frontend/edu/brown/hstore/TestAntiCacheManagerTPCC.java
  221. +13 −13 tests/frontend/edu/brown/hstore/TestAntiCachePerformance.java
  222. +68 −23 tests/frontend/edu/brown/hstore/TestHStoreCoordinator.java
  223. +23 −0 tests/frontend/edu/brown/hstore/TestReadWriteTracking.java
  224. +29 −0 tests/frontend/edu/brown/workload/TestWorkloadAnalyzer.java
  225. +5 −5 tests/frontend/org/voltdb/regressionsuites/LocalCluster.java
  226. +3 −1 tests/frontend/org/voltdb/regressionsuites/TestAntiCacheSuite.java
  227. +5 −3 tests/frontend/org/voltdb/regressionsuites/TestSQLFeaturesSuite.java
  228. +441 −0 tests/frontend/org/voltdb/regressionsuites/TestSnapshotSave.java
  229. +423 −0 tests/frontend/org/voltdb/regressionsuites/TestSnapshotSaveAndRestorePartitionedTable.java
  230. +407 −0 tests/frontend/org/voltdb/regressionsuites/TestSnapshotSaveAndRestoreReplicatedTable.java
  231. +467 −0 tests/frontend/org/voltdb/regressionsuites/TestTPCCLogicalRecovery.java
  232. +238 −0 tests/frontend/org/voltdb/regressionsuites/TestTPCCPhysicalRecovery.java
  233. +181 −0 tests/frontend/org/voltdb/regressionsuites/TestUsersSuite.java
  234. +51 −1 tests/frontend/org/voltdb/regressionsuites/TestVoterSuite.java
  235. +506 −0 tests/frontend/org/voltdb/regressionsuites/TestYCSBLogicalRecovery.java
  236. +249 −0 tests/frontend/org/voltdb/regressionsuites/TestYCSBPhysicalRecovery.java
  237. +0 −90 tests/frontend/org/voltdb/regressionsuites/saverestore/CatalogChangeSingleProcessServer.java
  238. +0 −115 tests/frontend/org/voltdb/regressionsuites/saverestore/SaveRestoreTestProjectBuilder.java
  239. +11 −9 third_party/cpp/json_spirit/json_spirit_reader.cpp
View
@@ -62,4 +62,5 @@ src/catgen/out
.wtpmodules
.classpath
.project
.cproject
.settings
View
@@ -154,8 +154,20 @@
<arg value="site.anticache_max_evicted_blocks=${site.anticache_max_evicted_blocks}" />
<arg value="site.anticache_blocks_per_eviction=${site.anticache_blocks_per_eviction}" />
<arg value="site.anticache_eviction_distribution=${site.anticache_eviction_distribution}" />
<arg value="site.anticache_batching=${site.anticache_batching}" />
<arg value="site.storage_mmap=${site.storage_mmap}" />
<arg value="site.storage_mmap_dir=${site.storage_mmap_dir}" />
<arg value="site.storage_mmap_file_size=${site.storage_mmap_file_size}" />
<arg value="site.storage_mmap_reset=${site.storage_mmap_reset}" />
<arg value="site.storage_mmap_sync_frequency=${site.storage_mmap_sync_frequency}" />
<arg value="site.aries=${site.aries}" />
<arg value="site.aries_forward_only=${site.aries_forward_only}" />
<arg value="site.aries_dir=${site.aries_dir}" />
<arg value="site.aries_reset=${site.aries_reset}" />
<arg value="site.snapshot=${site.snapshot}" />
<arg value="site.snapshot_dir=${site.snapshot_dir}" />
<arg value="site.snapshot_reset=${site.snapshot_reset}" />
<arg value="site.snapshot_interval=${site.snapshot_interval}" />
<arg value="site.mr_map_blocking=${site.mr_map_blocking}" />
<arg value="site.mr_reduce_blocking=${site.mr_reduce_blocking}" />
<arg value="site.network_heartbeats_interval=${site.network_heartbeats_interval}" />
View
@@ -198,9 +198,11 @@
types.cpp
UndoLog.cpp
NValue.cpp
MMAPMemoryManager.cpp
RecoveryProtoMessage.cpp
RecoveryProtoMessageBuilder.cpp
DefaultTupleSerializer.cpp
StringRef.cpp
"""
CTX.INPUT['execution'] = """
@@ -273,6 +275,7 @@
CopyOnWriteIterator.cpp
ConstraintFailureException.cpp
MaterializedViewMetadata.cpp
mmap_persistenttable.cpp
persistenttable.cpp
PersistentTableStats.cpp
PersistentTableUndoDeleteAction.cpp
@@ -299,8 +302,10 @@
CTX.INPUT['logging'] = """
JNILogProxy.cpp
LogManager.cpp
AriesLogProxy.cpp
Logrecord.cpp
"""
# specify the third party input
CTX.THIRD_PARTY_INPUT['json_spirit'] = """
@@ -345,6 +350,7 @@
CTX.TESTS['indexes'] = """
index_key_test
index_multikey_test
index_scripted_test
index_test
"""
@@ -353,6 +359,7 @@
CopyOnWriteTest
constraint_test
filter_test
mmap_persistent_table_test
persistent_table_log_test
serialize_test
StreamedTable_test
@@ -366,21 +373,34 @@
# CTX.TESTS['expressions'] = """expserialize_test expression_test"""
###############################################################################
# MMAP STORAGE
# STORAGE MMAP
###############################################################################
if CTX.MMAP_STORAGE:
CTX.CPPFLAGS += " -DMMAP_STORAGE"
if CTX.STORAGE_MMAP:
CTX.CPPFLAGS += " -DSTORAGE_MMAP"
###############################################################################
# ARIES
###############################################################################
if CTX.ARIES:
CTX.CPPFLAGS += " -DARIES"
###############################################################################
# ANTI-CACHING
###############################################################################
if CTX.ANTICACHE_BUILD:
CTX.CPPFLAGS += " -DANTICACHE"
if CTX.ANTICACHE_NVM:
CTX.CPPFLAGS += " -DANTICACHE_NVM"
if CTX.ANTICACHE_REVERSIBLE_LRU:
CTX.CPPFLAGS += " -DANTICACHE_REVERSIBLE_LRU"
if CTX.ANTICACHE_DRAM:
CTX.CPPFLAGS += " -DANTICACHE_DRAM"
# Bring in berkeleydb library
CTX.SYSTEM_DIRS.append(os.path.join(CTX.OUTPUT_PREFIX, 'berkeleydb'))
View
@@ -139,10 +139,24 @@
-->
<!-- Default Project -->
<!--<condition property="project" value="tpcc">
<condition property="project" value="auctionmark">
<not><isset property="project"/></not>
</condition>-->
</condition>
<condition property="target.workload" value="${project}-1">
<not><isset property="target.workload"/></not>
</condition>
<condition property="workload" value="${files.workloads.dir}/${target.workload}.trace.gz">
<not><isset property="workload"/></not>
</condition>
<condition property="stats" value="${benchmark.tablestats}">
<not><isset property="stats"/></not>
</condition>
<condition property="output" value="${files.stats.dir}/${project}.stats">
<not><isset property="output"/></not>
</condition>
<!-- Project Jar File -->
<property name="benchmark.jar" location="${project}.jar" />
<condition property="jar" value="${benchmark.jar}">
@@ -181,6 +195,11 @@
<isset property="regressions"/>
</condition>
<condition property="junitclass" value="TestAntiCacheBatching">
<not><isset property="junitclass"/></not>
</condition>
<!-- Workload Tracer Properties -->
<condition property="workload.trace.class" value="">
<not><isset property="workload.trace.class"/></not>
@@ -860,9 +879,14 @@ NATIVE EE STUFF
<exec dir='.' executable='python' failonerror='true'>
<arg value="build.py" />
<arg value="LOG_LEVEL=${site.exec_ee_log_level}" />
<arg value="MMAP_STORAGE=${site.storage_mmap}" />
<arg value="STORAGE_MMAP=${site.storage_mmap}" />
<arg value="STORAGE_MMAP_FILE_SIZE=${site.storage_mmap_file_size}" />
<arg value="STORAGE_MMAP_SYNC_FREQUENCY=${site.storage_mmap_sync_frequency}" />
<arg value="ARIES=${site.aries}" />
<arg value="ANTICACHE_ENABLE=${site.anticache_enable}" />
<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="${build}" />
</exec>
</target>
@@ -1201,16 +1225,15 @@ TEST CASES
</formatters>
<tests>
<fileset dir='${build.test.dir}'>
<include name='org/voltdb/regressionsuites/Test*.class'/>
<exclude name="**/*$*.class"/>
<include name='org/voltdb/regressionsuites/Test*.class'/>
<exclude name="**/TestCatalogUpdateSuite.class" />
<exclude name="**/TestFailureDetectSuite.class" />
<exclude name="**/TestSneakyExecutionOrderSuite.class" />
<exclude name="**/TestMaliciousClientSuite.class" />
<exclude name="**/TestSaveRestoreSysprocSuite.class" />
<exclude name="**/TestMaliciousClientSuite.class" />
<exclude name="**/TestMapReduceTransactionSuite.class" />
<exclude name="**/TestWikipediaSuite.class" />
<exclude name="**/TestWikipediaLoader.class" />
<exclude name="**/TestWikipediaLoader.class" />
<!-- <exclude name="**/TestAntiCache*.class" /> -->
</fileset>
</tests>
@@ -1712,7 +1735,7 @@ TEST CASES
<arg value="CATALOG=${catalog}" />
<arg value="DEFERRABLE=${deferrable}" />
<arg value="EVICTABLE=${evictable}" />
<arg value="BATCHEVICTABLE=${batchevictable}" />
<arg value="partitionplan=${partitionplan}" />
<arg value="partitionplan.nosecondary=${partitionplan.nosecondary}" />
<arg value="partitionplan.ignore_missing=${partitionplan.ignore_missing}" />
@@ -2065,6 +2088,24 @@ UTILITIES
</java>
</target>
<target name='workload-analyzer'
description="analyze workload">
<java fork="yes" classname="edu.brown.workload.WorkloadAnalyzer" failonerror='true'>
<jvmarg value="-Xmx${global.memory}m" />
<jvmarg value="-Dlog4j.configuration=${basedir}/log4j.properties"/>
<arg value="catalog.jar=${jar}" />
<arg value="workload=${workload}" />
<arg value="workload.output=${output}" />
<arg value="workload.xactlimit=${limit}" />
<arg value="workload.xactoffset=${offset}" />
<arg value="workload.procexclude=${exclude}" />
<arg value="workload.procinclude=${include}" />
<arg value="workload.procinclude.multiplier=${multiplier}" />
<classpath refid='project.classpath' />
<assertions><enable /></assertions>
</java>
</target>
<!--
******************************************************************************
* MARKOV MODELS
View
@@ -38,19 +38,38 @@ def __init__(self, args):
self.NM = "/usr/bin/nm"
self.NMFLAGS = "-n" # specialized by platform in build.py
self.COVERAGE = False
self.LOG_LEVEL = "DEBUG"
self.VOLT_LOG_LEVEL = None
self.MMAP_STORAGE = False
self.STORAGE_MMAP = False
self.ANTICACHE_BUILD = True
self.ANTICACHE_REVERSIBLE_LRU = True
self.ANTICACHE_NVM = False
self.ANTICACHE_DRAM = False
self.ARIES = False
for arg in [x.strip().upper() for x in args]:
if arg in ["DEBUG", "RELEASE", "MEMCHECK", "MEMCHECK_NOFREELIST"]:
self.LEVEL = arg
if arg in ["BUILD", "CLEAN", "BUILDTEST", "TEST", "VOLTRUN", "VOLTDBIPC"]:
self.TARGET = arg
if arg in ["COVERAGE"]:
self.COVERAGE = True
if arg.startswith("MMAP_STORAGE="):
if arg.startswith("STORAGE_MMAP="):
parts = arg.split("=")
if len(parts) > 1 and not (parts[1].startswith("${")): self.STORAGE_MMAP = bool(parts[1])
if arg.startswith("STORAGE_MMAP_FILE_SIZE="):
parts = arg.split("=")
if len(parts) > 1 and not (parts[1].startswith("${")): self.STORAGE_MMAP_FILE_SIZE = long(parts[1])
if arg.startswith("STORAGE_MMAP_SYNC_FREQUENCY="):
parts = arg.split("=")
if len(parts) > 1 and not (parts[1].startswith("${")): self.STORAGE_MMAP_SYNC_FREQUENCY = long(parts[1])
if arg.startswith("ARIES="):
parts = arg.split("=")
if len(parts) > 1 and not (parts[1].startswith("${")): self.ARIES = bool(parts[1])
if arg.startswith("ANTICACHE_ENABLE="):
parts = arg.split("=")
if len(parts) > 1 and not (parts[1].startswith("${")): self.ANTICACHE_ENABLE = bool(parts[1])
if arg.startswith("ANTICACHE_REVERSIBLE_LRU="):
parts = arg.split("=")
if len(parts) > 1 and not parts[1].startswith("${"):
self.MMAP_STORAGE = bool(parts[1])
@@ -62,6 +81,10 @@ def __init__(self, args):
parts = arg.split("=")
if len(parts) > 1 and not parts[1].startswith("${"):
self.ANTICACHE_REVERSIBLE_LRU = bool(parts[1])
if arg.startswith("ANTICACHE_NVM="):
parts = arg.split("=")
if len(parts) > 1 and not parts[1].startswith("${"):
self.ANTICACHE_NVM = bool(parts[1])
if arg.startswith("LOG_LEVEL="):
parts = arg.split("=")
@@ -0,0 +1,6 @@
## ------------------------------------------------------------
## H-Store Benchmark Configuration Parameters
## ------------------------------------------------------------
builder = edu.brown.benchmark.articles.ArticlesProjectBuilder
datadir = src/benchmarks/edu/brown/benchmark/articles/data
@@ -0,0 +1,9 @@
## ------------------------------------------------------------
## H-Store Benchmark Configuration Parameters
## ------------------------------------------------------------
builder = edu.brown.benchmark.simple.SimpleProjectBuilder
# SimpleLoader will add the number of tuples defined in 'num_records'
num_records = 1000
@@ -12,7 +12,7 @@ loadthread_per_warehouse = true
## Or you can use these parameters to specifically
## control the number of warehouses and/or load threads
# warehouses = 4
# warehouses = 100
# loadthreads = 4
## Testing Options
@@ -0,0 +1,6 @@
## ------------------------------------------------------------
## H-Store Benchmark Configuration Parameters
## ------------------------------------------------------------
builder = edu.brown.benchmark.users.UsersProjectBuilder
datadir = src/benchmarks/edu/brown/benchmark/users/data
@@ -8,3 +8,6 @@ builder = edu.brown.benchmark.ycsb.YCSBProjectBuilder
# only add the number of tuples defined in 'num_records'
fixed_size = false
num_records = 100000
# Zipfian skew factor for tuple access
skew_factor = 0.5
Oops, something went wrong.

0 comments on commit ff87778

Please sign in to comment.