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

14512 Commits

Author SHA1 Message Date
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
baslr 3d9f58bb70 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 12:45:35 +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
Wilfried Goesgens 7cbd1841a8 fix gcc 4.9 compilation issue 2017-04-24 11:25:10 +02:00
jsteemann 603cc849b9 fix attempt for @dothebart'a ancient compiler 2017-04-24 11:12:08 +02:00
Kaveh Vahedipour a211e5ee83 ipv4 is so yesterday 2017-04-24 11:08:04 +02:00
Kaveh Vahedipour 09a6888d14 attempt at fixing shutdown bug on mac os x 2017-04-24 10:45:54 +02:00
Michael Hackstein 9b15e1a913 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-24 10:44:06 +02:00
Michael Hackstein 851f772dc1 Fixed some counting/reporting for AQL statistics in Traverser. 2017-04-24 10:42:40 +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
jsteemann 31c9e04ae6 fixed memleak 2017-04-22 00:28:45 +02:00
jsteemann c197d617d9 proper file order 2017-04-21 20:32:56 +02:00
jsteemann ea8496f1a5 cppcheck 2017-04-21 20:19:36 +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
jsteemann b24f4a9435 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 18:14:31 +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
Andreas Streichardt 7322e3bff3 Allow seeding of randomgenerator for tests 2017-04-21 18:08:49 +02:00
jsteemann c0995c7328 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 18:08:00 +02:00
Dan Larkin 734921f003 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 11:52:07 -04:00
Dan Larkin 557eddb912 Added batchSize support to collection dumping. 2017-04-21 11:51:56 -04:00
Michael Hackstein ac90968c30 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 17:40:18 +02:00
jsteemann 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +02:00
Michael Hackstein 3b34d4edec Unified static-counting for Traversals on the Cache 2017-04-21 15:58:44 +02:00
Kaveh Vahedipour 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann 361d513087 re-enable user settings for RocksDB 2017-04-21 15:28:29 +02:00
baslr e275112601 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 15:20:39 +02:00
Michael Hackstein e46642fce1 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-21 15:06:42 +02:00
Michael Hackstein aa2abe0c1d Fixed a bug in TraverserOptions when using more than one edge collection and a specific filter on depth. 2017-04-21 15:06:24 +02:00
jsteemann 0444a5a068 disable usage of (bad) default values 2017-04-21 14:02:50 +02:00
baslr 8749276b02 include ldaplib if enterprise 2017-04-21 13:58:58 +02:00
jsteemann b33390c1d4 remove log spam 2017-04-21 13:21:38 +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 691dac7a73 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 12:35:07 +02:00
Kaveh Vahedipour 2dbd179656 Fix ocasionally hangling shut down on mac 2017-04-21 11:49:22 +02:00
baslr 76eeef7bd0 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 11:37:45 +02:00
Michael Hackstein e3beaaa8fc Added a test + fix for a Stackoverflow issue in Traversals and ShortestPath in AQL. This occured in the case where there are a lot of starting vertices in a row that do not have any paths attached to them. Fixes: #2445 2017-04-21 11:31:30 +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
jsteemann 618544a745 remove unused include 2017-04-21 10:00:27 +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 2994988210 attempt to fix broken graph stuff 2017-04-20 22:14:30 +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
Michael Hackstein e3febed2b5 ShortestPath and TraversalNode now call GraphNode::toVelocyPack as expected, not the Base ExecuteionNode::toVelocypackGeneric by accident 2017-04-20 17:19:30 +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
Michael Hackstein e51aa69d4a Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 16:35:42 +02:00
Michael Hackstein 3dc03d01b2 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 16:35:34 +02:00
baslr 6966b7e1d3 remove old ldap cmake configs 2017-04-20 16:08:02 +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
baslr 9d6d781425 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-20 15:58:08 +02:00
Michael Hackstein 1619e6b3d8 First version of ShortestPath that is presumably working in Clustered Mode with MMFiles and RocksDB 2017-04-20 15:57:06 +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 7df812dbdb Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 15:24:08 +02:00
Simon Grätzer 8bfdcaa000 Added TTL 2017-04-20 15:24:03 +02:00
jsteemann 60d39f4650 replication bugfixes 2017-04-20 15:20:22 +02:00
jsteemann f69e8e25da replication bugfixes 2017-04-20 15:08:14 +02:00
Michael Hackstein 4f899bfd2c Integreated a ShortestPathEngine on DBServers and wired it up with ShortestPathNode and Options. The path seems to be computed correctly in clsuter now, but the vertices are not yet retrieved. 2017-04-20 13:57:14 +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 859568453c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  optimize query cache invalidation for MMFiles a bit
 2017-04-20 12:06:19 +02:00
