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

919 Commits

Author SHA1 Message Date
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
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 41844d2b1e fixed typos 2015-09-11 10:32:37 +02:00
Jan Steemann bead727a32 initial work for better incremental synchronization 2015-09-10 18:17:58 +02:00
Willi Goesgens 778d2c84cb Work on sub-structured data to be propper formatted for swagger. 2015-09-10 10:57:42 +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
Willi Goesgens eb9e03f3f0 Upgrade the REST-API documentation to to swagger V2.0 
Wrap lines in examples.
 2015-09-09 15:21:18 +02:00
Jan Steemann 0735277830 removed IndexWatermarks again... not needed 2015-09-09 14:22:58 +02:00
CoDEmanX 8aa78dcb7f Fix some more typos 2015-09-05 17:18:04 +02:00
Jan Steemann e602ca5662 issue #1471: document() vs documents() parameters (_key and _id) 2015-09-04 18:13:23 +02:00
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Jan Steemann f4c542795c getIndexes(true) 2015-08-26 09:48:48 +02:00
Jan Steemann 9374a25822 removed unused error code 2015-08-25 19:55:48 +02:00
Jan Steemann 52af8c5781 added comments 2015-08-25 13:16:07 +02:00
Jan Steemann 1af238a6d5 added tests for requireFromIncluded 2015-08-25 12:50:58 +02:00
Jan Steemann 37da76546c re-introduced tracking of replication "clients" 2015-08-24 12:02:57 +02:00
Jan Steemann b08713d768 added tests and documentation 2015-08-24 11:05:26 +02:00
Jan Steemann 9e08b1ebc5 add tickRanges() function 2015-08-21 17:00:32 +02:00
Jan Steemann 31a6547d4c fix replication resumption 2015-08-21 15:57:24 +02:00
Jan Steemann f0ef3d450f refactoring 2015-08-20 18:25:47 +02:00
Jan Steemann 1be3733a64 moved some handlers around 
fix disappeared handlers
 2015-08-20 01:26:52 +02:00
