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

724 Commits

Author SHA1 Message Date
Max Neunhoeffer 48762f3cc2 Add disabled tests. 
Disable shell-readonly test on server.
 2014-06-30 12:45:10 +02:00
scottashton e6225b66c6 adjusted tests for new rewrite rules on apache 2014-06-27 17:02:02 +02:00
Esteban Lombeyda 5206610e18 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 16:39:09 +02:00
Esteban Lombeyda 5d162c0b3c moving some nonccluster tests to a new file 2014-06-26 16:38:08 +02:00
Jan Steemann a8e1aabd40 renamed test file 2014-06-26 16:19:22 +02:00
Jan Steemann eec6012318 increased wait time 2014-06-26 13:18:30 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +02:00
scottashton 3dc7188141 heal the build 2014-06-24 14:26:46 +02:00
scottashton 3ba8719173 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 13:13:09 +02:00
scottashton 4f01409c4b processed lucas feedback regarding aql docu 2014-06-24 13:13:01 +02:00
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
Jan Steemann 53909c0dcd adjusted tests 2014-06-23 18:45:06 +02:00
Jan Steemann 13e061bd76 fixed tests 2014-06-23 17:46:00 +02:00
Jan Steemann 6707468c95 excluded collection 2014-06-23 13:27:27 +02:00
gschwab cda1eb462c sorting for edgeDefinitions added 2014-06-23 13:01:55 +02:00
gschwab 5406db3dc8 renamed _getToVertex(...) -> _toVertex(..) 2014-06-23 10:16:05 +02:00
gschwab 69df68c54e renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:47:48 +02:00
gschwab d31e8f784b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-06-23 09:13:51 +02:00
gschwab 1f02d36570 renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:11:07 +02:00
Jan Steemann 82a220361c issue #919: fixed null options handling 2014-06-23 08:40:51 +02:00
Jan Steemann b5fe73270c use test-helper for unloading collections 2014-06-21 03:19:54 +02:00
gschwab 3fb7a85ca0 error handling 2014-06-20 15:36:26 +02:00
gschwab ad6e867e9d merge 2014-06-20 15:15:16 +02:00
gschwab b311c94977 exception handling 2014-06-20 15:11:29 +02:00
scottashton 7c532982d0 stabilized tests 2014-06-20 14:41:44 +02:00
scottashton 45b46fb45b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:07:56 +02:00
scottashton fda940cd1b fixed tests 2014-06-20 14:07:40 +02:00
Jan Steemann e51dcdb2cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-06-20 13:39:51 +02:00
scottashton 678277981c fixed merge conflict 2014-06-20 09:59:00 +02:00
scottashton b263e38a9e docu refactoring, added more functions into graph module 2014-06-20 09:58:09 +02:00
Jan Steemann e132c8ea19 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:45:53 +02:00
gschwab dbe0cbbf7f renamed _directedRelationDefinition(...) -> _directedRelation(..) 2014-06-20 09:01:35 +02:00
gschwab 639e657897 renamed _undirectedRelationDefinition(...) -> _undirectedRelation(..) 2014-06-20 08:56:59 +02:00
Jan Steemann 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +02:00
Jan Steemann 1d68586500 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-18 16:37:28 +02:00
Jan Steemann 8b9cdbe075 fixed tests 2014-06-18 16:34:11 +02:00
Frank Celler cef655eb49 ignore devel version 2014-06-18 16:04:48 +02:00
gschwab 6dc18982aa graph._removeVertexCollection(...): dropCollection default set to false 2014-06-18 10:50:07 +02:00
gschwab 820d318927 graph._drop(): dropCollection default set to false 2014-06-18 09:52:49 +02:00
gschwab 7366e8a6d9 renamed removeOrphanCollection(..) -> removeVertexCollection(..) 2014-06-18 09:29:34 +02:00
gschwab 903dce0fbf renamed getOrphanCollections() -> orphanCollections() 2014-06-18 09:01:04 +02:00
Alan Plum 130e7fa53b Added crypto.constantEquals. 2014-06-18 01:15:39 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Alan Plum 509c2c9c9f Lint, whitespace. 2014-06-17 13:30:11 +02:00
Alan Plum d43afae82a More exhaustive testing for hmac. 2014-06-17 13:29:43 +02:00
Alan Plum af49ea6c53 Added tests for hmac. 2014-06-17 13:25:07 +02:00
Jan Steemann b303db2b50 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
 2014-06-17 00:49:18 +02:00
