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

666 Commits

Author SHA1 Message Date
Jan Steemann 6686a075ca pretty printing fix 2013-01-15 14:46:18 +01:00
Jan Steemann 682d22bfb0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 14:35:19 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
a-brandt c175c73f97 added some missing changes 2013-01-15 14:07:16 +01:00
a-brandt f2288b5900 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 09:08:28 +01:00
a-brandt 60c8ad808f Changed graph moudule to use _key 2013-01-15 09:07:31 +01:00
Jan Steemann 2a3293a59e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-14 14:12:26 +01:00
Jan Steemann 848cc1ae28 added CollectionDatasourceFactory 2013-01-14 14:08:28 +01:00
Lucas Dohmen 7189151f93 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 13:37:15 +01:00
Lucas Dohmen bad6578ce5 Frank: Templates. 
You can now use templates (currently via Underscore, but is expandable)
in Frank.
 2013-01-14 13:35:43 +01:00
Jan Steemann c8b55b9b4d added patch & head methods 2013-01-14 13:22:02 +01:00
Lucas Dohmen a8561d0121 Frank: Put, Post, Delete 2013-01-14 09:34:25 +01:00
Michael Hackstein f32c4b2ae4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 02:36:51 +01:00
Michael Hackstein 96a5e832b0 Added includeMatchingAttributesFilter 2013-01-14 02:36:45 +01:00
Lucas Dohmen ef8bb55165 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 02:36:40 +01:00
Lucas Dohmen 9052dbdcbe Frank: Added some simple convenience functions to the response 
Will make everything more comfy.
Amazing.
And wonderful 🦄
The middleware is not yet attached.
 2013-01-14 02:35:27 +01:00
Michael Hackstein 1fae3deaa8 Merged conflict 2013-01-14 01:21:00 +01:00
Michael Hackstein 913bb09c67 Expand edges with labels 2013-01-14 01:18:28 +01:00
Michael Hackstein a91d92917e Added follow edges with labels 2013-01-14 01:02:47 +01:00
Jan Steemann f7d8df846b fixed test 2013-01-14 00:24:00 +01:00
Jan Steemann 4761e9c28c added more tests 2013-01-14 00:02:10 +01:00
Michael Hackstein 1f492f2444 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-14 00:00:53 +01:00
Michael Hackstein c451776ddf creation of first test datasource in function 2013-01-14 00:00:46 +01:00
Jan Steemann 6acc85389c fixed "any" traversal 2013-01-13 23:56:28 +01:00
Lucas Dohmen a29f2f7370 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 23:43:09 +01:00
Lucas Dohmen ffeca77e1a First Version of Frank 
* Added Underscore (We still need to run all tests to see if it works
  entirely)
* Added the first version of Frank with a few thoughts on how to
  continue working on it
 2013-01-13 23:42:01 +01:00
Jan Steemann ad14130aa0 some tests for traversal 2013-01-13 23:40:27 +01:00
Jan Steemann b42212e559 removed "redeclaration of bind parameter" 2013-01-13 23:25:27 +01:00
Jan Steemann 0ce59432e0 edge & vertex uniqueness for TRAVERSE 2013-01-13 22:56:14 +01:00
Jan Steemann a2373b7036 added any expander 2013-01-13 14:53:26 +01:00
Michael Hackstein cc2df18db8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 14:44:25 +01:00
Michael Hackstein f946da1772 Added datasource object for manually created graphs 2013-01-13 14:44:06 +01:00
Michael Hackstein ebec929394 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 13:52:02 +01:00
Michael Hackstein 8bb5096e42 First version of expand graphs by labels 2013-01-13 13:51:46 +01:00
Frank Celler bad4c293ad Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-13 13:50:51 +01:00
Jan Steemann 8bf8a733a2 added traversal function 2013-01-13 13:48:23 +01:00
Frank Celler fe3e4e5b24 cosmetic changes 2013-01-13 12:40:22 +01:00
Michael Hackstein e0dc0be787 Removed unused wrapper filter 2013-01-13 11:36:02 +01:00
Michael Hackstein 8686dbe51b Added combine filters, and min/maxDepth filters 2013-01-13 11:26:43 +01:00
Jan Steemann e23e6e3ae6 changed return value for filter functions 2013-01-13 00:55:03 +01:00
Jan Steemann baaaf81cd3 changed the API for traversals 2013-01-13 00:17:11 +01:00
Jan Steemann 8b13d4687a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-12 21:30:12 +01:00
Jan Steemann 227a92aa1c added test cases, some fixes 2013-01-12 21:29:13 +01:00
Frank Celler 12b611d102 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2013-01-12 21:08:35 +01:00
Jan Steemann 8080b2f501 test cases for collection-based expanders 2013-01-12 20:42:43 +01:00
Jan Steemann f53b09c64a adjusted traversal API 2013-01-12 18:26:57 +01:00
Frank Celler 514244868d added printf 2013-01-11 22:39:03 +01:00
Frank Celler 4cda9c48f1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-11 22:25:52 +01:00
Frank Celler ecb2602ba0 fixed path 2013-01-11 21:11:31 +01:00
Jan Steemann 79f40a5822 fixed tests 2013-01-11 20:53:02 +01:00
Jan Steemann b694d72742 added tests 2013-01-11 15:01:57 +01:00
Jan Steemann 196e3872b6 fixed a bug width non-expanded nodes 2013-01-11 14:57:31 +01:00
Jan Steemann a45da0ce05 added path tests 2013-01-11 14:42:41 +01:00
Jan Steemann 3cdac5f258 tests paths 2013-01-11 14:35:12 +01:00
Jan Steemann 0874d95467 more tests 2013-01-11 14:30:58 +01:00
Jan Steemann f34b5085ee more tests 2013-01-11 14:17:42 +01:00
Jan Steemann 5c19f2d196 cleaned up traversal code, initial unittest 2013-01-11 13:59:03 +01:00
Frank Celler 33e3031380 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	VERSION
	arangod/V8Server/v8-query.cpp
	build_posix.h
	configure
	configure.ac
 2013-01-10 18:00:25 +01:00
