Permalink
Browse files

merge complete from https://github.com/apavlo/h-store.git

  • Loading branch information...
Atreyee Maiti
Atreyee Maiti committed May 22, 2014
2 parents 621c2d0 + 61f230d commit 18dd06fc61bdfa7b30047214da7480aa0abc9232
Showing with 2,288 additions and 2,389 deletions.
  1. +0 −133 .cproject
  2. +1 −0 .gitignore
  3. +0 −185 .project
  4. +3 −0 build-common.xml
  5. +2 −2 build.py
  6. +3 −7 build.xml
  7. +2 −2 buildtools.py
  8. +4 −21 log4j.properties
  9. +4 −3 properties/benchmarks/ycsb.properties
  10. +0 −17 run.sh
  11. +21 −17 scripts/anticache/tpcc.sh
  12. +2 −2 src/benchmarks/edu/brown/api/BenchmarkController.java
  13. +2 −1 src/benchmarks/edu/brown/benchmark/voter/voter-ddl.sql
  14. +4 −4 src/benchmarks/edu/brown/benchmark/ycsb/YCSBClient.java
  15. +1 −1 src/benchmarks/edu/brown/benchmark/ycsb/YCSBConstants.java
  16. +4 −40 src/benchmarks/edu/brown/benchmark/ycsb/YCSBLoader.java
  17. +1 −1 src/benchmarks/org/voltdb/benchmark/tpcc/TPCCClient.java
  18. +12 −9 src/ee/anticache/AntiCacheDB.cpp
  19. +2 −2 src/ee/anticache/AntiCacheEvictionManager.cpp
  20. +1 −1 src/ee/common/DefaultTupleSerializer.h
  21. +1 −1 src/ee/common/ExportSerializeIo.h
  22. +1 −1 src/ee/common/NValue.cpp
  23. +1 −1 src/ee/common/NValue.hpp
  24. +0 −2 src/ee/common/Pool.hpp
  25. +0 −1 src/ee/common/StringRef.cpp
  26. +17 −16 src/ee/common/TupleSchema.cpp
  27. +7 −1 src/ee/common/debuglog.h
  28. +262 −272 src/ee/common/executorcontext.hpp
  29. +25 −17 src/ee/execution/VoltDBEngine.cpp
  30. +12 −15 src/ee/executors/deleteexecutor.cpp
  31. +5 −5 src/ee/indexes/indexkey.h
  32. +0 −1 src/ee/indexes/tableindex.h
  33. +50 −28 src/ee/logging/AriesLogProxy.cpp
  34. +4 −2 src/ee/logging/AriesLogProxy.h
  35. +4 −4 src/ee/logging/Logrecord.cpp
  36. +1 −1 src/ee/storage/CopyOnWriteContext.h
  37. +24 −10 src/ee/storage/MaterializedViewMetadata.cpp
  38. +3 −4 src/ee/storage/tablefactory.cpp
  39. +2 −4 src/frontend/edu/brown/hstore/HStore.java
  40. +195 −13 src/frontend/edu/brown/hstore/HStoreSite.java
  41. +30 −16 src/frontend/edu/brown/hstore/PartitionExecutor.java
  42. +14 −1 src/frontend/edu/brown/hstore/cmdlog/CommandLogReader.java
  43. +129 −119 src/frontend/edu/brown/hstore/cmdlog/CommandLogWriter.java
  44. +44 −4 src/frontend/edu/brown/hstore/conf/HStoreConf.java
  45. +0 −3 src/frontend/edu/brown/hstore/txns/AbstractTransaction.java
  46. +3 −4 src/frontend/edu/brown/hstore/txns/DependencyInfo.java
  47. +12 −11 src/frontend/edu/brown/hstore/txns/DependencyTracker.java
  48. +2 −2 src/frontend/edu/brown/hstore/txns/LocalTransaction.java
  49. +1 −1 src/frontend/edu/brown/utils/ProjectType.java
  50. +6 −6 src/frontend/org/voltdb/AriesLogNative.java
  51. +2 −15 src/frontend/org/voltdb/DefaultSnapshotDataTarget.java
  52. +5 −5 src/frontend/org/voltdb/SnapshotSaveAPI.java
  53. +27 −22 src/frontend/org/voltdb/VoltProcedure.java
  54. +0 −7 src/frontend/org/voltdb/VoltTable.java
  55. +0 −6 src/frontend/org/voltdb/catalog/Host.java
  56. +0 −2 src/frontend/org/voltdb/compiler/VoltCompiler.java
  57. +7 −8 src/frontend/org/voltdb/compiler/VoltProjectBuilder.java
  58. +0 −1 src/frontend/org/voltdb/jni/EELoggers.java
  59. +1 −1 src/frontend/org/voltdb/jni/ExecutionEngine.java
  60. +7 −4 src/frontend/org/voltdb/jni/ExecutionEngineJNI.java
  61. +8 −13 src/frontend/org/voltdb/sysprocs/LoadMultipartitionTable.java
  62. +2 −2 src/frontend/org/voltdb/sysprocs/SnapshotDelete.java
  63. +0 −798 src/frontend/org/voltdb/sysprocs/SnapshotRestoreLocal.java
  64. +1 −1 src/frontend/org/voltdb/sysprocs/SnapshotSave.java
  65. +7 −7 src/frontend/org/voltdb/sysprocs/SnapshotScan.java
  66. +3 −3 src/frontend/org/voltdb/sysprocs/saverestore/PartitionedTableSaveFileState.java
  67. +2 −1 tests/ee/anticache/anticachedb_test.cpp
  68. +2 −0 tests/ee/common/tabletuple_test.cpp
  69. +41 −47 tests/ee/harness.h
  70. +1 −0 tests/ee/storage/StreamedTable_test.cpp
  71. +4 −7 tests/ee/storage/persistent_table_log_test.cpp
  72. +2 −0 tests/frontend/edu/brown/hstore/TestAntiCacheManager.java
  73. +1 −1 tests/frontend/org/voltdb/regressionsuites/LocalSingleProcessServer.java
  74. +5 −3 tests/frontend/org/voltdb/regressionsuites/TestSQLFeaturesSuite.java
  75. +467 −0 tests/frontend/org/voltdb/regressionsuites/TestTPCCLogicalRecovery.java
  76. +238 −0 tests/frontend/org/voltdb/regressionsuites/TestTPCCPhysicalRecovery.java
  77. +51 −1 tests/frontend/org/voltdb/regressionsuites/TestVoterSuite.java
  78. +231 −236 ...s/frontend/org/voltdb/regressionsuites/{TestSnapshotRecovery.java → TestYCSBLogicalRecovery.java}
  79. +249 −0 tests/frontend/org/voltdb/regressionsuites/TestYCSBPhysicalRecovery.java
  80. +0 −184 ycsb.sh
View
133 .cproject

This file was deleted.

Oops, something went wrong.
View
@@ -62,4 +62,5 @@ src/catgen/out
.wtpmodules
.classpath
.project
.cproject
.settings
View
185 .project

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 18dd06f

Please sign in to comment.