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

3059 Commits

Author SHA1 Message Date
jsteemann d6833b6862 potentially optimized lookups for _from and _to 2016-04-30 14:21:15 +02:00
jsteemann e478c1ae11 faster lookup for _key attribute 2016-04-30 13:25:06 +02:00
jsteemann 58736a9d50 prepation for optimizations 2016-04-29 17:26:22 +02:00
Michael Hackstein 4216e6cbb1 Removed resolved TODO comments 2016-04-29 17:05:26 +02:00
jsteemann 8d17d10ebb fixed undefined behavior 2016-04-29 16:25:17 +02:00
Michael Hackstein c58b78062b Added a sanitize externals function that expands externals on demand. It is now used whenever a query is stored in the query cache as the data it is pointing to might be moved. Has to be used as well when sending VPack to client. 2016-04-29 15:21:48 +02:00
Michael Hackstein 7af9beefa1 Neighbors now uses VPackSlices with specialized string comparision function. 2016-04-29 13:55:02 +02:00
Michael Hackstein 165d92fc58 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 09:15:09 +02:00
jsteemann b796e4cc7d use some static strings here and there 2016-04-29 01:37:44 +02:00
jsteemann 7974b2bc42 small changes 2016-04-29 01:01:49 +02:00
Michael Hackstein bc464435a4 trx.document now uses externals and AQL functions react to it 2016-04-28 17:33:25 +02:00
Michael Hackstein 7c12301444 The c++ graph modul can now work with externals 2016-04-28 15:05:33 +02:00
jsteemann b9ef307bf1 micro optimizations 2016-04-28 12:04:14 +02:00
Michael Hackstein 647c7b6584 Finished implementing baby api in Modification blocks. 2016-04-27 15:23:40 +02:00
Michael Hackstein c3958a1215 AQL REMOVE Block now makes use of baby variant. 2016-04-26 14:50:21 +02:00
Michael Hackstein b25a35f6fe Removed unnecessary forwards and imports of JSON and doc_mptr in ModificationBlocks. 2016-04-26 11:17:18 +02:00
Jan Steemann 64350d802d micro optimizations 2016-04-26 10:22:13 +02:00
jsteemann 26b10e2e10 use make_unique 2016-04-26 00:02:33 +02:00
Jan Steemann 7dc214160f fixed variable name 2016-04-25 17:51:34 +02:00
Jan Steemann c8c8625727 try to fix some undefined behavior on cluster startup 2016-04-25 15:31:23 +02:00
jsteemann 0da9ac7cdc micro optimizations 2016-04-23 16:23:15 +02:00
jsteemann 7db14d381a unified include guards 2016-04-22 16:05:50 +02:00
Jan Steemann 2151ecce68 fixed crash 2016-04-21 17:27:12 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Michael Hackstein 490905d188 Replaced an unordered set by a vector. The uniqueness is guaranteed by other mechanisms anyways. Further improved computationtime of Neighbors 2016-04-21 13:52:12 +02:00
jsteemann accb2cb33e added operator LIKE 2016-04-20 23:05:38 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann 316a1bd190 starting support for Externals 2016-04-19 22:31:40 +02:00
Jan Steemann bc7d45aada fixed crash 2016-04-19 16:38:50 +02:00
Jan Steemann 2254df14f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 15:38:37 +02:00
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +02:00
Michael Hackstein be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Kaveh Vahedipour d97d23b8df naming and FMH merge perp 2016-04-19 07:59:51 +00:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Simran Brucherseifer 097dcb0984 Minor corrections 2016-04-18 19:01:56 +02:00
Jan Steemann a3ad9ba3a3 fixed issue #1805 2016-04-18 15:09:42 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
jsteemann a0f05f584f speed up IN lookups on ranges 2016-04-17 21:09:36 +02:00
jsteemann 30ec73e596 AQL bugfixes and tests, CHANGELOG updates 2016-04-17 20:57:13 +02:00
Frank Celler 92dc9224c2 fixed startup 2016-04-17 16:18:03 +02:00
Michael Hackstein 6f7723bc58 Entirely removed TRI_json_t from AQL/Ast. All replaced by VPack 2016-04-16 23:44:03 +02:00
Michael Hackstein 122c891fa8 Removed Ast::nodeFromJson which was obsolete and is not used anymore 2016-04-16 23:40:43 +02:00
Frank Celler f7249d2729 WIP 2016-04-15 22:47:35 -07:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
jsteemann bbac0b673f don't pull filters beyond modification nodes 2016-04-15 18:10:16 +02:00
jsteemann ecd7de16cb added optimizer rule "inline-subqueries" 2016-04-15 17:21:22 +02:00
Michael Hackstein e90193bec0 Fixed a nullptr access in Traversal condition finder. 2016-04-14 13:32:28 +02:00
Michael Hackstein 2d860fb80e Added a cpp file for AqlTransaction. Now only parts of AQL have to be rebuild on cluster changes, not complete AQL 2016-04-14 11:30:54 +02:00
Jan Steemann 576fcab12b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-13 16:29:26 +02:00
Jan Steemann a0fde1b7b2 allow array values in attribute name bind parameters 2016-04-13 16:29:09 +02:00
Michael Hackstein b043b103e0 Optimized IN in AQL pattern Matcher properly. Also added some tests for it 2016-04-13 14:49:21 +02:00
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
jsteemann 25c89bb7e8 make AQL RANGE() function return a real range object 2016-04-11 23:11:05 +02:00
Frank Celler 922753ef3d WIP 2016-04-11 17:44:41 +02:00
Jan Steemann 947fb8d9ad make LIKE wildcards newline-aware 2016-04-11 14:02:12 +02:00
jsteemann 4a7c9f0f68 simplified bloated comments 2016-04-09 11:27:30 +02:00
Jan Steemann 4646f5d5f0 fix wrong path 2016-04-08 13:11:03 +02:00
Jan Steemann 3a582af765 fix Windows build 2016-04-08 13:09:32 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Jan Steemann 6a00984114 fixed some comments 2016-04-07 18:21:02 +02:00
Jan Steemann 6df7221691 cleanup 2016-04-07 17:08:44 +02:00
Michael Hackstein 1b967d9535 Started fixing AQL-failures-noncluster tests. Still two are failing. Return and Sort. 2016-04-07 14:37:18 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Michael Hackstein dc58c5d769 Fixed Modify edges in cluster test. Expected old return codes 2016-04-04 18:41:28 +02:00
Michael Hackstein 96df479125 Fixed error Reporting in AQLRestHandler. It did always throw OOM despite of the error. 2016-04-04 17:46:41 +02:00
Kaveh Vahedipour 723eb01cee merging back from agency 2016-04-04 12:13:43 +00:00
Michael Hackstein ab46b07f98 Reimplemented Traversal in Cluster case 2016-04-04 12:52:11 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler 09da78e444 WIP 2016-04-03 13:48:25 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Frank Celler 8e39a3c889 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-01 10:39:50 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Kaveh Vahedipour e0990c947e fixed broken agency test 2016-04-01 10:38:10 +02:00
Michael Hackstein e32df21b2c Also reverted simple geo queries to old version to make them functional again 2016-03-31 17:34:21 +02:00
Michael Hackstein b5c0ce0a82 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-31 16:20:33 +02:00
Michael Hackstein fb2b7b6b0f Fixed FullText index in cluster. Newest implementation ended up in an endless Loop. Reverted to original version. 2016-03-31 16:20:20 +02:00
Frank Celler c41c51b23d Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-31 14:46:49 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Michael Hackstein 938c5470f4 Fixed serialisation of ItemBlock in Cluster Case. 2016-03-31 13:03:05 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Michael Hackstein 8761550add Whenever an AQLValue should store an external it will now store a pointer instead. 2016-03-29 16:01:58 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Michael Hackstein db4b6d2a5b Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-24 15:48:50 +01:00
Jan Steemann dce7c427d9 test fixes 2016-03-24 14:55:31 +01:00
Michael Hackstein 76d70591e9 Removed unnecessary import 2016-03-24 13:41:39 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +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 16e56446b1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-22 19:01:27 +01:00
Jan Steemann e8c09f3cc1 added missing reset functionality for nested traversals 2016-03-22 18:58:08 +01:00
Jan Steemann d763c102d6 fulltext fixes 2016-03-22 18:34:40 +01:00
Jan Steemann 80413739d1 fixed test 2016-03-22 14:34:18 +01:00
Michael Hackstein 6a1f392efe Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-22 11:37:14 +01:00
Michael Hackstein 51c0d6ee64 Edge queries are now more relaxed about the start vertex. They will not throw errors instead just return empty array as a value. 2016-03-22 11:37:04 +01:00
Jan Steemann 45cc15fe45 fixes 2016-03-22 10:51:42 +01:00
Michael Hackstein e7271f6e58 AQL EDGES function does not throw COLLECTION_NOT_FOUND any more 2016-03-22 09:55:14 +01:00
Max Neunhoeffer 4f8ffadd42 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-21 23:32:58 +01:00
Max Neunhoeffer 5bfdca8d69 Fix AQL in cluster bugs. 2016-03-21 23:30:13 +01:00
jsteemann 9fcc5d043b removed superfluous includes 2016-03-21 22:58:42 +01:00
jsteemann 3dede4a71f cleanup 2016-03-21 22:30:00 +01:00
Jan Steemann 776fae268c Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 17:09:19 +01:00
Michael Hackstein ebcdcbf581 Fixed illeagal stat points in TraversalBlock 2016-03-21 17:08:59 +01:00
Jan Steemann 53a576ed46 debugging 2016-03-21 16:42:23 +01:00
Jan Steemann aa874ab9ff debugging 2016-03-21 16:26:02 +01:00
Jan Steemann ce63219435 removed DocumentAccessor 2016-03-21 15:40:44 +01:00
Jan Steemann 811732230c fixed test 2016-03-21 13:46:58 +01:00
Jan Steemann 304243a4b0 fixes 2016-03-21 13:17:36 +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
jsteemann 87d3d4935b fixed query cache 2016-03-18 20:22:14 +01:00
jsteemann 4d3e00ff48 optimized v8-to-vpack conversion 2016-03-18 19:40:46 +01:00
Michael Hackstein f1c91d9550 Fixed forgotten nullptr handling. 2016-03-18 17:28:18 +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 20eb786921 Fixed invalid forward declartion 2016-03-18 15:48:09 +01:00
jsteemann d5f754a430 fixed leaks 2016-03-18 14:30:55 +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 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
jsteemann 3e75388165 fixed leak 2016-03-18 11:34:46 +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 172ff37b43 Fixed used after free in IndexBlock 2016-03-18 11:07:53 +01:00
Michael Hackstein c7b63f0ffa Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-18 08:48:39 +01:00
jsteemann 62fd9435d9 fixed some tests 2016-03-17 22:57:11 +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 1ee1ff23ec bugfixes 2016-03-17 18:36:40 +01:00
jsteemann 81ca88381f bugfixes 2016-03-17 15:20:13 +01:00
jsteemann dc3581563c bugfixes 2016-03-17 14:46:49 +01:00
jsteemann a15e9d9550 removed files 2016-03-17 00:28:08 +01:00
jsteemann c41f18080b removed includes 2016-03-17 00:04:03 +01: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
Michael Hackstein f0b860cc72 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-16 11:13:46 +01:00
Michael Hackstein c503910d54 AQL Traversal now uses VPackResult instead of JSON 2016-03-16 11:10:43 +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
jsteemann b2d7038b30 fixed some datafile issues 2016-03-15 23:37:39 +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 c9b42aac95 Fixed a stupid double assign. 2016-03-15 18:32:26 +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
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 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
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 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
Max Neunhoeffer ed1e59b3a1 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-14 14:08:29 +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 04ff5dafe3 removed TODO 2016-03-12 12:23:25 +01:00
jsteemann 47c7c6ccff renamed type 2016-03-12 12:12:25 +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 8b281b0538 repaired explain 2016-03-11 16:38:01 +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 0ced13c4ff fixed AQL REMOVE 2016-03-11 15:13:34 +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
Jan Steemann 7b68bd2656 remove printing 2016-03-11 13:03:52 +01:00
Jan Steemann da691ed39c fixed memory issues 2016-03-11 12:44:38 +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
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
jsteemann 279fb105e2 cppcheck 2016-03-09 22:57:49 +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
Michael Hackstein 0294fd403b Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-09 12:43:40 +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
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
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00