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

532 Commits

Author SHA1 Message Date
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