Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
45,687 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

1435 Commits

Author SHA1 Message Date
Simon Grätzer 020c3db093 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 20:55:26 +02:00
Simon Grätzer a53025b5a9 Added RocksDB WAL types 2017-04-25 20:55:21 +02:00
Dan Larkin c11857df09 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-25 13:58:47 -04:00
Dan Larkin 9dd275b497 Fixed dump/restore tests. 2017-04-25 13:54:56 -04:00
jsteemann 7344a03623 fix crashes 2017-04-25 15:47:11 +02:00
Jan Christoph Uhde fca8f01df6 create logger state just in one place 2017-04-25 14:58:32 +02:00
Simon Grätzer 3c6074a206 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 13:33:36 +02:00
jsteemann 861291da16 honor exclusive locks 2017-04-25 12:56:56 +02:00
Simon Grätzer 8aaac6d5a2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-25 12:02:04 +02:00
Simon Grätzer 5d20b79c0f Incremental Sync 2017-04-25 12:01:58 +02:00
Jan Christoph Uhde e5447d2e8c prevent crashing of replication when not using mmfiles engine 2017-04-25 11:11:58 +02:00
jsteemann 0434d88ab4 rocksdb options 2017-04-25 02:22:00 +02:00
jsteemann 4300c77d3e fixes for non-array IN lookups, added tests 2017-04-25 01:47:07 +02:00
jsteemann fe1268af97 added missing return 2017-04-24 23:30:57 +02:00
jsteemann d1cad2acc9 cppcheck 
fix
 2017-04-24 23:06:36 +02:00
Dan Larkin a17de4e296 Added a missing switch break. 2017-04-24 16:36:50 -04:00
Simon Grätzer 91fe0f01ea formatting 2017-04-24 15:55:21 +02:00
Simon Grätzer fe84b499c0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel 2017-04-24 15:45:39 +02:00
Simon Grätzer 7176d34169 Fixed incremental synced 2017-04-24 15:40:48 +02:00
jsteemann af9a214c9f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-24 14:23:54 +02:00
jsteemann b7bf8a8983 implement basic operations for settings 2017-04-24 14:19:29 +02:00
Michael Hackstein 6cfa55ac6c Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-04-24 13:54:42 +02:00
jsteemann 507054de99 adjust include order 2017-04-24 13:50:54 +02:00
jsteemann fcc61115d8 try to fix feature startup order (Scheduler vs. CacheManager vs. DatabaseFeature) 2017-04-24 13:17:21 +02:00
Simon Grätzer 06fea9dbf4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-24 12:43:55 +02:00
Simon Grätzer 88dc999001 Counter manager fixes 2017-04-24 12:43:44 +02:00
Jan Christoph Uhde 2269ca7b0a add batchId and logging 2017-04-24 11:47:54 +02:00
Simon Grätzer df57b291f8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-24 10:23:33 +02:00
jsteemann a32c2e84d4 use adjusted write options on commit 2017-04-24 09:39:35 +02:00
Dan Larkin 7c49b6bdd4 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 13:12:25 -04:00
Dan Larkin d7f56172fd Fixed a status return in replication handler. 2017-04-21 13:12:19 -04:00
jsteemann d0fae3cf7b savepoint optimizations 2017-04-21 18:23:47 +02:00
Simon Grätzer 1265fb759c Merge + sync 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBReplicationContext.h
 2017-04-21 18:11:01 +02:00
Simon Grätzer e850dd635a Incremental sync 2017-04-21 18:10:10 +02:00
Dan Larkin 557eddb912 Added batchSize support to collection dumping. 2017-04-21 11:51:56 -04:00
jsteemann 361d513087 re-enable user settings for RocksDB 2017-04-21 15:28:29 +02:00
jsteemann 0444a5a068 disable usage of (bad) default values 2017-04-21 14:02:50 +02:00
Simon Grätzer ff4f8181dd Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 13:00:36 +02:00
Simon Grätzer 235f006a27 const collection CRUD methods 2017-04-21 13:00:30 +02:00
Simon Grätzer 064c51c731 Adding const statements 2017-04-21 12:59:20 +02:00
jsteemann 862ec7bae3 remove log garbage 2017-04-21 12:57:20 +02:00
jsteemann 5d86a729c0 fix dump format 2017-04-21 11:09:06 +02:00
jsteemann 498ace382a remove debug log messages 2017-04-21 10:00:39 +02:00
Dan Larkin 30efe6c136 Made more progress on dump tests. 2017-04-20 23:05:56 -04:00
Dan Larkin c46d4c6a6f Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 18:04:36 -04:00
Dan Larkin 9d6aa4b297 Some more replication handler changes. 2017-04-20 18:04:33 -04:00
jsteemann c0348c2840 more fixes 2017-04-20 23:23:04 +02:00
jsteemann 493154a319 fix inventory when there is no batchId 2017-04-20 23:14:58 +02:00
jsteemann 6abc9c62f2 fixed after merge conflict 2017-04-20 23:05:14 +02:00
jsteemann 467a90f749 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 23:02:33 +02:00
jsteemann 84f1a012b9 some bugfixes 2017-04-20 22:59:35 +02:00
Dan Larkin f45d46d087 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 16:27:11 -04:00
Dan Larkin b7f8854666 Made some progress on dump tests. 2017-04-20 16:23:35 -04:00
jsteemann 27f58d0675 prepare for some optimization 2017-04-20 22:15:10 +02:00
jsteemann f5009099cf cppcheck 2017-04-20 21:48:01 +02:00
Dan Larkin 6b67470dbd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 14:59:55 -04:00
Dan Larkin 57701ff766 Added (rough) logger-follow handler. 2017-04-20 14:59:49 -04:00
Simon Grätzer 2235a70e62 Fix shutdown 2017-04-20 19:17:13 +02:00
Simon Grätzer 98df9c21a2 Fixing warnings 2017-04-20 19:07:30 +02:00
Simon Grätzer ec848b879f Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 18:50:57 +02:00
Simon Grätzer b304d35ac2 Added rocksdb background thread 2017-04-20 18:50:52 +02:00
Michael Hackstein 9d621d1ffd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 18:08:53 +02:00
Michael Hackstein 24992be707 Removed an assertion of PrimaryIndex toVelocyPack. The case i was tackeling was writing the index-information as an attribtue into an object, which was not allowed by this assertion, but actually it is. 2017-04-20 17:49:26 +02:00
jsteemann f4d889d697 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 17:21:50 +02:00
jsteemann d776b9f40f removed unused code 2017-04-20 17:21:41 +02:00
Dan Larkin 973b410698 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 11:10:13 -04:00
Dan Larkin 4ec2a40cd5 Split replication context/status/tailing. 2017-04-20 11:10:08 -04:00
Simon Grätzer 7e8624d9d4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 17:01:16 +02:00
jsteemann 569450321d cppcheck 2017-04-20 16:47:10 +02:00
Simon Grätzer 67c4776ce8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 16:39:22 +02:00
Simon Grätzer 502dc66697 Make some methods const 2017-04-20 16:39:18 +02:00
Jan Christoph Uhde f96d197cfc Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixed bug/warning.
  formatting
 2017-04-20 16:02:43 +02:00