Frank Celler 2e6c075405 added getPeerVertex 2013-01-10 15:12:05 +01:00
Frank Celler 1612f22319 moved graph to org/arangodb/graph 2013-01-09 22:49:56 +01:00
Frank Celler 22357a4cfa removed debug output 2013-01-09 15:46:29 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Frank Celler 812360145e added flush 2013-01-09 11:47:17 +01:00
Jan Steemann a05edcdccc fixed JS print output 2013-01-08 00:28:12 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Frank Celler f5b1476d78 fixed jslint warnings 2013-01-06 11:05:28 +01:00
Frank Celler fb881581e1 fixed GUI 2013-01-06 01:31:32 +01:00
Frank Celler 3826a4603e removed print.js 2013-01-06 00:23:40 +01:00
Frank Celler 337cee7606 fixed jslint warnings 2013-01-05 23:59:44 +01:00
Frank Celler 7be1c01bda removed linked in JavaScript code, separate files for 'fs' and 'console' 2013-01-05 23:24:10 +01:00
Frank Celler 89a7cac605 added listTree 2013-01-05 22:45:09 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
 2013-01-05 11:16:50 +01:00
Jan Steemann 6dce10de80 slightly fixed the print function for arrays & objects 2013-01-04 15:50:55 +01:00
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 
Conflicts:
	js/common/bootstrap/modules.js
 2013-01-03 18:57:18 +01:00
Frank Celler 06e191877a added jslint target 2013-01-03 17:45:35 +01:00
Frank Celler 114de14816 fixed duplicate 2013-01-03 17:16:25 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +01:00
Jan Steemann b48d039e3f issue #327 2012-12-27 18:26:04 +01:00
Jan Steemann 110fb8ade6 issue #327 2012-12-27 18:14:19 +01:00
Jan Steemann e28d9b9a93 issue #327: fixed javascript parse errors 2012-12-27 18:05:02 +01:00
Jan Steemann d562c52fd7 backport of issue #300 2012-12-22 03:38:29 +01:00
Jan Steemann 599428859e issue #330 2012-12-21 22:01:51 +01:00
Jan Steemann 2b84d417f8 issue #330 2012-12-21 21:54:55 +01:00
Jan Steemann 96637435ab fulltext: more query operators, more tests, more controlled memory usage and statistics 2012-12-18 14:56:06 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann ec9f72f227 return appropriate error codes 2012-12-07 10:49:06 +01:00
Jan Steemann 1ffa8e702c more tests and documentation for fulltext indexes 2012-12-05 16:12:33 +01:00
Frank Celler 051705c7b9 Merge branch '1.1' of github.com:triAGENS/ArangoDB 
Conflicts:
	.gitignore
	CHANGELOG
	Doxygen/Examples.ArangoDB/arangosh-options
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	UnitTests/HttpInterface/api-collection-spec.rb
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Documentation/first-steps-arangodb.dox
	arangod/Documentation/user-manual.dox
	arangod/HashIndex/compare.h
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hasharray.h
	arangod/HashIndex/hashindex.h
	arangod/V8Server/v8-actions.cpp
	arangod/VocBase/simple-collection.c
	arangosh/V8Client/V8ClientConnection.cpp
	arangosh/V8Client/V8ClientConnection.h
	arangosh/V8Client/arangoimp.cpp
	arangosh/V8Client/arangosh.cpp
	configure
	configure.ac
	html/admin/css/layout.css
	html/admin/index.html
	html/admin/js/master.js
	js/actions/system/api-system.js
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	js/server/js-server.h
	js/server/server.js
	lib/BasicsC/voc-errors.c
	lib/V8/v8-globals.h
 2012-12-05 12:34:08 +01:00