Jan Steemann ea382e1f4c removed triagens::rest::Handler 2015-08-20 01:26:50 +02:00
Jan Steemann f587b2ca6a replication refactoring 2015-08-19 16:13:53 +02:00
Jan Steemann 878641f674 some replication refactoring 2015-08-19 15:32:24 +02:00
Max Neunhoeffer ff135a10ad Add some overrides to silence a clang compiler warning. 2015-08-19 14:46:06 +02:00
Jan Steemann 8677da48b1 replication API enhancements, not yet ready 2015-08-18 18:08:20 +02:00
Jan Steemann 338dd7e100 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-17 18:41:13 +02:00
Jan Steemann 4e771b2728 replication improvements 2015-08-17 18:41:05 +02:00
Jan Steemann ffe4fb556b pacify VS 2015-08-17 17:05:52 +02:00
Jan Steemann 22cff81a5c added status methods for logfiles 2015-08-17 15:04:26 +02:00
Jan Steemann 95a346edd2 fix leak 2015-08-14 18:17:22 +02:00
Jan Steemann 57e9b55739 use TRI_CHAR_NODE_PAIR() 2015-08-14 00:54:59 +02:00
Jan Steemann fe6d67daf4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-13 15:40:35 +02:00
Willi Goesgens 209cbc9768 Move documentation into the source. 2015-08-13 15:37:43 +02:00
Jan Steemann 5b82096145 honor indexBuckets attribute in restore operation of collection 2015-08-13 15:37:32 +02:00
Willi Goesgens bbb8198d2b Add a @brief to all descriptions, remove stray markup. 2015-08-12 16:58:06 +02:00
Willi Goesgens 096ad46f05 revert ad5a2c49f1c8479fb4896a28b178d34fcfe3abe8 - arangodump isn't a plain json. 2015-08-11 14:49:06 +02:00
Willi Goesgens b6613208d0 switch to logging json formatted response for better user experience. 2015-08-11 14:15:15 +02:00
Jan Steemann b659d9fa07 use unique_ptr 2015-08-07 16:48:35 +02:00
Jan Steemann 5d82f0b385 some cleanup 2015-08-07 15:16:33 +02:00
Jan Steemann 30839600e6 use unique_ptr 2015-08-06 22:13:33 +02:00
Jan Steemann 22e734a940 use unique_ptr 2015-08-05 21:03:52 +02:00
Jan Steemann 7ad99087ee use unique_ptr 2015-08-03 09:18:20 +02:00
Jan Steemann 6d7ccd7699 move shaper to cxx 2015-07-28 17:38:31 +02:00
Frank Celler 35a3c6421c moved dispatcher to atomic 2015-07-23 15:40:34 +02:00
Jan Steemann 4d0872f2b9 more cxx 2015-07-20 18:42:02 +02:00
Jan Steemann 124fe7a34c use new/delete for TRI_vocbase_t 2015-07-20 12:08:13 +02:00
Jan Steemann c71dc4d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-query-cache 2015-07-13 10:49:14 +02:00
Frank Celler 27f9af2808 added more info about expect and received value 2015-07-09 16:17:40 +02:00
Willi Goesgens f442455fdd Fix memleak - Replace creates a copy. 2015-07-02 10:55:42 +02:00
Willi Goesgens 1dea6b29a5 Fix memleaks in coordinator. 2015-06-30 14:36:37 +02:00
Jan Steemann 1f5e047486 query cache, now with result limitations, HTTP and JavaScript APIs 2015-06-27 01:12:32 +02:00
Willi Goesgens df031a9f2a Find the right place where the json wasn't free'd 2015-06-25 09:45:05 +02:00
Willi Goesgens 29366dff96 Fix memleaks. 2015-06-24 17:42:26 +02:00
Jan Steemann 83b326cfc7 moved PUT /_api/simple/all to C++ 2015-06-18 15:34:45 +02:00
Jan Steemann 5a5407f516 constified methods 2015-06-17 23:22:45 +02:00
Jan Steemann b76cb5caee use nullptr 2015-06-02 23:39:41 +02:00
Jan Steemann 49fb7effb3 issue #1353: Windows: HTTP API - incorrect path in errorMessage 
Do not return path part, collection name and key part in error response
 2015-06-02 10:26:37 +02:00
Jan Steemann 4dde6e49cd goodbye barriers, welcome ditches 2015-05-28 10:23:30 +02:00
Jan Steemann 4b67c7a735 several fixes for indexes 2015-05-26 13:35:11 +02:00
Jan Steemann a9f2769ffa now compiles and links 2015-05-23 04:31:13 +02:00
Michael Hackstein 86c7f87dd3 Merge branch 'cppTrav2' into devel 2015-05-19 16:17:27 -07:00
Jan Steemann b6142f475c micro optimizations 2015-05-15 17:40:41 +02:00
Jan Steemann 541257c537 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-05-12 14:53:15 +02:00
Jan Steemann f6bc0a05e3 added `limit` parameter for export API 2015-05-12 14:16:27 +02:00
Jan Steemann 5cd7b64ce8 fixed potential race during arangob runs 2015-05-11 22:57:30 +02:00
Jan Steemann 8c3e72d33c added waitForSync option 2015-05-11 13:09:37 +02:00
Jan Steemann 5ad7dea0c8 use auto for HTTP response headers iteration 2015-05-08 17:44:33 +02:00
Jan Steemann 6b412a1c01 Merge branch 'json-privatisierung' of https://github.com/arangodb/arangodb into json-privatisierung 2015-05-07 13:05:12 +02:00
Jan Steemann 855c1465fd added documentation for new simple methods 2015-05-07 11:42:58 +02:00
Jan Steemann e93225d7f5 fix cluster document fetching 2015-05-06 11:00:41 +02:00
Jan Steemann 46cdf686c4 documentation update 2015-05-05 18:23:07 +02:00
Jan Steemann c677ea8b88 added tests for collection.lookupByKeys() and collection.removeByKeys() 2015-05-05 17:57:33 +02:00
Jan Steemann 63138def67 fix location response headers with special characters 2015-05-05 14:00:06 +02:00
Jan Steemann a007a867ee "privatized" TRI_vector_t internals. 
This allows changing the internals of TRI_vector_t structs in order to make the struct smaller.
On 64 bits, the size of TRI_vector_t is reduced from 48 bytes to 28 bytes.
TRI_json_t does benefit from this, as its biggest component is a TRI_vector_t.
 2015-05-05 10:31:02 +02:00
