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

7399 Commits

Author SHA1 Message Date
jsteemann 3bcc5cd193 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 20:34:55 +01:00
jsteemann 75e815896d allow cancelation of traversal queries 2015-12-22 20:26:00 +01:00
Jan Steemann 5aebcbd91d Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 18:05:35 +01:00
Jan Steemann 6e3878ec94 changed behavior of [*] operator, added COLLECTION_COUNT internal function 2015-12-22 18:03:59 +01:00
Jan Steemann ae5a6952da fix 2015-12-22 17:54:22 +01:00
Max Neunhoeffer a80f2e71f4 Merge branch 'vpack' of ssh://github.com/ArangoDB/ArangoDB into vpack 2015-12-22 16:50:54 +01:00
Max Neunhoeffer 225c8cd843 Work on TODOs. 2015-12-22 16:50:09 +01:00
Jan Steemann 06ed7c8413 fix upgrade test 2015-12-22 15:27:49 +01:00
Jan Steemann fb0a522081 fixed compile error 2015-12-22 14:19:32 +01:00
Max Neunhoeffer 989e92761b Merge branch 'vpack' of ssh://github.com/ArangoDB/ArangoDB into vpack 2015-12-22 14:18:46 +01:00
Max Neunhoeffer 5f3a1fbdb2 Merge branch 'devel' into vpack 2015-12-22 14:18:34 +01:00
Max Neunhoeffer 152f3485b3 Fix dump bug in cluster. 2015-12-22 14:18:11 +01:00
Jan Steemann 1b1e42b1b9 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 14:15:22 +01:00
jsteemann 13fb41c6b0 removed useless flag 2015-12-22 14:15:02 +01:00
Jan Steemann 80c7645146 one more try 2015-12-22 13:10:43 +01:00
Jan Steemann e2e483e06a potential fix 2015-12-22 12:34:48 +01:00
Jan Steemann a3898bd54e fixed test 2015-12-22 11:27:05 +01:00
Jan Steemann 55729b78a9 fixed test 2015-12-22 10:44:52 +01:00
Jan Steemann dac697d24b removed some leftover iostream includes 2015-12-21 18:20:43 +01:00
Jan Steemann c0d5973adb garbage collection changes 2015-12-21 16:41:54 +01:00
Max Neunhoeffer 61dd94bc27 Merge branch 'devel' into vpack 2015-12-21 16:06:45 +01:00
Max Neunhoeffer ade47c06dc Fix isSorted bug in cluster. 2015-12-21 16:06:04 +01:00
Max Neunhoeffer 61fe51072c Merge branch 'devel' into vpack 2015-12-21 15:22:46 +01:00
Max Neunhoeffer e8e6dc8597 More VPackObjectBuilder usages. 2015-12-21 15:22:19 +01:00
Max Neunhoeffer 8ce0a484e1 Fix graph traversal tests, behaviour and documentation. 2015-12-21 15:20:56 +01:00
Max Neunhoeffer e0a527eb5d Fix arangodump in cluster. 2015-12-21 11:53:37 +01:00
Max Neunhoeffer b37c8fb5a2 Fix js/common/tests/shell-collection.js in cluster. 2015-12-21 11:05:02 +01:00
Jan Steemann eb7ed34519 potential fix for _hasActiveExternals 2015-12-21 10:42:12 +01:00
Jan Steemann 4435a6f392 randomly shuffle V8 contexts 2015-12-21 10:28:56 +01:00
Jan Steemann ba52741a55 adapted compaction status messages 2015-12-21 10:28:52 +01:00
Max Neunhoeffer 9d303b69d7 Merge branch 'devel' into vpack 2015-12-21 09:47:42 +01:00
Max Neunhoeffer 0cf659aca2 Allow to set id at collection creation in cluster. 2015-12-21 09:46:50 +01:00
jsteemann a41f65b0ca optimizer simplifications 2015-12-21 01:43:16 +01:00
jsteemann 50818d9c80 simplifications 2015-12-18 23:54:14 +01:00
jsteemann a058699312 use std::make_shared 2015-12-18 23:34:18 +01:00
jsteemann 19782a45a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-18 23:33:44 +01:00
jsteemann 20ed092d11 added `--create-collection-type` option for arangoimp 2015-12-18 22:26:32 +01:00
Max Neunhoeffer 0743885dec Fix handling of VPackOptions in Parser/Builder usage. 
Also fix TRI_json_t* handling for cluster methods.
 2015-12-18 20:42:59 +01:00