Jan Steemann efde7b5efa first test cases for fulltext index 2012-12-03 23:55:46 +01:00
Jan Steemann aed99d178d fixed assertion 2012-12-03 15:31:08 +01:00
Jan Steemann cdbb96788f issue #313 2012-12-03 15:30:01 +01:00
Jan Steemann d60888e970 replaced arango-upgrade script with server startup option --upgrade 2012-12-03 13:45:58 +01:00
Jan Steemann 42ba0502f0 changed upgrade procedure 
removed arango-upgrade script, replaced it with --upgrade server option
adjusted documentation & start scripts
 2012-12-03 13:02:59 +01:00
Jan Steemann 59461d0c4b added functionality to add and remove users programatically 
removed arango-password script
 2012-12-03 11:42:30 +01:00
Jan Steemann fec05c853d issue #312 2012-12-03 09:58:00 +01:00
Jan Steemann 30a47496b0 issue #312 2012-12-03 09:55:44 +01:00
Jan Steemann 8c7ca55512 issue #300 2012-12-01 03:15:39 +01:00
Jan Steemann cbad6b526a make collections accesible via name instead of id. 
this allows using the collection name instead of ids in _from, _to, _id etc.
 2012-11-28 13:16:15 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann f812408a7e documentation for collection names / keys 2012-11-23 19:41:14 +01:00
Jan Steemann ad855bd2bd fixed doxygen errors 2012-11-21 18:10:45 +01:00
Jan Steemann f3b87fbe1f fixed documentation 2012-11-21 17:52:44 +01:00
Jan Steemann a2b404123a load monkeypatches on all occasions 2012-11-20 16:50:15 +01:00
Jan Steemann b159a0539b moved monkeypatches.js to bootstrap folder and load it at all occasions, allowing graph usage from arangosh 2012-11-20 15:36:19 +01:00
Jan Steemann 171914bf7a added test case for #284 2012-11-19 21:57:21 +01:00
a-brandt 78aacd35da printing issues fixed 2012-11-19 15:20:34 +01:00
Jan Steemann 3780aafde9 issue #284 2012-11-19 15:14:29 +01:00
Jan Steemann ace85c43c9 nesting transactions from v8-vocbase... 2012-11-15 18:55:52 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
Jan Steemann 12d76b8306 introduced additional transaction type for import 2012-11-15 09:52:47 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Frank Celler 19d4125e80 fixed issue #275: strange error message in arangosh 1.0.3 at startup 
Conflicts:
	CHANGELOG
	js/common/bootstrap/js-modules.h
 2012-11-12 17:50:51 +01:00
Frank Celler 57d1d5e59c fixed issue #275: strange error message in arangosh 1.0.3 at startup 2012-11-12 17:39:07 +01:00
Jan Steemann dacd2fb70c some cleanup 2012-11-06 19:24:27 +01:00
Jan Steemann 59791248bf some refactoring of v8-vocbase, trx integration 2012-11-06 19:02:09 +01:00
Jan Steemann 203560d30b moved transactions into javascript object 2012-11-06 14:42:52 +01:00
a-brandt b800f2652c renamed "blueprint" to "blueprints" and added documentation and tests 2012-10-30 13:35:36 +01:00
a-brandt fff25d5ac3 renamed "blueprint" to "blueprints" and added documentation and tests 2012-10-30 12:29:51 +01:00
a-brandt 7daa018969 removed "reuseID" 2012-10-26 12:36:13 +02:00
Jan Steemann 296ad4f5e7 reduce index bloat for edges 2012-10-25 22:02:31 +02:00
Jan Steemann cb6c8c8e7e added bidirectional edges, fixup edges index 2012-10-25 17:18:54 +02:00
Jan Steemann f60f71718b issue #262 2012-10-25 11:00:53 +02:00
Jan Steemann 67c0ac2e2c issue #262 2012-10-25 10:57:51 +02:00
Jan Steemann bbd3dc8e23 issue #262 2012-10-25 10:57:26 +02:00
a-brandt e66daf3f43 bugfix unit tests 2012-10-24 12:36:11 +02:00
a-brandt c2d0749178 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/RestHandler/RestImportHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
	arangod/VocBase/primary-collection.c
	arangod/VocBase/primary-collection.h
 2012-10-24 10:46:38 +02:00