Jan Christoph Uhde 96b05c0f61 work on dump for rocksdb replication 2017-04-20 15:58:48 +02:00
Dan Larkin 6da43d4171 Fixed bug/warning. 2017-04-20 09:51:52 -04:00
Simon Grätzer f389baf500 Fixed warning 2017-04-20 15:28:42 +02:00
Simon Grätzer 8bfdcaa000 Added TTL 2017-04-20 15:24:03 +02:00
Simon Grätzer 3444f91e51 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 13:34:41 +02:00
Simon Grätzer a04f991aa0 Fixed warning 2017-04-20 13:34:37 +02:00
jsteemann 2cf6b5c751 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 12:55:07 +02:00
jsteemann a24b5b0763 make more exception safe 2017-04-20 12:54:59 +02:00
Simon Grätzer 6dd02bab0d Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 12:47:28 +02:00
Simon Grätzer 3319a5d607 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp
 2017-04-20 12:47:22 +02:00
jsteemann 213387e64f fix shutdown issue 2017-04-20 12:36:54 +02:00
jsteemann 87477d20a9 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 12:26:08 +02:00
jsteemann 3727e7fb7a first stab at exclusive locks 2017-04-20 12:25:53 +02:00
Simon Grätzer 388121158e Started inventory rest handler 2017-04-20 12:16:40 +02:00
Jan Christoph Uhde 325c64773d make use of ReplicationManager and ReplicationContext 2017-04-20 12:05:40 +02:00
Jan Christoph Uhde 7889291247 add contextId to replication handler 2017-04-20 10:56:17 +02:00
jsteemann 1c950e0111 cppcheck 2017-04-20 09:04:49 +02:00
Dan Larkin f494f45785 Added initial, stripped RocksDBRestReplicationHandler. 2017-04-19 17:30:06 -04:00
Dan Larkin d7bad293f1 Added initial implementatino of WAL tailing for replication. 2017-04-19 15:35:07 -04:00
Dan Larkin dfd1e78f35 Added objectId-to-database+collection mapping. 2017-04-19 13:56:17 -04:00
Simon Grätzer 93b31d6f42 Replication manager + test fixes 2017-04-19 18:20:47 +02:00
Dan Larkin ea58b36bd7 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-19 10:02:05 -04:00
Jan Christoph Uhde f529e58b71 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  cppcheck
  jslint
  renamed engine-specific test files
  fix query cache invalidation
  fix compile warning
  fix README_maintainers, provide debug output for invalid invocations
  slightly improve error message
  ui event bugfix
 2017-04-19 14:08:17 +02:00
jsteemann 8e779aab24 cppcheck 2017-04-19 13:20:46 +02:00
jsteemann 8d99dc62c9 fix query cache invalidation 2017-04-19 12:32:16 +02:00
Jan Christoph Uhde 507b870ff1 add RocksDBOptionFeature to unify configuration of RocksDB 
instances for storage-engine and persistent-index that are used mutual
exclusive.
 2017-04-19 12:20:41 +02:00
Simon Grätzer dd7dd54ad1 Fixing aql query index optimizer 2017-04-19 10:16:19 +02:00
Dan Larkin 21866f5f0e Initial partial implementation of replication contexts. 2017-04-18 19:55:18 -04:00
Simon Grätzer c2bd35151a Fixing index lookup 2017-04-18 23:15:01 +02:00
jsteemann e42b500ea7 turn off log spam 2017-04-18 21:58:03 +02:00
jsteemann 702e33759c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 21:03:08 +02:00
Dan Larkin 7ad0c75745 Fixed bug in index info persistence/recovery. 2017-04-18 14:55:58 -04:00
Simon Grätzer 83d4be462a Adding failure points 2017-04-18 18:10:49 +02:00
Simon Grätzer 2c4d77668f Fixing array indexes 2017-04-18 18:06:40 +02:00
jsteemann dc5fb20b81 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 17:28:04 +02:00
jsteemann 69576ca79e preparations for locks 2017-04-18 17:27:37 +02:00
Jan Christoph Uhde 02de7ea6d4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Starting AQL tests
  fixed typos
  fixed assertion failure
  call shutdown in the dtor
  added RW lock
 2017-04-18 17:00:07 +02:00
Jan Christoph Uhde c12bd6f2ed remove code that tracks size of index operations 
in RocksDBTransactions
 2017-04-18 16:58:44 +02:00
