1
0
Fork 0
Commit Graph

800 Commits

Author SHA1 Message Date
Jan Steemann 9818e55efe use resourceholder 2012-11-27 14:47:49 +01:00
Jan Steemann f84207e368 removed redundant declaration of edges index. edges index is now a regular index 2012-11-27 14:14:31 +01:00
Jan Steemann 64737c06f6 some renaming 2012-11-27 14:01:05 +01:00
Jan Steemann bd3c8189dc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-27 13:56:08 +01:00
Jan Steemann d4daccb3a5 added a fix and tests for issue #293 2012-11-27 13:55:52 +01:00
Frank Celler 6e94eeb36f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-11-27 12:35:12 +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
a-brandt 1c7b0a6387 fix 2012-11-26 17:28:51 +01:00
Jan Steemann 4ecb3b09f5 fix compiler warning 2012-11-26 10:07:57 +01:00
Frank Celler 56c3a4fd18 added web interface description 2012-11-25 20:19:31 +01:00
Jan Steemann c751611ee8 fixed logic error 2012-11-24 17:12:52 +01:00
Jan Steemann eac11fb793 issue #293 2012-11-24 03:16:23 +01:00
Jan Steemann 317b7f9cab issue #292 2012-11-24 00:04:21 +01:00
Jan Steemann 8ac81dbc85 shut up the compiler 2012-11-23 20:37:03 +01:00
Jan Steemann f812408a7e documentation for collection names / keys 2012-11-23 19:41:14 +01:00
Frank Celler da4534bdb0 fixed more links, moved Glossary to markdown 2012-11-23 13:34:44 +01:00
Frank Celler 708ac517fc fixed more links, moved Glossary to markdown 2012-11-23 13:33:26 +01:00
Jan Steemann bc94851026 fixed compile warnings 2012-11-23 13:18:00 +01:00
Frank Celler f9ea4d5755 started adding links 2012-11-23 12:36:19 +01:00
Frank Celler bd64d7e6a1 started adding links 2012-11-23 12:35:07 +01:00
Frank Celler c3bc85826a renamed Manual to UserManual, fixed references, removed First section 2012-11-23 11:31:54 +01:00
Frank Celler c68dc92809 renamed Manual to UserManual, fixed references, removed First section 2012-11-23 11:28:43 +01:00
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
Jan Steemann 10bfbb90e5 fixed type errors 2012-11-23 09:04:37 +01:00
Jan Steemann 687eac97b5 fix type errors 2012-11-23 09:00:11 +01:00
Jan Steemann b2faa016a6 fixed gcc compile warnings 2012-11-22 21:34:41 +01:00
Jan Steemann aaf34f44f4 fixed lots of compile warnings 2012-11-22 21:20:22 +01:00
Jan Steemann 71b28c541d return _bidirectional and _vertices 2012-11-22 16:50:56 +01:00
Jan Steemann ad1c204f3a added upgrade notes in devel, too 2012-11-21 19:34:27 +01:00
Jan Steemann ad855bd2bd fixed doxygen errors 2012-11-21 18:10:45 +01:00
Jan Steemann 6a30d421c8 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1 2012-11-21 17:44:37 +01:00
Jan Steemann fabf8b700b fixed documentation 2012-11-21 17:44:23 +01:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
a-brandt 7220ffafc5 blueprints api updates 2012-11-21 14:14:55 +01:00
Frank Celler 18bfd048ef fixed documentation 2012-11-21 10:58:29 +01:00
Jan Steemann bc9cf9428a issue #287 2012-11-20 18:27:48 +01:00
Jan Steemann 0f8767a996 issue #287 2012-11-20 18:22:31 +01:00
Jan Steemann f3fe1c3896 added a missing release 2012-11-20 17:07:39 +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 744618fbe0 fixed some escape routes in version check 2012-11-20 09:31:09 +01:00
Jan Steemann 2efa2f32db added server version check 2012-11-20 09:27:28 +01:00
Jan Steemann 3d70b85734 fix g++ warning 2012-11-20 08:59:53 +01:00
Jan Steemann 85a8f56a34 complain about non-expected database directory versions 2012-11-20 01:41:41 +01:00
Jan Steemann 66cf084232 fixed issue #283: AQL LENGTH() now works on documents, too 2012-11-19 14:01:47 +01:00
Jan Steemann 37750da396 * fixed issue #283: AQL LENGTH() now works on documents, too 2012-11-19 14:00:09 +01:00
Jan Steemann 69c9a9716c prevent compile warning 2012-11-19 13:59:06 +01:00
Jan Steemann 9c167a734f issue #281 2012-11-19 13:32:23 +01:00
Jan Steemann 70b4d7c9d7 issue #281 2012-11-19 13:29:26 +01:00
Jan Steemann e69145e391 fix memleak 2012-11-19 13:28:22 +01:00
Jan Steemann 3718f3570d ALL() moved to transaction semantics 2012-11-19 13:07:38 +01:00
Jan Steemann 662112bad3 changed call to figures to lock inside primary-collection.c instead of v8-vocbase.cpp 2012-11-19 11:47:52 +01:00
Jan Steemann d1fda6525d make truncate use transaction semantics 2012-11-19 11:42:49 +01:00
Jan Steemann fe693e6ae3 make documents read use transaction semantics 2012-11-19 11:23:44 +01:00
Jan Steemann 6e1fe6a423 delete now uses transaction semantics 2012-11-19 11:00:25 +01:00
Jan Steemann 3eda13c181 update and replace now use transaction semantics 2012-11-19 10:42:20 +01:00
Jan Steemann 541066cdc1 free global instances of collections at shutdown 2012-11-16 15:43:48 +01:00
Jan Steemann 952383beb6 removed some debug messages 2012-11-16 15:37:36 +01:00
Jan Steemann 38025fbc31 documents and edges are now created using transaction contexts 2012-11-16 15:36:44 +01:00
Jan Steemann c2689f0f5e moved AhuacatlContextGuard class out of vocbase 2012-11-16 13:39:49 +01:00
Jan Steemann b416bc1a4b removed JsonContainer, introduced more general ResourceHolder class 2012-11-16 13:29:19 +01:00
Jan Steemann 66bc12901c fixed AQL optimiser bug, related to OR-comined conditions on the same attribute 2012-11-16 12:16:52 +01:00
Jan Steemann c8b18a338a fixed AQL optimiser bug, related to OR-combined conditions on the same attribute 2012-11-16 12:15:33 +01:00
Jan Steemann 3009bdfcfd issue #277 2012-11-15 22:55:59 +01:00
Jan Steemann 2849b4555f fixed wrong path in error message 2012-11-15 22:23:41 +01:00
Jan Steemann 9ac2e4235e issue #277 2012-11-15 22:20:37 +01:00
Jan Steemann 79f407e1d3 issue #277 2012-11-15 22:09:23 +01:00
Jan Steemann ace85c43c9 nesting transactions from v8-vocbase... 2012-11-15 18:55:52 +01:00
Jan Steemann de9b2c71c1 fixed some transaction stuff 2012-11-15 18:39:48 +01:00
Jan Steemann fe7e061a27 transaction nesting 2012-11-15 18:14:20 +01:00
Jan Steemann afb54b533d moved some methods to base class 2012-11-15 15:06:56 +01:00
Jan Steemann fddcea9d4e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Utils/Collection.h
2012-11-15 13:59:54 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
a-brandt 407ac48821 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-15 11:25:22 +01:00
a-brandt 71d3d54de1 collection info struct changed 2012-11-15 11:24:35 +01:00
Jan Steemann 12d76b8306 introduced additional transaction type for import 2012-11-15 09:52:47 +01:00
Jan Steemann 00c9955ed2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-14 17:14:11 +01:00
Jan Steemann 9e40045025 changed document CRUD API signatures 2012-11-14 17:11:16 +01:00
a-brandt 3e302a5aea changed function TRI_IsAllowedCollectionName 2012-11-14 14:09:00 +01:00
Jan Steemann f440f4d54c forgot to adjust makefile 2012-11-14 13:42:07 +01:00
Jan Steemann 897a086649 renamed parameters 2012-11-14 13:28:04 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Jan Steemann cdd163cc8a added TRANSACTION() JS function 2012-11-13 18:45:27 +01:00
Jan Steemann 57f0677d7b split self-contained transactions into read & write transactions 2012-11-13 17:56:13 +01:00
Jan Steemann b8655965f4 some transaction changes 2012-11-13 17:36:24 +01:00
Jan Steemann f483e9c41c added threadNumber global variable 2012-11-12 09:45:38 +01:00
Jan Steemann 6b6b692592 cleaned up v8 function creation 2012-11-12 09:30:51 +01:00
Jan Steemann d7aa6d7d0a more cleanup 2012-11-09 18:42:07 +01:00
Jan Steemann be39dbd419 some cleanup 2012-11-09 17:50:07 +01:00
Jan Steemann 728dfa3d9e fixed a few out of memory situations 2012-11-09 17:30:28 +01:00
Jan Steemann 419456c1a8 some refactoring 2012-11-09 15:06:28 +01:00
Jan Steemann b9019329c8 fail gracefully on invalid marker types 2012-11-09 11:05:06 +01:00
Jan Steemann 65db6eee8b some simplification 2012-11-09 11:03:42 +01:00
Jan Steemann 7dfab2d6dc introduced validFrom, still does nothing 2012-11-09 10:42:06 +01:00
Jan Steemann b4ae789573 cleaned up naming 2012-11-08 19:01:05 +01:00
Jan Steemann bef21db8d8 renamed variable 2012-11-08 18:47:39 +01:00
Jan Steemann b7b2c87ea8 re-used function declaration functions in v8-query 2012-11-08 18:44:10 +01:00
Jan Steemann 149c6c1fc1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-08 17:47:53 +01:00
Jan Steemann 64c6bc5cb0 renamed marker member _deletion to _validTo, some cleanup 2012-11-08 17:47:18 +01:00
Jan Steemann 5b4f8431b4 removed unused _eid from master pointer 2012-11-08 16:36:08 +01:00