Jan Steemann f09d8903a9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
Conflicts:
	Documentation/Scripts/generateExamples.py
 2015-05-04 17:47:31 +02:00
Jan Steemann 244cc2d66d added some batch processing methods 2015-05-04 17:46:47 +02:00
Willi Goesgens 312972a4ec Modify examples so they clean up after their run. 2015-05-04 17:22:25 +02:00
Jan Steemann 0099fe260a return value optimization for AQL 2015-04-30 23:38:27 +02:00
Max Neunhoeffer 1dd7802450 Fix error reporting at import. 2015-04-26 12:53:02 -07:00
Jan Steemann f985c8eef9 removed duplicate examples 2015-04-20 16:17:19 +02:00
Jan Steemann 6e23c5330f added restrictions for export API 2015-04-17 00:24:43 +02:00
Jan Steemann 6624c00215 explicitly set clientTaskId 2015-04-15 17:30:14 +02:00
Jan Steemann 92fcdd3e56 issue #1298: Bulk import if data already exists 
This change extends the HTTP REST API for bulk imports as follows:

When documents are imported and the `_key` attribute is specified for them, the import can be
used for inserting and updating/replacing documents. Previously, the import could be used for
inserting new documents only, and re-inserting a document with an existing would have failed
with a *unique key constraint violated* error.

The above behavior is still the default. However, the API now allows controlling the behavior
in case of a unique key constraint error via the optional URL parameter `onDuplicate`.

This parameter can have one of the following values:

- `error`: when a unique key constraint error occurs, do not import or update the document but
  report an error. This is the default.

- `update`: when a unique key constraint error occurs, try to (partially) update the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. Only the attributes present in the import data will be
  updated and other attributes already present will be preserved. The number of updated documents
  will be reported in the `updated` attribute of the HTTP API result.

- `replace`: when a unique key constraint error occurs, try to fully replace the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. The number of replaced documents will be reported in the
  `updated` attribute of the HTTP API result.

- `ignore`: when a unique key constraint error occurs, ignore this error. There will be no
  insert, update or replace for the particular document. Ignored documents will be reported
  separately in the `ignored` attribute of the HTTP API result.

The result of the HTTP import API will now contain the attributes `ignored` and `updated`, which
contain the number of ignored and updated documents respectively. These attributes will contain a
value of zero unless the `onDuplicate` URL parameter is set to either `update` or `replace`
(in this case the `updated` attribute may contain non-zero values) or `ignore` (in this case the
`ignored` attribute may contain a non-zero value).
 2015-04-14 11:44:33 +02:00
Jan Steemann 2299d2916d initial commit to satisfy #1298 2015-04-13 18:26:33 +02:00
Jan Steemann 92c8dc9429 fixed documentation 
Conflicts:
	Documentation/Scripts/generateSwaggerApi.py
 2015-04-03 13:22:44 +02:00
Jan Steemann 0f1244f72d better export API cleanup 2015-03-31 18:44:51 +02:00
Jan Steemann 6dfb4d4b09 Merge branch 'devel' of https://github.com/arangodb/arangodb into cursor-refactoring 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpServerJob.h
 2015-03-31 15:13:31 +02:00
Jan Steemann 6f4fadd630 removed .o files 2015-03-31 14:45:22 +02:00
Frank Celler ffbc45d2e2 new HttpServer & HttpCommTask 
Conflicts:
	Makefile.in
	arangod/Aql/RestAqlHandler.cpp
	arangod/Aql/grammar.cpp
	arangod/Cluster/RestShardHandler.cpp
	lib/GeneralServer/GeneralServer.h
	lib/GeneralServer/GeneralServerDispatcher.h
	lib/HttpServer/HttpServerJob.h
	lib/HttpServer/HttpsCommTask.h
	lib/SimpleHttpClient/SslClientConnection.cpp
 2015-03-31 09:12:01 +02:00