a-brandt 9a599e468a added "_key" attribute 2012-10-23 15:58:09 +02:00
Jan Steemann d4cb1b5399 issue #262: more verbose error messages when loading broken modules 2012-10-22 16:21:04 +02:00
Jan Steemann 6796b9516b issue #262: more verbose error messages when loading broken modules 2012-10-22 16:20:07 +02:00
Jan Steemann 6c033bb7f9 issue #262: more verbose errors when loading broken modules 2012-10-22 16:16:13 +02:00
Frank Celler d27ba1cf30 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2012-10-20 22:56:54 +02:00
Frank Celler 0499d8b4e2 ixed wrong attribute 
Conflicts:
	js/common/bootstrap/js-modules.h
 2012-10-20 22:46:59 +02:00
Frank Celler 2589a8e800 fixed wrong attribute 2012-10-20 22:45:01 +02:00
Frank Celler 3b5a0967bc Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	arangod/Documentation/communication.dox
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hashindex.c
	lib/Rest/Endpoint.cpp
	lib/Rest/Endpoint.h
	lib/Rest/EndpointIp.h
	lib/Rest/EndpointIpV4.h
	lib/Rest/EndpointIpV6.h
	lib/Rest/EndpointUnixDomain.cpp
 2012-10-20 22:37:25 +02:00
Frank Celler 61856501ea changed .module to .content for modules in collection _modules 
Conflicts:
	js/common/bootstrap/js-modules.h
 2012-10-20 22:17:54 +02:00
Frank Celler 5e3216d4c5 changed .module to .content for modules in collection _modules 2012-10-20 22:15:37 +02:00
Frank Celler c1b0c37480 added module org/arangodb, added convinient functions 2012-10-18 15:39:00 +02:00
Jan Steemann 0c4da6a1d7 added test cases for edge insert/update rollback 2012-10-17 17:37:29 +02:00
Jan Steemann 5c4d981e7a added tests, fixed documentation 2012-10-17 16:50:35 +02:00
Jan Steemann 057cadc5c0 added some tests, fixed docs 2012-10-17 16:49:48 +02:00
Jan Steemann be54759314 issue #245 2012-10-17 14:24:31 +02:00
Jan Steemann c2be68fc7f issue #245 2012-10-17 14:21:46 +02:00
Frank Celler 195d6903c1 added generated files 2012-10-14 16:23:48 +02:00
Frank Celler 59ef60d6b2 fixed doc errors 2012-10-12 19:21:52 +02:00
Frank Celler 7c3547e815 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.files
	Makefile.in
	js/actions/system/api-system.js
 2012-10-11 23:18:55 +02:00
Jan Steemann 2bb0407826 issue #235: fixed broken web front end 2012-10-11 21:32:15 +02:00
Frank Celler bbd9698d22 removed generated files 2012-10-11 16:20:08 +02:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB 
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
 2012-10-11 15:19:44 +02:00
Jan Steemann b639a6ec8c removed lines that printed stuff out 2012-10-10 18:33:34 +02:00
Jan Steemann 9ffa4779e2 test cases for issue #213 2012-10-10 09:22:18 +02:00
Jan Steemann 3b8ad1835e harmonise API between client and server versions 
this adds db._createStatement() on the server side, furthermore it provides GeneralArrayCursor.elements()
 2012-10-08 18:11:45 +02:00
Jan Steemann 788f91cd59 added ArangoStatement.explain() client method, wrote test cases 2012-10-08 15:49:15 +02:00
Oreste Panaia 5d79b618c7 strings converted to char* 2012-10-01 18:36:42 +08:00
Frank Celler a5f83c3e8d create modules collection 2012-10-01 12:00:43 +02:00
Frank Celler 5d21d2ac2d removed try/catch 2012-09-29 14:52:56 +02:00
Oreste Panaia eabf79704a VS 2012-09-28 23:45:16 +08:00
Jan Steemann 56dcb0aedf reduced number of docs in compaction test even more 2012-09-27 13:49:59 +02:00
Jan Steemann 856a1bf9f6 reduced number of docs even further 2012-09-26 16:44:33 +02:00
Jan Steemann 704520c436 reduced waittime 2012-09-26 16:26:40 +02:00
Jan Steemann ad6f26e86a added waittime, reduced number of docs 2012-09-26 16:26:05 +02:00
Jan Steemann 55a1c66203 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 15:49:01 +02:00
Jan Steemann 4a0e773536 added waittime 2012-09-26 15:48:23 +02:00
Lucas Dohmen 06fb38ca20 Requiring Graph.js automatically requires monkeypatches 
The user should not have to do that manually.
Makes no sense.
 2012-09-26 14:18:24 +02:00
