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

1859 Commits

Author SHA1 Message Date
Michael Hackstein 59010f7a68 Finished with the first run through the general graph modules documentation to add improvements 2014-06-20 17:25:05 +02:00
Michael Hackstein 7bff2d7ff7 And some more optimizations of the general graph module documentation 2014-06-20 16:57:33 +02:00
Lucas Dohmen 192a35eeca testrunner jslinted 2014-06-20 16:40:34 +02:00
Lucas Dohmen b88be851e8 JSLinted org/arangodb/extend 2014-06-20 16:40:34 +02:00
Lucas Dohmen f6b7bb23a0 Remove the stub and mock module 
This is now inside of shell-foxx until it has been converted to
Jasmine
 2014-06-20 16:40:34 +02:00
Lucas Dohmen ca6a9c02ca `backbone` is now `org/arangodb/extend` 2014-06-20 16:40:34 +02:00
Lucas Dohmen ec43e21fb7 Move `util` to node, because it is only used there 2014-06-20 16:40:33 +02:00
Michael Hackstein 426961abef Further improvements of general-graph documentation. 2014-06-20 16:21:17 +02:00
gschwab 34cd589908 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 16:19:04 +02:00
gschwab 28b5f27ca6 error added 2014-06-20 16:18:58 +02:00
Lucas Dohmen 95fb92b195 Move testrunner into the org/arangodb 'namespace' 2014-06-20 16:05:09 +02:00
Michael Hackstein 1db8391e42 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 16:02:00 +02:00
Michael Hackstein c0cbe73476 Futher layout optimization of FluentAQL Graph Module 2014-06-20 16:01:25 +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
Michael Hackstein 707c79d5a5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 15:07:29 +02:00
Michael Hackstein 0eff0753e8 Started improving the layout of FluentAQL Documentation in general graph module 2014-06-20 14:57:04 +02:00
Frank Celler 44b1421f82 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 14:48:26 +02:00
Jan Steemann be0b4b8c6e remove definePeriodic 2014-06-20 14:45:14 +02:00
scottashton 7c532982d0 stabilized tests 2014-06-20 14:41:44 +02:00
Frank Celler af109c73ca Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-06-20 14:41:13 +02:00
Frank Celler e5c0418a35 fixed issue #707: Missing exception on mounting foxx app without collection 2014-06-20 14:28:23 +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 ec2d0e94f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 13:00:01 +02:00
scottashton ec45a40d0b changed examples in routplanner 2014-06-20 12:59:56 +02:00
Heiko Kernbach 3c72644b00 added functionality to download and install foxx applications from github 2014-06-20 10:30:35 +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 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Frank Celler 42b7014237 replaced @EXAMPLES 2014-06-18 19:44:32 +02:00
Frank Celler 5ea6286029 removed leading blanks 2014-06-18 19:14:34 +02:00
Jan Steemann 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Michael Hackstein 791c3bb67e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 17:01:32 +02:00
Michael Hackstein ff709e92b6 Fixed examples for graph http module 2014-06-18 16:50:14 +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 10ff1d391c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-18 15:22:55 +02:00
gschwab cb649c1293 fixed collection binding 2014-06-18 15:22:49 +02:00
Alan Plum c9d7f113a6 Linting. 2014-06-18 15:19:12 +02:00
Michael Hackstein f9b16f5e23 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 14:49:04 +02:00
Michael Hackstein 1d503a0d2a Added the knows graph of the traversal module to graph examples. Started rewriting traversal examples for new graph module. 2014-06-18 14:44:40 +02:00
gschwab 6ff46bb068 docu fixed 2014-06-18 11:12:10 +02:00
gschwab 528b1e85cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-18 10:56:22 +02:00
gschwab dcd9cd669f graph._removeVertexCollection(...): dropCollection default set to false - docu 2014-06-18 10:56:18 +02:00
Michael Hackstein 25293a4d20 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 10:51:06 +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
Michael Hackstein 11b48ceca2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 08:53:29 +02:00
Alan Plum 130e7fa53b Added crypto.constantEquals. 2014-06-18 01:15:39 +02:00
Lucas Dohmen 360d9c82a1 Merge pull request #910 from triAGENS/foxx_repository 
Rewrote the Foxx Repository Specs with Jasmine
 2014-06-17 21:48:09 +02:00