jsteemann 2f574a75be remove debug output 2017-04-18 15:06:22 +02:00
jsteemann d3f32799c6 fixed assertion failure 2017-04-18 14:54:29 +02:00
jsteemann 49fbec6ac3 call shutdown in the dtor 2017-04-18 14:49:57 +02:00
jsteemann e15feada03 added RW lock 2017-04-18 13:54:35 +02:00
Jan Christoph Uhde 4336d31e7b createIndex of RocksDBEngine must not throw! 2017-04-18 13:32:57 +02:00
Jan Christoph Uhde 9e366d2193 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  slightly adjust error messages
  Fixing jslint errors
  Add changelog from 3.1
  Properly generate an error message during import
  Fixed scannedIndex values in traverser tests. It did not report the correct number of lookups required after modification for new Storage-Engine
  fixed issue #2429
  issue #2427: change while into an if
  don't fail when non-array, but simply ignore it
 2017-04-18 13:21:54 +02:00
Jan Christoph Uhde a02e816598 add reset function to RocksDBTransactionState 2017-04-18 13:14:15 +02:00
jsteemann 031e9adb3c slightly adjust error messages 2017-04-18 12:43:21 +02:00
Dan Larkin 97d525e9b7 Revert "Fixed primary index cluster bug." 
This reverts commit 8c4214625c.
 2017-04-17 17:06:23 -04:00
Dan Larkin 841ef8b1a0 Changed index VPack building to include forPersistence flag. 2017-04-17 17:04:50 -04:00
Dan Larkin 8c4214625c Fixed primary index cluster bug. 2017-04-13 21:44:51 -04:00
Dan Larkin 2e0fdbf666 Fixed some bugs. 2017-04-13 20:06:25 -04:00
Simon Grätzer e0e00b0b6b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEdgeIndex.cpp
 2017-04-13 17:48:52 +02:00
Simon Grätzer 866d8b7451 Fixing tests 2017-04-13 17:45:16 +02:00
Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
Jan Christoph Uhde 864650eb8c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixed cluster startup
  Upload rockst start script
 2017-04-13 14:34:42 +02:00
Simon Grätzer 76b4c0b2c1 Fixed cluster startup 2017-04-13 14:32:55 +02:00
Jan Christoph Uhde e690e7fc80 Merge remote-tracking branch 'origin/feature/engine-api/edgeindex-report-as-single-index' into engine-api 
* origin/feature/engine-api/edgeindex-report-as-single-index:
  change mmfiles indexes to work with slightly changed API
  fix rocksdb engine index reporting but break report for mmfiles engine
  update error messages
 2017-04-13 08:46:54 +02:00
Simon Grätzer 3b3ee5f996 Counter fixes 2017-04-12 17:10:35 +02:00
Dan Larkin d435d274ea Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-12 09:35:19 -04:00
Simon Grätzer d8c191600a Better log messages 2017-04-12 15:24:45 +02:00
Simon Grätzer 5df9867a7c removed unnecessary code 2017-04-12 15:23:35 +02:00
Simon Grätzer df7e7d3749 Forgotten code 2017-04-12 15:22:30 +02:00
Simon Grätzer d9510eee0b Fixing count 2017-04-12 15:22:18 +02:00
Jan Christoph Uhde 2700a6d79d fix rocksdb engine index reporting but break report for mmfiles engine 2017-04-12 14:50:55 +02:00
Simon Grätzer 1d90520a9d Updated counter manager 2017-04-12 09:58:01 +02:00
Jan Christoph Uhde afd5d92f19 update error messages 2017-04-12 09:25:59 +02:00
Jan Christoph Uhde 11d7e11a45 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Moved some Edge Lookup logic around and moved the EdgeCursor to it's own class. This is still ongoing work. Expect shortest-path to fail.
  Fixed a bug with SortedIndexes. Some sort functions for AstNodes ordered upperbounds before lower bounds. This caused the index iterator to ignore the upperbound in sparse index cases.
  ShortestPathOptions now contain forward and backward lookupinfos for all edge collections in use.
  The ShortestPathBlock and -Node now use a pointer to the same options instead of managing one each.
  Simplified AqlTraverser Setup code by moving shared logic into the TraverserOptions.
  Removed external expander functions and moved them into the PathFinder implementations.
 2017-04-12 09:01:40 +02:00
Jan Christoph Uhde d67aa33fe3 limit transaction size and work on intermediate commits 2017-04-12 09:01:13 +02:00
Michael Hackstein 3cb9f0b805 Fixed a bug with SortedIndexes. Some sort functions for AstNodes ordered upperbounds before lower bounds. This caused the index iterator to ignore the upperbound in sparse index cases. 2017-04-11 17:57:59 +02:00
Simon Grätzer bcea7b62b0 Fixing transaction-no-commit 2017-04-11 14:01:50 +02:00
Simon Grätzer 5ed8f67726 Fixed counter manager 2017-04-11 13:09:30 +02:00
Simon Grätzer fac53e5a06 Fixing edge iterator 2017-04-11 10:01:56 +02:00
Simon Grätzer 901ffd5e2f Fixed rocksdb options 2017-04-11 09:31:39 +02:00
Dan Larkin b030cdb347 Fixed an edge index iterator bug. 2017-04-10 20:12:15 -04:00
Jan Christoph Uhde 8df9fe1d21 fix error in insert 2017-04-10 21:27:52 +02:00
Jan Christoph Uhde 60c4f27ec6 finish transaction limiting for truncate 2017-04-10 16:33:36 +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 efb6d498f0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixed issue with cache transactions.
  Fixing more recovery tests
 2017-04-10 09:28:54 +02:00
