1
0
Fork 0
Commit Graph

73 Commits

Author SHA1 Message Date
Simon Grätzer 5ed8f67726 Fixed counter manager 2017-04-11 13:09:30 +02:00
Jan Christoph Uhde bb25adf0e6 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  Removed unreachable code
  Removed superflous aql::ShortestPathOptions and replaced it by traverser::ShortestPathOptions. Api is not fixed yet.
2017-04-10 14:01:32 +02:00
Jan Christoph Uhde c82fadc863 prepare limitation of transaction size 2017-04-10 14:00:55 +02:00
Michael Hackstein b3ae8e8676 Removed unreachable code 2017-04-10 11:19:17 +02:00
Jan Christoph Uhde b4b2ac0dbd work on counting bug 2017-04-10 09:23:35 +02:00
jsteemann 940209001c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-07 12:06:04 +02:00
jsteemann 2b0673c3fe removed type "Index" 2017-04-07 12:05:56 +02:00
Simon Grätzer 4ba0f23c97 Fixed rev Id 2017-04-07 11:28:46 +02:00
Simon Grätzer 42a79ed1ac Fixing counter WAL parsing 2017-04-07 11:26:52 +02:00
Jan Christoph Uhde b494d22e22 silence warning 2017-04-06 17:42:58 +02:00
Simon Grätzer 8366400e27 Fixed counters 2017-04-06 17:27:14 +02:00
Simon Grätzer b3b1850f90 Fix while(true){} 2017-04-06 15:25:32 +02:00
Simon Grätzer 4f4dcf58e7 Fixing counter key bounds 2017-04-06 15:16:52 +02:00
jsteemann e5d733867e make more tests pass 2017-04-05 14:57:18 +02:00
jsteemann 14921c6fba Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 15:27:32 +02:00
jsteemann b293668bb0 cppcheck 2017-04-04 15:27:28 +02:00
Simon Grätzer 245b4b87ea Fixing comparator use 2017-04-04 14:11:14 +02:00
Simon Grätzer c123ac3734 Fixed truncate 2017-04-04 10:48:37 +02:00
Simon Grätzer 664f45d029 Fixed counter 2017-04-03 15:16:14 +02:00
Simon Grätzer 64101eebec Fixed deadlock 2017-04-03 15:00:37 +02:00
Simon Grätzer c46db78904 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	arangod/RocksDBEngine/RocksDBCommon.h
#	arangod/RocksDBEngine/RocksDBEngine.cpp
2017-04-03 13:27:04 +02:00
Simon Grätzer cf4294c9ca Integrated counters with collections 2017-04-03 13:24:22 +02:00
Simon Grätzer 01036b65d9 Added counter manager 2017-04-03 09:23:35 +02:00