Michael Hackstein 2136673e94 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 18:22:31 +02:00
gschwab 4f962ed379 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 18:18:28 +02:00
Lucas Dohmen 79f2c7f72c Jasmine Fixes 2014-06-17 17:34:54 +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
Michael Hackstein 9a948ed92b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 13:34:42 +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
Alan Plum de9750cf21 Fixed hmac comments. 2014-06-17 13:25:07 +02:00
gschwab 9b68074a40 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 13:22:38 +02:00
gschwab 889bf312a1 docu 2014-06-17 13:22:32 +02:00
Michael Hackstein 17b088fcc8 Fixed example generation for new graph module 2014-06-17 13:22:31 +02:00
Michael Hackstein 18df651dff Fixed some graph module examples 2014-06-17 13:14:05 +02:00
scottashton d5bffb80c6 resolve merge conflict 2014-06-17 11:50:29 +02:00
scottashton 094809bdf8 more docs 2014-06-17 11:43:21 +02:00
gschwab 9176391eb6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 11:23:37 +02:00
Michael Hackstein 9fe3d9d2f2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 11:23:16 +02:00
gschwab cb18e9e8b3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 11:22:03 +02:00
Michael Hackstein 5f43e43979 Added more in-code documentation for the graph module 2014-06-17 11:21:22 +02:00
Jan Steemann 70fec69952 added crypto.hmac function 2014-06-17 11:20:46 +02:00
gschwab 579b55e8f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 10:57:45 +02:00
gschwab 37b532d872 fixed docu examples 2014-06-17 10:57:37 +02:00
Michael Hackstein 59d8ebe830 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 09:53:15 +02:00
Michael Hackstein 37c006c8dc Added documentation for _create function in graph module code 2014-06-17 09:53:11 +02:00
gschwab 6afda915ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-17 09:42:46 +02:00
gschwab 1afee1b2eb fixed docu 2014-06-17 09:42:34 +02:00
Jan Steemann 297b4bfac4 added derived files 2014-06-17 00:53:36 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +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
Lucas Dohmen dbfbd994cb Merge pull request #905 from triAGENS/jasmine 
[WIP] Add Support for Jasmine in our ArangoDB JavaScript Tests
 2014-06-16 16:32:55 +02:00
