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

1473 Commits

Author SHA1 Message Date
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-03-01 14:52:35 +01:00
jsteemann cf5d20ddee Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-28 17:02:42 +01:00
jsteemann b6a265068a fix velocypack-over-HTTP responses 2017-02-28 17:01:59 +01:00
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
jsteemann 94ce6a65f8 renamed methods 2017-02-27 11:22:44 +01:00
jsteemann d0df1952e8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-24 17:51:59 +01:00
jsteemann e14909966d issue #2326 2017-02-24 10:35:52 +01:00
Michael Hackstein de31c68539 Moved isVolatile into MMfiles collection. 2017-02-23 14:56:54 +01:00
Michael Hackstein 7cf3581812 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-21 13:25:18 +01:00
Michael Hackstein aacbb3e4cf This commit should fix cluster startup problems 2017-02-21 13:22:29 +01:00
Jan Christoph Uhde 071137adf6 move doCompact into PhysicalColletion 2017-02-20 10:53:11 +01:00
Michael Hackstein 91f303e963 Removed readRevision from LogicalCollection. You only get readDocument with a token. Moved it's logic into MMFilesCollection. removed the ignoreWal parameter from readDocumentConditional. It was always true anyways... 2017-02-17 17:29:49 +01:00
Michael Hackstein f0fbe78b2d Moved restoreIndex to Physical collection. 2017-02-16 15:01:00 +01:00
Michael Hackstein a3aae2e43b Moved saveIndex logic into the physical collection 2017-02-16 12:53:05 +01:00
jsteemann 089ff78d2d moved collection lock state into its own struct 2017-02-16 10:27:14 +01:00
jsteemann d49c5c3fc0 simplified internal APIs a bit 2017-02-15 12:42:07 +01:00
jsteemann 01bf68549d simplifications 2017-02-14 22:48:51 +01:00
jsteemann 80be198a39 moved helper classes into their own file 2017-02-14 12:35:34 +01:00
jsteemann 7e690a0c61 renaming 2017-02-13 15:18:40 +01:00
jsteemann 16189aa969 moved TransactionHints.h 2017-02-13 14:36:27 +01:00
jsteemann eb73dbf960 renaming 2017-02-13 13:30:57 +01:00
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
Simon Grätzer 4edba27b41 Fixed log topic 2017-02-10 16:31:38 +01:00
Michael Hackstein 01d5559ad5 Removed unnecessary includes 2017-02-10 16:28:05 +01:00
Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Aql/FunctionDefinitions.cpp
#	arangod/Aql/Functions.h
#	arangod/Utils/ExplicitTransaction.h
 2017-02-10 15:21:24 +01:00
Michael Hackstein d5f2e8fba5 Fixed a uniqueness bug in api/edges 2017-02-10 12:27:45 +01:00
Michael Hackstein 96e2f4a1a0 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-10 10:45:56 +01:00
Michael Hackstein 27c6756367 Readded POST _api/edges a client js module uses it ;( 2017-02-10 10:45:47 +01:00
jsteemann 103ceec2f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 09:43:23 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
Michael Hackstein b43cf48252 Added a self-contained edge condition builder that allows to create AQL conditions without actually having an AQL query. The RestEdgesHandler uses it to serve requests for edges now. Removed undocumented endpoints PUT/POST /_api/edges as obsolete. 2017-02-09 17:15:42 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +01:00
Michael Hackstein dfc9f29e69 Moved FunctionDefinitions to an AqlFunctionFeature. This now has a defined startup ordering 2017-02-08 15:45:59 +01:00
Max Neunhoeffer bde48d524d Change undocumented behaviour in case of invalid rev in JS document ops. 
An invalid rev should lead to a 1200 ("conflict") error rather than a
1239 ("illegal document revision") error. This is more intuitive and
in line with the corresponding change in the HTTP API. No tests needed
adjustment.
 2017-02-08 10:59:04 +01:00
jsteemann 01d3ad67b1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-08 00:59:16 +01:00
Max Neunhoeffer cbcda7932c Change undocumented behaviour in case of invalid rev in If-Match headers. 
An invalid rev should lead to a 412 PRECONDITION FAILED rather than a
404 BAD error. This is more intuitive, in particular since we have
never documented what valid rev strings are. Also adjust tests and
CHANGELOG.
 2017-02-07 22:37:38 +01:00
Simon Grätzer 9b9f91a81c Pegel: Adding support for "PREGEL_RESULT" in aql 2017-02-07 18:37:23 +01:00
Max Neunhoeffer 883c11ea45 Handle the case that ClusterComm is already shut down gracefully. 
This touches every single place where ClusterComm is being used.
 2017-02-07 15:31:40 +01:00
jsteemann f213d67de0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 13:04:40 +01:00
jsteemann d503a4d354 added reactor type 2017-02-07 12:41:41 +01:00
jsteemann 6b3a4d1dc3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 15:48:54 +01:00
Max Neunhoeffer 71dae630c3 Store ClusterComm singleton in shared_ptr. 2017-02-06 15:25:18 +01:00
Simon Grätzer 877aa43599 Fixing a bug 2017-02-02 16:49:39 +01:00
Michael Hackstein da32eef2ca RestEdgesHandler now uses Callback Based OpCursor API 2017-02-02 15:42:57 +01:00
Simon Grätzer 13f19fe51b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/RestServer/arangod.cpp
#	arangod/Utils/ExplicitTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-02-02 11:25:23 +01:00
jsteemann d96ce9af37 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-30 12:53:10 +01:00
Simon Grätzer 37243315e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-28 15:30:28 +01:00
jsteemann 0cb7d416d0 moved transaction collections into their own files 2017-01-26 16:51:57 +01:00
Michael Hackstein f61a27d0e6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-26 09:50:00 +01:00
jsteemann d7b131852c factored out transaction hints 2017-01-25 13:12:09 +01:00