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

8737 Commits

Author SHA1 Message Date
Jan Steemann 0f213e3049 made base class virtual 2016-03-21 13:24:01 +01:00
Jan Steemann d2195c43a7 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 13:17:42 +01:00
Jan Steemann 304243a4b0 fixes 2016-03-21 13:17:36 +01:00
Michael Hackstein b04ec0f4fe Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-21 13:11:48 +01:00
Michael Hackstein e8f8e4b4da Reactivated vertexCollectionRestrictions in Neighbors 2016-03-21 13:11:43 +01:00
Jan Steemann b672ce0985 test fixes 2016-03-21 12:15:40 +01:00
Michael Hackstein 7f9ae321a0 Traverser Basic options now know the transaction. Modified all implementations to use Slices in apropriate places. Fixes some, but not all tests 2016-03-21 11:28:33 +01:00
Kaveh Vahedipour 2583c00859 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-21 10:41:15 +01:00
Jan Steemann 9e158aafd7 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:49 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
Michael Hackstein af30560aa1 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-21 09:20:43 +01:00
Michael Hackstein 7896905ad7 Fixed a multithreading bug for EdgeCollectionInfos. Threads shared the same Builder instance which is not possible. 2016-03-21 09:20:31 +01:00
Max Neunhoeffer 268dc3c097 Fix geo index remove. 2016-03-21 09:12:56 +01:00
Kaveh Vahedipour 41d804d765 need to find out how to define the headers properly 2016-03-21 08:14:58 +01:00
Kaveh Vahedipour 3beb3450b1 catch malformed input. 2016-03-21 08:00:54 +01:00
jsteemann 87d3d4935b fixed query cache 2016-03-18 20:22:14 +01:00
jsteemann 005a64dd0d Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 19:41:42 +01:00
jsteemann 4d3e00ff48 optimized v8-to-vpack conversion 2016-03-18 19:40:46 +01:00
Kaveh Vahedipour 3d3fb23a62 writing test 2016-03-18 18:59:06 +01:00
Michael Hackstein 75fa81302a Fixed access to a nullptr. 2016-03-18 18:46:01 +01:00
Michael Hackstein f1c91d9550 Fixed forgotten nullptr handling. 2016-03-18 17:28:18 +01:00
Michael Hackstein 5bc2274855 Fixed invalid search values in Graph Traverser. Now some more tests are green. Still failing 2016-03-18 16:47:55 +01:00
Michael Hackstein fa82868e7b Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-18 15:55:09 +01:00
Michael Hackstein 8e678d0fc2 Fixed single server version of Traverser 2016-03-18 15:54:52 +01:00
Michael Hackstein a2ecc653f0 Removed unused debug output 2016-03-18 15:53:09 +01:00
Michael Hackstein 25b33b9048 Fixed invalid forward declarations 2016-03-18 15:52:49 +01:00
Michael Hackstein 20eb786921 Fixed invalid forward declartion 2016-03-18 15:48:09 +01:00
jsteemann cb60a0b222 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 14:31:05 +01:00
jsteemann d5f754a430 fixed leaks 2016-03-18 14:30:55 +01:00
Michael Hackstein 16208d78f6 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-18 14:29:23 +01:00
Michael Hackstein bb40b3c420 Fixed edge index lookup. Did fail for IN cases 2016-03-18 14:29:17 +01:00
jsteemann 40682e9c45 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 13:57:02 +01:00
jsteemann 5ded90ed1c fixed compare function for Custom attributes 2016-03-18 13:55:36 +01:00
Michael Hackstein 8b0b8a3667 Fixed invalid nullptr for any() query 2016-03-18 13:55:11 +01:00
Michael Hackstein 7a7479519a Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-18 13:17:48 +01:00
Michael Hackstein 5c3b9e3fd6 Fixed invalid use after free in IndexBlock 2016-03-18 13:17:40 +01:00
Kaveh Vahedipour 062e403dba correct array pop/push/shift/prepend behaviours if non-array entry on store 2016-03-18 11:47:24 +01:00
jsteemann 3e75388165 fixed leak 2016-03-18 11:34:46 +01:00
Kaveh Vahedipour bb2475544a merged in from devel 2016-03-18 11:28:48 +01:00
jsteemann a3ce925066 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 11:23:44 +01:00
jsteemann 906418778c cppcheck 2016-03-18 11:23:38 +01:00
Michael Hackstein 61e6e64a63 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-18 11:08:03 +01:00
Michael Hackstein 172ff37b43 Fixed used after free in IndexBlock 2016-03-18 11:07:53 +01:00
Kaveh Vahedipour eb71e96e0c minor minor 2016-03-18 11:03:13 +01:00
jsteemann fd49f750fb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 10:46:03 +01:00
Kaveh Vahedipour d6db18d655 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-18 10:45:15 +01:00
Frank Celler 6d19bdbbfe Merge branch 'devel' of github.com:arangodb/arangodb into v8 2016-03-18 09:50:20 +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 3ced50dc2a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-18 02:07:09 +01:00
Max Neunhoeffer d1c5c64d6b Fix baby methods for documents in arangosh. 2016-03-18 02:05:19 +01:00
Andreas Streichardt 14ce41435b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-17 22:40:00 +00:00
Andreas Streichardt 90862b6081 Proper secondary => Primary failover 2016-03-17 22:39:15 +00:00
jsteemann 62fd9435d9 fixed some tests 2016-03-17 22:57:11 +01:00
Kaveh Vahedipour 67d46b9485 we have ttl 2016-03-17 21:52:07 +01:00
jsteemann a9ab4eaace Merge branch 'devel' of https://github.com/arangodb/arangodb into v8 2016-03-17 21:13:21 +01:00
Kaveh Vahedipour 0051c9d3d4 we have ttl 2016-03-17 21:04:12 +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
Max Neunhoeffer 20d0e98462 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 18:50:33 +01:00
Max Neunhoeffer 827f2f4f44 Improve /_api/simple/remove-by-key. 
Fix more document methods.
 2016-03-17 18:49:52 +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 1ee1ff23ec bugfixes 2016-03-17 18:36:40 +01:00
