Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
apavlo committed May 7, 2014
2 parents 726c623 + 303201d commit 61f230d0c94dd69a50d1b8c1d71146efeca7df8b
Showing with 13,859 additions and 3,974 deletions.
  1. +1 −0 .gitignore
  2. +0 −169 .project
  3. +10 −0 build-common.xml
  4. +23 −4 build.py
  5. +9 −5 build.xml
  6. +26 −3 buildtools.py
  7. +9 −0 properties/benchmarks/simple.properties
  8. +181 −0 scripts/anticache/tpcc.sh
  9. +29 −25 scripts/anticache/ycsb.sh
  10. +1 −0 src/benchmarks/edu/brown/benchmark/simple/README.txt
  11. +162 −0 src/benchmarks/edu/brown/benchmark/simple/SimpleClient.java
  12. +155 −0 src/benchmarks/edu/brown/benchmark/simple/SimpleLoader.java
  13. +30 −0 src/benchmarks/edu/brown/benchmark/simple/SimpleProjectBuilder.java
  14. +19 −0 src/benchmarks/edu/brown/benchmark/simple/procedures/GetData.java
  15. +6 −0 src/benchmarks/edu/brown/benchmark/simple/simple-ddl.sql
  16. +11 −0 src/benchmarks/edu/brown/benchmark/simple/simple.mappings
  17. +1 −1 src/benchmarks/edu/brown/benchmark/ycsb/YCSBClient.java
  18. +1 −1 src/benchmarks/org/voltdb/benchmark/tpcc/TPCCClient.java
  19. +258 −29 src/ee/anticache/AntiCacheDB.cpp
  20. +77 −19 src/ee/anticache/AntiCacheDB.h
  21. +33 −6 src/ee/anticache/AntiCacheEvictionManager.cpp
  22. +1 −1 src/ee/anticache/AntiCacheEvictionManager.h
  23. +3 −1 src/ee/common/DefaultTupleSerializer.cpp
  24. +6 −0 src/ee/common/ExportSerializeIo.h
  25. +234 −0 src/ee/common/MMAPMemoryManager.cpp
  26. +94 −0 src/ee/common/MMAPMemoryManager.h
  27. +221 −0 src/ee/common/MMAP_Pool.hpp
  28. +20 −4 src/ee/common/NValue.cpp
  29. +294 −114 src/ee/common/NValue.hpp
  30. +294 −180 src/ee/common/Pool.hpp
  31. +164 −0 src/ee/common/STLMMAPAllocator.h
  32. +94 −0 src/ee/common/StringRef.cpp
  33. +73 −0 src/ee/common/StringRef.h
  34. +69 −0 src/ee/common/ThreadLocalPool.h
  35. +1 −1 src/ee/common/Topend.h
  36. +5 −5 src/ee/common/TupleSchema.cpp
  37. +14 −1 src/ee/common/ValueFactory.hpp
  38. +10 −9 src/ee/common/ValuePeeker.hpp
  39. +16 −0 src/ee/common/debuglog.h
  40. +277 −198 src/ee/common/executorcontext.hpp
  41. +54 −0 src/ee/common/serializeio.h
  42. +138 −121 src/ee/common/tabletuple.h
  43. +60 −3 src/ee/common/types.cpp
  44. +5 −2 src/ee/common/types.h
  45. +0 −1 src/ee/execution/IPCTopend.h
  46. +0 −1 src/ee/execution/JNITopend.h
  47. +1,662 −1,178 src/ee/execution/VoltDBEngine.cpp
  48. +158 −21 src/ee/execution/VoltDBEngine.h
  49. +0 −1 src/ee/executors/aggregateexecutor.hpp
  50. +127 −0 src/ee/executors/deleteexecutor.cpp
  51. +54 −0 src/ee/executors/insertexecutor.cpp
  52. +4 −0 src/ee/executors/projectionexecutor.cpp
  53. +108 −0 src/ee/executors/updateexecutor.cpp
  54. +4 −0 src/ee/expressions/expressionutil.cpp
  55. +5 −5 src/ee/indexes/indexkey.h
  56. +192 −0 src/ee/logging/AriesLogProxy.cpp
  57. +66 −0 src/ee/logging/AriesLogProxy.h
  58. +1 −0 src/ee/logging/LogDefs.h
  59. +24 −1 src/ee/logging/LogManager.cpp
  60. +35 −7 src/ee/logging/LogManager.h
  61. +20 −0 src/ee/logging/Logger.h
  62. +550 −0 src/ee/logging/Logrecord.cpp
  63. +196 −0 src/ee/logging/Logrecord.h
  64. +5 −0 src/ee/logging/StdoutLogProxy.h
  65. +1 −1 src/ee/storage/PersistentTableUndoUpdateAction.cpp
  66. +2 −1 src/ee/storage/TableCatalogDelegate.cpp
  67. +131 −0 src/ee/storage/mmap_persistenttable.cpp
  68. +145 −0 src/ee/storage/mmap_persistenttable.h
  69. +100 −22 src/ee/storage/persistenttable.cpp
  70. +36 −24 src/ee/storage/persistenttable.h
  71. +52 −1 src/ee/storage/table.cpp
  72. +21 −0 src/ee/storage/table.h
  73. +69 −45 src/ee/storage/tablefactory.cpp
  74. +5 −3 src/ee/storage/tablefactory.h
  75. +4 −3 src/ee/storage/tableutil.cpp
  76. +0 −1 src/ee/voltdbipc.cpp
  77. +176 −3 src/ee/voltdbjni.cpp
  78. +12 −9 src/frontend/edu/brown/hstore/AntiCacheManager.java
  79. +1 −0 src/frontend/edu/brown/hstore/HStore.java
  80. +292 −3 src/frontend/edu/brown/hstore/HStoreSite.java
  81. +223 −16 src/frontend/edu/brown/hstore/PartitionExecutor.java
  82. +42 −8 src/frontend/edu/brown/hstore/cmdlog/CommandLogReader.java
  83. +122 −108 src/frontend/edu/brown/hstore/cmdlog/CommandLogWriter.java
  84. +22 −3 src/frontend/edu/brown/hstore/cmdlog/LogEntry.java
  85. +93 −5 src/frontend/edu/brown/hstore/conf/HStoreConf.java
  86. +4 −0 src/frontend/edu/brown/hstore/txns/DependencyTracker.java
  87. +1 −1 src/frontend/edu/brown/utils/ProjectType.java
  88. +23 −0 src/frontend/org/voltdb/AriesLog.java
  89. +324 −0 src/frontend/org/voltdb/AriesLogNative.java
  90. +23 −0 src/frontend/org/voltdb/ClientResponseImpl.java
  91. +123 −42 src/frontend/org/voltdb/SnapshotSaveAPI.java
  92. +78 −43 src/frontend/org/voltdb/SnapshotSiteProcessor.java
  93. +58 −0 src/frontend/org/voltdb/VoltProcedure.java
  94. +7 −2 src/frontend/org/voltdb/compiler/VoltProjectBuilder.java
  95. +2 −1 src/frontend/org/voltdb/jni/EELoggers.java
  96. +57 −4 src/frontend/org/voltdb/jni/ExecutionEngine.java
  97. +38 −0 src/frontend/org/voltdb/jni/ExecutionEngineIPC.java
  98. +82 −4 src/frontend/org/voltdb/jni/ExecutionEngineJNI.java
  99. +39 −0 src/frontend/org/voltdb/jni/MockExecutionEngine.java
  100. +27 −0 src/frontend/org/voltdb/logging/Level.java
  101. +160 −0 src/frontend/org/voltdb/logging/VoltLog4jLogger.java
  102. +173 −0 src/frontend/org/voltdb/logging/VoltLogger.java
  103. +110 −0 src/frontend/org/voltdb/logging/VoltUtilLoggingLogger.java
  104. +15 −5 src/frontend/org/voltdb/sysprocs/SnapshotDelete.java
  105. +7 −4 src/frontend/org/voltdb/sysprocs/SnapshotRegistry.java
  106. +515 −556 src/frontend/org/voltdb/sysprocs/SnapshotRestore.java
  107. +115 −137 src/frontend/org/voltdb/sysprocs/SnapshotSave.java
  108. +93 −209 src/frontend/org/voltdb/sysprocs/SnapshotScan.java
  109. +5 −17 src/frontend/org/voltdb/sysprocs/SnapshotStatus.java
  110. +6 −0 src/frontend/org/voltdb/sysprocs/SysProcFragmentId.java
  111. +20 −1 src/frontend/org/voltdb/sysprocs/saverestore/ClusterSaveFileState.java
  112. +2 −2 ...frontend/org/voltdb/regressionsuites → src/frontend/org/voltdb/sysprocs}/saverestore/MatView.java
  113. +82 −93 src/frontend/org/voltdb/sysprocs/saverestore/PartitionedTableSaveFileState.java
  114. +115 −80 src/frontend/org/voltdb/sysprocs/saverestore/ReplicatedTableSaveFileState.java
  115. +48 −10 ...rg/voltdb/regressionsuites → src/frontend/org/voltdb/sysprocs}/saverestore/SaveRestoreSelect.java
  116. +259 −0 src/frontend/org/voltdb/sysprocs/saverestore/SaveRestoreTestProjectBuilder.java
  117. +16 −3 src/frontend/org/voltdb/sysprocs/saverestore/SnapshotUtil.java
  118. +172 −141 src/frontend/org/voltdb/sysprocs/saverestore/TableSaveFile.java
  119. +18 −0 src/frontend/org/voltdb/sysprocs/saverestore/TableSaveFileState.java
  120. 0 ...ltdb/regressionsuites → src/frontend/org/voltdb/sysprocs}/saverestore/saverestore-altered-ddl.sql
  121. +9 −0 src/frontend/org/voltdb/sysprocs/saverestore/saverestore-ddl-partitioned.sql
  122. +9 −0 src/frontend/org/voltdb/sysprocs/saverestore/saverestore-ddl-replicated.sql
  123. 0 ...d/org/voltdb/regressionsuites → src/frontend/org/voltdb/sysprocs}/saverestore/saverestore-ddl.sql
  124. +94 −0 src/frontend/org/voltdb/utils/SnapshotVerifier.java
  125. +3 −0 tests/ee/anticache/anticachedb_test.cpp
  126. +1 −1 tests/ee/harness_test.cpp
  127. +8 −7 tests/ee/logging/logging_test.cpp
  128. +219 −0 tests/ee/storage/mmap_persistent_table_test.cpp
  129. +4 −7 tests/ee/storage/persistent_table_log_test.cpp
  130. +10 −23 tests/frontend/edu/brown/hstore/TestAntiCacheManager.java
  131. +5 −3 tests/frontend/org/voltdb/regressionsuites/TestSQLFeaturesSuite.java
  132. +441 −0 tests/frontend/org/voltdb/regressionsuites/TestSnapshotSave.java
  133. +423 −0 tests/frontend/org/voltdb/regressionsuites/TestSnapshotSaveAndRestorePartitionedTable.java
  134. +407 −0 tests/frontend/org/voltdb/regressionsuites/TestSnapshotSaveAndRestoreReplicatedTable.java
  135. +467 −0 tests/frontend/org/voltdb/regressionsuites/TestTPCCLogicalRecovery.java
  136. +238 −0 tests/frontend/org/voltdb/regressionsuites/TestTPCCPhysicalRecovery.java
  137. +506 −0 tests/frontend/org/voltdb/regressionsuites/TestYCSBLogicalRecovery.java
  138. +249 −0 tests/frontend/org/voltdb/regressionsuites/TestYCSBPhysicalRecovery.java
  139. +0 −90 tests/frontend/org/voltdb/regressionsuites/saverestore/CatalogChangeSingleProcessServer.java
  140. +0 −115 tests/frontend/org/voltdb/regressionsuites/saverestore/SaveRestoreTestProjectBuilder.java
View
@@ -62,4 +62,5 @@ src/catgen/out
.wtpmodules
.classpath
.project
.cproject
.settings
View
169 .project

This file was deleted.

Oops, something went wrong.
View
@@ -144,6 +144,7 @@
<arg value="site.anticache_enable=${site.anticache_enable}" />
<arg value="site.anticache_build=${site.anticache_build}" />
<arg value="site.anticache_reversible_lru=${site.anticache_reversible_lru}" />
<arg value="site.anticache_nvm=${site.anticache_nvm}" />
<arg value="site.anticache_profiling=${site.anticache_profiling}" />
<arg value="site.anticache_dir=${site.anticache_dir}" />
<arg value="site.anticache_block_size=${site.anticache_block_size}" />
@@ -156,6 +157,15 @@
<arg value="site.anticache_eviction_distribution=${site.anticache_eviction_distribution}" />
<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_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.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'] = """
@@ -353,6 +358,7 @@
CopyOnWriteTest
constraint_test
filter_test
mmap_persistent_table_test
persistent_table_log_test
serialize_test
StreamedTable_test
@@ -366,21 +372,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
@@ -860,9 +860,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 +1206,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>
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= True
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,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
Oops, something went wrong.

0 comments on commit 61f230d

Please sign in to comment.