Jan Christoph Uhde 325c64773d make use of ReplicationManager and ReplicationContext 2017-04-20 12:05:40 +02:00
jsteemann 2322079bed Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 10:59:55 +02:00
jsteemann b8deda40bd optimize query cache invalidation for MMFiles a bit 2017-04-20 10:59:37 +02:00
Jan Christoph Uhde 7889291247 add contextId to replication handler 2017-04-20 10:56:17 +02:00
jsteemann 97c41a3ea7 remove debug output 2017-04-20 09:06:35 +02:00
jsteemann fd333875a2 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 09:05:23 +02:00
jsteemann 1c950e0111 cppcheck 2017-04-20 09:04:49 +02:00
Michael Hackstein bdb621ab92 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-20 08:54:29 +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
Frank Celler f42b23ebca fixed mimum desriptors in case of unlimited 2017-04-19 19:57:55 +02:00
Frank Celler f1d0c5eba1 added jemalloc feature 2017-04-19 19:57:54 +02:00
Dan Larkin dfd1e78f35 Added objectId-to-database+collection mapping. 2017-04-19 13:56:17 -04:00
Simon Grätzer 3fcf08cd62 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 18:20:51 +02:00
Simon Grätzer 93b31d6f42 Replication manager + test fixes 2017-04-19 18:20:47 +02:00
jsteemann 97b7463683 improve error message 2017-04-19 17:55:46 +02:00
jsteemann c5854d050b fix shutdown issue, modernize thread creation a bit 2017-04-19 16:57:53 +02:00
baslr 42ad1a8480 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-19 16:08:14 +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
Michael Hackstein 0fa1980064 More unified merge of Traverser- and ShortestPath- into GraphNode. Now the ShortestPathNode creates TraverserEngines on the Cluster. Finally everything ready to wire computation together 2017-04-19 15:23:37 +02:00
Jan Christoph Uhde b66c8526c2 change --rocksdb.enabled to be a obosolete option 2017-04-19 14:54:10 +02: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 f08a118dfc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 12:33:05 +02:00
jsteemann 8d99dc62c9 fix query cache invalidation 2017-04-19 12:32:16 +02:00
jsteemann e5a9bf27e4 fix compile warning 2017-04-19 12:31:13 +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
jsteemann e949b39d27 slightly improve error message 2017-04-19 11:07:40 +02:00
jsteemann e9f9f155e2 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 10:20:16 +02:00
Simon Grätzer dd7dd54ad1 Fixing aql query index optimizer 2017-04-19 10:16:19 +02:00
Michael Hackstein e7142beca0 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-19 10:10:57 +02:00
Michael Hackstein 50ce09cd98 Added a generic GraphNode as a base-class for Traversal and ShortestPath. It should handle Graph parsing and Engine creation. 2017-04-19 10:10:47 +02:00
jsteemann bda09ab9bd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 08:34:57 +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 35d951877d Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 22:01:40 +02:00
jsteemann 24b00a0744 unify test for engines 2017-04-18 22:01:24 +02:00
jsteemann e42b500ea7 turn off log spam 2017-04-18 21:58:03 +02:00
Dan Larkin 28bc8e5de3 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-18 15:35:57 -04:00
Dan Larkin af8e1889a1 Moved MMFiles replication handler. 2017-04-18 15:35:45 -04: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
Simon Grätzer 0adfd1f399 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 17:17:37 +02:00
Simon Grätzer c31d4c1590 Fixed iterator 2017-04-18 17:17:28 +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 5f8d9c4eb8 attempt to fix synchronization 2017-04-18 15:33:56 +02:00
jsteemann ece6a0c035 improve error messages 2017-04-18 15:22:52 +02:00
jsteemann 2f574a75be remove debug output 2017-04-18 15:06:22 +02:00
jsteemann 67cd947266 fixed typos 2017-04-18 14:54:48 +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 6cd6ed192d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 12:53:37 +02:00
jsteemann 031e9adb3c slightly adjust error messages 2017-04-18 12:43:21 +02:00
baslr 778c5b4586 ldap: dev log cleanup 2017-04-18 12:39:31 +02:00
baslr 608cdb5f4d Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-18 12:19:28 +02:00
baslr 5e370422ef remove dev logging 2017-04-18 12:18:12 +02:00
Simon Grätzer bab71f6339 Fixing jslint errors 2017-04-18 12:15:26 +02:00
Andreas Streichardt 4d7e6a8fba Properly generate an error message during import 2017-04-18 12:05:31 +02:00
baslr 52a0af661e Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-18 11:38:06 +02:00
jsteemann 2cf48d1709 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 11:33:16 +02:00
Michael Hackstein afad626e78 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-18 11:03:25 +02:00
Michael Hackstein 57fbf418f0 Fixed scannedIndex values in traverser tests. It did not report the correct number of lookups required after modification for new Storage-Engine 2017-04-18 10:40:35 +02:00
jsteemann 20202b532e issue #2427: change while into an if 2017-04-18 09:47:06 +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 5b345519ef Fixed small bug... maybe? 2017-04-14 15:46:18 -04:00
Dan Larkin 0f411afe59 Fixed Vpack building bug. 2017-04-14 10:38:54 -04:00
Dan Larkin 8c4214625c Fixed primary index cluster bug. 2017-04-13 21:44:51 -04:00
Dan Larkin 0dd8af7369 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-13 20:06:31 -04:00
Dan Larkin 2e0fdbf666 Fixed some bugs. 2017-04-13 20:06:25 -04:00
Simon Grätzer b778103cd2 Fixing some warnings 2017-04-13 18:00:13 +02: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
Michael Hackstein 177a3de0fd Squashed commit of the following: 
commit ba04aa66ce874fc67644ef2c7b8ee6ef3397e13e
Merge: 8ea1ad2 c6d65ea
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Apr 13 16:51:17 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 8ea1ad2ff0325fc014479376b5258d1b3fa4f730
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Apr 3 14:18:11 2017 +0200

    Deactivated cache in single-server mode