jsteemann 996299cea3 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 17:17:50 +01:00
jsteemann 4de93d49b9 added shebang support 2016-03-17 16:18:04 +01:00
Max Neunhoeffer 8d35a2b6f9 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 15:53:35 +01:00
Max Neunhoeffer 2c81e5cac9 Fix V8 behaviour for documents. 2016-03-17 15:53:14 +01:00
Andreas Streichardt dca42efb2e Rework cluster state handling 2016-03-17 14:48:33 +00:00
jsteemann 81ca88381f bugfixes 2016-03-17 15:20:13 +01:00
jsteemann dc3581563c bugfixes 2016-03-17 14:46:49 +01:00
Kaveh Vahedipour 92bcc0c376 All operators + new without set 2016-03-17 12:55:18 +01:00
jsteemann 9fda52ab9c initialize array buffer allocator differently 2016-03-17 10:53:32 +01:00
Max Neunhoeffer 929c50d6dd Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 09:36:47 +01:00
jsteemann c710168e5c removed unused parts 2016-03-17 01:02:35 +01:00
jsteemann 8148d73c03 removed some more Shaper 2016-03-17 00:36:34 +01:00
Max Neunhoeffer 138ed35012 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 00:29:05 +01:00
Max Neunhoeffer 61bf275b85 Add some options to usage message. 2016-03-17 00:28:53 +01:00
jsteemann a15e9d9550 removed files 2016-03-17 00:28:08 +01:00
jsteemann 3cd107e761 removed includes 2016-03-17 00:11:07 +01:00
Max Neunhoeffer 8c2545bf66 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 00:06:55 +01:00
jsteemann 97f6f87b01 removed unused files 2016-03-17 00:06:11 +01:00
Max Neunhoeffer 3f648ef2bb Fix remove behaviour. 2016-03-17 00:05:51 +01:00
jsteemann c41f18080b removed includes 2016-03-17 00:04:03 +01:00
jsteemann 873854a0a0 removed unused file 2016-03-16 23:56:52 +01:00
Kaveh Vahedipour af56c18345 Construct builder with prefilled buffer. Agency store increment, decrement, push pop 2016-03-16 23:53:09 +01:00
Kaveh Vahedipour 5acdc36d07 Construct builder with prefilled buffer. Agency store increment, decrement, push pop 2016-03-16 23:40:53 +01:00
jsteemann 171488b6d2 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 23:34:29 +01:00
Max Neunhoeffer 95888c1b7c Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-16 19:56:17 +01:00
Max Neunhoeffer 8b8019b28a Fix behaviour of remove. 2016-03-16 19:55:49 +01:00
Max Neunhoeffer d18c7cb625 Fix precondition failed babies case in RestDocumentHandler. 2016-03-16 19:54:59 +01:00
Andreas Streichardt 614beefc74 Throw Http error 503 when a required backend is unavailable 2016-03-16 18:04:05 +00:00
jsteemann 0720ccdecb harmonized 2016-03-16 18:49:42 +01:00
jsteemann a61c6b8ffa fixed query options 2016-03-16 17:53:39 +01:00
Kaveh Vahedipour 7355cde795 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-16 16:27:53 +01:00
Michael Hackstein f0b860cc72 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-16 11:13:46 +01:00
Michael Hackstein 4a2c33eafc Replaced setStartVertex(Slice) by setStartVertex(string) in Traversal and fixed all resulting compile errors. It now compiles but is not Functional yet. Have to implement reading of Documents from DB in TRX / VPack Style 2016-03-16 11:12:27 +01:00
Michael Hackstein c503910d54 AQL Traversal now uses VPackResult instead of JSON 2016-03-16 11:10:43 +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 665c1b9103 yet another function 2016-03-16 10:41:06 +01:00
jsteemann 85c5333dcf simplified functions, halfway through 2016-03-16 02:47:23 +01:00
Kaveh Vahedipour a2de635eba correct const/non const iterations in operator() for Store 2016-03-16 00:24:15 +01:00
jsteemann b281a97784 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 23:38:39 +01:00
jsteemann b2d7038b30 fixed some datafile issues 2016-03-15 23:37:39 +01:00
Kaveh Vahedipour 9671c386b4 correct const/non const iterations in operator() for Store 2016-03-15 21:49:56 +01:00
Michael Hackstein 7113e93c67 Finished with Shortest Path Implementation based on new TRX and VPack API 2016-03-15 20:48:02 +01:00
Kaveh Vahedipour 6f8841fcc8 correct const/non const iterations in operator() for Store 2016-03-15 20:44:06 +01:00
jsteemann 3c3a4fb0d2 use AqlValues 2016-03-15 20:27:57 +01:00
jsteemann 8650404c9e fixed startup 2016-03-15 20:09:15 +01:00
jsteemann 1cfe222faf Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 18:35:26 +01:00
Michael Hackstein fb7088b5da Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-15 18:34:54 +01:00
Michael Hackstein 6bcbf1241b Started reimplementing ShortestPath wth new transactions and VPack 2016-03-15 18:34:37 +01:00
Michael Hackstein 84454f49c4 Fixed Edge Index iterator to always retain the iterator data 2016-03-15 18:34:00 +01:00
Michael Hackstein c9b42aac95 Fixed a stupid double assign. 2016-03-15 18:32:26 +01:00
Kaveh Vahedipour 8bf2264e88 null result for non-existent key in agency dbs 2016-03-15 16:28:27 +01:00
jsteemann 4f8265bfc8 temporary builder leaser 2016-03-15 14:08:03 +01:00
jsteemann 6d00c2d9e9 simplified 2016-03-15 12:37:40 +01:00
jsteemann b7d576bce2 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 12:29:11 +01:00
jsteemann 3a6e618a30 micro optimizations 2016-03-15 12:28:58 +01:00
Michael Hackstein 82542ea90c Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-15 11:12:15 +01:00
Michael Hackstein 7e0c8c935d Reimplemented optimizer rule to remove unnecessary SORT if covered by index 2016-03-15 11:12:10 +01:00
jsteemann fb50c5c0bb removed wrong location header 2016-03-15 10:59:28 +01:00
jsteemann 26245ddf54 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 10:40:43 +01:00
jsteemann 3fd954fc6a micro optimizations 2016-03-15 10:40:37 +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
jsteemann 7fb31d9ef6 free by default 2016-03-15 00:13:11 +01:00
jsteemann b04ec219d9 changed functions signature 2016-03-15 00:01:54 +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
jsteemann a84c46d62b some optimizations for V8<->vpack conversion 2016-03-14 21:50:16 +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 3850ace12c Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-14 18:07:21 +01:00
jsteemann 2ade0ef3d0 fixed log output 2016-03-14 18:05:20 +01:00
Max Neunhoeffer f8f27c6cbf Polish mechanism for recovery via Transaction API. 2016-03-14 18:05:17 +01:00
jsteemann 9cb9dfd8af Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-14 17:54:54 +01:00
jsteemann 358b09260e fixed prologue marker writing 2016-03-14 17:54:46 +01:00
Max Neunhoeffer 3ebce7b392 Put in check for changed shard keys. 2016-03-14 17:27:46 +01:00
Max Neunhoeffer d4fb621d19 Remove old code w.r.t. shardKeysChanged test. 2016-03-14 16:31:37 +01:00
jsteemann d7bec3c343 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-14 14:34:36 +01:00
jsteemann c13f7f116d diversify between VPACK_POINTER and VPACK_DOCUMENT 2016-03-14 14:33:44 +01:00
jsteemann 1a9d46ad31 removed wrapper for ShapedJson 2016-03-14 14:33:32 +01:00
Max Neunhoeffer ed1e59b3a1 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-14 14:08:29 +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
jsteemann 874a748477 use ValuePair 2016-03-14 09:19:52 +01:00
jsteemann 3c6cdb5ddb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-14 09:14:54 +01:00
jsteemann 47e5069bf7 do not leak 2016-03-14 09:13:55 +01:00
jsteemann e8662b5265 preparation 2016-03-12 12:42:29 +01:00
jsteemann 04ff5dafe3 removed TODO 2016-03-12 12:23:25 +01:00
jsteemann 47c7c6ccff renamed type 2016-03-12 12:12:25 +01:00
Max Neunhoeffer 627ef39b81 Finish returnNew and returnOld for RestDocumentHandler. 2016-03-11 23:16:45 +01:00
Max Neunhoeffer 01f942239e Fix Rest handler. 2016-03-11 21:50:35 +01:00
Max Neunhoeffer 1cf6299399 RestDocumentHandler returnNew and returnOld. 2016-03-11 21:45:47 +01:00
Jan Steemann c4ad66ce6d startup fixes 2016-03-11 19:11:45 +01:00
Jan Steemann 4569aa9aac fixed UPSERT 2016-03-11 18:08:57 +01:00
Jan Steemann ba91761a66 fix resetting of cursors 2016-03-11 17:56:23 +01:00
Kaveh Vahedipour b59e7adfeb actually getting out what was put into kv-store 2016-03-11 17:07:16 +01:00
Jan Steemann 4385bd8a4e Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 16:38:15 +01:00
Jan Steemann 8b281b0538 repaired explain 2016-03-11 16:38:01 +01:00
Max Neunhoeffer 8f6cd501aa Change behaviour of remove(), return data, allow returnOld. 2016-03-11 16:35:55 +01:00
Jan Steemann 99c6786858 fixed AQL UPDATE/REPLACE 2016-03-11 15:32:50 +01:00
Jan Steemann 39516d6980 fixed INSERT 2016-03-11 15:20:03 +01:00
Jan Steemann 5f966dd506 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 15:13:44 +01:00
Jan Steemann 0ced13c4ff fixed AQL REMOVE 2016-03-11 15:13:34 +01:00
Max Neunhoeffer 1c94f8d1be returnNew and returnOld, progress. 2016-03-11 15:12:58 +01:00
Max Neunhoeffer 968d1cfd1f Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-11 15:12:40 +01:00
Jan Steemann 44070b149e fixes for AQL 2016-03-11 14:54:14 +01:00
Jan Steemann c814332503 fixed materialization of _id values 2016-03-11 14:15:59 +01:00
Max Neunhoeffer 58269de240 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-11 13:10:30 +01:00
Max Neunhoeffer 0dad5a6c7e Finish implementation of returnNew and returnOld. 2016-03-11 13:10:14 +01:00
Jan Steemann 7b68bd2656 remove printing 2016-03-11 13:03:52 +01:00
Jan Steemann 0389fc41be Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 12:44:56 +01:00
Jan Steemann 724ce2e081 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 12:44:52 +01:00
Jan Steemann da691ed39c fixed memory issues 2016-03-11 12:44:38 +01:00
Max Neunhoeffer e77159b008 New returnNew option for insert. 2016-03-11 12:44:36 +01:00
Kaveh Vahedipour ac52b47708 actually getting out what was put into kv-store 2016-03-11 12:10:39 +01:00
Max Neunhoeffer 06be35dd9b Fix RestDocumentHandler after recent changes to rev management. 2016-03-11 10:09:06 +01:00
Max Neunhoeffer 447c95af83 Change revision management in Transaction.cpp. 2016-03-11 09:53:20 +01:00
Max Neunhoeffer a8b41636a7 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-11 09:52:17 +01:00
Jan Steemann cae40ca1cd less waitForSync usage 2016-03-11 09:15:50 +01:00
Max Neunhoeffer be45ecd09d Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-11 09:00:21 +01:00
Jan Steemann ff24255cdb added isSingleOperationTransaction 2016-03-11 08:54:11 +01:00
Max Neunhoeffer 9dbe9acf5f Lose MasterPointer.cpp (all header now). 2016-03-11 08:43:58 +01:00
Jan Steemann 11d9451c8c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-10 19:26:05 +01:00
Jan Steemann 613b08440e handle externals, somehow 2016-03-10 18:45:22 +01:00
Jan Steemann 7028516b03 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-10 18:24:26 +01:00
Jan Steemann beb132b466 AqlValue refactoring 2016-03-10 18:24:12 +01:00
Kaveh Vahedipour 9f51fe5fe9 merging from devel 2016-03-10 18:19:54 +01:00
Kaveh Vahedipour 61a55d61db Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-03-10 17:37:43 +01:00
Kaveh Vahedipour 3b59217c21 merging from devel 2016-03-10 17:37:37 +01:00
Max Neunhoeffer 0daedb4cbe Prepare returnOld and returnNew. 2016-03-10 16:49:03 +01:00
Max Neunhoeffer 97b5a7860f Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-10 16:28:37 +01:00
Max Neunhoeffer 9e98cc7107 Fix a bug in babies API for documents. 2016-03-10 16:28:27 +01:00
Michael Hackstein 9a0a8746db Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 16:23:22 +01:00
Michael Hackstein 380e4eda69 Another fix for skiplist index for Searches that should not hit any element 2016-03-10 16:22:15 +01:00
Michael Hackstein 34f9206a63 Fixed SkiplistIndex Lookup for Slice. Seems to be working in AQL. Needs to be tested in detail 2016-03-10 16:11:28 +01:00
Max Neunhoeffer c23b20c741 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-10 15:31:05 +01:00
Max Neunhoeffer 0647661f5a Fix a bug in update for babies. 2016-03-10 15:30:52 +01:00
Michael Hackstein eb8b09c85b Fixed Skiplist Index Lookup. Equallity Lookups now seem to work. Range Lookups will crash now. 2016-03-10 14:37:12 +01:00
Michael Hackstein b802ff9d25 Fixed memleak in HashIndex Lookup 2016-03-10 13:11:32 +01:00
Michael Hackstein 5e860c14da Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 12:49:33 +01:00
Michael Hackstein 3cf571d59f Undefined behaviour in HashIndex. Slice is correct but is not iterated properly yet 2016-03-10 12:49:26 +01:00
Max Neunhoeffer 66a7f298da Remove RestEdgeHandler. 2016-03-10 11:29:24 +01:00
Max Neunhoeffer 70772d6174 Remove RestEdgeHandler, start API-Changes-3.0.md Dokument. 2016-03-10 11:28:26 +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 0d414b2aa6 Fixed PrimaryIndex iterator creation from AQL. Got my first FILTER x._key == 'test' query running. yeah 2016-03-10 11:10:58 +01:00
Michael Hackstein ff4cf5e0b2 Fixed merge bug. Last commit didn't build 2016-03-10 11:10:13 +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
Frank Celler dd36dd55e6 fixes for windows 2016-03-10 09:25:54 +00:00
Max Neunhoeffer 995eecc832 Last traces of update_policy gone. 2016-03-10 00:17:33 +01:00
Max Neunhoeffer d51beb5326 Get rid of update_policy for good. 2016-03-10 00:14:06 +01:00
Max Neunhoeffer f25c5175ac Kill further uses of update_policy. 2016-03-10 00:07:51 +01:00
Max Neunhoeffer 9074f99f09 Get rid of update policy in RestHandlers. 2016-03-10 00:02:47 +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
jsteemann a67877de66 removed unused shaping functionality 2016-03-09 23:33:10 +01:00
jsteemann cf3b00adc2 removed unused functionality 2016-03-09 23:14:29 +01:00
jsteemann 279fb105e2 cppcheck 2016-03-09 22:57:49 +01:00
jsteemann a7450eb65f removed some includes 2016-03-09 22:21:08 +01:00
Jan Steemann 1c53076529 moved inventoryLock to the outside 2016-03-09 18:20:37 +01:00
Jan Steemann 878865c53a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 17:57:07 +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 c831858224 Fix RestDocumentHandler for POST. 2016-03-09 15:21:29 +01:00
Max Neunhoeffer bffd86b035 Temporarily disable external VPack usage again. 2016-03-09 15:20:21 +01:00
Michael Hackstein f5f039e493 Added a static function to edgeIndex to build a search-Value in a builder. 2016-03-09 13:28:43 +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 0294fd403b Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-09 12:43:40 +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 ecbab4e2da Removed duplicate functionality from functions.cpp. Also Simplified the example matcher to not use Resolver and Shaper any more 2016-03-09 12:43:04 +01:00
Kaveh Vahedipour 3d066d2f03 Store intestinals into cpp file. Write to db ok. 2016-03-09 12:29:01 +01:00
Jan Steemann 0c8003c8a1 added hash function for AqlValue$ 2016-03-09 10:54:29 +01:00
Jan Steemann 69d9d8084b Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 10:32:25 +01:00
Jan Steemann c21d7fc2f4 less json 2016-03-09 10:32:08 +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
Max Neunhoeffer 823a313c73 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-09 09:59:48 +01:00
Max Neunhoeffer a2d0e709dc Babies for <collection>.remove 2016-03-09 09:59:36 +01:00
Kaveh Vahedipour 3a239fe1d5 Store intestinals into cpp file. Write to db ok. 2016-03-09 09:58:43 +01:00
Frank Celler 5e027818c5 fixed dependencies in case USE_PRECOMPILED_V8 2016-03-09 09:44:57 +01:00
Jan Steemann 329b3d623f Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:24 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Max Neunhoeffer d39ced89b2 Babies for <collection>.document(). 2016-03-09 09:39:59 +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 b9b27b2579 Finish for good call to lookupDocument. 2016-03-08 21:42:49 +01:00
Max Neunhoeffer e4cda0d33f Fix new call to lookupDocument. 2016-03-08 21:41:06 +01:00
Max Neunhoeffer 94e5014293 Remove update polic from document-collection. 2016-03-08 21:36:13 +01:00