Jan Steemann a1177816aa modifiable AQL, final syntax 2014-06-17 00:37:08 +02:00
Jan Steemann 74fb8fe2ad issue #906: changed returned field in primary index description from `_id` to `_key`. 2014-06-16 17:08:45 +02:00
Jan Steemann 02d171412d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-16 14:47:41 +02:00
gschwab 3943fdeb13 refactored orphan treatment for guacamole belongings 2014-06-16 14:16:21 +02:00
Jan Steemann ae6ac271e3 index rework 2014-06-14 23:40:56 +02:00
Jan Steemann 5a53dc9f44 fixed typos 2014-06-13 20:08:02 +02:00
Jan Steemann 85b92dbf21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 18:16:48 +02:00
Jan Steemann 0c5950507c fixed test 2014-06-13 17:50:44 +02:00
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
gschwab f067be5a97 orphan may only be added when not used in edge def 2014-06-13 13:56:39 +02:00
gschwab 0646677b3e orphan collections treatment added with edit edge definitions 2014-06-13 11:51:15 +02:00
Jan Steemann 9e03189fb0 added waitUnload as a test helper function 2014-06-13 11:31:14 +02:00
Jan Steemann d5e695e63f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/ArangoServer.h
	arangod/VocBase/server.cpp
	js/common/bootstrap/errors.js
 2014-06-13 02:23:03 +02:00
gschwab c46e0df090 added CRD for orphan collections of graphs 2014-06-12 15:28:35 +02:00
gschwab 17e850f646 fixed tests 2014-06-12 13:30:21 +02:00
gschwab 7f9d3ffc03 fixed errors, added (standalone) vertex collection function for graphs 2014-06-12 11:36:29 +02:00
Jan Steemann fa6e98d94c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
 2014-06-11 17:40:15 +02:00
gschwab 63272b8a47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:51:41 +02:00
gschwab 76ce378991 jslint 2014-06-11 15:51:37 +02:00
scottashton 5bb6a22e82 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:45:46 +02:00
scottashton 8209796f7c added documentation to ahuacatl general graph functions and refactored common_Neighbors and common_properties 2014-06-11 15:45:31 +02:00
gschwab 3556868659 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 14:52:10 +02:00
gschwab 4bc2905f29 added extend and edit functions for edgeDefinitions of existing graphs 2014-06-11 14:51:26 +02:00
Jan Steemann 49cc332361 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/common/bootstrap/errors.js
 2014-06-11 14:23:47 +02:00
Jan Steemann 28d2ae151e flush 2014-06-11 14:18:04 +02:00
Jan Steemann 7e6750c397 wal flush w/ collection unload 2014-06-11 11:33:02 +02:00
Michael Hackstein f9628e48c2 Fixed tests for new error codes. Also implemented creation of an empty graph initially. It can be modified during runtime 2014-06-11 10:52:07 +02:00
gschwab 866709a434 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-10 13:30:13 +02:00
gschwab 4bcca3408a - added function to remove a single edge definition from a graph\n- some docu 2014-06-10 13:30:07 +02:00
scottashton 6649fc5819 fixed test 2014-06-10 13:06:43 +02:00
Jan Steemann 3f22fa03be fixed some indexes 2014-06-08 03:03:16 +02:00
Jan Steemann 7b9e3af0f1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/voc-shaper.cpp
 2014-06-06 17:00:49 +02:00
gschwab dda28bc102 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-06 15:41:50 +02:00
gschwab 682d85a948 renaming of getIn/OutVertex to getFrom/ToVertex, documentation 2014-06-06 15:40:51 +02:00
Jan Steemann cb5bb4eb0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Makefile.files
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/voc-shaper.cpp
 2014-06-05 22:58:49 +02:00
Esteban Lombeyda 7171c91c03 renaming tests 2014-06-05 16:29:24 +02:00
Michael Hackstein 9e4a983d2f Simplified some general graph tests 2014-06-05 11:45:20 +02:00
Jan Steemann 3d4873457b unload 2014-06-04 18:21:06 +02:00
Jan Steemann 7b7f42118e fixed some unique constraint violation handling 2014-06-04 17:28:06 +02:00
Michael Hackstein 6da48f6ae8 Removed _.neighbors from general graph module. The way to get neighbors is to first select the set of start vertices and then execute neighbors 2014-06-04 17:17:20 +02:00
Michael Hackstein d1ef96a801 Added further docu to general graph and removed unused functions 2014-06-04 14:32:47 +02:00
gschwab 7590652d57 fixed neighbors 2014-06-04 12:36:21 +02:00
gschwab 4f6e85faf8 fixed tests 2014-06-02 10:58:35 +02:00
gschwab 1fc4060899 edgeCollection may only be used in equal edge definitions 2014-05-28 15:45:03 +02:00
gschwab 8373ae3c28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-28 13:38:12 +02:00
gschwab 59e61298ea removing an vertex will now remove its edges recursively 2014-05-28 13:38:05 +02:00
scottashton 504a167077 added commonNeighbors and commonProperties to ahuacatl and general-graph 2014-05-28 09:59:10 +02:00
Jan Steemann b876bfd34f fixed typos 2014-05-27 11:04:10 +02:00
Esteban Lombeyda 8353af15eb renaming test method and cleaning 2014-05-26 16:07:47 +02:00
Esteban Lombeyda c563756a35 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 13:44:12 +02:00
Michael Hackstein 63113a84ad Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 13:10:37 +02:00
Michael Hackstein f49826afd9 Better integrated neighbors into fluent AQL of graphs. Yet missing in AQL: Give examples of target verticies 2014-05-26 13:10:23 +02:00
Esteban Lombeyda 14a7074002 Bug fix in updatebyExample 2014-05-26 11:52:11 +02:00