1
0
Fork 0
Commit Graph

695 Commits

Author SHA1 Message Date
Michael Hackstein f0f41b6f95 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-22 13:23:51 +02:00
Michael Hackstein 74ce6ccc1a The ClusterMethods for document interaction (CRUD) now use automatic retries in cluster communication. 2016-04-22 13:23:44 +02:00
Max Neunhoeffer f3cb1e2bc0 Implement synchronous replication for truncate. 2016-04-22 12:21:50 +02:00
Max Neunhoeffer 45d7ae567f Implement synchronous replication for replace and update. 2016-04-22 11:42:52 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Max Neunhoeffer fdddf52e0a Fix maintainer mode compilation again. 2016-04-20 16:08:15 +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
Max Neunhoeffer b0d95461e7 Fix build in maintainer mode. 2016-04-20 14:51:32 +02:00
Max Neunhoeffer c35e3516c5 Implement synchronous replication for remove. 2016-04-20 13:37:55 +02:00
Max Neunhoeffer 10ce1b262f Fix synchronous replication. 2016-04-20 13:20:07 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann 240cb95f0c fixed crash 2016-04-19 15:54:10 +02:00
Max Neunhoeffer ed41c310c1 Fix synchronous replication. 2016-04-19 15:40:51 +02: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 be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +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
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
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07: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
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 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
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
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 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Jan Steemann 6f9d45f99e don't move 2016-04-13 15:24:57 +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
Max Neunhoeffer c9031a648f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-11 23:39:02 +02:00
Max Neunhoeffer 99de60c6fc First version of synchronous replication for insertLocal. 2016-04-11 23:38:02 +02:00
jsteemann 13b27483a0 move construction to initializer list 2016-04-11 23:10:48 +02:00
Michael Hackstein 7ae80aaf70 Activated babies update in coordinator mode 2016-04-11 17:23:55 +02:00
Michael Hackstein a7a5565069 Further improved baby-api implementation in transaction. 2016-04-11 14:22:22 +02:00
Michael Hackstein 83b13bb8b3 Implemented modifyDocument in cluster with babies. 2016-04-11 10:25:03 +02:00
Michael Hackstein df497eb8b2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-10 14:09:25 +02:00
Michael Hackstein ca6be0eec8 Fixed a bug in DBServer side of Baby-delete implementation. 2016-04-08 17:35:45 +02:00
Michael Hackstein 184e702935 There was another bug in cluster create with babies. This is fixed now. Also started implementing DELETE with babies. 2016-04-08 17:02:01 +02:00
Jan Steemann 3a582af765 fix Windows build 2016-04-08 13:09:32 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Jan Steemann c2749b850f fixed tests 2016-04-07 17:48:51 +02:00
Michael Hackstein 30725c510f Removed baby guard in insert Coordinator 2016-04-07 10:59:05 +02:00
Michael Hackstein 6847d3f4a7 Preperation to create documents on coordinator with baby awareness. 2016-04-07 10:27:01 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Michael Hackstein 98b4c43315 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:30:11 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Michael Hackstein a968446820 SingleServer INSERT babies now uses newest format. It tries to insert as much as possible. Reports each document individually. Also reports each error individually. The ordering of documents in request and response is identical. 2016-04-05 15:53:48 +02:00
Michael Hackstein 489d6c5400 The OperationResult now optionally contains a map errorCode => count. Which is used to report errors in Baby-case. 2016-04-05 15:52:13 +02:00