Frank Celler e9b1e1c58f Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	3rdParty/mruby/include/mrbconf.h
	3rdParty/mruby/include/mruby.h
	3rdParty/mruby/include/mruby/array.h
	3rdParty/mruby/include/mruby/khash.h
	3rdParty/mruby/include/mruby/object.h
	3rdParty/mruby/include/mruby/variable.h
	3rdParty/mruby/mrblib/error.rb
	3rdParty/mruby/mrblib/print.rb
	3rdParty/mruby/src/array.c
	3rdParty/mruby/src/cdump.c
	3rdParty/mruby/src/class.c
	3rdParty/mruby/src/codegen.c
	3rdParty/mruby/src/error.c
	3rdParty/mruby/src/gc.c
	3rdParty/mruby/src/init.c
	3rdParty/mruby/src/kernel.c
	3rdParty/mruby/src/math.c
	3rdParty/mruby/src/numeric.c
	3rdParty/mruby/src/object.c
	3rdParty/mruby/src/parse.y
	3rdParty/mruby/src/pool.c
	3rdParty/mruby/src/proc.c
	3rdParty/mruby/src/range.c
	3rdParty/mruby/src/sprintf.c
	3rdParty/mruby/src/state.c
	3rdParty/mruby/src/string.c
	3rdParty/mruby/src/struct.c
	3rdParty/mruby/src/symbol.c
	3rdParty/mruby/src/time.c
	3rdParty/mruby/src/variable.c
	3rdParty/mruby/src/vm.c
	3rdParty/mruby/src/y.tab.c
	3rdParty/mruby/test/assert.rb
	3rdParty/mruby/test/t/array.rb
	3rdParty/mruby/test/t/exception.rb
	3rdParty/mruby/test/t/kernel.rb
	3rdParty/mruby/test/t/math.rb
	3rdParty/mruby/test/t/module.rb
	3rdParty/mruby/test/t/string.rb
	3rdParty/mruby/test/t/struct.rb
	3rdParty/mruby/test/t/time.rb
	3rdParty/mruby/tools/mirb/mirb.c
	3rdParty/mruby/tools/mruby/mruby.c
	Doxygen/arango-html.doxy
	Doxygen/arango.template
	Makefile.am
	Makefile.in
	UnitTests/HttpInterface/api-http-spec.rb
	aclocal.m4
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-query.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/V8Server/v8-vocbase.h
	arangod/VocBase/compactor.c
	arangod/VocBase/compactor.h
	arangod/VocBase/shadow-data.c
	arangod/VocBase/simple-collection.c
	arangod/VocBase/simple-collection.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
	arangoirb/MRClient/arangoirb.cpp
	config/compile
	config/depcomp
	config/install-sh
	config/missing
	configure
	js/actions/demo/geo.js
	js/actions/demo/hallo-world.js
	js/actions/system/api-collection.js
	js/actions/system/api-edges.js
	js/actions/system/api-system.js
	js/actions/system/documents.js
	lib/BasicsC/locks-posix.c
	lib/BasicsC/operating-system.h
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpCommTask.h
	lib/MRuby/MRLineEditor.cpp
	lib/MRuby/mr-utils.c
	m4/Makefile.doxygen
	m4/all-in-one.mruby
 2012-09-20 16:39:59 +02:00
Frank Celler 8f5b31177b added redirect 2012-09-18 16:33:16 +02:00
Frank Celler 2ce0c4336a added module in database 2012-09-18 15:07:57 +02:00
Frank Celler 88b72adea4 more actions example, reloadCache added 2012-09-17 18:08:28 +02:00
Oreste Panaia f5316acb9d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
 2012-09-17 22:40:12 +08:00
Oreste Panaia c7e5eae52d Added additional error numbers for bitarray index creation 2012-09-17 19:57:10 +08:00
Frank Celler 4f6762436c added first go at user actions 2012-09-16 17:25:57 +02:00
Frank Celler 21eb612376 first version of new actions module 2012-09-15 19:16:36 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 1d865cddb1 removed unnecessary long waits 2012-09-13 17:41:00 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
 2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Jan Steemann 135d454a3c fix wrong variable names 2012-09-10 17:59:51 +02:00
Lucas Dohmen fbe85fcb40 Merge branch 'graph_algorithms' into devel 
Conflicts:
	Makefile.in
	configure
 2012-09-04 09:41:03 +02:00
Jan Steemann 4aaf066081 issue #185: increased wait time in test 2012-09-04 08:35:19 +02:00
Jan Steemann 035ca9c548 increased wait time 2012-09-03 17:42:55 +02:00
Jan Steemann 13f703c2c7 issue #184 2012-09-03 11:08:35 +02:00
Jan Steemann 6232ca74c7 changed unloading of collections to not wait in an endless loop if collection cannot be unloaded 2012-09-03 10:40:07 +02:00
Jan Steemann f70cdc8fcb issue #169: adjusted documentation 2012-08-31 18:08:36 +02:00
Jan Steemann e4e73a7a56 issue #169: missing argument for simple queries 2012-08-31 17:32:53 +02:00
Jan Steemann 374b65e0d7 issue #177: fixed wrong error message 2012-08-31 10:49:36 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling 
moved common functions to ArangoClient
 2012-08-30 16:54:42 +02:00
