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

2690 Commits

Author SHA1 Message Date
Jan Steemann 4cbe5cf69a shutup VC warning 2014-03-06 10:34:00 +01:00
Jan Steemann e968d62367 re-use planId 2014-03-05 15:33:49 +01:00
Esteban Lombeyda e38906dd21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestPleaseUpgradeHandler.cpp
 2014-03-05 09:12:49 +01:00
Esteban Lombeyda 39b0b759e9 bug fix: compiling error 2014-03-05 09:00:23 +01:00
Jan Steemann 415055705f adjusted documentation 2014-03-04 18:45:56 +01:00
Jan Steemann 5ebdc7d307 fixed "cannot convert value to JSON" error 2014-03-04 16:21:40 +01:00
Max Neunhoeffer 1cb38c6aca Fix compilation under windows. 2014-03-04 08:53:16 +01:00
Jan Steemann c092158891 disable forwarding of expect header 2014-03-03 19:24:26 +01:00
Jan Steemann a4451d3459 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-03 12:03:51 +01:00
Jan Steemann f5234b0ed6 always return ignoreNull 2014-03-03 12:03:14 +01:00
Frank Celler 79a98c5095 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-03 11:12:14 +01:00
Frank Celler 2e80955b5f removed debug message 2014-03-03 11:12:08 +01:00
Jan Steemann 65bc5dddad documentation 2014-03-03 10:40:29 +01:00
Jan Steemann 8041752f4f documentation 2014-03-03 10:33:29 +01:00
Jan Steemann 1481ceba42 documentation 2014-03-03 10:28:38 +01:00
Jan Steemann 3478c8bc74 cppcheck 2014-03-03 09:12:34 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Jan Steemann be8abb0cc1 allow syncing with 2.0 2014-02-28 22:19:21 +01:00
Jan Steemann 978e784462 disable replication handlers for coordinators 2014-02-28 21:51:02 +01:00
Frank Celler b888e8cfa6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/V8PeriodicJob.cpp
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
 2014-02-28 20:37:05 +01:00
Jan Steemann 0b1dcc0deb include collection in inventory if id is equal to current server tick 2014-02-28 20:00:04 +01:00
Max Neunhoeffer 944f29deb0 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:51:24 +01:00
Max Neunhoeffer cb8f0257a7 Give the server state in the agency a time to live. 2014-02-28 18:47:46 +01:00
Jan Steemann 3ca2001c99 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 18:43:36 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Max Neunhoeffer 0a8555fab3 Sort out path to javascript files. 2014-02-28 14:19:04 +01:00
Jan Steemann 4615310e97 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 13:50:56 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Frank Celler 1aa3a02167 changed default log level to warning 2014-02-28 12:25:30 +01:00
Esteban Lombeyda 85e824f1c8 Bug Fix: compiler error 
: searching strategy for installation directory upgraded
 2014-02-28 12:07:29 +01:00
Frank Celler f22f1525d2 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	etc/relative/arangod.conf
 2014-02-28 12:03:11 +01:00
Frank Celler 9a410a5b71 added config for server state 2014-02-28 12:02:21 +01:00
Jan Steemann 6f26e4fc23 do not pass auth header 2014-02-28 09:12:27 +01:00
Jan Steemann c04377e4cd Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-28 08:59:48 +01:00
Jan Steemann ed8f52b323 fixed small memleak reported by valgrind 2014-02-27 20:40:49 +01:00
Jan Steemann 8edf96e9aa added documentation for cluster authentication options 2014-02-27 19:27:12 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
Jan Steemann a0c554fa22 fixed tests 2014-02-27 14:58:01 +01:00
Jan Steemann 076b8f1029 fixed test 2014-02-27 14:03:23 +01:00
Jan Steemann c387b697e8 fixed test 2014-02-27 13:26:40 +01:00
Jan Steemann a0c32e90d7 fixed edge access in coordinator 2014-02-27 13:14:02 +01:00
Frank Celler 3afa2214f7 added disable-cluster-dispatcher 2014-02-27 11:47:26 +01:00
Frank Celler 710c3c9716 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:17:39 +01:00
Jan Steemann ef84dc23e2 fixed segfault 2014-02-27 09:16:07 +01:00
Frank Celler e10bab8059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-27 09:16:02 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
 2014-02-27 09:13:03 +01:00