commit 2c68eaeb841aebccccd245ef78bab919adf39a2f
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Apr 3 09:18:36 2017 +0200

    Activating document cache in cluster mode for traversals.

commit 3943ca4f8257fe54534949c46749e40c28c4d597
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Mar 31 16:10:39 2017 +0200

    Created two implementations of TraverserCache. One that takes responsibility for strings only, the other one also caches Documents.

commit 0951f906f18d3631cec412cd0b00504e6d00fc3e
Merge: 0f9970b 87fbbe8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Mar 31 14:59:16 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 0f9970b7bab478c4b591b3f4c7fb18915753df30
Merge: d546fd1 8a42089
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 30 17:09:20 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit d546fd13c6a0a3bb4622f6aefd44ea3a149cc8cb
Merge: 873bc59 bd4a2eb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 29 15:16:54 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 873bc5950028248bf209d0c53fc9eb93938e3610
Merge: 8e4457a 3487097
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Mar 27 14:00:27 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 8e4457a96754bea3437e8d44c0ef9db2366ee86d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Mar 27 13:59:44 2017 +0200

    Removed old VPackSlice based getVertex API in traversers.

commit 2e0716eeeec1ec56b96571a18074539f5e27cb40
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Mar 24 09:09:02 2017 +0100

    Fixed logic error in SingleServerEdgeCursor readAll. The cursorId was not propageted properly, which cased filter-evaluations to fail