Jan Steemann 1167b62ca6 issue #153: wrote upgrade script for arango. this will convert collections into edge collections etc. 2012-08-28 17:29:36 +02:00
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Jan Steemann 105af56bf7 issue #110: support for partial updates 2012-08-21 15:17:51 +02:00
Lucas Dohmen 1699414168 Added two execution files for the comparison 2012-08-16 13:21:45 +02:00
Lucas Dohmen 472f279506 Added Payload Tests 2012-08-15 22:15:11 +02:00
Jan Steemann b29d303488 fixed sporadically failing test 2012-08-15 12:43:20 +02:00
Lucas Dohmen 26182ef857 Removed some unnecessary files 2012-08-15 00:55:25 +02:00
Lucas Dohmen 5fa6eb8478 Some minor fixes. 2012-08-15 00:51:14 +02:00
Jan Steemann 396859e4fc added test case to trigger compaction 2012-08-14 11:52:50 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
 2012-08-09 15:25:29 +02:00
Frank Celler 80b78a7415 added GC 2012-08-08 15:33:58 +02:00
Jan Steemann 7e79bfd5eb added derived file 2012-08-08 14:51:54 +02:00
Jan Steemann 982781ec3e reduced sleep intervals 2012-08-08 14:51:00 +02:00
Frank Celler 5027294e26 wait for collection to unload in unit-tests 2012-08-08 10:21:44 +02:00
Lucas Dohmen 353b28d814 Faster Handling of shortest path if empty 2012-08-06 16:07:12 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
 2012-08-02 17:17:36 +02:00
Oreste Panaia 03cce62c3a bitarray index now support explicit values 2012-08-02 15:20:43 +08:00
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +02:00
Frank Celler b2a334a063 added datafile map for collection 2012-07-25 20:56:34 +02:00
Oreste Panaia 53e4fb7f12 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/BitIndexes/bitarrayIndex.c
 2012-07-24 14:56:04 +08:00
Oreste Panaia cd5ed3ac67 added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
Lucas Dohmen 0b0df398d0 First version of Measurements and Shortest Path Executor 2012-07-23 13:56:25 +02:00
Lucas Dohmen 00ae5bf344 Merge branch 'master' into graph_algorithms 2012-07-18 16:03:13 +02:00
Lucas Dohmen 463045e17c The pathTo method now supports graph-wide caching 
This is the first step to support measurements. The data for the tests
has been added.
 2012-07-18 16:00:17 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 1df2799005 added --javascript.script 
renamed --unit-tests to --javascript.unit-tests
 2012-07-15 00:50:05 +02:00
Frank Celler 191b1338fe issue #98: Unable to change journalSize 2012-07-11 13:42:17 +02:00
Lucas Dohmen 8861bd6410 Moved Graph tests to the correct file 2012-07-10 14:55:19 +02:00
Lucas Dohmen fb605e1247 Betweenness Measurement added to Vertices 2012-07-09 18:09:57 +02:00
Lucas Dohmen c6c9712f82 Added support for geodesics to Graph.js 2012-07-09 16:22:02 +02:00
Oreste Panaia 224614f14a Bitarray index fixes 2012-07-06 12:02:08 +08:00
Oreste Panaia 67d6b7fca0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-07-05 13:59:46 +08:00
Oreste Panaia c72f44c949 Bitarray indexes update 2012-07-05 13:59:26 +08:00
Jan Steemann be6d64ced6 fixed unittest expectations after fix for issue #121 2012-07-04 12:32:09 +02:00
Oreste Panaia b84c9fefa9 Some bitarray index creation tests 2012-06-29 14:49:52 +08:00
Oreste Panaia a9f9c3af55 trying to upload bitarrays 2012-06-27 14:21:21 +08:00
Lucas Dohmen 07366afcfc Added two measurements to graphs 
* diameter
* radius
 2012-06-26 15:25:26 +02:00
Oreste Panaia 43309908ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
 2012-06-26 20:41:04 +08:00
Lucas Dohmen ecf09fc4dc Added distanceTo and two measurements to Vertices 
The two measurements are:

* eccentricity
* closeness
 2012-06-26 14:17:41 +02:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Lucas Dohmen c6b2b2642c Added Degrees to Vertices, Size and Order to Graphs 2012-06-26 12:51:26 +02:00
Lucas Dohmen ac092872ee Refactoring on Graph.js 
All methods reviewed and refactored. The refactorings use the new
ECMA Script 5 methods which are more efficient and precise.
 2012-06-24 09:30:30 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Lucas Dohmen 2745997ad8 Re-Did the optimizations of the monkeypatches 2012-06-20 17:01:14 +02:00
