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

9395 Commits

Author SHA1 Message Date
Michael Hackstein cc542af656 Reactivated continuous neighbors searches after performance improvements. 2016-04-21 17:15:10 +02:00
Kaveh Vahedipour e980c74548 class Node out of Store.{h,cpp} 2016-04-21 17:11:44 +02:00
Kaveh Vahedipour 2d118944a7 Merge branch 'FMH' of https://github.com/arangodb/arangodb into devel 2016-04-21 17:02:34 +02:00
Kaveh Vahedipour 9aa8a3dcad Store no longer inherits from Node 2016-04-21 17:02:02 +02:00
Andreas Streichardt 24afe7a6ac Finally implement proper agent notification 2016-04-21 17:01:31 +02:00
Max Neunhoeffer 4aa0764ff5 Fix dropCollectionCoordinator. 2016-04-21 16:52:50 +02:00
Max Neunhoeffer db7041db1e Fix transaction management in AgencyComm. 2016-04-21 16:52:36 +02:00
Jan Steemann d5c2035b4a fixed leak 2016-04-21 15:51:40 +02:00
Max Neunhoeffer 6e08b056bb Merge branch 'FMH' into devel 2016-04-21 14:35:16 +02:00
Max Neunhoeffer fa99e47129 Fix a bug in traverser. 2016-04-21 14:30:14 +02:00
Kaveh Vahedipour 35b27663b0 class Node out of Store.{h,cpp} 2016-04-21 14:10:41 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Kaveh Vahedipour 307e4a31a0 class Node out of Store.{h,cpp} 2016-04-21 13:55:28 +02:00
Andreas Streichardt 917255fa28 Remove traces 2016-04-21 13:54:46 +02:00
Michael Hackstein 490905d188 Replaced an unordered set by a vector. The uniqueness is guaranteed by other mechanisms anyways. Further improved computationtime of Neighbors 2016-04-21 13:52:12 +02:00
Michael Hackstein 68691c6799 All Neighbors implementations now use the fastest variant. 2016-04-21 13:33:28 +02:00
Kaveh Vahedipour 5f552a5860 cppcheck warnings 2016-04-21 13:25:06 +02:00
Kaveh Vahedipour 87ee0c49d2 cppcheck warnings 2016-04-21 11:28:58 +02:00
Kaveh Vahedipour 1acb0cba6f agency/cluster startups seem correct 2016-04-21 11:19:07 +02:00
Max Neunhoeffer 80cd846702 Sort out start order of things w.r.t. cluster. 2016-04-21 11:13:11 +02:00
Michael Hackstein fe41af2257 Fixed a bug in Neighbors matchVertex. It aborted too early some times 2016-04-21 10:49:25 +02:00
Max Neunhoeffer ef01814127 Add servers entry to getCollectionInfoCurrent in JS. 2016-04-21 09:29:05 +02:00
Max Neunhoeffer 57842d1dc8 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-21 09:28:50 +02:00
jsteemann 6ccb2600bc use atomic variable instead of condition variable 2016-04-20 23:05:55 +02:00
jsteemann accb2cb33e added operator LIKE 2016-04-20 23:05:38 +02:00
Max Neunhoeffer f7bf3bdb40 Fix a cppcheck warning. 2016-04-20 22:38:19 +02:00
Max Neunhoeffer 646165f827 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 22:38:11 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections 
Excluded Aardvark, the graph viewer in particular
 2016-04-20 22:09:00 +02:00