Jan Steemann c508eb0a81 removed some debugging features 2015-03-30 22:05:31 +02:00
Jan Steemann 925f4fbab6 cleanup of some static const variables 2015-03-30 21:43:55 +02:00
Jan Steemann e672d791b5 refactored cursor API, added export API 2015-03-30 18:03:42 +02:00
Jan Steemann 80a99ab23e refactored cursor API 2015-03-30 14:58:51 +02:00
Jan Steemann c352ba6a03 small logging refactoring 2015-03-26 03:09:07 +01:00
Jan Steemann e230ac11c0 fixed leak 2015-03-25 16:55:45 +01:00
Frank Celler 4c5d57f1b8 merged Exceptions.h and Exception.h 2015-03-23 14:05:19 +01:00
Frank Celler 3c52dcde6d changed _api/query to C++ 
Conflicts:
	CHANGELOG
	Makefile.in
	README
	arangod/RestServer/ArangoServer.cpp
 2015-03-23 10:51:14 +01:00
Jan Steemann 7f121fc352 use barrier 2015-03-04 11:35:32 +01:00
Jan Steemann 68c57ce061 fix Visual Studio undefinedness 2015-02-26 18:07:25 +01:00
Willi Goesgens dcac88c35a Fix error message on tempfile creation 2015-02-23 15:28:46 +01:00
Willi Goesgens d61fc4343a Set debug message trap for failing windows arangobench tests. 2015-02-17 14:27:25 +01:00
Jan Steemann 320d7c3e8f reduce var scope 2015-02-03 16:20:41 +01:00
Jan Steemann 8273970856 fixed leak 2015-01-30 12:37:31 +01:00
Jan Steemann 2ad6f4179f fixed leak 2015-01-29 15:37:23 +01:00
Jan Steemann ddc8e52a59 fixed leak 2015-01-29 15:31:55 +01:00
Patrick Huber 387c7686e7 document how the http status code and lastincluded http headers relate to each other 2015-01-28 11:04:18 +01:00
Jan Steemann 81db41763f foxx file upload 2015-01-23 11:23:58 +01:00
Jan Steemann 8aeded5c86 fixed documentation 2015-01-22 13:36:01 +01:00
Jan Steemann f75e4dfbb3 issue #1219: /_api/replication/logger-state clients field 2015-01-22 11:06:55 +01:00
Jan Steemann 957fa189d2 better diagnostics for arangoimp 2015-01-15 13:42:31 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Max Neunhoeffer 05c069f361 Another fix for the distributed locking problem in cluster AQL. 2014-12-23 14:35:19 +01:00
Max Neunhoeffer e50a705d9a Squashed commit of the following: organise locking in distributed AQL 
Locking is now done in an extra round after the query is fully
instanciated in the cluster. All participating shards are locked
in alphabetical order of their shard ID (local collection name).
For this to work there is a new action in the RestAqlHandler plus a
mechanism to prevent the usual locking from happening: Each thread has a
thread local static class variable of
  triagens::arango::Transaction::_makeNolockHeaders
which is of type std::unordered_set<std::string>*.
Whenever this is not equal to nullptr and a local collection name is
stored in there, no locking or unlocking takes place. This information
is forwarded by the X-Arango-Nolock HTTP header, whenever an HTTP
request is sent via ClusterComm to a shard.
 2014-12-22 14:40:22 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Jan Steemann 04bcf3f362 issue #1184: use error codes more consistently 2014-12-15 16:22:18 +01:00
Jan Steemann 4b12897026 issue #1184: return error codes more consistently 2014-12-15 16:18:49 +01:00
Tomas Bosak 32bc422ad5 Improve edge API docs. 
- create edge operation with 202 result is returned when waitForSync was
set to false
- add missing If-None-Match header parameter description to read head
operation
- add information about _key attribute in result for replace, update and
delete operations
 2014-12-12 17:33:30 +01:00
Tomas Bosak 953d5efa7a Add 'mergeObjects' description to edge API docs. 
Description of 'mergeObjects' parameter was missing in edge update
(PATCH) operation.
 2014-12-10 23:24:32 +01:00