Jan Steemann 3cfd8214a9 handle id and isSystem when creating collections 2015-12-18 20:16:39 +01:00
Jan Steemann 36eac6ffd0 fixed index selection in some queries 2015-12-18 20:16:09 +01:00
Michael Hackstein 642a6261f2 Added a proper selectivity estimate for traversal nodes. 2015-12-18 18:02:13 +01:00
Michael Hackstein c00d0cbc4d Improved stability of AQL Traverser. Also added checks for illegal edge cases 2015-12-18 16:17:09 +01:00
Jan Steemann 8053911c39 tests for issue #1583 2015-12-18 12:15:52 +01:00
Jan Steemann c701a8e66e Merge branch 'vpack' of https://github.com/arangodb/arangodb into vpack 2015-12-18 12:13:17 +01:00
Jan Steemann ba2ed30093 fix collection creation 2015-12-18 11:35:15 +01:00
Michael Hackstein 5856fe9a40 Fixed state export in replication applier. 2015-12-18 10:17:02 +01:00
Richard Parker aa9115886d Merge branch 'geoindex' into devel 
This adds Richards new cursor implementation.
 2015-12-18 08:56:20 +00:00
Michael Hackstein a46dbff097 Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-18 09:35:01 +01:00
Michael Hackstein 506c8f9be2 Constified the keyOptions buffer. No one should ever change it's content once it is stored in the VocbaseCollectionInfo. 2015-12-18 09:34:56 +01:00
Jan Steemann e56d385c5e fixed undefinedness 2015-12-17 18:31:11 +01:00
Jan Steemann e8084e3ef4 Merge branch 'vpack' of https://github.com/arangodb/arangodb into vpack 2015-12-17 15:45:53 +01:00
Jan Steemann 7dd4cab103 potential fix for server start 2015-12-17 15:40:20 +01:00
Michael Hackstein d99a6977b5 Fixed illegal access to empty buffer 2015-12-17 15:26:06 +01:00
Michael Hackstein 4907eaf66c Fixed wrong usage of V8ToVPack 2015-12-17 15:21:37 +01:00
Michael Hackstein 3c4643993d Fixed JS constructor for Edge Collections. The collection did not mention that it wants to be an edge collection 2015-12-17 15:06:20 +01:00
Jan Steemann 1faaaa0632 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 14:41:24 +01:00
Michael Hackstein c49876bf23 Fixed uninitialized access in VocbaseCollectionInfo constructor 2015-12-17 14:41:13 +01:00
Michael Hackstein 119a7fdee3 Fixed uninitialized access in VocbaseCollectionInfo constructor 2015-12-17 14:36:44 +01:00
Michael Hackstein cd93e959bd Fixed compiler warnings 2015-12-17 14:07:55 +01:00
Michael Hackstein c7b327e7de Fixed access to uninitialized variables 2015-12-17 14:03:43 +01:00
Wilfried Goesgens e908be8cd4 fix style 2015-12-17 13:39:05 +01:00
Michael Hackstein 46b9ac5c53 Fixed collection constructor from name 2015-12-17 13:24:45 +01:00
Michael Hackstein c6ae901487 Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-17 12:41:53 +01:00
Michael Hackstein b992423d1e Changed default type value for collections if not given in the JSON object on disc 2015-12-17 12:41:40 +01:00
Jan Steemann ad45a4b254 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 12:31:14 +01:00
Jan Steemann b76c61adb1 \0 fix 2015-12-17 12:28:16 +01:00
Michael Hackstein 002c876858 Fixed nullptr exception for keyOptions. 2015-12-17 11:35:08 +01:00
Michael Hackstein f708becba1 Fixed VPack parser error during startup 2015-12-17 11:31:20 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
jsteemann ead2ee47e7 issue #1409: fix NUL-byte handling 2015-12-17 10:54:24 +01:00
Jan Steemann 164741f144 improved diagnostic message 2015-12-16 19:52:31 +01:00
Jan Steemann 6ee9a6f90e replication fixes 2015-12-16 19:52:01 +01:00
Michael Hackstein 82eea28fea Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-16 19:03:15 +01:00
Michael Hackstein 73f3ddc753 Finished with first move to VocbaseCollectionInfo class. This commit compiles but it is untested. 2015-12-16 19:03:07 +01:00
Michael Hackstein e40679e4b5 Integrated the new VocbaseCollectionInfo in Document-collection 2015-12-16 18:59:03 +01:00
Michael Hackstein d506300568 Integrated the new VocbaseCollectionInfo in VocShaper 2015-12-16 18:58:49 +01:00
Michael Hackstein cad674549e Integrated the new VocbaseCollectionInfo in Vocbase main 2015-12-16 18:58:34 +01:00
Michael Hackstein c2eb6553ae The web of TRI_col_info_t is increasing... 2015-12-16 18:56:54 +01:00
Michael Hackstein a1c66851da Further adoptions to the VocbaseCollectionInfo class in V8Server 2015-12-16 18:53:47 +01:00
Michael Hackstein f9f7c02772 Simple adoptions to VocbaseCollectionInfo class 2015-12-16 18:53:20 +01:00
Wilfried Goesgens 1914fefc48 remove unused code path 2015-12-16 17:31:04 +01:00
Wilfried Goesgens 9d1f861736 Fix memory management of traverser expression. 2015-12-16 17:07:17 +01:00
Jan Steemann 573ba54da2 fixed typo 2015-12-16 12:04:27 +01:00
Jan Steemann 35eda37ab1 make_unique 2015-12-16 11:54:33 +01:00
Michael Hackstein 41d7fbb803 First draft of class implementation of TRI_col_info_t 2015-12-16 11:46:55 +01:00
Michael Hackstein 7f0792ab9b Started adapting the V8Server file to class version of TRI_col_info_t 2015-12-16 11:46:18 +01:00
Jan Steemann 8e18d6463f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-16 11:44:56 +01:00
Michael Hackstein c475822a76 Adapted V8Traverser to class version of TRI_col_info_t 2015-12-16 11:43:44 +01:00
Michael Hackstein bec87a0ef8 Adapted utils to class version of TRI_col_info_t 2015-12-16 11:43:12 +01:00
Michael Hackstein b543680cca Adapted resthandler to class version of TRI_col_info_t 2015-12-16 11:42:59 +01:00
Michael Hackstein f5bd11bda5 Adapted replication to class version of TRI_col_info_t 2015-12-16 11:42:39 +01:00
Michael Hackstein 37b4d2739b Adapted indexes to class version of TRI_col_info_t 2015-12-16 11:42:26 +01:00
Michael Hackstein ef3889363f Adapted cluster communication to class version of TRI_col_info_t 2015-12-16 11:42:02 +01:00
Michael Hackstein 5e4efc7267 Updated AQL to class verison of TRI_col_info_t 2015-12-16 11:38:33 +01:00
Jan Steemann a694b7ef48 make_unique 2015-12-16 11:36:35 +01:00
Wilfried Goesgens da57d31488 Implement de/serializing of filters in traversalnodes 2015-12-16 11:17:38 +01:00
Max Neunhoeffer 5a350b4391 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-16 10:59:18 +01:00
Max Neunhoeffer 98fa31818a Cleanup. 2015-12-16 10:59:10 +01:00
Michael Hackstein 2867ff1eb4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-16 10:52:08 +01:00
Michael Hackstein e6e66d4469 Fixed a bug in Traversal Path Uniqueness. 2015-12-16 10:51:54 +01:00