jsteemann f01c03a88e cppcheck 2016-04-20 21:39:19 +02:00
Kaveh Vahedipour 70528a9abd shifted critical mass logs to DEBUG 2016-04-20 16:07:38 +00:00
Kaveh Vahedipour b63393afc4 Merge branch 'FMH' of https://github.com/arangodb/arangodb into FMH 2016-04-20 15:46:15 +00:00
jsteemann 4a87925b41 fixed cluster start 2016-04-20 17:36:39 +02:00
Max Neunhoeffer 905a412952 Fix a typo. 2016-04-20 17:23:36 +02:00
Max Neunhoeffer aba651ad0d Better error handling. 2016-04-20 17:22:37 +02:00
Jan Steemann 80b0dc470e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-20 16:58:30 +02:00
Jan Steemann 57e40aa328 properly handle --wal.sync-interval 2016-04-20 16:58:14 +02:00
Michael Hackstein c1ad6dd5dd Added the improvement for OutboundNeighbors to Inbound and Any neighbors as well. For Any-Neighbors the effect is not too significant. 2016-04-20 16:49:34 +02:00
Kaveh Vahedipour 2637666698 cluster start on fmh succeeds, however slow 2016-04-20 16:12:48 +02:00
Max Neunhoeffer fdddf52e0a Fix maintainer mode compilation again. 2016-04-20 16:08:15 +02:00
Max Neunhoeffer 83f380aa2b Use vocbase. 2016-04-20 15:31:18 +02:00
Max Neunhoeffer cbd5f202bb Initialize ClusterInfo lib in cluster. 2016-04-20 15:31:08 +02:00
Michael Hackstein 6ee5e97a0f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 15:13:47 +02:00
Michael Hackstein ae80b86599 Added a function to request babies from an IndexIterator (next n elements). Used this function in OperationCursor to get a list of mptrs. The only Index supporting it right now is EdgeIndex. It is only used in OutboundNeighbors at this point. 2016-04-20 15:13:42 +02:00
Kaveh Vahedipour c575ff0467 Merge branch 'FMH' of https://github.com/arangodb/arangodb into FMH 2016-04-20 13:13:36 +00:00
Kaveh Vahedipour 72eb968d99 vobase is now acquired through server feature 2016-04-20 15:13:24 +02:00
Max Neunhoeffer b0d95461e7 Fix build in maintainer mode. 2016-04-20 14:51:32 +02:00
Kaveh Vahedipour b480155000 preparing merge back into deve 2016-04-20 14:42:32 +02:00
Max Neunhoeffer eacd5f504a Add dependency of features. 2016-04-20 14:16:48 +02:00
Max Neunhoeffer c35e3516c5 Implement synchronous replication for remove. 2016-04-20 13:37:55 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Max Neunhoeffer 6654eb03c6 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 13:20:22 +02:00
Max Neunhoeffer 10ce1b262f Fix synchronous replication. 2016-04-20 13:20:07 +02:00
Michael Hackstein 98995d8805 Improved Neighbors function, if there is no vertex example given. It will recognize earlier that there is nothing to check and will not fetch the real document. 2016-04-20 12:53:06 +02:00
Max Neunhoeffer 7a12918021 Fix agency startup. Agency not yet working. 2016-04-20 12:25:13 +02:00
Michael Hackstein 0cb3741e4f Fixed a bug in assoc multi. One result container was not handed in by reference. 2016-04-20 11:19:55 +02:00
jsteemann ef027dabaf added missing handler 2016-04-20 10:34:05 +02:00
Michael Hackstein 3407f4b111 The edge index now hands-in the result vector for doc mptr to AssocMulti. Also fixed the batch size for index lookups 2016-04-20 09:16:51 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann a5bbb8d084 allow using a few more bytes for indexed slice values 2016-04-19 23:34:39 +02:00
jsteemann 316a1bd190 starting support for Externals 2016-04-19 22:31:40 +02:00
jsteemann a3b154043e removed unused typedef 2016-04-19 22:31:12 +02:00
Jan Steemann c091031ec7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:12:06 +02:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Andreas Streichardt c738773f22 Include guards instead of #pragma once 2016-04-19 17:40:51 +02:00
Jan Steemann 0088fa2cbb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:38:55 +02:00
Jan Steemann bc7d45aada fixed crash 2016-04-19 16:38:50 +02:00
Max Neunhoeffer 1e6b346db7 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 16:17:57 +02:00
Max Neunhoeffer 2bfe7b8b24 Finishing touches to performRequests. 2016-04-19 16:17:41 +02:00
Jan Steemann be2ec7b9fc don't access allocatorThread when it's already destroyed 2016-04-19 16:08:32 +02:00
Jan Steemann 240cb95f0c fixed crash 2016-04-19 15:54:10 +02:00
Max Neunhoeffer 4382ac89d1 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 15:41:04 +02:00
Max Neunhoeffer ed41c310c1 Fix synchronous replication. 2016-04-19 15:40:51 +02:00
Max Neunhoeffer d1bea93518 Fix too short timeout in server shutdown /Current/Lock in agency. 2016-04-19 15:40:19 +02:00
Jan Steemann 2254df14f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 15:38:37 +02:00
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +02:00
Kaveh Vahedipour 0ed4c912b4 some wrong header declarations 2016-04-19 13:11:42 +00:00
Max Neunhoeffer 5c232edee2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 14:44:35 +02:00
Max Neunhoeffer 0d1a7239c1 Bugfixes for synchronous replication. 2016-04-19 14:44:23 +02:00
Michael Hackstein 7e6fd1561e Reverted usage of externals in Graph Functions. Commit was to early. Still warting for transparent handling of externals in VelocyPack 2016-04-19 14:42:17 +02:00
Michael Hackstein be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +02:00
Kaveh Vahedipour 5eed7c8b44 some wrong header declarations 2016-04-19 12:15:20 +00:00
Max Neunhoeffer 9e43206513 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 13:25:31 +02:00
Jan Steemann 32082e30f0 use move 2016-04-19 13:20:13 +02:00
Michael Hackstein 36e608a5fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 12:32:54 +02:00
Michael Hackstein cf737639ba V8Traverser now uses externals in Slices instead of direct documents 2016-04-19 12:30:50 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Kaveh Vahedipour 2435dcc71b Outsourced config_t 2016-04-19 08:29:07 +00:00
Kaveh Vahedipour 2c1f9efc3b Outsourced config_t 2016-04-19 08:21:40 +00:00
Kaveh Vahedipour d97d23b8df naming and FMH merge perp 2016-04-19 07:59:51 +00:00
Max Neunhoeffer 168f3e0e7a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 08:55:11 +02:00
Kaveh Vahedipour 96ee5b6b60 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 08:41:08 +02:00
Kaveh Vahedipour 934b7ca107 cppcheck warnings 2016-04-19 08:40:56 +02:00
Frank Celler 75d3de2b31 fixed merge 2016-04-19 07:52:02 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Frank Celler f85c700d20 silence some warnings 2016-04-19 07:35:03 +02:00
jsteemann 9eb3036c2e fixed typo 2016-04-18 22:40:15 +02:00
Max Neunhoeffer dc7f855cfc Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 19:59:22 +02:00
Simran Brucherseifer 097dcb0984 Minor corrections 2016-04-18 19:01:56 +02:00
Jan Steemann f686188d5b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 18:11:36 +02:00
Jan Steemann aaf6176347 remove useless checks 2016-04-18 18:11:28 +02:00
Michael Hackstein 22b6f3f7b0 CPPCheck improvements 2016-04-18 17:36:02 +02:00
Max Neunhoeffer 16769c59b4 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 16:24:28 +02:00
Kaveh Vahedipour 114b643d6e cluster startup and supervision 2016-04-18 16:13:30 +02:00
Kaveh Vahedipour 313140e0e1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:27:31 +02:00
Kaveh Vahedipour 3cf55c5e3e cluster startup and supervision 2016-04-18 15:27:23 +02:00
Jan Steemann 881f13e13b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:09:50 +02:00
Jan Steemann a3ad9ba3a3 fixed issue #1805 2016-04-18 15:09:42 +02:00
Max Neunhoeffer 7a8daa35cb Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-18 13:47:38 +02:00
Max Neunhoeffer e9f2276f0c Finish insert case of synchronous replication. 2016-04-18 13:47:20 +02:00
Michael Hackstein 94ee7b41f8 Removed unneccessary warning 2016-04-18 13:44:11 +02:00
Kaveh Vahedipour 1221326753 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 13:08:56 +02:00
Kaveh Vahedipour 76a0b2d41a cluster startup and supervision 2016-04-18 13:08:49 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
Kaveh Vahedipour 6ae8aa7c0d replace sleep_for with wait 2016-04-18 10:46:26 +02:00
Michael Hackstein 930b7216b1 Fixed a bug in ClusterTraverser. Moved a string too early 2016-04-18 09:29:46 +02:00
jsteemann a0f05f584f speed up IN lookups on ranges 2016-04-17 21:09:36 +02:00
jsteemann 30ec73e596 AQL bugfixes and tests, CHANGELOG updates 2016-04-17 20:57:13 +02:00
Frank Celler 92dc9224c2 fixed startup 2016-04-17 16:18:03 +02:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Frank Celler cf416c686c WIP 2016-04-16 18:44:10 -07:00
Frank Celler 9de6e8ec6d fixed error message 2016-04-17 00:02:00 +02:00
Michael Hackstein 35bd5c44e4 Removed TRI_json_t from Vocbase traverser. Still needs Json for serialisation of varNode 2016-04-16 23:48:18 +02:00
Michael Hackstein 6f7723bc58 Entirely removed TRI_json_t from AQL/Ast. All replaced by VPack 2016-04-16 23:44:03 +02:00
Michael Hackstein 122c891fa8 Removed Ast::nodeFromJson which was obsolete and is not used anymore 2016-04-16 23:40:43 +02:00
Michael Hackstein ca64e727a1 Entirely removed TRI_json_t and Json from ClusterMethods and RestEdgesHandler 2016-04-16 23:23:25 +02:00
Michael Hackstein afdadcdfe5 Transformed getFilteredDocuments on Coordinator in ClusterMethods to use only VelocyPack 2016-04-16 22:39:52 +02:00
Michael Hackstein 1c040696b4 Removed unnecessary TRI_json_t in RestReplicationHandler 2016-04-16 22:37:48 +02:00
Michael Hackstein 5ba68d76e5 Removed now obsolete function getAllEdgesOnCoordinator in ClusterMethods 2016-04-16 20:16:57 +02:00
Michael Hackstein be32214554 Removed now obsolete function getAllDocumentsOnCoordinator from CLusterMethods 2016-04-16 20:15:43 +02:00
Michael Hackstein 0a11583560 Removed now obsolete function mergeResponseHeaders in ClusterMethods 2016-04-16 20:13:34 +02:00
Frank Celler f40f87155a WIP 2016-04-15 23:04:32 -07:00
Frank Celler 22e116b143 fixed ambiguity 2016-04-15 23:02:28 -07:00
Frank Celler f7249d2729 WIP 2016-04-15 22:47:35 -07:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
jsteemann bbac0b673f don't pull filters beyond modification nodes 2016-04-15 18:10:16 +02:00
Michael Hackstein cd12a07a4d Fixed return codes in cluster. They are now forwarded properly from DBServer to Client 2016-04-15 17:58:06 +02:00
jsteemann 18f54c2dde Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-15 17:21:35 +02:00
jsteemann ecd7de16cb added optimizer rule "inline-subqueries" 2016-04-15 17:21:22 +02:00
Kaveh Vahedipour 1605310908 [[{"url":"test","op":12,"ttl":6}]] broke agency 2016-04-15 16:41:33 +02:00
Kaveh Vahedipour 757faac442 [[{"url":"test","op":12,"ttl":6}]] broke agency 2016-04-15 16:37:24 +02:00
Kaveh Vahedipour e3dbb4f9b6 [[{url:test,op:12,ttl:6}]] broke agency 2016-04-15 16:31:00 +02:00
Kaveh Vahedipour 97a6c29ec6 [[{url:test,op:12,ttl:6}]] broke agency 2016-04-15 16:29:44 +02:00
Jan Steemann bbfaee3bfe allow specifying collection name prefixes for `_from` and `_to` in arangoimp: 2016-04-15 16:18:23 +02:00
Michael Hackstein 5645d77d22 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 15:40:04 +02:00
Michael Hackstein 3dab8da1aa Now the cluster method to request documents babies slow case properly sets return code 2016-04-15 15:34:33 +02:00
Michael Hackstein df97260961 Fixed Error behaviour in baby variant of delete in Cluster 2016-04-15 15:31:47 +02:00
Max Neunhoeffer 83771447c9 Silence a warning that shows up in every cluster test. 2016-04-15 15:24:24 +02:00
Max Neunhoeffer 4dfa9c57f6 FIx compilation. 2016-04-15 15:23:46 +02:00
Michael Hackstein 20733a81ae Improved baby errors in cluster 2016-04-15 14:48:44 +02:00
Kaveh Vahedipour 7e039ef1a2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-15 14:10:43 +02:00
Kaveh Vahedipour a6193a58eb unguarded access to _time_table in Store 2016-04-15 14:10:21 +02:00
Max Neunhoeffer 8490606317 Add a warning about shared folders. 2016-04-15 13:48:51 +02:00
Max Neunhoeffer 860c5f77ed Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-15 12:35:56 +02:00
Max Neunhoeffer 0918516e34 Minor changes. 2016-04-15 12:27:35 +02:00
Jan Steemann a071a2ffe2 fixed startup race 2016-04-15 12:01:14 +02:00
Michael Hackstein 0e2d31f633 Moved GET _api/document?collection=xxx to PUT _api/simple/all-keys {collection: xxx}. Adapted all tests. Also removed Transaction::allKeys which got obsolete by this commit. 2016-04-15 11:23:25 +02:00
Jan Steemann 0073a86228 fix potential agency initialization race 2016-04-15 10:45:50 +02:00
Michael Hackstein 4dc69a0162 Fixed a bug in Shard distribution for Cluster Coordinator. 2016-04-15 10:32:07 +02:00
Michael Hackstein 59f7d1ec70 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 08:25:05 +02:00
Frank Celler 8254bd4bd6 WIP 2016-04-14 21:32:12 -07:00
Frank Celler b2b5fbb62d WIP 2016-04-14 14:02:07 -07:00
Jan Steemann 46e5150272 micro optimizations 2016-04-14 20:57:24 +02:00
Michael Hackstein eee02b40cb Use proper URL encoding in Cluster Documents API (single case) 2016-04-14 20:26:11 +02:00
Michael Hackstein 8989c9e31c Fixed condition checking in SingleDocument Read Cluster case 2016-04-14 20:13:59 +02:00
Michael Hackstein 8c7023850e Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 19:37:28 +02:00
Andreas Streichardt 23af9480f6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 18:18:16 +02:00
Andreas Streichardt 612c387c56 Optimize version increase stuff 2016-04-14 18:17:25 +02:00
Michael Hackstein 483ca0d5b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 17:42:41 +02:00
Michael Hackstein 4411bb390b REmoved dead code 2016-04-14 17:41:25 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Kaveh Vahedipour 333d53e733 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:29:46 +02:00
Kaveh Vahedipour 2dcf897797 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 17:27:17 +02:00
Kaveh Vahedipour db4b527df5 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:27:06 +02:00
Kaveh Vahedipour 67c06047f3 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:17:37 +02:00
Max Neunhoeffer c71788ef32 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-14 16:51:01 +02:00
Max Neunhoeffer bd1fd8fc3d Fix AgencyComm::getValues. 2016-04-14 16:50:46 +02:00
Kaveh Vahedipour f9716fee62 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 16:41:18 +02:00
Kaveh Vahedipour 393b068ac4 store's operator handling 2016-04-14 16:40:25 +02:00
Andreas Streichardt 7a8f101cfc Merge branch 'devel' into agency 2016-04-14 15:31:14 +02:00
Andreas Streichardt 3160b3cccb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:30:34 +02:00
Andreas Streichardt 10461fe369 Fix cluster shutdown time 2016-04-14 15:30:19 +02:00
Kaveh Vahedipour 544b8df334 signle instance agency doesn't need to utilize thread in Agent 2016-04-14 14:57:39 +02:00
Kaveh Vahedipour 220132f5e7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 14:05:05 +02:00
Kaveh Vahedipour 01ec96f859 correct handling of objects in agency op set 2016-04-14 14:03:42 +02:00
Michael Hackstein e90193bec0 Fixed a nullptr access in Traversal condition finder. 2016-04-14 13:32:28 +02:00
Max Neunhoeffer 79d709a01c Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-14 13:30:23 +02:00
Max Neunhoeffer 87197cd843 Fix lock() in AgencyComm. 2016-04-14 13:30:07 +02:00
Andreas Streichardt 1794be7c30 Version is now an Uint64 consistently 2016-04-14 13:29:36 +02:00
Andreas Streichardt a9b282a231 Init done in one step 2016-04-14 13:12:57 +02:00
Jan Steemann 5c17402536 reduce number of agency requests a bit 2016-04-14 11:40:21 +02:00
Michael Hackstein 2d860fb80e Added a cpp file for AqlTransaction. Now only parts of AQL have to be rebuild on cluster changes, not complete AQL 2016-04-14 11:30:54 +02:00
Michael Hackstein 66aa7aa17a Fixed a bug in baby-distribution. Merging of results from several shards did not work as expected 2016-04-14 10:52:36 +02:00
Michael Hackstein 9d26149187 RestHandler now reacts to NOT_ALL_SHARDING_ATTRIBUTES_GIVEN. This could not occur before. 2016-04-14 10:23:11 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Kaveh Vahedipour 4321ef5fa5 opteration options need only be defined once in state 2016-04-13 20:08:00 +02:00
Kaveh Vahedipour c40a13f262 Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-13 19:41:47 +02:00
Kaveh Vahedipour fa6e12efe4 option to turn off sync for wait on every persistence call 2016-04-13 19:40:19 +02:00
Andreas Streichardt 0ed24b7465 Merge branch 'agency' into devel 2016-04-13 19:35:30 +02:00
Jan Steemann 576fcab12b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-13 16:29:26 +02:00
Jan Steemann a0fde1b7b2 allow array values in attribute name bind parameters 2016-04-13 16:29:09 +02:00
Kaveh Vahedipour ff6ccf0dee Merge branch 'agency' of https://github.com/arangodb/arangodb into agency 2016-04-13 15:50:24 +02:00
Andreas Streichardt b03d4e610a Remove watchValue from agency 2016-04-13 15:42:23 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
Andreas Streichardt b77cc777ff Kill remaining watchValues 2016-04-13 15:35:17 +02:00
Jan Steemann 6f9d45f99e don't move 2016-04-13 15:24:57 +02:00
Kaveh Vahedipour f00e419e76 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-13 14:52:55 +02:00
Kaveh Vahedipour 83868d4ca9 correct depiction of multimap entities 2016-04-13 14:52:44 +02:00
Michael Hackstein 50bf4845f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-13 14:49:31 +02:00
Michael Hackstein b043b103e0 Optimized IN in AQL pattern Matcher properly. Also added some tests for it 2016-04-13 14:49:21 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Michael Hackstein 044b1e89e6 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 13:11:04 +02:00
jsteemann ffd3dfa9fe avoid completely busy waiting 2016-04-13 12:49:56 +02:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
jsteemann 96d96ca977 always load agency data, regardless of startup mode 2016-04-13 12:20:24 +02:00
Kaveh Vahedipour ab5c5bd84c new simple URI form from endpoint 2016-04-13 11:21:52 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
Frank Celler dc3e8e6bdb WIP 2016-04-12 20:27:46 +02:00
Jan Steemann d0296b38e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 18:27:53 +02:00
Jan 7cd428c367 Merge pull request #1798 from ObiWahn/devel 
optional velocypack response
 2016-04-12 18:27:08 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