commit cea85c2ac1163ed0a989c492b8039ed4f7622325
Merge: 538f216 45a4fac
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Mar 24 08:17:31 2017 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 538f216cbefcdfb4d06fe16a42f223cecae8598b
Merge: 5f4afee 8bfcb49
Author: Simon Grätzer <simon@graetzer.org>
Date:   Thu Mar 23 16:33:44 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of https://github.com/arangodb/arangodb into devel-feature/traversal-cache

commit 5f4afee54094ea6d2a0cfec1abfb75451f228a23
Author: Simon Grätzer <simon@graetzer.org>
Date:   Thu Mar 23 16:33:38 2017 +0100

    VertexGetter StringRef methods

commit 8bfcb490d7a907ebd7dcc9e6f38a8d29baa7c7e5
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 16:32:38 2017 +0100

    Fixed AqlValues created by traverser-cache. They are now not using externals anymore which cased everything to crash

commit 614cdedb7e30e35f65f289b310c38b2585eb03e4
Merge: 773b0a5 416777b
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 12:52:19 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of github.com:arangodb/arangodb into devel-feature/traversal-cache

    This state is still red

commit 773b0a5e51f87875fa9bf1440dd002b2e1fcfd2a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 12:48:53 2017 +0100

    Added Implementation or readAll in Cluster EdgeCursor. This commit is still red.

commit 82ebbd6ec84918d43bbc64174bc251efa548a4de
Merge: e52b210 35dffc4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 11:37:31 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of github.com:arangodb/arangodb into devel-feature/traversal-cache

    This commit is not green.

