1
0
Fork 0
Commit Graph

8338 Commits

Author SHA1 Message Date
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
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
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
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