Jan Steemann f5269fa3de fixed traversals 2014-02-26 21:28:40 +01:00
Jan Steemann fe74e030ea fixed keygen test 2014-02-26 16:47:38 +01:00
Jan Steemann 08ff8f9237 allowUserKeys method 2014-02-26 16:31:48 +01:00
Jan Steemann 460455d0ed dont clear result 2014-02-26 16:31:23 +01:00
Jan Steemann 7f9ae2292c fix geo index comparison 2014-02-26 15:11:07 +01:00
Jan Steemann 4137eb72ae prevent segfault 2014-02-26 15:03:58 +01:00
Jan Steemann b086729d1b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 14:23:13 +01:00
Jan Steemann 42465ce876 properly return collection status 2014-02-26 14:23:06 +01:00
Max Neunhoeffer c1ac5eeecf Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 13:58:26 +01:00
Jan Steemann 276a3cf3a1 added SHORTEST_PATH AQL function, fixed bug in Graph.pathTo 2014-02-26 13:34:42 +01:00
Max Neunhoeffer 54d62007f2 Create users in new cluster database (if given). 2014-02-26 13:28:20 +01:00
Jan Steemann 8e05df9950 split tests 2014-02-26 13:21:10 +01:00
Jan Steemann e0ec5768a5 disallow dropping certain system collections 2014-02-26 12:04:28 +01:00
Jan Steemann 0b50c0353d disallow dropping certain system collections 2014-02-26 12:01:56 +01:00
Jan Steemann 9ac1a7cc50 cluster-internal authentication 2014-02-26 12:01:41 +01:00
Jan Steemann 9a56f68468 fixed return value for remove 2014-02-26 11:07:32 +01:00
Jan Steemann 23ba186b0d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/CapConstraint/cap-constraint.c
	js/apps/system/aardvark/frontend/scss/_tiles.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/frontend/scss/style.scss
	js/common/modules/org/arangodb/users-common.js
 2014-02-25 17:21:14 +01:00
Jan Steemann 98ceb07b77 add initial user 2014-02-25 17:05:02 +01:00
Frank Celler 3c5f3a656b Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 15:32:12 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Max Neunhoeffer 6d88ec3dde Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:24:41 +01:00
Max Neunhoeffer 4add2b4c9f The sin of the day: Disable transactions on coordinators. 2014-02-25 14:24:22 +01:00
Jan Steemann 00cd7cd936 fix error message for udf document keys 2014-02-25 14:23:59 +01:00
Jan Steemann 0d57a95d52 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:08:08 +01:00
Jan Steemann e1f3b6f2d4 react on empty shard lists 2014-02-25 14:08:00 +01:00
Frank Celler 569778ae10 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 12:07:46 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Max Neunhoeffer f3d12fdd35 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-25 11:35:21 +01:00
Max Neunhoeffer 974cc8b441 Correct a caching bug in ClusterInfo. 2014-02-25 11:34:59 +01:00
Jan Steemann af96607fc1 fixed index tests 2014-02-25 11:19:51 +01:00
Jan Steemann 0b2c38bfac fixed uninitialised variable access 2014-02-24 17:50:19 +01:00
Jan Steemann edb0e61e13 fixed uninitialised variable access 2014-02-24 17:48:56 +01:00
Jan Steemann a907fa332c fixed wrong condition 2014-02-24 15:56:17 +01:00
Jan Steemann ea717607e1 implemented missing useDatabase for coordinator 2014-02-24 15:43:02 +01:00
Jan Steemann 4988abb3fd prevent segfault 2014-02-24 15:03:34 +01:00
Jan Steemann f8ebe5ded5 fixed small memleak 2014-02-24 14:51:06 +01:00
Jan Steemann 018a8390ce refactored create/drop database 2014-02-24 14:50:31 +01:00
Jan Steemann bb3704e04b fixed small memleak 2014-02-24 14:23:50 +01:00
Jan Steemann a6b71d8eba fixed memleak 2014-02-24 14:19:42 +01:00
Jan Steemann 00d8a9023f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-21 17:40:38 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Max Neunhoeffer 267ee74d9a Fix a namespace problem with a new file. 2014-02-21 16:11:00 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
 2014-02-21 15:28:21 +01:00
Jan Steemann 50b3ec2999 fixed compiler warnings 2014-02-21 14:45:15 +01:00
Max Neunhoeffer 91db141ea5 Change value of things in agency according to Sharding.md. 2014-02-21 13:19:57 +01:00
Jan Steemann 2e03f01a25 moved implementation of DBServerJob into own file 2014-02-21 09:09:21 +01:00
Jan Steemann 2f6f59e228 fixed startup race condition 2014-02-21 08:47:24 +01:00
Frank Celler 5a7880b037 added no request 2014-02-20 21:09:13 +01:00
Frank Celler c7c5576f18 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-20 21:02:37 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Frank Celler b427bad63a do not allow reset 2014-02-20 20:51:00 +01:00
Frank Celler 730da7623a added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
Jan Steemann 13357cb846 made clear functions private 2014-02-20 17:33:56 +01:00
Jan Steemann 0480dbb404 added collection.revision() 2014-02-20 17:30:26 +01:00
Jan Steemann a820a74a6b added collection.figures() for sharded collections 2014-02-20 17:06:36 +01:00
Jan Steemann 9666407721 sped up property lookup for db 2014-02-20 12:52:41 +01:00
Jan Steemann ba8a1fb51f disallow key generators 2014-02-20 09:34:11 +01:00
Jan Steemann 4f48172323 some renames 2014-02-20 09:16:25 +01:00
Jan Steemann 82d84e92dd more sleeping 2014-02-19 18:33:11 +01:00
Jan Steemann d92dd90aac fixed instance race condition 2014-02-19 17:10:11 +01:00
Jan Steemann 4770fed362 removed dead code 2014-02-19 15:35:52 +01:00
Jan Steemann dd5b172e2c fixed race conditions 2014-02-19 14:55:21 +01:00
Frank Celler 726144ce39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
 2014-02-19 14:30:46 +01:00