Jan Christoph Uhde b4b2ac0dbd work on counting bug 2017-04-10 09:23:35 +02:00
Dan Larkin 842a665ec5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-07 17:02:34 -04:00
Dan Larkin eaac6c013c Fixed issue with cache transactions. 2017-04-07 16:58:22 -04:00
Jan Christoph Uhde 9a079381b3 fix warning and make use of error code 2017-04-07 17:58:33 +02:00
jsteemann cb031de4fe disable cache in primary index 2017-04-07 14:56:11 +02:00
jsteemann 4cf5fedca9 honor subcodes in rocksdb statuses 2017-04-07 14:55:55 +02:00
jsteemann 08cd4ced33 moved class around 2017-04-07 13:13:48 +02:00
jsteemann 742e5d17fd remove always-true asserts 2017-04-07 12:17:54 +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
Dan Larkin c066b5c84c Fixed bug in document update code. 2017-04-06 18:34:11 -04:00
Dan Larkin f056aeee42 Fixed unloaded collection status reporting issue. 2017-04-06 16:21:51 -04:00
Dan Larkin 06e9c006b8 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-06 14:23:27 -04:00
Dan Larkin aa24d452fe Fixed any iterator. 2017-04-06 14:23:15 -04:00
Simon Grätzer 4ec65589f5 Added counter remove 2017-04-06 19:00:01 +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 f8d76fe9f8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 15:16:58 +02:00
Simon Grätzer 4f4dcf58e7 Fixing counter key bounds 2017-04-06 15:16:52 +02:00
jsteemann f59c78b587 add engine capabilities 2017-04-06 14:50:27 +02:00
jsteemann e4f8e7e011 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 14:22:37 +02:00
jsteemann a8f8587504 fix a test 2017-04-06 14:16:35 +02:00
Simon Grätzer 3071cf7945 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 13:38:46 +02:00
Simon Grätzer 63d4a34d3f Fixed Any iterator 2017-04-06 13:38:40 +02:00
jsteemann 77db254530 added fake selectivity estimate 2017-04-06 12:54:24 +02:00
Simon Grätzer fce51594ac Fixing hash index semantics 2017-04-06 12:41:47 +02:00
Jan Christoph Uhde 5e63ba1e6f Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  fix objectId handling
  Fixing windows build
  Fixing windows build
  Bugfix: we want the common _and_ the server tests.
  Conversion warnings
  Conversion errors
  Renaming test files
  fix windows build
  fix if clause
  exclude longrunning tests
  add slash here too.
  ...
 2017-04-06 11:20:32 +02:00
jsteemann 82fe6cf098 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 11:19:36 +02:00
Jan Christoph Uhde cc39030042 move key options ot logical collection 2017-04-06 11:19:30 +02:00
jsteemann 0e98a32455 fix objectId handling 2017-04-06 11:19:27 +02:00
Simon Grätzer e58bdb6258 Fixing windows build 2017-04-06 11:17:42 +02:00
Simon Grätzer 6435e3b2bc Fixing windows build 2017-04-06 11:15:49 +02:00
Simon Grätzer 08167c2614 Conversion warnings 2017-04-06 10:56:50 +02:00
Simon Grätzer a90e62bc02 Conversion errors 2017-04-06 10:50:40 +02:00
Dan Larkin 3c3d6ae52f Slightly improved any iterator. 2017-04-05 18:03:10 -04:00
Dan Larkin ae84e8ac84 Cache workaround to pass upgrade test. 2017-04-05 12:55:16 -04:00
Simon Grätzer b3743292e3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 17:43:49 +02:00
Simon Grätzer 19f220726e Fixed dump setup 2017-04-05 17:43:38 +02:00
jsteemann 5bca16bbf3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 17:08:57 +02:00
Simon Grätzer 060ddcea59 Fixed database drop 2017-04-05 15:17:54 +02:00
jsteemann e5d733867e make more tests pass 2017-04-05 14:57:18 +02:00
jsteemann 171160db6a Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 14:51:24 +02:00
Simon Grätzer 342613bd59 Fixing export 2017-04-05 14:03:58 +02:00
jsteemann 5880daf2a5 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 13:40:25 +02:00
jsteemann 1c43920bfc preparations for revision() 2017-04-05 13:40:18 +02:00
Simon Grätzer d61cdd23ee Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 13:38:47 +02:00
Simon Grätzer 5822e77843 invokeOnAllElements 2017-04-05 13:38:43 +02:00
jsteemann 6480d56b7e fix memleak 2017-04-05 13:24:01 +02:00
jsteemann c086e31a3f fix range lookups 2017-04-05 12:32:00 +02:00
jsteemann 79fc5224cb fix count() 2017-04-05 12:31:53 +02:00
jsteemann adcb8b6a29 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 12:10:35 +02:00
Simon Grätzer b69294641f Moving api-wal-noncluster and adding running trx 2017-04-05 11:54:30 +02:00
jsteemann 72c62182de added assertion 2017-04-05 11:23:48 +02:00
Simon Grätzer 57b0aa4a3d Any iterator 2017-04-05 10:48:08 +02:00
jsteemann 9f330881a2 constify method 2017-04-05 09:00:06 +02:00
jsteemann 8759ca3021 remove unused variable 2017-04-05 08:34:55 +02:00
jsteemann b338abba5d Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 08:31:20 +02:00
Dan Larkin 872dd95ca8 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-04 17:35:30 -04:00
Dan Larkin e303e2a51f Added RocksDB export functionality and some bug fixes. 2017-04-04 17:33:14 -04:00
Simon Grätzer 01ea3556b8 Added REST Wal handler 2017-04-04 18:27:19 +02:00
jsteemann 78302d1766 make versionFilename() a property of the engine 2017-04-04 17:23:02 +02:00
Simon Grätzer de388b10a0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 17:09:41 +02:00
Simon Grätzer b8ccfb72f8 Fill indexes 2017-04-04 17:09:35 +02:00
jsteemann fd258acc1d fix index removal 2017-04-04 16:45:19 +02:00
jsteemann 7fc2d97ae1 fix dropping of indexes 2017-04-04 16:41:05 +02:00
jsteemann de769b534d split ManagedDocumentResult in .h and .cpp files 2017-04-04 15:47:05 +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 96dc714139 Fixed some tests in shell_server 2017-04-04 15:10:17 +02:00
Simon Grätzer c113685700 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 14:23:27 +02:00
Simon Grätzer 464cf7dd40 Removing documents 2017-04-04 14:23:17 +02:00
Jan Christoph Uhde 3532ea88b0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixing comparator use
 2017-04-04 14:11:57 +02:00
