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

306 Commits

Author SHA1 Message Date
Frank Celler 46b04f1317 added message id to debug output 2017-03-24 09:57:07 +01:00
jsteemann fbb14ceffc added db._engine() 2017-03-22 11:19:31 +01:00
jsteemann 358e18d5af fix wrong assertions 2017-03-22 09:45:02 +01:00
Frank Celler a25932293b added assert and only compact if no request is in flight 2017-03-22 08:52:37 +01:00
Frank Celler e997b791a8 fixed lost HTTP requests 2017-03-21 22:51:49 +01:00
jsteemann b8e011eee5 move attributes into engine 2017-03-21 10:31:50 +01:00
jsteemann c46c52d8c8 Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-17 09:31:25 +01:00
Frank Celler 5759414ec1 because VST supports pipelining, allows queue the request in the scheduler 2017-03-17 09:08:01 +01:00
jsteemann 2c0f9d9369 Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 15:47:48 +01:00
Max Neunhoeffer d4d532faa4 Silence a compiler warning. 2017-03-16 14:13:28 +01:00
Max Neunhoeffer bbcc20378a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-03-16 13:54:02 +01:00
Max Neunhoeffer 428b6aa67f Port thread fixes from 3.1 to devel. 2017-03-16 13:53:40 +01:00
jsteemann 25a380f77c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 12:50:11 +01:00
jsteemann 238fcae46a some simplifications 2017-03-16 10:54:08 +01:00
Dan Larkin 966e05b596 Added very basic rest handler for views. 2017-03-14 19:05:14 -04:00
Simon Grätzer 7b35f75b23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/GeneralServer/GeneralServerFeature.cpp
 2017-03-13 12:25:28 +01:00
jsteemann 45a68f54f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-13 12:10:54 +01:00
Simon Grätzer 871272d7c1 Merge from devel 2017-03-12 12:32:22 +01:00
jsteemann b217a9d6af remove unused feature 2017-03-10 23:59:09 +01:00
jsteemann 0a07bb3222 make RestWalHandler a handler of the MMFiles engine 2017-03-10 09:00:37 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
jsteemann e495b5fb6c jslint && cppcheck 2017-03-06 16:13:04 +01:00
jsteemann 8ba2654540 cleanup 2017-03-06 16:08:49 +01:00
Simon Grätzer c0a390aefe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-06 15:53:43 +01:00
jsteemann f7b819579d attempt to fix clang build 2017-03-06 15:40:03 +01:00
Frank Celler da27597ff4 fixed missing double quote 2017-03-05 23:29:08 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
 2017-03-04 02:08:27 +01:00
Jan Christoph Uhde d4000ebf70 Add hexdump when vaidation fails for incoming VPackSlice 2017-03-03 22:38:04 +01:00
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 dc72ec3ee7 fixed a race when dropping databases 2017-02-23 15:22:50 +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
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +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
Frank Celler 0da95481ea added locks for keep-alive 2017-02-08 09:41:18 +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
Frank Celler 9588595335 added more info about scheduler status 2017-02-07 11:22:23 +01:00
jsteemann ac9e28d353 fix typo 2017-02-06 17:38:36 +01:00
Frank Celler e3fe51faa8 better threads working handling 2017-02-06 16:32:55 +01:00
jsteemann ab11410911 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 13:05:11 +01:00
Simon Grätzer 9967053d11 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-04 15:01:12 +01:00
jsteemann 3c9c826210 make method protected 2017-02-03 16:44:30 +01:00
jsteemann 902429ddfd less log spam at startup 2017-02-03 11:42:03 +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 fa917937c4 do not use namespaces in header files 2017-02-01 13:41:31 +01:00
jsteemann e2a312450f fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
jsteemann 09851cdf75 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-27 16:37:32 +01:00
Simon Grätzer 64343cd579 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	scripts/startLocalCluster.sh
 2017-01-27 15:58:22 +01:00
Frank Celler 0457e2f587 safety check 2017-01-27 14:02:16 +01:00