Frank Celler c779325b5d added frontend-development switch 2014-02-19 14:28:51 +01:00
Jan Steemann 66bc4c9a41 allow unique index creation on shard keys only 2014-02-19 10:30:41 +01:00
Jan Steemann 29f3e17eef extract real error number 2014-02-18 14:27:32 +01:00
Jan Steemann dc8e590bca inedges, outedges, edges 2014-02-18 13:46:09 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Frank Celler 57796c96d1 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-17 16:55:17 +01:00
Frank Celler c5d6e6a9d3 fixed rethrow 2014-02-17 16:54:03 +01:00
Max Neunhoeffer 640b7c1530 Start fixing post-database creation actions for coordinator. 2014-02-17 16:31:43 +01:00
Max Neunhoeffer 99df09decb Fix cmake entry for RestShutdownHandler 2014-02-17 16:30:23 +01:00
Max Neunhoeffer fd8ed72546 Add RestShutdownHandler.cpp to CMakeLists.txt 2014-02-17 14:37:31 +01:00
Max Neunhoeffer 064aec971e Get rid of template parameters for make_pair in one place. 2014-02-17 14:11:47 +01:00
Jan Steemann c40d930fa6 issue #765: added SLICE AQL function 2014-02-17 11:09:03 +01:00
Jan Steemann 89d96c6c3b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-14 18:47:59 +01:00
Jan Steemann ec0ad56f8e fix potentially dangerous function 2014-02-14 18:47:41 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Frank Celler 65d7d8fdab Merge remote-tracking branch 'origin/devel' into sharding 2014-02-14 17:23:33 +01:00
Frank Celler ddfbe9d8f9 ignore helper files 2014-02-14 16:52:01 +01:00
Max Neunhoeffer 98ed29ab84 Make check for useDatabase switchable for unittests. 2014-02-14 15:33:35 +01:00
Esteban Lombeyda e958f6052a Icon Bug fix 2014-02-14 15:12:12 +01:00
Jan Steemann 87eba429fe updated documentation 2014-02-14 10:37:46 +01:00
Jan Steemann 0f0ef8a33f updated index docs 2014-02-14 10:30:05 +01:00
Jan Steemann 44dccf582c Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 18:14:59 +01:00
Jan Steemann f8476ce0b0 fixed tests 2014-02-13 18:14:53 +01:00
Frank Celler eb95f1bee9 added rethrow 2014-02-13 16:58:46 +01:00
Jan Steemann f2cd112bf5 index ids 2014-02-13 16:30:48 +01:00
Jan Steemann c9c8f4e62a added tests 2014-02-13 16:12:57 +01:00
Jan Steemann bb0f591349 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-13 15:33:39 +01:00
Jan Steemann 7970881b22 single-threaded plan changes 2014-02-13 15:33:29 +01:00
Frank Celler 739900fc2f try to force abort 2014-02-13 12:06:52 +01:00
Jan Steemann 4fc8cae57d index creation with ids 2014-02-13 11:00:08 +01:00
Jan Steemann 70988aa215 removed withStats option 2014-02-13 08:48:22 +01:00
Jan Steemann 4dca29cf4e fixed dropIndex 2014-02-12 18:17:15 +01:00
Jan Steemann df22a09d7f fixed compile error in non-sharding configuration 2014-02-12 17:51:51 +01:00
Jan Steemann c4d52ff133 getIndexes, dropIndex 2014-02-12 17:09:47 +01:00
Jan Steemann 85f36777b8 prevent confusing message at startup 2014-02-12 17:07:10 +01:00
Jan Steemann ce248b3107 documentation 2014-02-12 15:02:33 +01:00
Jan Steemann 2cbf050a43 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-02-12 14:56:39 +01:00
Jan Steemann 9dc4c9f6c1 getIndexes, coordinator 2014-02-12 14:53:37 +01:00
Max Neunhoeffer a3c7166805 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-12 14:45:22 +01:00
Max Neunhoeffer dd4bba8bb2 Remove undocumented saveOrReplace functionality. 2014-02-12 14:44:58 +01:00
Jan Steemann 6dd81767c9 cleanup 2014-02-12 14:16:27 +01:00