Jan Christoph Uhde 358793c804 update doc for comparator usage 2017-04-04 14:11:30 +02:00
Simon Grätzer 245b4b87ea Fixing comparator use 2017-04-04 14:11:14 +02:00
Simon Grätzer 046b768553 Fix renamed method 2017-04-04 13:40:03 +02:00
Simon Grätzer 244b034aeb Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 13:38:56 +02:00
Simon Grätzer 936945c714 Modified truncate 2017-04-04 13:38:51 +02:00
jsteemann 4196594130 fixed crash 2017-04-04 13:27:35 +02:00
Jan Christoph Uhde dfeadeabe1 begin to split http tests for mmfiles and rocksdb 2017-04-04 13:22:05 +02:00
jsteemann 949985dff1 report a path, make it restartable 2017-04-04 12:03:29 +02:00
Simon Grätzer d9d921ed6d Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 11:52:46 +02:00
jsteemann 48663a696a Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 11:40:56 +02:00
Simon Grätzer 580bb19bd7 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 11:38:57 +02:00
Simon Grätzer 3066a67005 Collection rename 2017-04-04 11:38:52 +02:00
Jan Christoph Uhde b3526d2626 add error handling 2017-04-04 11:35:55 +02:00
Jan Christoph Uhde cea5fa8e4f delete views when dropping database 2017-04-04 11:22:22 +02:00
Simon Grätzer ca790e9327 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 10:48:44 +02:00
Simon Grätzer c123ac3734 Fixed truncate 2017-04-04 10:48:37 +02:00
Jan Christoph Uhde 11a048c420 replace prepare drop with empty stub 2017-04-04 10:29:04 +02:00
jsteemann e7c0633e8c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 10:24:02 +02:00
jsteemann 0c14c53633 dont fail on method that does nothing 2017-04-04 10:23:49 +02:00
Jan Christoph Uhde 93a54e26f3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  make SORT RAND() removal a feature of the old engine
  Some bug fixes.
 2017-04-04 09:55:30 +02:00
Jan Christoph Uhde 34aa22948d add helper function for non-transactional iteration of bounds 2017-04-04 09:54:58 +02:00
Dan Larkin 9ec54dc23b Some bug fixes. 2017-04-03 21:01:16 -04:00
Jan Christoph Uhde 5773a028c8 add more code for dropping databases 2017-04-03 21:29:25 +02:00
Jan Christoph Uhde b48975fc37 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixed allocation bug for many-cache situation.
  Fixed comparator
  added internal.wal.flush()
  added v8 functions
  RocksDB Indexes do now destroy their cache as soon as they are dropped, instead of during deletion
 2017-04-03 17:51:01 +02:00
Jan Christoph Uhde 256b2b2d6a construct rocksdbkey from slice 2017-04-03 17:50:36 +02:00
Simon Grätzer 53e5dc8e24 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 17:28:17 +02:00
Simon Grätzer e6919fc6c2 Fixed comparator 2017-04-03 17:28:13 +02:00
jsteemann 947a2427ca added internal.wal.flush() 2017-04-03 17:25:24 +02:00
jsteemann b9bf7d298b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 17:14:19 +02:00
jsteemann 8e3d83aa6e added v8 functions 2017-04-03 17:14:09 +02:00
Michael Hackstein ac1f51e3ea Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-03 17:10:33 +02:00
Michael Hackstein 3d39766f12 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-03 17:10:21 +02:00
Michael Hackstein 069394634c RocksDB Indexes do now destroy their cache as soon as they are dropped, instead of during deletion 2017-04-03 17:10:10 +02:00
Jan Christoph Uhde 1806624e41 fix compile error 2017-04-03 17:09:11 +02:00
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 f619cc5d0f added assertion to Comparator 2017-04-03 15:44:37 +02:00
jsteemann c4ecfbf089 fix RemoveLargeRange 2017-04-03 15:44:30 +02:00
jsteemann f162fb2a0f fix ub 2017-04-03 15:26:38 +02:00
jsteemann 72f1790057 fix assertion failure at shutdown 2017-04-03 15:21:43 +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 bc36c56716 Fixed broken merge 2017-04-03 14:52:12 +02:00
Simon Grätzer d10ebac338 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEngine.cpp
 2017-04-03 14:26:14 +02:00
Simon Grätzer 7afcac9ed7 Fixing some issues 2017-04-03 14:24:58 +02:00
Jan Christoph Uhde ec1fbb29fd now drop elements for indexes as well 2017-04-03 13:32:17 +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
Michael Hackstein 83e42cf6aa Added a destructor for RocksDB indxes that destroys the cache in the manager. Otherwise we end up with too many caches. 2017-04-03 13:16:38 +02:00
Jan Christoph Uhde e49024f16e add drop collection to rocksdb engine 2017-04-03 10:41:02 +02:00
Simon Grätzer 805314274e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 09:23:41 +02:00
Simon Grätzer 01036b65d9 Added counter manager 2017-04-03 09:23:35 +02:00
Dan Larkin 23038fdc3b Fixed uniqueness checking in primary index. 2017-03-31 18:03:50 -04:00
Dan Larkin f30f4bdb47 Implemented views methods. 2017-03-31 17:09:27 -04:00
Dan Larkin 631b4e93e0 Honored limit in RocksDBVPackIndex iterator. 2017-03-31 11:10:32 -04:00
jsteemann 90121b69fd honor limit in iterators 2017-03-31 17:05:45 +02:00
Jan Christoph Uhde 46cfae8a7e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  comment out log spam
  added comments
  fix cross book links
 2017-03-31 15:45:43 +02:00
