1
0
Fork 0
Commit Graph

843 Commits

Author SHA1 Message Date
Jan Steemann 55729b78a9 fixed test 2015-12-22 10:44:52 +01:00
Max Neunhoeffer e0a527eb5d Fix arangodump in cluster. 2015-12-21 11:53:37 +01:00
jsteemann a058699312 use std::make_shared 2015-12-18 23:34:18 +01:00
jsteemann 19782a45a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-18 23:33:44 +01:00
jsteemann 20ed092d11 added `--create-collection-type` option for arangoimp 2015-12-18 22:26:32 +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 0198b4576b Merge branch 'devel' into ClustUp1 2015-12-15 20:40:52 +01:00
jsteemann 086fc073cf cppcheck 2015-12-15 19:35:51 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Michael Hackstein 7fbb519117 Added an internal route to request edges for a list of vertices instead of a single vertex only. This is used for out/in/edges in cluster which was working with a list of edges locally but not in cluster mode 2015-12-15 16:38:54 +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 757577de42 Updated VPack addObject to openObject 2015-12-09 11:28:54 +01:00
Michael Hackstein acadb089ee Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-09 10:29:13 +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 3f78b86492 Merge branch 'devel' into ClustUp1 2015-12-09 09:04:00 +01:00
Wilfried Goesgens 4f4087a944 Fix link to the error codes 2015-12-08 23:45:36 +01:00
Max Neunhoeffer b00c253481 Merge branch 'devel' into ClustUp1 2015-12-08 23:22:38 +01:00
jsteemann 18da212003 fixed edge handler response 2015-12-08 22:57:46 +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 b465921629 Adaption to new HttpRequest API 2015-12-07 14:24:42 +01:00
Michael Hackstein f63535c142 Further reduced usage of TRI_json_t in RestImportHandler 2015-12-06 13:36:59 +01:00
Michael Hackstein 11dc6373d9 Reduced usage of TRI_Json_t in RestDocumentHandler and entirely removed it from RestEdgeHandler 2015-12-06 13:34:16 +01:00
Michael Hackstein 498c4395df Started moving ReplciationHandler to VPack 2015-12-06 12:57:58 +01:00
Michael Hackstein 8317982983 Fixed imports. Moved from .h to .cpp 2015-12-06 12:56:11 +01:00
Michael Hackstein 07dae24edb Entirely removed TRI_json_t from VocbaseBaseHandler 2015-12-06 12:55:36 +01:00
Michael Hackstein 13a8f6871f Fixes in RestImport handler. It failed in some malformed input formats 2015-12-06 01:04:38 +01:00
Michael Hackstein e32b2e2d6f Largely removed references to TRI_json_t in RestImportHandler. Only needs temporary TRI_json_t's to interact with transactions 2015-12-05 13:01:55 +01:00
Michael Hackstein cc6283a349 Moved some references to TRI_json_t out of rest document handler 2015-12-04 18:18:15 +01:00
Michael Hackstein 4c2903ad44 Removed duplicated try {} catch in RestEdgesHandler 2015-12-04 18:17:26 +01:00
Michael Hackstein c5979d4ab3 Added a general catch block for bad_alloc for all RestHandlers 2015-12-04 18:16:56 +01:00
Michael Hackstein 6ebf72ee60 Removed usage of TRI_json_t in RestDocumentHandler. Could not yet eliminate it as ClusterMethods are not yet VPack compatible 2015-12-04 17:56:53 +01:00
Michael Hackstein 4bfb0c018f Removed now obsolete forward declaration of TRI_json_t 2015-12-04 17:26:25 +01:00
Michael Hackstein 712117e3ae Reduced usage of TRI_json_t in RestEdgeHandler. Now only builds it to pass it to the transaction 2015-12-04 17:21:51 +01:00
Michael Hackstein fd00792ac1 Removed TRI_json_t constructor from TraverserExpression. It is only possible to be build from VPack 2015-12-04 16:49:49 +01:00
Michael Hackstein b137e9471e The RestEdgesHandler now uses VPack instead of TRI_json_t 2015-12-04 16:45:29 +01:00
Jan Steemann 1a3ea99e95 fixed after signature changes 2015-12-04 15:52:40 +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 3b7cbef240 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:50:42 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Michael Hackstein c60271d3c8 Fixed early optimizations of Cluster traversal filters, when document does not exist. Now behaves identical to single server and to execution without optimization 2015-12-04 13:30:40 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
Max Neunhoeffer 3821a775a3 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-02 14:48:04 +01:00
Max Neunhoeffer 3556f76469 Fix ClusterComm::asyncRequest w.r.t. body shared_ptr. 2015-12-02 14:15:18 +01:00
Michael Hackstein e47ebdd48d Fixed statistics reporting for AQL traversal in Cluster. The tests are green in cluster mode now. 2015-12-02 13:41:24 +01:00
Michael Hackstein 18db3bf681 The edges api now returns a stats property encapsulating how many items where scanned and how many where filtered 2015-12-02 11:38:51 +01:00
Michael Hackstein 1a13af6f36 Merged remote changes with local stash 2015-12-02 11:34:58 +01:00
Jan Steemann eb8899d9ae applied changes suggested by cppcheck 2015-12-02 10:17:14 +01:00
Jan Steemann 2bbcaa868f fixed invalid memory usages 2015-12-01 16:48:55 +01:00
hkernbach 6d25ac57e9 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-01 11:25:58 +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
jsteemann 37f72fa721 micro optimizations 2015-11-30 19:37:58 +01:00
Jan Steemann f013c809ea replication improvements 2015-11-30 18:27:31 +01:00
Michael Hackstein 2c61930752 Enabled the CXX RestEdges Handler in coordinator case as well 2015-11-30 15:10:13 +01:00
Michael Hackstein e9a36a3fbf Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-30 14:17:44 +01:00
Michael Hackstein 43ac825241 The CXX Edges handler now first checks if the collection is an edge collection 2015-11-30 14:17:13 +01:00
Michael Hackstein 0ab087c764 Added an internal filter option for lookup-by-keys. It is used by AQL traversel to move vertex filtering to the server 2015-11-30 13:29:31 +01:00
Jan Steemann 4e33bda538 fixes for new replication features 2015-11-30 12:46:26 +01:00
Michael Hackstein 5a8b6ad721 Fixed out of scope when requesting edges in cluster 2015-11-27 16:24:08 +01:00
Jan Steemann bd8b70455a replication improvements 2015-11-27 16:16:15 +01:00
Michael Hackstein 07f772c758 Fixed potential memleaks and bad access in edges api 2015-11-27 11:20:54 +01:00
Jan Steemann dea7a3f56f fixed API 2015-11-26 17:41:58 +01:00
Michael Hackstein 7bf37620bb Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-26 16:32:26 +01:00
Michael Hackstein 7290507c25 Removed debug output 2015-11-26 16:01:26 +01:00
Michael Hackstein d109a4e2aa Filtered edges are now able to react to a list of expressions instead of only one expression. The list symbolises an AND 2015-11-26 11:38:09 +01:00
Michael Hackstein 38cf7dc8ed First implementation of a filtered edges API. This is for cluster internal use only. 2015-11-26 09:26:46 +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
Michael Hackstein bcd5813bb1 CXX RestEdgesHandler now actually returns a result. All tests are green now 2015-11-24 10:47:07 +01:00
Michael Hackstein 4c8c98524e Fixed errorNum whenever the vertex-handle is incorrect 2015-11-24 10:30:16 +01:00
Michael Hackstein 430eb2fd07 First version of CXX RestEdgesHandler. Required for early filtering in Cluster Traversals 2015-11-24 10:23:35 +01:00
Jan Steemann 6192ff6ac1 fixed test 2015-11-23 12:41:17 +01:00
Jan Steemann b08e1a76bc Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-11-23 12:06:29 +01:00
Jan Steemann 1bf5abaf14 changed HTTP return code for canceled operations from 408 to 410 2015-11-23 10:25:05 +01:00
Jan Steemann 89e0f887b9 velocypack update 2015-11-19 13:28:40 +01:00
Michael Hackstein fbee0b0859 Started to transform Parts of AQL Query to VPack. Especially the QueryResult is now using VPack internally. 2015-11-12 11:09:35 +01:00
Michael Hackstein c971dead79 Removed some TRI_json_t parts from the RestCursorHandler. But now it does not state anymore that it used the query cache 2015-11-10 17:18:47 +01:00
Jan Steemann ccf75ab804 updated vpack library 2015-11-10 15:49:38 +01:00
Michael Hackstein 9055f629ba Fixed forgotten close() of VelocyPack Objects 2015-11-10 14:35:33 +01:00
Michael Hackstein d12daaaef7 Replaced TRI_Json_t in RestExportHandler by VelocyPack 2015-11-10 14:12:40 +01:00
Michael Hackstein 400059db93 Removed references to TRI_Json_t in RestSimpleQueryHandler 2015-11-10 10:50:55 +01:00
Michael Hackstein b30a656c1e Use VPackSlice::copyString in favor of rebuilding the string ourselfes 2015-11-10 10:49:59 +01:00
Jan Steemann 1506a6cd4a fixed access to wrong value 2015-11-10 09:57:06 +01:00
Michael Hackstein f6622011bf Removed references to TRI_json_t in RestSimpleHandler 2015-11-10 09:56:14 +01:00
Michael Hackstein 1a84b49b3a RestQueryHandler now uses VelocyPack input as well 2015-11-09 16:02:26 +01:00
Michael Hackstein b003cf6de9 Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-11-09 15:37:12 +01:00
Michael Hackstein ff2552a9b2 Further adoption of VelocyPack in RestQueryHanlder 2015-11-09 15:36:58 +01:00
Jan Steemann 9c471df56f fixed compile warning 2015-11-09 15:33:39 +01:00
Michael Hackstein 34e4d461d0 RestQueryHandler uses the first VelocyPack parsed user input 2015-11-09 15:13:47 +01:00
Michael Hackstein 2ff01110f7 Added a option to VelocyPackify HTTP request bodies 2015-11-09 14:40:19 +01:00
Michael Hackstein 7555c2add0 Added a convenience OOM result builder in RestBaseHandler 2015-11-09 13:39:14 +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 f5ef995d16 The UploadHandler now uses VelocyPack instead of TRI_json_t 2015-11-09 11:20:32 +01:00
Michael Hackstein 769bcd8dfc Started to replace TRI_json_t in RestReplication handler. 2015-11-09 11:15:44 +01:00
Michael Hackstein 1daca4f156 Constified generateResult in RestBaseHandler 2015-11-07 19:09:48 +01:00
Michael Hackstein 52e198b59f Fixed a bug in RestDocumentHandler. One VelocyPack did result in an illegal representation 2015-11-07 19:06:38 +01:00
Michael Hackstein bedb61ea49 Removed cast for size_t in VPack. It is different in Mac and Linux but now VPack supports both natively 2015-11-07 18:51:31 +01:00
Michael Hackstein 22a7d1e49a The rest Query Handler now uses VelocyPack in most places. One place still missing... 2015-11-06 16:17:49 +01:00
Michael Hackstein ede603b74a QueryCache and it's RestHandler now use VelocyPack 2015-11-06 15:43:47 +01:00
Michael Hackstein 0b2d40ef1d RestImportHandler now uses VelocyPack instead of TRI_json_t* 2015-11-06 15:28:21 +01:00
Michael Hackstein e20f0d9f11 RestDocumentHandler now uses VelocityPack instead of TRI_json_t 2015-11-06 15:12:24 +01:00
Michael Hackstein 42cf09e7f0 The RestVersionHandler now uses VPack instead of TRI_json_t 2015-11-06 15:02:13 +01:00
Michael Hackstein 454b3f0d7a The ShutdownHandler now uses VelocityPack instead of TRI_json_t 2015-11-06 14:39:50 +01:00
Michael Hackstein aff851ec81 The RestJobHandler now uses VelocyPack generateResult instead of TRI_json_t* 2015-11-06 14:22:06 +01:00
Michael Hackstein bcc79cc1cf AdminLogHandler and DebugHelperHandler now use generateResult for VelocyPack insted of TRI_json_t 2015-11-06 14:10:59 +01:00
Michael Hackstein 746c1a2573 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-11-06 12:43:03 +01:00
Jan Steemann cb60466228 removed useless RestAdminBaseHandler layer 2015-11-06 12:42:02 +01:00
Michael Hackstein bc76a8999c RestBaseHandler now uses VelocyPack internally 2015-11-06 12:38:45 +01:00
Michael Hackstein 0a08c31b95 The first function now uses VelocyPack. Yay 2015-11-06 11:40:04 +01:00
Jan Steemann b692cae352 never respond with empty error messages 2015-11-05 11:23:26 +01:00
Jan Steemann aa3039cece fixes for cluster tests 2015-10-20 18:10:53 +02:00
Wilfried Goesgens 15b1d7cfd5 Migrate sub-structured replies to swagger2 preproc docu style 2015-09-18 17:02: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
jsteemann 0196dc0f51 documentation fixes 2015-09-16 19:58:59 +02:00
Jan Steemann 7eb93821a7 explicit 2015-09-16 17:15:37 +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
Wilfried Goesgens 176b150c46 Implement possibility to add reply grammers via the documentation. 2015-09-14 10:49:28 +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