Lucas Dohmen 15eddecc34 Revert "Monkeypatches have their own module now." 
This reverts commit d01b16a930cfc5a47174d7e24a1742c20f874318.

Conflicts:
	js/common/modules/monkeypatches.js
 2012-06-20 16:43:08 +02:00
Lucas Dohmen 455befdbf6 Monkeypatches loaded by default and refactored 
The monkeypatches will now always be loaded a server startup.
I also refactored them.
 2012-06-20 16:18:04 +02:00
Lucas Dohmen a31d5e8f27 Monkeypatches have their own module now. 2012-06-20 15:14:48 +02:00
Lucas Dohmen bfa2e09ee6 All "Monkey Patches" now use Object.defineProperty 2012-06-20 14:12:26 +02:00
Lucas Dohmen a7d3d50082 Linted graph.js and shell-graph-algorithms.js 2012-06-16 18:31:50 +02:00
Lucas Dohmen c129644fff Added a listed option to commonNeighbors and commonAttributes 
If the listed option is given, instead of the number of attributes /
neighbors, the list of the names of the shared attributes / the IDs
of the shared neighbors are returned.
 2012-06-16 18:26:41 +02:00
Lucas Dohmen edff65d5c8 Vertex#commonPropertieWith now also has a normalized variant 2012-06-16 18:05:14 +02:00
Lucas Dohmen b3620827d3 Added commonPropertiesWith to Vertex 2012-06-16 18:00:32 +02:00
Lucas Dohmen 2c70ce9291 Reorganization of functionality and tests for Graph.js 2012-06-16 17:38:27 +02:00
Lucas Dohmen c0a94a570b Added a commonNeighborsWith method to Vertex 
Returns the number of common neighbors.
 2012-06-16 14:58:48 +02:00
Lucas Dohmen 15b0a44aba Edge Exclusion for pathTo function 
You can now exclude certain edges in your pathTo function with the
paramater `only` that expects a function that takes an edge as an
argument and returns true if and only if the edge should be used
for the path.

Use Case:
Only include edges on the path that have a rating of x or higher.
 2012-06-16 14:26:26 +02:00
Lucas Dohmen 580813f006 Added Support for Weight Functions in pathTo 
Instead of just selecting an attribute to get the weight of an edge,
the user can now formulate the computation of the weight of an edge
as a function that takes an edge as an argument and returns the weight.
This allows more flexible weights in the application.
 2012-06-16 14:04:37 +02:00
Lucas Dohmen 46027601ac Merge branch 'devel' into graph_algorithms 2012-06-13 16:19:54 +02:00
Lucas Dohmen e41291c44d Tiny improvement: forEach instead of for 2012-06-13 16:11:26 +02:00
Lucas Dohmen aa17edce23 Refactored Vertex#getNeighbors 2012-06-13 14:01:48 +02:00
Lucas Dohmen ad91d8cdfc The weighted pathTo now also takes a default weight 
The default weight is needed, when an edge doesn't
have the specified weight attribute.
The default for this default value is `Infinity`.
 2012-06-13 13:48:54 +02:00
Lucas Dohmen 7eddaa9259 Added support for weighted graphs to pathTo 
The method `pathTo` now also accepts the following option:

* weight: The name of the attribute including the weight
 2012-06-13 13:15:21 +02:00
Lucas Dohmen f11acff837 Enhanced pathTo for directed and labelled graphs 
The `pathTo` method accepts an options hash.
Currently supported:

* direction: "both", "outbound", "inbound"
* labels: undefined or Array of Strings
 2012-06-13 11:55:26 +02:00
Lucas Dohmen 70ae8d84d4 Small Refactoring for pathesForTree 2012-06-12 15:38:19 +02:00
Lucas Dohmen 104b28b607 Refactored the pathesForTree method 
* It's now testable
* It's now in a better OO design
 2012-06-12 15:25:06 +02:00
Lucas Dohmen e3a3e5f857 Heavy refactoring of the methods for Dijkstra 2012-06-12 13:24:25 +02:00
Lucas Dohmen 33732898ce Enhanced Vertex#getNeighbors 
* getNeighbors now takes the following arguments:
  * direction: 'both', 'outbound' or 'inbound'
  * pathLabels: undefined or Array of Strings
 2012-06-12 12:23:09 +02:00
Frank Celler 6675e8da2b Merge pull request #102 from jsteemann/master 
potential solution for issue #95 (execute jslint)
 2012-06-07 08:49:59 -07:00
Lucas Dohmen ea13cfac51 Renamed all occurrences of node to vertex... 2012-06-06 19:14:21 +02:00
Lucas Dohmen 933bc293b6 Added documentation for all pathTo helper functions 2012-06-06 19:11:53 +02:00
Lucas Dohmen 0433236c8b Graph.js: Lint-Free 2012-06-06 18:49:43 +02:00
Lucas Dohmen 020aa12c35 Dijkstra: Finds all shortest pathes now 
* Previously only found one shortest path
* Returns the same results as Neo4j
 2012-06-06 18:09:57 +02:00