Jan Christoph Uhde 772a7a32da add buffer() to RocksDBValue for data retrieval 2017-03-31 15:41:27 +02:00
jsteemann 6f3e37ac36 comment out log spam 2017-03-31 15:37:33 +02:00
jsteemann ff0e1b1a54 added comments 2017-03-31 15:25:57 +02:00
Jan Christoph Uhde c038815941 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  transaction-specific count tracking
  initial implementation of count()
  Fixed memory leaks in traverser.
  Fix links in docs
  Fix links in docs
  pass trx into numberDocuments
  Fixed undefined behaviour in TraverserCache.
  improve error message in case wrong JSON is sent to the server
 2017-03-31 15:06:21 +02:00
Jan Christoph Uhde 0140822dc4 implement persist index 2017-03-31 15:06:06 +02:00
jsteemann 07cdc49504 transaction-specific count tracking 2017-03-31 14:57:21 +02:00
jsteemann 689140fbd0 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 14:05:53 +02:00
jsteemann 794cace842 initial implementation of count() 2017-03-31 14:05:44 +02:00
Simon Grätzer 0fd98ed0bb Fixed HashIndex matchesDefinition method 2017-03-31 12:22:58 +02:00
Simon Grätzer 0a5ca1baf8 Fixed persistent index 2017-03-31 11:44:40 +02:00
jsteemann a1d0acf28e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 11:33:29 +02:00
jsteemann 81dcfbbe3d pass trx into numberDocuments 2017-03-31 11:33:16 +02:00
Simon Grätzer 36fa358a51 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 11:29:47 +02:00
Simon Grätzer 807d38784c Added some small fixes 2017-03-31 11:29:27 +02:00
jsteemann 49551127b9 de-constified lookupKey 2017-03-31 10:16:14 +02:00
Dan Larkin b6dc6aa4be Fixed stupid bug in comparator. 2017-03-30 21:39:39 -04:00
Dan Larkin e689bdce05 Set snapshot in transaction and read options. 2017-03-30 16:42:24 -04:00
Dan Larkin 3966c83730 Fix merge conflicts. 2017-03-30 16:11:58 -04:00
Dan Larkin 079c5764e8 Added cache support to RocksDBPrimaryIndex. 2017-03-30 16:09:40 -04:00
Jan Christoph Uhde 3e1c05ed97 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Finished basic implementation of RocksDBVPackIndex.
 2017-03-30 21:43:20 +02:00
Dan Larkin e305f87afd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-30 15:21:16 -04:00
Dan Larkin 8dbe314ad6 Finished basic implementation of RocksDBVPackIndex. 2017-03-30 15:21:08 -04:00
Jan Christoph Uhde bc27e4f0d6 Merge branch 'engine-api-arango-result' into engine-api 
* engine-api-arango-result:
  Add more copy debugging snippets to README_maintainers
  fix bug in Transaction state
  fix bug in import handler
  print more when using extremeVerbosity
  improve arangodb::Result
  add information on debugging
  refactor some code to make use of arangodb::Result
 2017-03-30 21:01:12 +02:00
Jan Christoph Uhde 95007fe28e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result 
* 'engine-api' of https://github.com/arangodb/arangodb: (46 commits)
  Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
  fix handling of externals
  fix toArray()
  fix returning documents
  Added hash-, skip list, persistent indexes
  harmonize filtering - filter on full filename.
  mini modifications
  standardize starting of servers for replication tests
  Edge index compliant with design doc
  another fix for #2404
  Moved „removeLargeRange“ method to commons
  Added length byte to IndexValue keys.
  fixed issue #2404
  Added drop to primary index
  Added drop() to indexes
  Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
  Fixed edge index
  Expand on CORS documentation
  Let ArangoDB handle the allow-credentials header
  make the authentication tests run on directories
  ...
 2017-03-30 19:46:17 +02:00
Simon Grätzer fd52c1a7f4 Added count function 2017-03-30 19:20:42 +02:00
Dan Larkin fa48111eb3 Merged RocksDBPathBasedIndex into RocksDBVPackIndex. 2017-03-30 12:56:43 -04:00
jsteemann 704c746c0d fix toArray() 2017-03-30 17:02:54 +02:00
Simon Grätzer 9754d38df3 Added hash-, skip list, persistent indexes 2017-03-30 16:00:27 +02:00
Simon Grätzer 1d3149c31b Edge index compliant with design doc 2017-03-30 15:11:03 +02:00
Simon Grätzer ed124e09ab Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-30 14:46:25 +02:00
Simon Grätzer e246a8d8cb Moved „removeLargeRange“ method to commons 2017-03-30 14:46:21 +02:00
Dan Larkin 423feffb90 Added length byte to IndexValue keys. 2017-03-30 08:43:15 -04:00
Simon Grätzer e8739dc2a4 Added drop to primary index 2017-03-30 14:06:10 +02:00
Simon Grätzer 1c6207fd86 Added drop() to indexes 2017-03-30 14:04:18 +02:00
Simon Grätzer 3eb1723dec Fixed edge index 2017-03-30 13:22:39 +02:00
jsteemann c1b6c815bc fix dropping of collections 2017-03-30 11:20:23 +02:00
Jan Christoph Uhde b83ae2ab82 refactor some code to make use of arangodb::Result 2017-03-30 09:39:21 +02:00
Dan Larkin 73154490fa Added shell of RocksDBVPackIndex. 2017-03-29 17:35:41 -04:00
jsteemann 5046112d86 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 18:01:26 +02:00
Simon Grätzer 6fd666fc8d Added some documentation 2017-03-29 17:56:04 +02:00
jsteemann e73417aef1 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:49 +02:00
Simon Grätzer 6b889e0a27 Fixed addIndexValues 2017-03-29 17:40:20 +02:00
Simon Grätzer cd9e9a13cf Path based enumerator 2017-03-29 17:33:02 +02:00
Simon Grätzer 89a869d684 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 13:19:01 +02:00
jsteemann d75a72eff2 honor feature optionality 2017-03-29 12:53:05 +02:00
jsteemann 080bd49791 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 12:16:22 +02:00
jsteemann df19cf3413 added stub implementation for update 2017-03-29 12:08:20 +02:00
Simon Grätzer d8d7b99a47 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 11:38:24 +02:00
Jan Christoph Uhde 408d7cab12 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  fixed serialization bug
  warn before we run out of file descriptors
  updated CHANGELOG
  slightly simplify logging
 2017-03-29 11:22:18 +02:00
