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

790 Commits

Author SHA1 Message Date
Michael Hackstein 91d394105c ClusterResolver cid by numeric name now checks if the number is actually a valid collection and it returns cid 0 instead of the given numeric number. Some apis rely on this to check if collection exists or not. 2016-04-01 14:31:13 +02:00
Frank Celler 873f226b5f added SchedulerFeature 2016-04-01 12:52:28 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +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
Michael Hackstein 618c855c85 Cluster Methods now use the OperationOptions of transactions. And now reacts to these options accordingly incl returnNew/returnOld 2016-03-31 10:52:24 +02:00
Michael Hackstein 118cc6c141 Reoming Documents in Cluster case now reacts to old revisions 2016-03-30 18:19:45 +02:00
Michael Hackstein a653f6d377 Fixed Conflict reporting in Cluster Case of delete 2016-03-30 17:14:03 +02:00
Michael Hackstein 428beab2c9 Fixed a Coordinator return code if document was not found (was collection not found former which was totally wrong 2016-03-30 15:54:39 +02:00
Michael Hackstein c4562a760c The cluster internal communication now uses if-match header instead of ?rev= which is not supported any more 2016-03-30 13:38:51 +02:00
Michael Hackstein a5d20b0041 Activated Externals in OperationCursor. This commit might break tests again. 2016-03-29 11:08:31 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann 13980ef299 bugfixes 2016-03-24 16:18:18 +01:00
Jan Steemann dce7c427d9 test fixes 2016-03-24 14:55:31 +01:00
Jan Steemann f161a98ba4 test fixes 2016-03-24 12:46:08 +01:00
jsteemann b7c1a42f96 test fixes 2016-03-24 01:12:57 +01:00
Jan Steemann 2986ec2a64 removed dead code 2016-03-23 20:08:22 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
Max Neunhoeffer 651d0e75c9 Fix compilation. 2016-03-23 09:18:58 +01:00
Max Neunhoeffer 12c420913e Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-23 09:02:14 +01:00
Max Neunhoeffer c2049b8ee1 Switch to IndexHandles. 2016-03-23 08:57:00 +01:00
Jan Steemann 8391455ce8 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-22 14:34:37 +01:00
Jan Steemann 80413739d1 fixed test 2016-03-22 14:34:18 +01:00
Max Neunhoeffer 1990441d9c Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-22 13:33:23 +01:00
Max Neunhoeffer 07d193f74d Implement indexesForCollection for coordinator case. 2016-03-22 13:32:53 +01:00
Jan Steemann 738851e6a9 collection id lookup for cluster 2016-03-22 12:59:12 +01:00
Jan Steemann 6552b42f59 centralized _id extraction 2016-03-22 12:57:01 +01:00
jsteemann 4694d36671 cppcheck 2016-03-21 20:56:08 +01:00
Jan Steemann e4674d0f5e test fixes 2016-03-21 17:46:47 +01:00
Jan Steemann 1587fadb82 fixed test 2016-03-21 17:18:41 +01:00
Jan Steemann 811732230c fixed test 2016-03-21 13:46:58 +01:00
Jan Steemann b672ce0985 test fixes 2016-03-21 12:15:40 +01:00
Michael Hackstein a2ecc653f0 Removed unused debug output 2016-03-18 15:53:09 +01:00
Michael Hackstein 8b0b8a3667 Fixed invalid nullptr for any() query 2016-03-18 13:55:11 +01:00
Michael Hackstein c7b63f0ffa Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-18 08:48:39 +01:00
Max Neunhoeffer d1c5c64d6b Fix baby methods for documents in arangosh. 2016-03-18 02:05:19 +01:00
Max Neunhoeffer 37bac8881d Implement babies variant of DELETE /_api/document/<collection>. 2016-03-17 20:28:40 +01:00
Michael Hackstein 2d2cfae297 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-17 18:51:30 +01:00
Michael Hackstein 401f55ae37 Replaced OperationCursor by shared_ptrs every where and removed the slice function from it. Instead it returns a shared ptr on a OperationResult on getMore 2016-03-17 18:49:20 +01:00
jsteemann 873854a0a0 removed unused file 2016-03-16 23:56:52 +01:00
Michael Hackstein 93efb73ca7 Added a convenience function to add a collection by name at Runtime to transaction 2016-03-16 11:09:42 +01:00
jsteemann 8650404c9e fixed startup 2016-03-15 20:09:15 +01:00
jsteemann 4f8265bfc8 temporary builder leaser 2016-03-15 14:08:03 +01:00
Michael Hackstein 7e0c8c935d Reimplemented optimizer rule to remove unnecessary SORT if covered by index 2016-03-15 11:12:10 +01:00
Michael Hackstein e0ddf68c4f Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-15 10:05:04 +01:00
Michael Hackstein 5d61b709bb Fixed OperationCursor and SkiplistIndex. The builder in OperationCursor did not retain the _buffer. 2016-03-15 08:56:37 +01:00
Michael Hackstein a4edc8dd49 Merge from spdvpk 2016-03-14 23:46:57 +01:00
jsteemann 33df831f41 small optimizations for v8<->vpack 2016-03-14 22:22:35 +01:00
Michael Hackstein 78f0b95289 AQL indexNode now uses the new transaction API. It does not know any index internals itself any more. Optimizer Rule to remove SORT node needs to be reimplemented yet 2016-03-14 21:28:58 +01:00
Max Neunhoeffer f8f27c6cbf Polish mechanism for recovery via Transaction API. 2016-03-14 18:05:17 +01:00
Max Neunhoeffer f1e0e66c20 Reorganise insert. 2016-03-14 12:13:05 +01:00
Max Neunhoeffer 50514610fc Change id and key validation to use length. 2016-03-14 10:23:08 +01:00
Jan Steemann ba91761a66 fix resetting of cursors 2016-03-11 17:56:23 +01:00
Max Neunhoeffer 8f6cd501aa Change behaviour of remove(), return data, allow returnOld. 2016-03-11 16:35:55 +01:00
Max Neunhoeffer 1c94f8d1be returnNew and returnOld, progress. 2016-03-11 15:12:58 +01:00
Max Neunhoeffer 0dad5a6c7e Finish implementation of returnNew and returnOld. 2016-03-11 13:10:14 +01:00
Max Neunhoeffer e77159b008 New returnNew option for insert. 2016-03-11 12:44:36 +01:00
Max Neunhoeffer 447c95af83 Change revision management in Transaction.cpp. 2016-03-11 09:53:20 +01:00
Jan Steemann ff24255cdb added isSingleOperationTransaction 2016-03-11 08:54:11 +01:00
Max Neunhoeffer 0daedb4cbe Prepare returnOld and returnNew. 2016-03-10 16:49:03 +01:00
Max Neunhoeffer 0647661f5a Fix a bug in update for babies. 2016-03-10 15:30:52 +01:00
Max Neunhoeffer 3ed256a478 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-10 11:25:20 +01:00
Max Neunhoeffer 3def27ee6e Do not check for existence of vertex collection at edge insertion. 2016-03-10 11:24:59 +01:00
Michael Hackstein 23f845de05 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 10:46:30 +01:00
Michael Hackstein 4c4c117059 Partially Adopted Traverser to new transaction API. This is still work in Progress. It compiles but it will not work yet. 2016-03-10 10:42:20 +01:00
Max Neunhoeffer 995eecc832 Last traces of update_policy gone. 2016-03-10 00:17:33 +01:00
Max Neunhoeffer 31112b9257 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-09 23:59:34 +01:00
Max Neunhoeffer 80ee083105 Fix RestDocumentHandler: modify and remove. 2016-03-09 23:59:02 +01:00
Jan Steemann 7e01c3208a Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 17:56:57 +01:00
Jan Steemann b55b5d7386 AqlValue refactoring 2016-03-09 17:50:20 +01:00
Max Neunhoeffer bffd86b035 Temporarily disable external VPack usage again. 2016-03-09 15:20:21 +01:00
Max Neunhoeffer 5b807d6753 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-09 13:28:43 +01:00
Max Neunhoeffer 6b2fa8c33d RestDocumentHandler GET method, plus tests. 2016-03-09 13:28:13 +01:00
Michael Hackstein 507b062fe1 trx->document now returns an EXTERNAL VPACK in local case 2016-03-09 12:43:32 +01:00
Michael Hackstein a24e28024e Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-09 09:59:56 +01:00
Michael Hackstein c3c06a2f5c Modified EDGES AQL funciton to use new Transaction API instead and does not rely on the shaper any more. Also added a iteratorForSlice method to EdgeIndex. It is slightly more complicated than other indexes iteratorForSlice functions because of the special _from, _to indexing in one index. 2016-03-09 09:59:51 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
jsteemann d756f6a176 removed TRI_transaction_collection_t from public APIs 2016-03-09 01:51:17 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Max Neunhoeffer be9bf2d90f Babies for document and remove, various cleanup. 2016-03-08 21:30:19 +01:00
Max Neunhoeffer 2ae400fa06 Adjust behaviour of replace and update to tests. 2016-03-08 18:45:52 +01:00
Jan Steemann 0c6e8bcd98 fixed replace 2016-03-07 16:49:26 +01:00
Jan Steemann b358fa329d fixed replication dump and logger-follow commands 2016-03-07 15:21:11 +01:00
Jan Steemann 0c2fdb9fb9 less dependency on document-collection.h 2016-03-04 20:53:17 +01:00
Jan Steemann 6eea757c01 simplifications 2016-03-04 19:40:24 +01:00
Jan Steemann 1c150d4d6e Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 18:35:40 +01:00
Jan Steemann ad4a9542ea removed file 2016-03-04 18:32:54 +01:00
Jan Steemann 4de5e41044 simplifications 2016-03-04 17:48:27 +01:00
Jan Steemann c157363f3c less dependencies 2016-03-04 17:21:09 +01:00
Max Neunhoeffer 4cb42662f3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-04 15:19:26 +01:00
Max Neunhoeffer e4ce808349 Finish revolution of document API, RestHandler still missing. 2016-03-04 15:16:23 +01:00
Jan Steemann 5ef3581d16 simplifications 2016-03-04 14:52:43 +01:00
Max Neunhoeffer 2654e654db Compiles again, document API not yet sorted out. 2016-03-04 10:32:34 +01:00
jsteemann cf1427adff smaller datafile markers 2016-03-04 02:25:03 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Max Neunhoeffer d2d785ec41 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 09:04:54 +01:00
Jan Steemann 4c03f4bf8d simplification 2016-03-02 15:50:52 +01:00
Jan Steemann ba40edac87 less json 2016-03-02 14:58:13 +01:00
Michael Hackstein 5153750abe Added a function to invoke a callback on all elements in a collection within a transaction. 2016-03-02 12:39:37 +01:00
Max Neunhoeffer 9da16d66a0 Fix bugs in Transaction replace method for babies. 2016-03-02 11:32:49 +01:00
Max Neunhoeffer a374cabfb9 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-01 18:16:42 +01:00
Jan Steemann 285de1998b velocypack 2016-03-01 17:54:57 +01:00
Max Neunhoeffer 1398eea35a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-01 17:50:39 +01:00
Max Neunhoeffer 2cfa417858 First go at babies variant of replace. RestHandler case missing. 2016-03-01 17:50:13 +01:00
Jan Steemann 747349db19 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 17:03:58 +01:00
Jan Steemann 026cb57138 collection export now using vpack 2016-03-01 17:03:44 +01:00
Michael Hackstein 65abe721f3 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-01 16:39:04 +01:00
Michael Hackstein 922a96fee0 Added a reset function to OperationCursor. ALso added a switch to getMore to define that all documents are referenced as Externals instead of inplace 2016-03-01 16:37:21 +01:00
Jan Steemann 3fa4623dd1 made some methods private 2016-03-01 15:53:10 +01:00
Jan Steemann 0cb0c0142f remove _rid from master pointer 2016-03-01 15:06:54 +01:00
Michael Hackstein 6e7f9ef49c Transaction OperationCursor now implements a skip method. 2016-03-01 14:37:40 +01:00
Jan Steemann 0fcaf41477 cleanup 2016-03-01 14:07:47 +01:00
Jan Steemann 15350cf4b8 renamed and removed 2016-03-01 12:34:03 +01:00
Jan Steemann 102066b4ee removed methods 2016-03-01 11:50:16 +01:00
Jan Steemann 21e5e68ae5 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 11:14:55 +01:00
Jan Steemann 6c152649d4 added allKeys() method 2016-03-01 11:14:40 +01:00
Max Neunhoeffer ad97830d7f Add babies to insert document API (V8 & HTTP & Transaction). 2016-03-01 10:14:24 +01:00
Michael Hackstein 16750ea55b Replaced OperationCursor by forward declaration 2016-02-29 15:26:52 +01:00
Michael Hackstein 4f7e03af58 Removed unnecessary reference to Index.h. Decreases build time when Indexes are changed 2016-02-29 14:25:35 +01:00
jsteemann 545b0ed6a2 cleanup 2016-02-27 02:44:51 +01:00
jsteemann f0aeab0d12 cleanup 2016-02-27 01:10:42 +01:00
Jan Steemann bd9293802d marker changes, unfinished 2016-02-26 19:39:17 +01:00
Jan Steemann 254a54a470 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-26 16:24:23 +01:00
Jan Steemann 27fac1e05e removed marker types 2016-02-26 16:24:17 +01:00
Michael Hackstein 4f832aa568 Fixed a bug in EdgeIndex lookup and added checks when inserting documents into an Edge Collection. They now need to have valid _from and _to entries 2016-02-26 15:48:48 +01:00
Jan Steemann ebf2d1520b removed TRI_doc_mptr_copy_t 2016-02-26 11:46:33 +01:00
Jan Steemann 2ee4dad77b TransactionContext is now the resource owner 2016-02-25 14:02:57 +01:00
Jan Steemann 3c6391279e cleanup 2016-02-25 12:24:04 +01:00
Jan Steemann 0b815931a7 fixed crud operations 2016-02-25 11:49:11 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
Jan Steemann 8f2e2de451 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 10:46:13 +01:00
jsteemann 1823ae4fd2 removed unused forwards and functions 2016-02-25 00:48:06 +01:00
Jan Steemann cd6a9d4988 cleanup 2016-02-24 20:12:46 +01:00
Jan Steemann 5ee8493c39 cleanup 2016-02-24 19:51:12 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Michael Hackstein a5442d19f3 Fixed a bug in expandInSearch values. And removed temporary test hack. 2016-02-24 14:46:21 +01:00
Michael Hackstein 9727a1f3a8 Started to add an implementation tu multiply queries with IN. THis is identical for all indexes and does not check validity. The general idea is that an index does not need to know anything about AND, OR, IN. It just has to know primitive types like EQ, LE, LT, GE, GT. 2016-02-24 13:29:26 +01:00
jsteemann 886dca61b0 removed log messages 2016-02-23 22:01:26 +01:00
jsteemann e69e37ec97 fixed start 2016-02-23 21:51:02 +01:00
jsteemann ee49f4f3f7 cppcheck 2016-02-23 21:33:59 +01:00
Jan Steemann a27f1efd66 changed resolver handling 2016-02-23 20:27:13 +01:00
Jan Steemann 0e5f1fcb24 moved ditches into TransactionContext 2016-02-23 16:46:25 +01:00
Jan Steemann b7ef8e6f1d removed unused method 2016-02-23 16:01:15 +01:00
Max Neunhoeffer fac2ebeaa2 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-23 14:35:45 +01:00
Max Neunhoeffer 54b645df55 Change API of index scan. 2016-02-23 14:34:41 +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
Jan Steemann f468cd00ad create transaction context as shared ptr 2016-02-23 12:18:39 +01:00
Jan Steemann e187615477 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 11:06:10 +01:00
Jan Steemann 0a969caf23 removed SingleCollectionReadOnlyTransaction and SingleCollectionWriteTransaction 2016-02-23 11:05:44 +01:00
Michael Hackstein 6edcfd1553 Transaction ALL and ANY now return the custom type handler, so the result is actually usable 2016-02-23 10:33:59 +01:00
Michael Hackstein 4b4661f2b0 Fixed compiler errors 2016-02-23 09:58:39 +01:00
Michael Hackstein c3dbb0a37a Added transaction.any new version 2016-02-23 09:42:34 +01:00
Michael Hackstein deef8c3c42 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-22 17:18:15 +01:00
Jan Steemann 49181147e4 truncate optimization 2016-02-22 16:52:18 +01:00
Jan Steemann 3e2e14d800 truncate() 2016-02-22 16:30:56 +01:00
Jan Steemann f07054bf6a Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 16:28:42 +01:00
Jan Steemann 7efe1c6091 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 16:28:37 +01:00
Michael Hackstein 39d022c4d3 Fixed compile error that only occured in Maintainer mode. 2016-02-22 16:11:21 +01:00
Michael Hackstein 1367368b38 Added a version for ScanIndex with CursorType::Any 2016-02-22 15:42:57 +01:00
Jan Steemann 840062af8d all() 2016-02-22 14:03:50 +01:00
Michael Hackstein ef4f3790bc Added OperationCursor to cmake file. Fixed compile errors 2016-02-22 14:02:03 +01:00
Michael Hackstein bbd6ee4c12 Added implementation for operation cursor 2016-02-22 13:53:27 +01:00
Michael Hackstein e9054fdf29 Added a All iterator for the primary index and made it available in the transaction 2016-02-22 13:25:51 +01:00
Jan Steemann 69833fbca2 added getCollectionType() method 2016-02-22 12:26:17 +01:00
Max Neunhoeffer ed29fd9d60 Introduce getCollectionId, use it in a few places. 2016-02-19 23:48:34 +01:00
Max Neunhoeffer 393ac7e753 Rename getCollectionId -> getCollectionIdLocal. 2016-02-19 23:26:17 +01:00
Michael Hackstein 687bc3c19b Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-19 18:22:24 +01:00
Michael Hackstein 756c056795 Added basic implementation to scan an index based on a transaction. However no index implements the new iterator yet. Next step. 2016-02-19 18:22:19 +01:00
Max Neunhoeffer 334ddda823 Fix error handling with wrong revisions. 2016-02-19 16:48:28 +01:00
Michael Hackstein 5ff54220ca Started implementing indexScan on transaction. Does not return anything useful yet 2016-02-19 16:35:17 +01:00
Max Neunhoeffer 20c1a8142f Add truncate for coordinator. 2016-02-19 16:14:11 +01:00
Max Neunhoeffer bbb47a5252 Add proper error handling for coordinator CRUD. Add remove. 2016-02-19 16:09:26 +01:00
Max Neunhoeffer 1e38c746dc Add update on coordinator in Transaction. 2016-02-19 15:12:45 +01:00
Max Neunhoeffer b406a062ca Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-19 14:13:54 +01:00
Max Neunhoeffer 81ae787388 Index Scan API. 2016-02-19 14:11:33 +01:00
Jan Steemann 18b6f3bbd9 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:23:55 +01:00
Max Neunhoeffer 0c97d9652a Fix SingleCollectionTransaction in cluster case. 
Collection ID lookup was not cluster ready.
 2016-02-19 12:19:35 +01:00
Jan Steemann d97cfc84e4 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 12:06:18 +01:00
Max Neunhoeffer bca482661a Factor out buildDocumentIdentity. 2016-02-19 11:56:44 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
jsteemann 62130d3239 locking-related bugfixes 2016-02-19 00:31:28 +01:00
Max Neunhoeffer a62a23d167 Fix compilation. 2016-02-18 23:09:07 +01:00
Max Neunhoeffer 5fccaecc67 Add API for Transaction::indexScan. 2016-02-18 22:34:53 +01:00
Max Neunhoeffer 092d96db08 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-18 21:26:29 +01:00
Jan Steemann 367c234d96 implemented count() 2016-02-18 17:54:28 +01:00
Max Neunhoeffer cb2b159af3 Add documentCoordinator in Transaction. 2016-02-18 16:54:23 +01:00
Jan Steemann 544fc3a31b fixed compile error 2016-02-18 16:34:41 +01:00
Jan Steemann 5b3b7e673b Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 16:17:07 +01:00
Jan Steemann 157bbe3cf7 fixed replace() 2016-02-18 16:16:54 +01:00
Max Neunhoeffer a66246e6ef Remove old constructors. 2016-02-18 15:57:35 +01:00
Max Neunhoeffer f08f663ec0 Fix constructor call to OperationResult. 2016-02-18 15:33:02 +01:00
Max Neunhoeffer 27885f75bd Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-18 14:56:59 +01:00
Max Neunhoeffer 52d051d571 Add insertCluster method to transaction. Change OperationResult. 2016-02-18 14:56:37 +01:00
Jan Steemann 9b80a8a371 return _rev in case of revision mismatch for document(), fixed update() 2016-02-18 14:42:38 +01:00
Michael Hackstein 7ed6754389 Fixed usage of document, to also include customTypeHandler for export to V8 2016-02-18 13:21:06 +01:00
Jan Steemann d7963c651b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 12:55:49 +01:00
Jan Steemann ea7a7b4242 handle custom types 2016-02-18 12:55:33 +01:00
Frank Celler a5e804ab70 added cancel 2016-02-17 22:19:52 +01:00
Jan Steemann d6cc325c43 initial implementation of update, still broken 2016-02-17 18:06:35 +01:00