Lucas Dohmen a41ff384ab Dijkstra finds pathes of correct length. 2012-06-06 14:57:57 +02:00
Jan Steemann 57fb43fe1e fixed broken functions and help texts in arangosh 2012-05-31 17:32:35 +02:00
Jan Steemann 0ef03fc006 mini cleanup 2012-05-28 22:10:03 +02:00
Jan Steemann 6f7e11e46c potential solution for issue #95 2012-05-28 22:01:32 +02:00
Frank Celler 86fcb881e9 fixed === and !== and == and != 2012-05-25 15:33:35 +02:00
Lucas Dohmen a1cf1017c5 Passes the Neo4j 500 Length Test now. 2012-05-25 15:25:13 +02:00
Frank Celler a0d19953e2 removed globals 2012-05-25 00:26:36 +02:00
Frank Celler 67e5ea65b3 console is now a module 2012-05-24 23:59:53 +02:00
Frank Celler 988d8090c1 jslint 2012-05-24 23:25:19 +02:00
Frank Celler ef3c8d0de6 cleanup JSLInt 2012-05-24 15:40:48 +02:00
Lucas Dohmen 4dd0306d0a Added the Random 500 Test and fixed a bug 2012-05-23 16:21:34 +02:00
Frank Celler 2554ce698e fixed printing 2012-05-23 15:58:43 +02:00
Frank Celler 6dc4cbd43d fixed error message 2012-05-22 09:38:36 +02:00
Frank Celler f5c7265911 fixed error message 2012-05-22 09:36:43 +02:00
Jan Steemann 5b05cc0d45 issue #69: added test cases with wrong parameters for inEdges(), outEdges() and edges() 2012-05-21 20:13:56 +02:00
Frank Celler b682357901 added skip list queries 2012-05-21 17:19:17 +02:00
Frank Celler b64a51844f added lookup skiplist index 2012-05-21 13:51:03 +02:00
Jan Steemann ba7eb326c7 added test cases 2012-05-18 17:18:50 +02:00
Jan Steemann 49990c5288 unified javascript runtime error messages in AQL 2012-05-18 15:52:11 +02:00
Jan Steemann c019da58b9 improved function argument validation 2012-05-18 13:33:59 +02:00
Lucas Dohmen dd5307de29 Dijkstra, Version 1 2012-05-16 16:25:07 +02:00
Jan Steemann b22b8ff269 added bind parameters to inject collection names into the query. The syntax is @@name. 2012-05-16 13:34:14 +02:00
Jan Steemann c7d2a8f5fc validate number of arguments for function calls in AQL 2012-05-14 23:49:40 +02:00
Frank Celler 56c53e5741 doc user-manual 2012-05-14 21:44:29 +02:00
Frank Celler c909ec20f3 more doc 2012-05-14 14:51:55 +02:00
Lucas Dohmen ff0ecc0b76 ... and its implementation 2012-05-13 21:00:53 +02:00
Lucas Dohmen 0b58cf8875 First version of Dijkstra 2012-05-13 20:59:00 +02:00
Frank Celler 615661c0a6 added hash index test 2012-05-12 22:17:28 +02:00
Frank Celler 675c5d0476 unique constraint 2012-05-12 22:09:00 +02:00
Frank Celler 5ba64bafe1 added test 2012-05-12 21:35:56 +02:00
Frank Celler d7379b2508 renamed Avocado to Arango 2012-05-12 14:51:33 +02:00
Frank Celler 763e7aba98 renamed to Arango 2012-05-12 14:40:34 +02:00
Jan Steemann 3ca2b5ff4a fixed error codes 2012-05-11 17:46:28 +02:00
Jan Steemann bd417248fb fixed some memory errors, removed unused error messages 2012-05-11 14:55:52 +02:00
Frank Celler 89ce610379 fixed for by-example 2012-05-10 17:10:07 +02:00
Frank Celler db46badb0f cleanup 2012-05-10 16:37:42 +02:00
Frank Celler 875746d0d4 fixed doc 2012-05-07 17:35:41 +02:00
Frank Celler 5c5f0827b3 fixed byExample and firstExample 2012-05-07 16:08:23 +02:00
Frank Celler 883760f865 Merge branch 'devel' of github.com:triAGENS/AvocadoDB 2012-05-07 13:35:37 +02:00
Jan Steemann 07db7dd731 more descriptive error messages 2012-05-07 13:28:16 +02:00
Frank Celler f47788fea6 simple query 2012-05-06 20:05:59 +02:00