Jan Christoph Uhde 796c32a341 improve error handling in some places 2017-03-29 11:04:04 +02:00
Simon Grätzer 8b832fe746 Moved to KeyBounds for edge prefix 2017-03-29 10:07:12 +02:00
Simon Grätzer 08047ab5e6 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 09:47:49 +02:00
Simon Grätzer 9ba5586f32 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/CMakeLists.txt
 2017-03-29 09:47:41 +02:00
jsteemann 38ac3c23c8 fixed serialization bug 2017-03-29 09:17:23 +02:00
Dan Larkin 8c024574d2 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-28 19:18:05 -04:00
Dan Larkin c1c7b27af0 Fixed RocksDBPrimaryIndex API. 2017-03-28 19:17:58 -04:00
jsteemann fcd54f7a17 get rid of compile warning 2017-03-29 01:03:07 +02:00
Dan Larkin e3609dbabf Added proper RocksDBPrimaryIndex implementation. 2017-03-28 18:52:09 -04:00
Simon Grätzer 94e99c28c9 Added PathBasedIndex 2017-03-28 21:50:03 +02:00
jsteemann eefdb2542d honor cppcheck results 2017-03-28 21:42:34 +02:00
Dan Larkin 06953bdd1d Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-28 13:57:16 -04:00
Dan Larkin 1b504b66c2 Added RocksDBKeyBounds class to handle left/right prefixes. 2017-03-28 13:57:07 -04:00
jsteemann 2ff83c7fa9 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 17:59:47 +02:00
jsteemann f4ce81f2e3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 17:59:32 +02:00
Dan Larkin 9b259d91fa Added comparator to engine/index. 2017-03-28 11:58:04 -04:00
jsteemann a221d30b8f added savepoints 2017-03-28 17:55:25 +02:00
Dan Larkin 77c95181d8 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-28 11:42:59 -04:00
Dan Larkin 3ec6934eb5 Changed RocksDBValue API slightly. 2017-03-28 11:42:52 -04:00
Simon Grätzer d5d4cae724 Added read options to edge index 2017-03-28 17:41:49 +02:00
Simon Grätzer b1f010e33c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBTransactionState.h
 2017-03-28 17:23:38 +02:00
Simon Grätzer 913b60c983 Fix usleep 2017-03-28 17:15:05 +02:00
Jan Christoph Uhde 6a39e962bd Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  add RocksDBIndex as base class for rocksdb-based indexes
  fixed issue #2400
  fixed issue: #2389
 2017-03-28 17:00:00 +02:00
Jan Christoph Uhde 7b48e45fa2 add readOptions to transaction 2017-03-28 16:59:39 +02:00
jsteemann 9e15fb4f35 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 16:59:22 +02:00
jsteemann c986590384 add RocksDBIndex as base class for rocksdb-based indexes 2017-03-28 16:56:29 +02:00
Jan Christoph Uhde 1b5cefddd3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fix build error
  Adding RocksDBPrimaryMockIndexIterator
 2017-03-28 15:51:05 +02:00
Jan Christoph Uhde 4b33614e12 Avoid one copy during document lookup for RocksDBEngine 2017-03-28 15:50:09 +02:00
Simon Grätzer 7fd102692f Fix build error 2017-03-28 15:16:08 +02:00
Simon Grätzer c592f911f3 Adding RocksDBPrimaryMockIndexIterator 2017-03-28 15:10:00 +02:00
Jan Christoph Uhde 965026ec6b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixed RocksDBAllIndexIterator
 2017-03-28 14:55:58 +02:00
Jan Christoph Uhde c6111ac8e3 silence warinings 2017-03-28 14:55:19 +02:00
Simon Grätzer aa1b443d85 Fixed RocksDBAllIndexIterator 2017-03-28 14:53:16 +02:00
Jan Christoph Uhde 31c52f60ff Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Added RocksDBPrimaryMockIndexIterator
 2017-03-28 14:52:59 +02:00
Jan Christoph Uhde 3c31ec2314 add function for looking up revisions to collection 2017-03-28 14:49:19 +02:00
Simon Grätzer 5e630d818f Added RocksDBPrimaryMockIndexIterator 2017-03-28 14:37:33 +02:00
Simon Grätzer 7a26fb22c1 Pushing commons method 2017-03-28 14:07:01 +02:00
Simon Grätzer f5b44d1c12 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 14:02:35 +02:00
Simon Grätzer 9e1a181393 Edge index tax changes 2017-03-28 14:02:29 +02:00
jsteemann e9e0d3a46c remove unused attribute 2017-03-28 13:25:10 +02:00
jsteemann 2e178d4378 make _objectId const 2017-03-28 13:25:03 +02:00
Simon Grätzer cfef1498f4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 12:01:48 +02:00
Simon Grätzer b2300ca207 Added EdgeIndexValue to RocksDBKey and switched lookup to StringRef 2017-03-28 12:01:40 +02:00
Wilfried Goesgens dac3b18040 move engine sources into their own cmake files 2017-03-28 11:38:45 +02:00
Simon Grätzer 4174183ffa Fixed exception because of hash index 2017-03-28 11:29:52 +02:00
Simon Grätzer 007ee4b081 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 10:57:25 +02:00
Simon Grätzer d6b7df6ba1 Edge index fixes 2017-03-28 10:13:07 +02:00
jsteemann 8e113b76d8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 08:47:09 +02:00
jsteemann 7bd6bd6e45 slightly adjusted index creation 2017-03-28 08:46:01 +02:00
Dan Larkin 80c91341e8 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-27 21:08:27 -04:00
Dan Larkin 61037c3078 Added some documentation to key/value/comparator classes. 2017-03-27 21:07:52 -04:00
Simon Grätzer fc3a950d08 Fixed compiler errors 2017-03-28 01:18:57 +02:00
Simon Grätzer 88b8e12cb6 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 01:16:00 +02:00
Simon Grätzer 8543cb77e3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBCommon.cpp
#	arangod/RocksDBEngine/RocksDBCommon.h
 2017-03-28 01:15:50 +02:00