Jan Steemann 51bfb8fe57 remove TRI_json_t 2016-04-12 16:37:36 +02:00
Kaveh Vahedipour 1d124b8166 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 16:01:48 +02:00
Kaveh Vahedipour 237b190032 correct callback jsons 2016-04-12 16:01:36 +02:00
Kaveh Vahedipour 9bd08b98c4 correct callback jsons 2016-04-12 16:01:00 +02:00
Jan Steemann f2c8df7db7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 14:51:37 +02:00
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
Kaveh Vahedipour b44af0ab60 new simple URI form from endpoint 2016-04-12 14:20:47 +02:00
Michael Hackstein 50535f6ad8 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 14:12:06 +02:00
Kaveh Vahedipour 0efa889f43 new simple URI form from endpoint 2016-04-12 14:10:18 +02:00
Michael Hackstein 4430f22840 Cluster delete now forwards ignoreRevs properly 2016-04-12 13:24:32 +02:00
Michael Hackstein 1311f73775 Further fixes in cluster communication for baby case 2016-04-12 13:04:51 +02:00
Kaveh Vahedipour 7d608b160f introducing cluster sanity checking to agency 2016-04-12 12:56:12 +02:00
Kaveh Vahedipour d80df74071 introducing cluster sanity checking to agency 2016-04-12 12:52:15 +02:00
Kaveh Vahedipour 9853b9662c introducing cluster sanity checking to agency 2016-04-12 12:10:46 +02:00
Kaveh Vahedipour 66636cdb7d introducing cluster sanity checking to agency 2016-04-12 11:35:27 +02:00
Kaveh Vahedipour 9a608f3037 introducing cluster sanity checking to agency 2016-04-12 11:04:37 +02:00
Kaveh Vahedipour b7c2a03558 introducing cluster sanity checking to agency 2016-04-12 10:59:18 +02:00
Kaveh Vahedipour 6dfa9baaf2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 10:26:00 +02:00
Kaveh Vahedipour bf95261493 introducing cluster sanity checking to agency 2016-04-12 10:25:52 +02:00
Michael Hackstein b9a209fff2 Now sending non-babies request in modify to non babies endpoint instead of a faked babies object. Result was different. 2016-04-12 10:22:27 +02:00
Michael Hackstein 68951f3a04 Fixed a bug in URL parameters 2016-04-12 09:11:05 +02:00
Michael Hackstein 04f796e9a1 Activated babies in cluster replace 2016-04-12 09:10:50 +02:00
Michael Hackstein 3927fd06de Fixed nullptr bug 2016-04-12 08:28:12 +02:00
Michael Hackstein 8760f10354 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 08:01:40 +02:00
Michael Hackstein 55ed0f52b0 Potential fix for some modifyDocument operations in cluster 2016-04-12 08:01:17 +02:00
Max Neunhoeffer c9031a648f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-11 23:39:02 +02:00