1
0
Fork 0
Commit Graph

69 Commits

Author SHA1 Message Date
Jan Christoph Uhde ae75917640 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  added assertion to Comparator
  fix RemoveLargeRange
  fix ub
  fix assertion failure at shutdown
  Remove provisional code
  Fixed counter
  remove usleeps
  Fixed deadlock
  Fixed broken merge
  Fixing some issues
  added p/ to gitignore
  Integrated counters with collections
  properly include the javascript enterprise folders into the test tarballs
  fix parsing for URLs starting with ldap://
  fix filter for replication testcases
  Added counter manager
  updated licenses, added generator
  removed jshint completely
2017-04-03 16:54:09 +02:00
Jan Christoph Uhde 234180c08b wip - drop database 2017-04-03 16:52:21 +02:00
jsteemann c4ecfbf089 fix RemoveLargeRange 2017-04-03 15:44:30 +02:00
Simon Grätzer bc36c56716 Fixed broken merge 2017-04-03 14:52:12 +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
Jan Christoph Uhde e49024f16e add drop collection to rocksdb engine 2017-04-03 10:41:02 +02:00
Simon Grätzer 01036b65d9 Added counter manager 2017-04-03 09:23:35 +02:00
Jan Christoph Uhde 0140822dc4 implement persist index 2017-03-31 15:06:06 +02:00
Simon Grätzer 807d38784c Added some small fixes 2017-03-31 11:29:27 +02:00
Simon Grätzer fd52c1a7f4 Added count function 2017-03-30 19:20:42 +02:00
Simon Grätzer e246a8d8cb Moved „removeLargeRange“ method to commons 2017-03-30 14:46:21 +02:00
jsteemann 38ac3c23c8 fixed serialization bug 2017-03-29 09:17:23 +02:00
Simon Grätzer 9e1a181393 Edge index tax changes 2017-03-28 14:02:29 +02:00
Dan Larkin 61037c3078 Added some documentation to key/value/comparator classes. 2017-03-27 21:07:52 -04:00
Dan Larkin cbafcadccd Finished conversion of RocksDBEntry to RocksDBKey and RocksDBValue. 2017-03-27 16:51:30 -04:00
Dan Larkin 5c36a617c4 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-27 11:35:15 -04:00
Dan Larkin a7a3c82bb3 Initial conversion of RocksDBEntry to RocksDBKey. 2017-03-27 11:34:55 -04:00
Jan Christoph Uhde f4e164ef78 fix compile errors 2017-03-27 08:57:51 +02:00
Dan Larkin fcb3c2f91e Added method to convert RocksDB Status to ArangoDB Result. 2017-03-24 13:19:34 -04:00