gschwab 6fe06843fe manually merged docu into mdpp 2014-06-16 16:22:49 +02:00
Lucas Dohmen 5abece1642 Make the output format configurable from the outside 2014-06-16 15:59:49 +02:00
Lucas Dohmen 8e22d4ef42 Refactoring Jasmine Wrapper 2014-06-16 15:55:45 +02:00
Lucas Dohmen 912b2cfd93 Jasmine: Execute in sandbox 2014-06-16 15:13:23 +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
Lucas Dohmen 403cdd80b6 Refactor Test Runner 2014-06-16 14:39:40 +02:00
Lucas Dohmen b5764513d9 Extracted the test runner from jsunity 2014-06-16 14:39:40 +02:00
Lucas Dohmen f939c8de08 Removed the unused Coverage functionality 2014-06-16 14:39:40 +02:00
Lucas Dohmen db5470ae6c Execute Jasmine specs via arangod --javascript.unit-test 2014-06-16 14:39:40 +02:00
Lucas Dohmen b0ce561546 Implemented `pending` 2014-06-16 14:39:40 +02:00
Lucas Dohmen 61fb82bb45 Refactoring of Jasmine functionality 2014-06-16 14:39:40 +02:00
Lucas Dohmen 4b1097a110 Status Code 2014-06-16 14:39:39 +02:00
Lucas Dohmen bf34e5f870 Reporter can now also have a dot format 2014-06-16 14:39:39 +02:00
Lucas Dohmen 7ca09cbf85 Really fancy reporter 2014-06-16 14:39:39 +02:00
Lucas Dohmen eade04cb17 Cleaned up and prettified the reporter 2014-06-16 14:39:39 +02:00
Lucas Dohmen 8c8fd7b72b First steps towards integrating Jasmine 2014-06-16 14:39:39 +02:00
gschwab 2514183982 jslint 2014-06-16 14:30:42 +02:00
gschwab 229834f5a4 fixed merge conflicts 2014-06-16 14:27:47 +02:00
gschwab 3943fdeb13 refactored orphan treatment for guacamole belongings 2014-06-16 14:16:21 +02:00
Michael Hackstein dc3e3703cc Solved uniqueness conflicts for generated examples 2014-06-15 23:12:26 +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
Michael Hackstein fdece972d0 Added tests for vertex and edge collection lists in http interface. Added docu for _list in general-graph module 2014-06-13 16:41:48 +02:00
Michael Hackstein 7541149200 Added functions to list all graphs and all vertex/edge collections of a specific graph to http-api 2014-06-13 15:11:59 +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 9e19e0c6ca don't print errors if something goes wrong 2014-06-13 02:23:13 +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
Jan Steemann 8843761c0e fixed issue #900 2014-06-12 17:15:35 +02:00
gschwab 1ed179cbaa some docu for orphan collections 2014-06-12 16:57:31 +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 3900902821 tmp repaired empty block for commit 2014-06-12 11:42:27 +02:00
gschwab d8bcfd3bbb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 11:36:39 +02:00
gschwab 7f9d3ffc03 fixed errors, added (standalone) vertex collection function for graphs 2014-06-12 11:36:29 +02:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +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
scottashton f4b67ed01d jslinted 2014-06-11 16:04: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
gschwab de08c073ab jslint 2014-06-11 15:50:30 +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 4cd857f5b9 added generated files 2014-06-11 14:25:01 +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
Michael Hackstein aa659e4686 Fixed JSLint warning 2014-06-11 10:23:03 +02:00
Michael Hackstein e2ab756642 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-11 09:59:41 +02:00
Michael Hackstein d2159e8897 Added some error objects for general graph module 2014-06-11 09:59:23 +02:00
Frank Celler 57bb47185b moved try/catch block to the top of routing chain 2014-06-10 22:57:10 +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
Frank Celler ca5a3ba908 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-10 13:16:20 +02:00
Frank Celler 4354d3e77c added example-users 2014-06-10 13:16:05 +02:00
scottashton 6649fc5819 fixed test 2014-06-10 13:06:43 +02:00
Jan Steemann d9653bc462 DML for AQL 2014-06-10 09:30:27 +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
Michael Hackstein af735550fb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 16:32:35 +02:00
Michael Hackstein e13164e247 Fixed duplicated names for examples 2014-06-06 16:32:32 +02:00
gschwab dda28bc102 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-06 15:41:50 +02:00
gschwab ee46c3bdaa fixed jslint 2014-06-06 15:41:46 +02:00
gschwab 682d85a948 renaming of getIn/OutVertex to getFrom/ToVertex, documentation 2014-06-06 15:40:51 +02:00
Michael Hackstein fdb79e26d1 The foxx manager now throws a more useful error if the fetched file is already on the server 2014-06-06 15:40:19 +02:00
Michael Hackstein 55efd34aab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 15:00:32 +02:00
Michael Hackstein 920cf4b7c3 Added fetchFromGithub to server-side foxx manager. Makes it a lot easier to update an already installed foxx from aardvark 2014-06-06 15:00:26 +02:00
Esteban Lombeyda b848ff00b5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 10:55:11 +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
Michael Hackstein 87b4124dfc Updated fluent AQL query interface documentation 2014-06-05 17:36:12 +02:00
scottashton e6b4fff2f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-05 16:59:53 +02:00
scottashton fe621c1723 finished measurements 2014-06-05 16:59:43 +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
Michael Hackstein bcbcf635e4 Further improvements in FluentAQL docu. It is now at least readable 2014-06-04 19:03:19 +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
Jan Steemann ad1feb0ed4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-04 14:30:28 +02:00
Michael Hackstein d17d1908e9 Made internal attributes of general graph objects non-enumerable to hide them from the user. 2014-06-04 14:10:20 +02:00
Michael Hackstein 808a34510f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-04 13:49:53 +02:00
Michael Hackstein 44a3dd1db1 Added start of documentation move to gitbooks in general graphs 2014-06-04 13:06:31 +02:00
gschwab 73c3d9cfec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-04 12:36:29 +02:00
gschwab 7590652d57 fixed neighbors 2014-06-04 12:36:21 +02:00
Michael Hackstein decd8e0c91 Added documentation for cursor behaviour in fluent AQL interface for graphs 2014-06-04 10:57:29 +02:00
Michael Hackstein ef94b4a9bb Added more documentation to fluent AQL interface in graphs 2014-06-04 10:47:27 +02:00
Jan Steemann 63f982bc6b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 18:12:51 +02:00
Frank Celler 8dc8600eb1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx/model.js
 2014-06-03 17:20:18 +02:00
