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

3607 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 a420093f2d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 17:25:51 +01:00
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
jsteemann 92788ad827 fix potential memory issue 2017-02-27 12:01:14 +01:00
jsteemann 94ce6a65f8 renamed methods 2017-02-27 11:22:44 +01:00
jsteemann 9d13dcaadd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 09:26:18 +01:00
jsteemann ca54ae9b72 use unique_ptrs 2017-02-24 18:03:40 +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 d46e3a6453 added some assertions 2017-02-23 18:08:41 +01:00
jsteemann 09919cfc36 fixed issue #2320 2017-02-23 10:14:42 +01:00
jsteemann 6c4ecf28aa also sanitize vpack custom types when sending vpack data to clients 2017-02-23 10:12:20 +01:00
Frank Celler e4da3d3948 allow passing of define USE_PLAN_CACHE in flags 2017-02-22 09:03:07 +01:00
jsteemann 99ea3c37bb attempt to fix broken AQL in cluster 2017-02-21 18:08:35 +01:00
jsteemann 04bc8124c3 try to fix crash 2017-02-21 17:33:22 +01:00
jsteemann def25b304a fix compile warning 2017-02-21 17:32:54 +01:00
jsteemann 9f7defa7de fix plan cache 2017-02-21 13:43:47 +01:00
jsteemann deb0ff1110 fix stringification of keys with _id type 2017-02-21 13:43:07 +01:00
jsteemann 511d0b29c7 deactive plan cache as final step before merge 2017-02-21 13:06:34 +01:00
jsteemann ed3a230939 some final cleanup 2017-02-21 13:04:24 +01:00
jsteemann c0c9fa4b19 Merge branch 'devel' of https://github.com/arangodb/arangodb into plan-cache 2017-02-21 12:18:55 +01:00
jsteemann f5c8932744 initial version of query execution plan cache, still very rough 2017-02-21 11:58:38 +01:00
jsteemann 12f1a7af29 fixed issue #2315 2017-02-21 09:11:50 +01:00
jsteemann 8ce7f6558d simplifications 2017-02-20 09:51:40 +01:00
Michael Hackstein fea2dbad79 Fixed compiler warning in Query.cpp 2017-02-20 09:21:54 +01:00
jsteemann be8d6b0a9e simplifications 2017-02-17 20:55:52 +01:00
Michael Hackstein 92f52b13d3 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-17 17:29:53 +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
jsteemann ea87cc52b7 simplifications 2017-02-17 17:10:13 +01:00
jsteemann 535eca3ae0 make ctor explicit 2017-02-17 15:56:55 +01:00
jsteemann 10ddb52964 remove unused property 2017-02-17 15:41:45 +01:00
jsteemann c652a313da Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-17 14:03:59 +01:00
Jan Christoph Uhde 6ac5aa9691 fix spelling 2017-02-16 13:39:15 +01:00
jsteemann a09d13168d removed now unused declaration 2017-02-16 10:30:26 +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 df3a3eff9f refactoring 2017-02-15 10:26:05 +01:00
jsteemann 01bf68549d simplifications 2017-02-14 22:48:51 +01:00
jsteemann bc080ae58f removed unused node type 2017-02-14 16:52:30 +01:00
jsteemann 12b973dc4b fix my compile errors 2017-02-14 16:41:31 +01:00
jsteemann 60e0b03b06 remove unused method 2017-02-14 16:23:07 +01:00
jsteemann 3ba6f1a1f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-14 16:16:01 +01:00
jsteemann 8c9dd79aeb potential fixes for MSVC 2017-02-14 16:11:18 +01:00
jsteemann 0909ffe69b moved helper functions into their own file 2017-02-14 13:44:54 +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 eb73dbf960 renaming 2017-02-13 13:30:57 +01:00
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
jsteemann 8b273b5eaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 08:37:41 +01:00