Dan Larkin 3a307521cd Updated comparator. 2017-03-27 19:00:21 -04:00
Simon Grätzer 1a50029592 Edge Index work 2017-03-28 00:55:59 +02:00
Dan Larkin cbafcadccd Finished conversion of RocksDBEntry to RocksDBKey and RocksDBValue. 2017-03-27 16:51:30 -04:00
Simon Grätzer 41e043cf40 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/RocksDBEngine/RocksDBIndexFactory.cpp
 2017-03-27 18:30:38 +02:00
Simon Grätzer a2157595e8 RocksDB: starting edge index 2017-03-27 18:22:24 +02: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
jsteemann 3a2462532d move engine-specific includes out of standard file 2017-03-27 16:36:34 +02:00
jsteemann cdf1c1d894 primary index 2017-03-27 12:37:23 +02:00
jsteemann b03f823db0 added lookupKey 2017-03-27 12:00:36 +02:00
Jan Christoph Uhde 87e1a0f7c2 try to build insert / remove for index 2017-03-27 11:53:13 +02:00
Jan Christoph Uhde 91b868a01d add some code for creating the fake rocksdb index 2017-03-27 11:32:26 +02:00
jsteemann 0d38d2c287 finalize insert() 2017-03-27 11:30:30 +02:00
jsteemann 9276d82578 remove debug log messages 2017-03-27 11:20:43 +02:00
jsteemann 00499c6a7a stub for collection::insert() 2017-03-27 11:15:42 +02:00
jsteemann 7a764b95a9 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-27 11:02:02 +02:00
jsteemann 6ca2b237d1 add method to augment index creation data 2017-03-27 11:01:09 +02:00
Jan Christoph Uhde d4c2bba930 create mock primary mock index for rocksdb 2017-03-27 09:26:17 +02:00
Jan Christoph Uhde f4e164ef78 fix compile errors 2017-03-27 08:57:51 +02:00
Dan Larkin 1d22d25c3f Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-24 13:19:43 -04:00
Dan Larkin fcb3c2f91e Added method to convert RocksDB Status to ArangoDB Result. 2017-03-24 13:19:34 -04:00
jsteemann 2c54a6ac1e added some basic transaction handling 2017-03-24 17:23:32 +01:00
jsteemann 2aa2fd65a4 more startup 2017-03-24 14:20:51 +01:00
jsteemann 02c0dcc689 properly report error locations 2017-03-23 20:18:33 +01:00
jsteemann f17ff29518 added stubs for indexes 2017-03-23 15:24:00 +01:00
jsteemann 45da5ffe9c more diagnostic output for "not implemented" 2017-03-23 14:10:00 +01:00
jsteemann 55c38befbf enum databases, views and collections at startup 2017-03-23 11:52:22 +01:00
jsteemann 806c33eb1c cleanup 2017-03-23 09:01:21 +01:00
Jan Christoph Uhde 59eafed99d Add code that checks during startup if _system database exists 2017-03-22 18:28:35 +01:00
Jan Christoph Uhde 1cb1d37d01 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 17:59:10 +01:00
Jan Christoph Uhde 7c7268b269 Try to load existing databases 2017-03-22 17:58:38 +01:00
jsteemann 2824472ddc removed obsolete APIs 2017-03-22 14:54:16 +01:00
Jan Christoph Uhde ea405c8ddb resolve conflicts after merge 2017-03-22 14:50:50 +01:00
jsteemann 324e89957f Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 14:48:29 +01:00
Jan Christoph Uhde 0deac5fe62 Add functon to create slices from RocksDBEntryTypes 2017-03-22 14:45:54 +01:00
jsteemann 3db380dc6d do not throw in destructor 2017-03-22 14:20:01 +01:00
Jan Christoph Uhde d93d154053 Move RocksDBEntryType to separate file 2017-03-22 13:38:03 +01:00
Jan Christoph Uhde 66423f97dc delete on shutdown 2017-03-22 13:07:27 +01:00
Jan Christoph Uhde e7202945dc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 12:26:10 +01:00
Jan Christoph Uhde d34f75548f enable engine selection 2017-03-22 12:14:39 +01:00
Dan Larkin 3eda7ce79f Added RocksDBComparator. 2017-03-21 19:07:19 -04:00
Dan Larkin 1e2b0552fb Added RocksDBEntry helper class to manage key/value conversions and access. 2017-03-21 18:06:36 -04:00
Jan Christoph Uhde 58c1f3f70f Work on RocksDBEngine and enable engine selection 2017-03-21 16:02:40 +01:00
Jan Christoph Uhde 68bb668f1b add more empty implementations for RocksDB Storage engine 2017-03-21 10:53:13 +01:00
Jan Christoph Uhde db8202fd50 Add empty RocksDBTransactionState implemenation 2017-03-20 16:48:39 +01:00
Jan Christoph Uhde 3ef89f118a Add empty RocksDBView 2017-03-20 16:22:30 +01:00
Jan Christoph Uhde 29e10ad551 Add RocksDBIndexFactory 2017-03-20 16:03:59 +01:00
Jan Christoph Uhde 3c73363507 Add empty implementation for RocksDBCollection 2017-03-20 15:19:59 +01:00
Jan Christoph Uhde 2795eedabd add empty implementation of RocksDBEngine 2017-03-20 14:24:42 +01:00