commit 416777b60a8a0c741d11e9c654745866d0dfa15d
Author: Simon Grätzer <simon@graetzer.org>
Date:   Thu Mar 23 11:25:35 2017 +0100

    Fixed errornous ClusterEdgeCursor implementation of `readAll

commit e52b21025a5f56e2cfc03e3c129da83793f19846
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 11:01:17 2017 +0100

    Fixed API for Traversals: All functions now use StringRefs to identify vertices and edges which are presisted within the traverser-cache.

commit 35dffc439c156366b1110c6770c1565021934632
Author: Simon Grätzer <simon@graetzer.org>
Date:   Wed Mar 22 20:26:41 2017 +0100

    Fixed a few cluster issues

commit 73cf4fe41c363f6c034a1daeacee1630d7e827a5
Author: Simon Grätzer <simon@graetzer.org>
Date:   Wed Mar 22 17:26:12 2017 +0100

    Fixed EdgeCursor bug

commit 2f7329b4e9711740b423cf2963c6cf3f880c4bdf
Merge: bb9b129 8e5edf5
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 22 14:32:07 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 8e5edf5fbe93f34d3340099619baa9a56a738887
Author: Simon Grätzer <simon@graetzer.org>
Date:   Wed Mar 22 14:09:43 2017 +0100

    Fixing compile errors

commit bb9b1294c9ff91f62bc27775a4c7a69c5daca2fd
Merge: 048a4c6 8e51e3b
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 22 11:39:17 2017 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 048a4c65e11d6fd9cb25a58ee97ed756a419a067
Merge: 693607e c6b177d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 22 11:34:57 2017 +0100

    Solved merge conflicts. Build is still red.

commit c6b177dfc348df0f49f07cd67e83b873871fe6c5
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 23:04:28 2017 +0100

    Fixed off by one error, and crash

commit 5dbc9eb58f1d21e5a530806d7ad7e52058234b83
Merge: 463e352 db8c255
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 17:46:01 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of https://github.com/arangodb/arangodb into devel-feature/traversal-cache

    # Conflicts:
    #	arangod/Graph/BreadthFirstEnumerator.cpp

commit 463e3520636c19ae7a7c1d445099f336c5bde31e
Merge: 4e75f29 b8cabbe
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 17:00:17 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of https://github.com/arangodb/arangodb into devel-feature/traversal-cache

    # Conflicts:
    #	arangod/Graph/BreadthFirstEnumerator.cpp

commit 693607ea92ab3116a628c08c59a983a6fdf8b5f4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 16:26:57 2017 +0100

    Moved specialized NeighborsEnumerator into its own files.

commit db8c25587ebcdeff8b32d08cf2d97d723bf2b3fe
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 15:16:39 2017 +0100

    Replaced SingleServerBreadthFirst with using Callbacks in readAll method of EdgeCursor

commit 4e75f29de95edeea35573b128a0a13e04c9e65d2
Merge: 8716936 6de86c5
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 14:32:12 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of https://github.com/arangodb/arangodb into devel-feature/traversal-cache

commit b8cabbedebb16c09c8168ec8b5a4499e98c705f4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 11:17:23 2017 +0100

    Removed _enumertedPath from BreadthFirstEnumerator. Less string copying expected now.

commit 8716936bd480f4b7c85ece6fc1a51335f1942258
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 11:05:04 2017 +0100

    Traverser: changed method definitions

commit 14af02fbc08b7e2ed6b0cbb918ff509ffaef76bf
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 10:45:13 2017 +0100

    Removed usage of _enumeratedPath in lastEdge/Vertex to AQL. Goal is to delete this struct in the class, as it does unneccessary copies

commit 06a20ab0549d97b47eda98d3428e3390619ca5ec
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 10:39:21 2017 +0100

    Intermediate changes

commit 3a9a5f7c7ad186c669c3986f6f89c5a26b835ee0
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 10:34:43 2017 +0100

    Logic of BreadthFirstEnumerator now points to the last path returned instead of the next path to return. This will allow to get rid of enumeratedPath in there.

commit 6de86c548220a3ad21c53fb1de691070774130ec
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 10:17:25 2017 +0100

    Extracted BreadthFirstEnumerator out of PathEnumerator files. Only moving of code.

commit acd1d9eba5d7ea23e0d6beab831a42dc61a385a5
Merge: a99ad3c 1ab8c44
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Mar 20 13:13:16 2017 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit a99ad3c624d7ae4815776f165d65f19e43167e56
Author: Simon Grätzer <simon@graetzer.org>
Date:   Fri Mar 17 13:25:45 2017 +0100

    Added TraverserCache to SingleServerTraverser

commit e88ae1e53d99b55546329413e7b4a5edc48c4875
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 15 13:36:05 2017 +0100

    Fixed compiler Issues in TraverserCache

commit 9d89cdc0297813f24064b46a67a43cde9a3d0297
Merge: 9d41804 f18ad19
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 15 09:43:06 2017 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 9d4180480c7bc37f1f64b6e3141dae611f8d399c
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 15 09:42:53 2017 +0100

    Started implementing a Traverser Cache Abstraction that is used to store already fetched documents.
 2017-04-13 17:00:44 +02:00
Michael Hackstein 2c446077dc Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-13 14:36:01 +02:00
Michael Hackstein d61203907b ClangFormat 2017-04-13 14:35:42 +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 75b0d44e70 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixing last two recovery tests
 2017-04-13 13:19:00 +02:00
Jan Christoph Uhde 8d57a93ded minor fixes 2017-04-13 11:08:01 +02:00
Michael Hackstein 904ec5d7a1 Added an additional assertion for non-reachable code. 2017-04-13 11:04:00 +02:00
Simon Grätzer 3dc603ad1a Fixing last two recovery tests 2017-04-13 10:45:52 +02:00
Jan Christoph Uhde 23f0a9246f Fix Index Node 2017-04-13 09:45:30 +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
Jan Christoph Uhde 1ad5fde19e change mmfiles indexes to work with slightly changed API 2017-04-13 08:38:13 +02:00
baslr cfe5d1891f Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-12 20:42:18 +02:00
Michael Hackstein 94c7ac283b Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-12 17:28:01 +02:00
Michael Hackstein 5f33a95a82 Fixed AttribtueWeighted ShortestPath computation. 2017-04-12 17:27:45 +02:00
Simon Grätzer 3b3ee5f996 Counter fixes 2017-04-12 17:10:35 +02:00
jsteemann 93e3707a47 fixed issue #2422 2017-04-12 15:38:08 +02:00
jsteemann ac65ee6fc2 added assert 2017-04-12 15:38:01 +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
Michael Hackstein 034b38f0cc Replaced the velocypack ConstantDistance ShortestPath API by a StringRef & TraverserCache version. This should be save for RocksDB. This commit fails in ClusterMode. 2017-04-12 14:21:53 +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 ce77f4933a Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Reenabled ShortestPath with AttributeWeight. Was accidentially disabled by options modifications.
 2017-04-12 09:08:07 +02:00
Michael Hackstein 7469cc7bec Reenabled ShortestPath with AttributeWeight. Was accidentially disabled by options modifications. 2017-04-12 09:05:54 +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 c2be40b4ab 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. 2017-04-11 18:03:56 +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
Michael Hackstein 9498116450 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-11 16:15:14 +02:00
Michael Hackstein 1119257d49 ShortestPathOptions now contain forward and backward lookupinfos for all edge collections in use. 2017-04-11 15:00:21 +02:00
Michael Hackstein 7e3ce102b1 The ShortestPathBlock and -Node now use a pointer to the same options instead of managing one each. 2017-04-11 14:08:21 +02:00
Simon Grätzer bcea7b62b0 Fixing transaction-no-commit 2017-04-11 14:01:50 +02:00
Michael Hackstein 212de2b0d1 Simplified AqlTraverser Setup code by moving shared logic into the TraverserOptions. 2017-04-11 13:47:06 +02:00
Simon Grätzer 5ed8f67726 Fixed counter manager 2017-04-11 13:09:30 +02:00
Michael Hackstein b09dfaa323 Removed external expander functions and moved them into the PathFinder implementations. 2017-04-11 11:41:12 +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
baslr d4ae94f937 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-10 17:14:37 +02:00
Andreas Streichardt bf2efb387e Fix unlocking of AQL queries in the cluster 2017-04-10 17:01:24 +02:00
Jan Christoph Uhde 8257168519 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Removed V8Traverser files and made ShortestPathOptions an extension of Graph::BaseOptions. Now they are ready to use LokkupInfos as well. Now starting to move logic around
  Factorized BaseOptions out of TraverserOptions. Those should be used in common for ShortestPath and Traversals. Right now only traverser use it.
 2017-04-10 16:34:11 +02:00
Jan Christoph Uhde 60c4f27ec6 finish transaction limiting for truncate 2017-04-10 16:33:36 +02:00
Michael Hackstein cf7136264b Removed V8Traverser files and made ShortestPathOptions an extension of Graph::BaseOptions. Now they are ready to use LokkupInfos as well. Now starting to move logic around 2017-04-10 16:26:23 +02:00
Michael Hackstein d9dbf2111a Factorized BaseOptions out of TraverserOptions. Those should be used in common for ShortestPath and Traversals. Right now only traverser use it. 2017-04-10 14:09:55 +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
Michael Hackstein 30d68ba962 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-10 11:02:14 +02:00
Michael Hackstein 052c4942fc Removed superflous aql::ShortestPathOptions and replaced it by traverser::ShortestPathOptions. Api is not fixed yet. 2017-04-10 11:02:01 +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
jsteemann 0229ab9326 issue #2415 2017-04-09 23:19:10 +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
Max Neunhoeffer 53b3a73486 Add a timeout option to <collection>.drop(). 
This is in particular used to allow the Schmutz to make progress
in the case of a long running transaction.
 2017-04-07 15:52:19 +02:00
jsteemann 5f72d80cc2 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-07 14:56:41 +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 f33d14f0d1 issue #2413: improve logging in case of lock timeout and deadlocks 2017-04-07 12:30:11 +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 0b9982d237 fix crash 2017-04-06 13:22:51 +02:00
jsteemann 77db254530 added fake selectivity estimate 2017-04-06 12:54:24 +02:00
jsteemann d76f9f67ff fix crash 2017-04-06 12:49:45 +02:00
Simon Grätzer 61791509d6 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 12:41:59 +02:00
Simon Grätzer fce51594ac Fixing hash index semantics 2017-04-06 12:41:47 +02:00
jsteemann 617e23e25a cppcheck 2017-04-06 11:48:07 +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 8b57f1996e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-06 11:19:41 +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
Michael Hackstein e3325e7e87 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-05 17:47:32 +02:00
Michael Hackstein daa8b2b855 Detemplateified the ShortestPath class structure. 2017-04-05 17:47:14 +02: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
Michael Hackstein fbd3e4e237 Removed VertexID from ShortestPath templates. 2017-04-05 17:01:05 +02:00
Michael Hackstein ee57f9abef Renamed ConstDistanceFinder => ConstantWeightShortestPathFinder 2017-04-05 16:29:40 +02:00
Michael Hackstein 30095556e9 Renamed DynamicDistanceFinder => AttributeWeightShortestPathFinder 2017-04-05 16:21:38 +02:00
Michael Hackstein 829fb4be54 Renamed PathFinder => ShortestPathFinder. 2017-04-05 16:17:37 +02:00
Michael Hackstein 535e4cd6cb Renamed PriorityQueue => ShortestPathPriorityQueue 2017-04-05 16:12:47 +02:00
Michael Hackstein 49f8ba8f85 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-05 15:33:00 +02:00
Michael Hackstein e64cadde7d Added a toAqlValue in ManagedDocumentResult that should be called from outside. This figures out if we have to copy the content into the AqlValue or if we could just point to the raw data. 2017-04-05 15:32:45 +02:00
Michael Hackstein 039c6fbd16 Moved all logic of lib/Basics/PathFinder into seperated files in arangod/Graph. Preparation to detemplatify this code as we need some arangodb interna in it for Slice mangement 2017-04-05 15:31:44 +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
jsteemann eaba8c5db0 make begin() behave correctly when there is OOM 2017-04-05 14:51:09 +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 8d864f92d8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 13:20:59 +02:00
jsteemann 2bdda1b9f4 try to fix compile error 2017-04-05 13:18:16 +02:00
jsteemann 56e946bcaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 12:32:09 +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
Michael Hackstein ef372c60c8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-05 12:27:12 +02:00
Michael Hackstein 61f0bfc9d8 The traverserengine registry will now wait until an engine is freed instead of throwing a deadlock situation 2017-04-05 12:26:09 +02:00
Simon Grätzer 1ef373dea7 Fixing some conversion issues 2017-04-05 12:16:53 +02:00
jsteemann dac6aeab0b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 12:10:40 +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
jsteemann b39935b711 fix conversion warning 2017-04-05 12:06:06 +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 9019dd380c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 10:48:24 +02:00
Simon Grätzer 57b0aa4a3d Any iterator 2017-04-05 10:48:08 +02:00
jsteemann e5ba517ecf fixed shutdown issue 2017-04-05 10:43:05 +02:00
Michael Hackstein 417b594032 Added checks if we got a nullptr from CacheManager in TraverserCache. 2017-04-05 09:43:44 +02:00
Michael Hackstein 8daa3820c7 Fixed initialisation of Member variable in IndexBlock 2017-04-05 09:33:50 +02:00
jsteemann 9f330881a2 constify method 2017-04-05 09:00:06 +02:00
jsteemann d37ef3b2a7 don't make Scheduler depend on Database again. needs to be fixed properly 2017-04-05 08:35:44 +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 dd0a7c8869 Move assertions to maintainer mode conditional blocks. 2017-04-04 19:17:23 -04: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
Michael Hackstein a16972f53f Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-04 19:08:31 +02:00
Michael Hackstein e56c20b99a Finally fixed undefined behaviour in IndexNode. Missed one part in the comit before 2017-04-04 19:08:21 +02:00
Simon Grätzer 01ea3556b8 Added REST Wal handler 2017-04-04 18:27:19 +02:00
jsteemann ad287a406c fix a shutdown error 2017-04-04 17:23:23 +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
Michael Hackstein 40634f88ab Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-04 16:58:12 +02:00