Frank Celler 44aefb2344 added mountedApp 2014-06-03 17:19:03 +02:00
Jan Steemann 8ea7fa5e4a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 17:18:02 +02:00
gschwab d4058d5aba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-03 16:08:48 +02:00
gschwab 6166c6bff5 path function for fluent interface added 2014-06-03 16:08:42 +02:00
Thomas Schmidts 87e0d54f04 small changes for new documentation in code-docu 2014-06-03 14:55:39 +02:00
Jan Steemann a9a12e42c8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	Makefile.am
 2014-06-03 10:18:08 +02:00
Frank Celler e6d7f438cb Merge pull request #885 from pluma/require-submodules 
Added fallback to allow requiring submodules (fixes #789)
 2014-06-03 09:42:48 +02:00
Jan Steemann 8688ae6b87 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 09:31:52 +02:00
Michael Hackstein f0084fa116 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/actions/api-simple.js
 2014-06-02 17:35:15 +02:00
Michael Hackstein 3e00b6aa30 Started with the documentation of the fluent interface in graphs module. Added documents accordingly. 2014-06-02 17:32:50 +02:00
gschwab 062c6649e2 remove is transactional now 2014-06-02 16:57:20 +02:00
Jan Steemann 687b2b128b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.cpp
 2014-06-02 16:31:55 +02:00
Alan Plum 6e33c8966b Fallback for sub-module requires. Fixes #789. 2014-06-02 15:01:37 +02:00
gschwab c6191a27ff Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-02 11:00:18 +02:00
gschwab 4f6e85faf8 fixed tests 2014-06-02 10:58:35 +02:00
Jan Steemann 6283a9618e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-02 10:42:09 +02:00
Michael Hackstein 2ad5a1971a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-02 10:39:14 +02:00
Michael Hackstein 3ccac40d50 Added _PRINT for Graph and Fluent AQL Interface 2014-06-02 10:38:59 +02:00
Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
 2014-06-02 09:52:05 +02:00
gschwab 638940dd54 jslint 2014-06-02 09:46:09 +02:00
gschwab efd057f021 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-02 09:43:57 +02:00
gschwab 0169a4817d error handling 2014-06-02 09:43:55 +02:00
Frank Celler 8db4667755 cleanup of version-check, added option check-version 2014-06-01 13:37:21 +02:00
Jan Steemann f5eb65c96c javascript cleanup 2014-05-31 01:53:30 +02:00
Jan Steemann 603de4ba20 javascript cleanup 2014-05-31 01:44:47 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +02:00
Michael Hackstein 5228984679 Fixed graph tests 2014-05-28 21:48:22 +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 74ccb66d59 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-28 09:17:55 +02:00
Jan Steemann b876bfd34f fixed typos 2014-05-27 11:04:10 +02:00
Jan Steemann 86cecdb6a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
 2014-05-26 17:28:16 +02:00
Esteban Lombeyda 8353af15eb renaming test method and cleaning 2014-05-26 16:07:47 +02:00
Esteban Lombeyda 5cc5d16645 Bug fix: yielding correct format for option parameters 2014-05-26 15:39:47 +02:00
Esteban Lombeyda 3df7990827 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 15:17:53 +02:00
Jan Steemann 1351de4523 fixed invalid collection / document access 2014-05-26 15:17:36 +02:00
Esteban Lombeyda c563756a35 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 13:44:12 +02:00
gschwab ec7c7659e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-26 13:43:51 +02:00
gschwab c6c9335442 fixed check 2014-05-26 13:43:47 +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 7840b42358 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 12:40:21 +02:00
Esteban Lombeyda 14a7074002 Bug fix in updatebyExample 2014-05-26 11:52:11 +02:00
gschwab d01fa951c2 some error handling added 2014-05-26 11:41:35 +02:00
Esteban Lombeyda a803c16016 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-26 10:56:17 +02:00
gschwab 3ed6b73702 remove edge will remove other edges used as from or to recursively 2014-05-26 10:37:56 +02:00
gschwab ba6e70f5c6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-26 09:45:17 +02:00
Frank Celler ea49ba807c fixed cluster statistics 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-05-25 23:34:25 +02:00
Frank Celler ecd5641d03 added i/o stats 2014-05-25 23:11:03 +02:00
Frank Celler 0e0773a161 added gc for statistics 2014-05-25 23:10:56 +02:00
Frank Celler 4c160be4a6 remove old stats 2014-05-25 23:10:49 +02:00
Frank Celler db2a843252 fixed cluster view and history 2014-05-25 23:10:24 +02:00
Frank Celler d097755324 cleanup of statistics, new css, merge css, view and template, added long/short history, exclude all statistics collections, added clusterId 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/_resizing.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/statistics.js
 2014-05-25 23:10:10 +02:00
gschwab 315aa52053 jslint 2014-05-23 17:22:11 +02:00
gschwab 49253e338b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-05-23 17:15:50 +02:00
gschwab 1423197564 removing edges: recursive remove, when edge is used as vertex 2014-05-23 17:10:44 +02:00
Esteban Lombeyda f1c8e9e1b4 Functions ..ByExample support new signature 2014-05-23 16:26:23 +02:00
Michael Hackstein 03c91573c1 Merged my offline state for general graphs and included all the tests, everything is green. Fluent interface is on a good way 2014-05-23 15:54:39 +02:00
Michael Hackstein 9505f95abb Added some more variables to replace plain strings 2014-05-23 15:11:29 +02:00
scottashton f7a78f354d added tests for GRAPH_VERTICES 2014-05-23 15:08:35 +02:00
scottashton 51cc041052 added GRAPH_VERTICES 2014-05-23 14:29:53 +02:00
Michael Hackstein b59033cc94 Improved the restrict statement, it is now not so restricted any more. Now .edges().filter().restrict() is allowed 2014-05-23 14:05:01 +02:00
Michael Hackstein 6bd3c88df0 All general-graph tests are green again, even with changed interface. Yet not included: restrict and vertices execution, generated AQL is tested. 2014-05-23 13:50:19 +02:00
Michael Hackstein fef7fd355e Finished tests against AQL for current state of fluent interface in general graph module. 2014-05-23 12:51:28 +02:00
Michael Hackstein ef8536f3e5 THe starting points for general-graph fluent AQL interface now have passing tests, nextup: fixing tests for fluent follow ups 2014-05-23 11:56:57 +02:00
Michael Hackstein 0a4877b71a Changed interface of graph._edges(). It now expectes examples for edges instead of examples for connected verticies. This fits better for chaining either start with a couple verticies or a couple of edges 2014-05-23 11:46:41 +02:00
Michael Hackstein 742e05d06b Further implementation of tests against generated AQL in general-graph module 2014-05-23 11:25:48 +02:00
Michael Hackstein 7a55d89363 Started implementing checks against chained AQL statements in general-graph. 2014-05-23 10:48:49 +02:00
Michael Hackstein 6f6091a846 Fixed most tests of the simple suites in general_graph. The restrict test fails right now, some error in AQL 2014-05-23 10:16:19 +02:00
Jan Steemann 558048d267 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-23 09:34:33 +02:00
Michael Hackstein 2296f15bef Made the general-graph code a bit more DRY 2014-05-23 00:06:38 +02:00
scottashton 25d6bf15f1 cleaned up merge conflict 2014-05-22 17:54:13 +02:00
scottashton 3bec9b4c93 refactored aql 2014-05-22 17:49:20 +02:00
Thomas Schmidts e5d4642193 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 15:48:28 +02:00
Thomas Schmidts 33b8a3b05c issue #849: A few changes 2014-05-22 15:47:44 +02:00
Michael Hackstein fe62bc8609 Added tests for chains in fluent aql interface for general graphs 2014-05-22 15:21:08 +02:00
gschwab 4bb40d8de5 removing a vertex will remove all edges where this vertex is used in all graphs 2014-05-22 15:14:45 +02:00
Esteban Lombeyda f728f5ce2b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 14:44:55 +02:00
Esteban Lombeyda 3e26f4384f Fix: function had used wrong signature for the test goal 2014-05-22 14:43:17 +02:00
Esteban Lombeyda bcd8490c1b Supporting new signature for remove function 2014-05-22 14:35:17 +02:00
Michael Hackstein fbdd3738b6 Further implementation of general-graph fluent interface tests, starting with edges now has tests, they fail intentionally 2014-05-22 14:20:52 +02:00
Michael Hackstein 790046b177 Started implementing more elaborate tests for chaining. Initial vertex tests are implemented but will intentionally fail now, corresponding AQL implementation is yet missing 2014-05-22 14:03:58 +02:00
Jan Steemann c8340f94ac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 13:14:36 +02:00
Jan Steemann 0b6b0357ed jslint 2014-05-22 13:13:38 +02:00
Jan Steemann ac7e73f6e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 13:11:39 +02:00
gschwab fdb93b881d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 12:34:14 +02:00
gschwab c63c8c465e jslint fix 2014-05-22 12:34:08 +02:00
Esteban Lombeyda 02b8ef12e9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 11:11:01 +02:00
Michael Hackstein ec1ecaa107 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-22 11:00:33 +02:00
Michael Hackstein 09f19cb13c Fixed JSLint and started implementing elaborate chaining tests 2014-05-22 11:00:29 +02:00
Jan Steemann dc742f255a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 10:52:37 +02:00
gschwab c820c8b264 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 10:41:42 +02:00
gschwab 0d25c94b62 graph._drop does not anymore drop collections used in other graphs 2014-05-22 10:41:38 +02:00
Michael Hackstein b1cdeca44c Further refactoring, another suite now based on variables and prefixed with UnitTests 2014-05-22 10:39:12 +02:00
Michael Hackstein 2aaca2fa0b Further refactoring fpr general graph 2014-05-22 10:36:27 +02:00
Esteban Lombeyda f8c330ce54 Supporting new signature for replace function 2014-05-22 10:31:01 +02:00
Michael Hackstein 1dfdcca97c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-05-22 09:53:40 +02:00
Michael Hackstein 597c2e9416 Further refactoring of test for general-graph 2014-05-22 09:52:48 +02:00
Michael Hackstein 51f523525c Started test refactoring for general-graph, uses parameters now whenever possible 2014-05-22 09:48:42 +02:00
gschwab d29ebfaa3b fixed tests 2014-05-22 09:32:21 +02:00
scottashton 0353483339 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 09:17:54 +02:00
scottashton 247fea8cef neighbors 2014-05-22 09:17:43 +02:00
gschwab 56f0576f99 implemented _extendEdgeDefinitions() 2014-05-22 09:05:47 +02:00
gschwab c0a7aa2d28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 08:32:37 +02:00
gschwab 3947574805 renamed edgeDefinitions -> _edgeDefinitions 2014-05-22 08:32:34 +02:00
Michael Hackstein 75d5a04ae7 Embedded cursors into fluent AQL interface for graphs. 2014-05-21 18:22:30 +02:00
Michael Hackstein bf89abb737 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 17:34:08 +02:00
Michael Hackstein 852c4da742 Added an example for Example generation in code to general graph module 2014-05-21 17:34:03 +02:00
Esteban Lombeyda 32aee78f7b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 11:53:34 +02:00
Esteban Lombeyda 0b6846e963 Supporting new signature for JS update function 2014-05-21 11:52:06 +02:00
Michael Hackstein 0904f00d77 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 09:55:50 +02:00
Michael Hackstein 27474a7960 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-21 09:55:37 +02:00
gschwab e20f18bb1a drop graph after tests 2014-05-21 09:46:27 +02:00
Michael Hackstein ed14083e6f Implemented a wrapper around collections in graph module. Old collection functionality is now preserved 2014-05-21 09:45:53 +02:00
Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	lib/ShapedJson/Legends.cpp
	lib/ShapedJson/Legends.h
 2014-05-20 17:03:49 +02:00
gschwab acb43a202f fixed remove for vertexColelctions 2014-05-20 16:51:54 +02:00
Michael Hackstein d03a8fa11b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 16:22:47 +02:00
Michael Hackstein dddc5cbd9e Added an _exists function to the general-graph module, which checks if there is a graph with given name to avoid error throwing within apps 2014-05-20 16:22:44 +02:00
gschwab 4080e1f681 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:53:24 +02:00
gschwab 0cc4969a31 jslint 2014-05-20 15:53:20 +02:00
Michael Hackstein eb7150d815 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 15:48:38 +02:00
Michael Hackstein 35f602fef2 Renamed collections for AQL queries to contain 'UnitTests' prefix 2014-05-20 15:48:33 +02:00
gschwab de2fd3ff69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:35:13 +02:00
gschwab 072b00c54b edges of a vertex will be removed, when vertex is removed 2014-05-20 15:35:09 +02:00
Michael Hackstein bb9aaaeb4e Fixed error handling on restrict. It will now throw an error if query is restricted to an unkown collection 2014-05-20 14:43:42 +02:00
Michael Hackstein f89b50a72e Fixed test for directedRelationDefinition error handling 2014-05-20 13:29:00 +02:00
Max Neunhoeffer 0dab3706c5 Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:27:57 +02:00
gschwab 3897840af5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:39 +02:00
gschwab a2460276d3 forgot to rename some variables... 2014-05-20 13:25:34 +02:00
Max Neunhoeffer 464b6720ca Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:10 +02:00
Max Neunhoeffer dbd973164b Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:24:29 +02:00
gschwab ef1665391a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 12:56:41 +02:00
gschwab ad10fc85e6 added drop function for graphs 2014-05-20 12:56:33 +02:00
Jan Steemann 9513227449 test fuxx 2014-05-20 12:44:51 +02:00
Jan Steemann 52be779997 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:40:19 +02:00
Michael Hackstein 1be58a157c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 11:39:37 +02:00
Michael Hackstein d89ff71dbc Implemented generalGraph as a datasource for Traversal queries incl. tests 2014-05-20 11:39:33 +02:00
Jan Steemann 6ecfc44f11 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:32:02 +02:00
gschwab b3ad2e303f added tests 2014-05-20 10:37:40 +02:00
gschwab a786369d2e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 09:52:30 +02:00
gschwab 434e1009c6 changed to setUp and tearDown 2014-05-20 09:52:25 +02:00
Michael Hackstein b416f8b762 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 09:43:39 +02:00
Michael Hackstein 058e1dc0e8 Added setUp and tearDown to AQLQueries test suite in general graph 2014-05-20 09:43:35 +02:00
gschwab 3c0fdae6f7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 08:57:48 +02:00
gschwab bfb5610426 x-edges tests 2014-05-20 08:57:44 +02:00
Michael Hackstein ff54178f22 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 17:47:47 +02:00
Michael Hackstein b798c4f23a Enabled tests against AQL execution in graph module 2014-05-19 17:47:42 +02:00
Jan Steemann b06e89da54 simplified 2014-05-19 17:44:56 +02:00
Michael Hackstein af96bf0b70 Fixed jslint warning, missing semicolon 2014-05-19 16:19:22 +02:00
Michael Hackstein 6a33a9f9e3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 16:17:34 +02:00
Michael Hackstein 39b38ae159 Commented part of the fluent AQL interface in graphs, there is some conception necessary. Implemented a filter alternative instead 2014-05-19 16:17:30 +02:00
Jan Steemann 59aa16de0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 15:50:19 +02:00
gschwab 81c4982380 added tests for vertex and edges - fixed jslint 2014-05-19 15:15:58 +02:00
gschwab 37f7002c75 added tests for vertex and edges - fixed jslint 2014-05-19 15:06:15 +02:00
gschwab c38a455760 added tests for vertex and edges 2014-05-19 15:04:19 +02:00
Jan Steemann 9453beb7cc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 14:25:34 +02:00
Michael Hackstein 105dde54a7 Implemented filter on general graph module and simplified test code 2014-05-19 13:12:10 +02:00
Jan Steemann 5c100bc85b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 12:07:26 +02:00
Michael Hackstein 044f094139 Fixed a bug in graph module aql generation. For in was missing 2014-05-19 12:02:21 +02:00
Jan Steemann 3b8d282c7b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 11:55:27 +02:00