1
0
Fork 0
Commit Graph

446 Commits

Author SHA1 Message Date
Jan Steemann 513dc26fc1 make replication tests more deterministic 2016-04-07 13:00:30 +02:00
Jan Steemann aae8ffa5e3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:46:47 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Max Neunhoeffer cae6b850df Fix addFollower. 2016-04-06 10:15:03 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Jan Steemann bd43decab4 replication fixes 2016-04-04 14:55:55 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
jsteemann b7c1a42f96 test fixes 2016-03-24 01:12:57 +01:00
Jan Steemann 31c06b0845 cleanup 2016-03-22 11:48:17 +01:00
Max Neunhoeffer d51beb5326 Get rid of update_policy for good. 2016-03-10 00:14:06 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann 5814cb024c adapted to new data structure 2016-03-07 17:07:57 +01:00
Jan Steemann b358fa329d fixed replication dump and logger-follow commands 2016-03-07 15:21:11 +01:00
Max Neunhoeffer af3d61c339 Fix complation. 2016-03-07 09:04:58 +01:00
Max Neunhoeffer ab82405e9a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-07 08:43:38 +01:00
Max Neunhoeffer 9358fcb96f Commit some fixes. 2016-03-07 08:40:54 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann 05f98cbd72 fixed compile errors 2016-03-04 18:43:51 +01:00
Jan Steemann ad4a9542ea removed file 2016-03-04 18:32:54 +01:00
Jan Steemann 3cadcd5340 less json 2016-03-03 15:40:00 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Jan Steemann ba40edac87 less json 2016-03-02 14:58:13 +01:00
Jan Steemann 102066b4ee removed methods 2016-03-01 11:50:16 +01:00
Jan Steemann ebf2d1520b removed TRI_doc_mptr_copy_t 2016-02-26 11:46:33 +01:00
Jan Steemann e1745608e3 inject attribute translator everywhere 2016-02-25 11:13:32 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann 851d19a9d6 logging simplifications 2016-02-25 00:00:18 +01:00
Jan Steemann 70d44f06fa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 13:22:46 +01:00
Jan Steemann eb202f528c pass vocbase in TransactionContext 2016-02-23 13:03:30 +01:00
Frank Celler 963578180a cleanup of TRI_ options 2016-02-23 12:26:10 +01:00
Jan Steemann f468cd00ad create transaction context as shared ptr 2016-02-23 12:18:39 +01:00
Jan Steemann 0a969caf23 removed SingleCollectionReadOnlyTransaction and SingleCollectionWriteTransaction 2016-02-23 11:05:44 +01:00
Max Neunhoeffer 393ac7e753 Rename getCollectionId -> getCollectionIdLocal. 2016-02-19 23:26:17 +01:00
Jan Steemann 0c4ab9054a API cleanup 2016-02-16 15:13:30 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Jan Steemann dad000b883 use std::string to avoid potential leaks 2016-02-11 10:13:49 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Jan Steemann 23dfbeee46 optionally restrict logger-follow to a single collection 2016-02-10 16:49:22 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Max Neunhoeffer fb17ac372b Report new follower to agency. 2016-02-09 15:51:58 +01:00
Jan Steemann 39c3d3d2a2 wait until applier has started 2016-02-09 10:54:37 +01:00
Jan Steemann 42c4bdbebb ported from 2.8 2016-02-07 19:47:37 +01:00
Jan Steemann 16df093e8f added barrier query API 2016-02-05 18:20:21 +01:00
Jan Steemann a0cb3b1832 replication changes 2016-02-05 18:06:39 +01:00
Jan Steemann 071d36c203 replication cleanup 2016-02-05 13:28:38 +01:00
Max Neunhoeffer daf2afe71a Merge branch 'devel' into ClustUp2 2016-02-01 12:30:45 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Max Neunhoeffer 0be190d85d Merge branch 'devel' into ClustUp2 2016-02-01 11:43:00 +01:00
Max Neunhoeffer bee1fd9eae Fix followerInfo. 2016-02-01 11:42:26 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
jsteemann 4e94803ad7 honor results of clang-test, clang-tidy and clang-modernize 2016-01-31 15:56:18 +01:00
jsteemann 13481bbebc fix or annotate problems identified by clang-check 2016-01-31 03:32:31 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
Michael Hackstein 436c377cb5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:01:53 +01:00
Jan Steemann 585208afcf changed directory name pattern for collections 2016-01-27 18:53:16 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 3d8a52cdf4 some refactoring 2016-01-27 13:28:19 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Michael Hackstein 969ac75d19 Removed all TRI_json_t references from v8-vocindex and all it's surroundings 2016-01-26 13:27:21 +01:00
Michael Hackstein 191c2dc3a9 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-21 16:29:38 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
jsteemann ef67a496e6 more checks & asserts, C API cleanup 2016-01-20 22:08:11 +01:00
Michael Hackstein 51a683facb Added a toVelocyPack function to all indexes. Removed specialized toJson from all indexes. Generalized toJson invokes specialized toVelocyPack for compatibility reasons. 2016-01-19 15:40:37 +01:00
Michael Hackstein 7f4980e87d Cluster internal communication now uses more VPack instead of TRI_json_t 2016-01-19 11:33:43 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
jsteemann 1b959c827d more const unification 2016-01-15 00:09:52 +01:00
Wilfried Goesgens 625cc51732 fix memleak. 2016-01-11 10:05:29 +01:00
jsteemann 64c5b21074 cppcheck 2016-01-08 01:17:44 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
Jan Steemann 8b4b6a1943 moved docu blocks into their own files 2016-01-07 16:03:17 +01:00
Wilfried Goesgens 7fc4b356e4 Revert formattings that break documentation parts. 2016-01-07 15:12:04 +01:00
Jan Steemann 02de75afe0 added option --default-number-of-shards for arangorestore 2016-01-07 10:54:02 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Jan Steemann 6caf94f6f5 fixed restoring dump from single server in cluster 2016-01-05 17:29:22 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Max Neunhoeffer c7f00bfeda Continue work on TODOs. 2015-12-23 14:40:04 +01:00
Max Neunhoeffer 225c8cd843 Work on TODOs. 2015-12-22 16:50:09 +01:00
Max Neunhoeffer 152f3485b3 Fix dump bug in cluster. 2015-12-22 14:18:11 +01:00
Max Neunhoeffer e0a527eb5d Fix arangodump in cluster. 2015-12-21 11:53:37 +01:00
Max Neunhoeffer 0743885dec Fix handling of VPackOptions in Parser/Builder usage.
Also fix TRI_json_t* handling for cluster methods.
2015-12-18 20:42:59 +01:00
Jan Steemann e56d385c5e fixed undefinedness 2015-12-17 18:31:11 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
Jan Steemann 6ee9a6f90e replication fixes 2015-12-16 19:52:01 +01:00
Michael Hackstein 82eea28fea Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-16 19:03:15 +01:00
Michael Hackstein f9f7c02772 Simple adoptions to VocbaseCollectionInfo class 2015-12-16 18:53:20 +01:00
Jan Steemann 573ba54da2 fixed typo 2015-12-16 12:04:27 +01:00
Michael Hackstein b543680cca Adapted resthandler to class version of TRI_col_info_t 2015-12-16 11:42:59 +01:00
Jan Steemann a694b7ef48 make_unique 2015-12-16 11:36:35 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Jan Steemann ad8381ad6a Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-15 16:37:33 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Max Neunhoeffer 7641feeb88 Fix ClusterComm library w.r.t. pointers. 2015-12-14 11:22:30 +01:00
Max Neunhoeffer af4d729284 The ClusterComm C++11 revolution. 2015-12-11 23:26:10 +01:00
Max Neunhoeffer c11ec07564 Merge branch 'devel' into ClustUp1 2015-12-11 13:28:07 +01:00
jsteemann c40bfe6557 cppcheck 2015-12-10 22:40:40 +01:00
Jan Steemann a406ced17c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-10 21:33:43 +01:00
Jan Steemann 4335af50e7 replication improvements 2015-12-10 19:07:10 +01:00
Michael Hackstein 51da7ab7af Replication Applier configuration now uses a Destructor instead of TRI_Destroy. This commit is subject to inspection for memleaks 2015-12-09 16:29:14 +01:00
Michael Hackstein cfd1caf01c Replaced TRI_JsonReplicationApplier in RestHandler with velocpack 2015-12-09 15:25:14 +01:00
Michael Hackstein 2eb5697864 Removing more and more TRI_json_t 2015-12-09 13:55:39 +01:00
Michael Hackstein 0738741cd1 Further removed references to TRI_json_t in RestReplication handler. This included a new toVelocyPack function for TRI_vocbase_col_t 2015-12-09 12:35:33 +01:00
Michael Hackstein 44b806418f Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-09 10:28:16 +01:00
Max Neunhoeffer ec4e37b2f9 Merge branch 'devel' into ClustUp1 2015-12-08 20:13:17 +01:00
Jan Steemann 76d5f57af0 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-08 18:23:06 +01:00
Jan Steemann 6eb44f229e issue #1598: improved error reporting for dump/restore 2015-12-08 18:11:44 +01:00
Michael Hackstein 7d90d583f0 Further movement of RestReplicationHandler to VPack. This state is not fully working 2015-12-08 10:31:47 +01:00
Michael Hackstein dd21a42523 Fixed calls to index->toVelocyPack in RestReplicationHandler 2015-12-07 15:45:22 +01:00
Michael Hackstein 602c6a61c2 The Replication handler now uses the index->toVelocyPack functionality 2015-12-07 15:00:11 +01:00
Michael Hackstein 5c11280cec Started moving the RestReplication Handler from TRI_json_t to VelocyPack 2015-12-07 14:25:29 +01:00
Michael Hackstein 498c4395df Started moving ReplciationHandler to VPack 2015-12-06 12:57:58 +01:00
Max Neunhoeffer 60df924ac1 Change data structures for collections in Agency.
Snapshot, compiles, untested, needs new VelocyPack.
2015-12-04 15:08:47 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Max Neunhoeffer 3556f76469 Fix ClusterComm::asyncRequest w.r.t. body shared_ptr. 2015-12-02 14:15:18 +01:00
Jan Steemann 0dd207f9f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-01 11:14:12 +01:00
jsteemann 3a73ec1a52 optionally trigger auto-resync in case of "no start tick" issue 2015-12-01 01:22:19 +01:00
jsteemann 04e81ea851 more replication 2015-11-30 23:33:59 +01:00
Jan Steemann f013c809ea replication improvements 2015-11-30 18:27:31 +01:00
Jan Steemann 4e33bda538 fixes for new replication features 2015-11-30 12:46:26 +01:00
Jan Steemann bd8b70455a replication improvements 2015-11-27 16:16:15 +01:00
Jan Steemann b6752faf0b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-11-25 11:44:32 +01:00
Alan Plum 7538d71333 URL parameter -> {query,path} parameter 2015-11-24 18:09:43 +01:00
Jan Steemann 75e4e6e815 added transaction to all signatures 2015-11-24 17:34:23 +01:00
Jan Steemann 9c471df56f fixed compile warning 2015-11-09 15:33:39 +01:00
Michael Hackstein 1d7b825462 Many parts of ReplicationHandler now use VelocyPack. Some parts interfere with the ReplicationApplier used in several places. Will be added later 2015-11-09 13:25:31 +01:00
Michael Hackstein 7fb1d9747c Continue moving RestReplicationHandler to VPack 2015-11-09 12:50:09 +01:00
Michael Hackstein 769bcd8dfc Started to replace TRI_json_t in RestReplication handler. 2015-11-09 11:15:44 +01:00
Jan Steemann aa3039cece fixes for cluster tests 2015-10-20 18:10:53 +02:00
jsteemann 53106f22b1 fixed leak 2015-09-17 14:05:30 +02:00
Wilfried Goesgens b06d03e84f Cleanup documentation for remaining @-tags 2015-09-17 11:15:33 +02:00
Wilfried Goesgens 70a2c74c1b Update RESTAPI documentation handling to work with the swagger 2 api
- use the structures from the swagger for post / reply structures
  - add missing documentation snippets to their respective places
  - fix syntax of documentation blocks
2015-09-16 16:35:13 +02:00
Jan Steemann dc7ac83354 incremental sync fixes 2015-09-15 14:20:08 +02:00
Jan Steemann 75ccd7e2cc fixed incremental sync method 2015-09-14 17:44:12 +02:00
Jan Steemann e08d840b47 replication API documentation 2015-09-14 15:30:00 +02:00
Jan Steemann 3f68ea3da0 Merge branch 'devel' of https://github.com/arangodb/arangodb into replication-sync-collections 2015-09-11 17:16:06 +02:00
Jan Steemann d7a3b51e1b additional sync method 2015-09-11 17:13:31 +02:00
Jan Steemann b0a924c5a8 sync 2015-09-11 11:56:38 +02:00
Willi Goesgens ac2acabd5d Work on formatting and grammer 2015-09-11 11:25:34 +02:00
Jan Steemann bead727a32 initial work for better incremental synchronization 2015-09-10 18:17:58 +02:00
Jan Steemann f077af1594 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-09 17:43:38 +02:00
Jan Steemann 6e290db783 fixed typos 2015-09-09 17:43:34 +02:00
Willi Goesgens e1ae661ae0 Work on multi-dimensional swagger post data 2015-09-09 17:40:51 +02:00