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

1269 Commits

Author SHA1 Message Date
Thomas Schmidts af1805b627 Fixed small spelling errors 2014-06-23 15:15:50 +02:00
Thomas Schmidts 10a5b782fd Some changes in the documentation code 2014-06-23 14:55:14 +02:00
Jan Steemann c930740862 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:22:56 +02:00
Thomas Schmidts 7b11a3e9f3 Changed some comments in code 2014-06-23 13:22:02 +02:00
Jan Steemann ebb7e61045 removed code for special handling of _trx and _replication 2014-06-23 09:03:42 +02:00
Thomas Schmidts 06e033c0c8 Some improvements in the python script 2014-06-23 08:55:47 +02:00
Jan Steemann fc823938c0 nullptr 2014-06-21 03:27:38 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Frank Celler 4dcf5dc817 updated disclaimer 2014-06-20 16:40:35 +02:00
Thomas Schmidts 90ad06833f Change some comments in the code 2014-06-20 15:10:16 +02:00
Jan Steemann 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +02:00
Jan Steemann 8b9cdbe075 fixed tests 2014-06-18 16:34:11 +02:00
Jan Steemann b952c6724d recovery 2014-06-17 18:19:04 +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
Frank Celler f794ee8368 fixed datafile debugger 
Conflicts:
	CHANGELOG
 2014-06-17 09:22:56 +02:00
Jan Steemann a1177816aa modifiable AQL, final syntax 2014-06-17 00:37:08 +02:00
Jan Steemann b54b89d68d key generator rework 2014-06-14 00:33:40 +02:00
Jan Steemann 47999865d6 read-only mode 2014-06-13 15:32:13 +02:00
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
Jan Steemann fabc51f889 fixed wrong ASSERT usage 2014-06-13 12:10:35 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +02:00
Jan Steemann 101b5ac95f Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 11:29:08 +02:00
Jan Steemann dae5a5151d call (still empty) WAL recovery procedure at startup 2014-06-12 11:28:48 +02:00
Max Neunhoeffer ed1a588baa Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 10:39:13 +02:00
Max Neunhoeffer 82ab5bc0ac More checks for protected getShaper accesses. 
Also: Make arangodump possible using fake trx objects.
 2014-06-12 10:38:39 +02:00
Jan Steemann bca5b999d9 removed fcall 2014-06-12 10:26:53 +02:00
Jan Steemann 1cc46c4626 copy WAL documents 2014-06-12 10:26:24 +02:00
Jan Steemann cc115a2766 removed outdated upgrade methods 2014-06-11 17:38:49 +02:00
Jan Steemann b802973273 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Wal/CollectorThread.cpp
 2014-06-11 11:33:48 +02:00
Jan Steemann 7e6750c397 wal flush w/ collection unload 2014-06-11 11:33:02 +02:00
Max Neunhoeffer f0bef2496f Make _shaper private and use getter/setter. 2014-06-11 11:18:22 +02:00
Max Neunhoeffer c2bddb1c19 Let TRI_document_collection_t inherit from TRI_collection_t. 2014-06-11 10:51:47 +02:00
Jan Steemann 5a8cdb0ec5 wal flush 2014-06-11 09:32:20 +02:00
Jan Steemann 7c599ef893 barriers 2014-06-10 16:42:15 +02:00
Jan Steemann ede9c634c3 assert 2014-06-10 15:42:39 +02:00
Jan Steemann da9f8247fb barriers are now created automatically by transactions 2014-06-10 11:56:40 +02:00
Jan Steemann d9653bc462 DML for AQL 2014-06-10 09:30:27 +02:00
Jan Steemann 72a102e794 major internal changes 2014-06-08 00:12:53 +02:00
Jan Steemann ca959cab9d simplified usage of transactions 2014-06-06 23:28:34 +02:00
Jan Steemann 3f6cb4d9ed fixed update policy 2014-06-06 22:53:59 +02:00
Jan Steemann 368091d7c3 function cleanup 2014-06-06 21:35:34 +02:00
Jan Steemann c6b8bb7313 do not create _trx collection 2014-06-06 17:06:07 +02:00
Jan Steemann a289a7ac89 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-06 17:00:56 +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
Max Neunhoeffer fd2c99443f Introduce TRI_doc_mptr_copy_t for copies of master pointers. 
Did not yet run through all occurrences of TRI_doc_mptr_t to see
whether they have to be TRI_doc_mptr_copy_t.
 2014-06-06 16:59:32 +02:00
Frank Celler 315232f2c8 fixed order of checks 2014-06-06 15:10:27 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +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 8da6824d15 added TRI_ASSERT and TRI_ASSERT_EXPENSIVE 2014-06-06 10:32:20 +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
Jan Steemann 6344bb5a1e merge 2014-06-05 22:28:19 +02:00
Jan Steemann 17981a92c2 more barriers 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-06-05 22:23:48 +02:00
Esteban Lombeyda 78e8b56117 cleaning 2014-06-05 16:01:58 +02:00
Frank Celler 2cfb2e0577 fixed issue #883: arango 2.1 - when starting multi-machine cluster, UI web does not change to cluster overview 
Conflicts:
	CHANGELOG
	lib/ShapedJson/shape-accessor.cpp
	lib/ShapedJson/shape-accessor.h
 2014-06-05 15:58:19 +02:00
Max Neunhoeffer 4de7e852f9 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.cpp
 2014-06-05 12:07:48 +02:00
Max Neunhoeffer 2776dc78fa Make TRI_doc_mptr_t a C++ struct. 2014-06-05 12:03:57 +02:00
Jan Steemann 7783bc6687 made function private 2014-06-05 01:14:13 +02:00
Jan Steemann 3bda98a28c Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/Wal/DocumentOperation.h
 2014-06-04 17:36:00 +02:00
Jan Steemann 7b7f42118e fixed some unique constraint violation handling 2014-06-04 17:28:06 +02:00
Max Neunhoeffer a7792a5306 Looked through TRI_EXTRACT_MARKER_KEY for protection. 2014-06-04 15:40:09 +02:00
Max Neunhoeffer a32bf12f2f Looked at all _dataptr dereferences. 2014-06-04 15:18:25 +02:00
Max Neunhoeffer 13541cf4ec Rename component _data -> _dataptr in master pointer. 2014-06-03 22:27:08 +02:00
Jan Steemann 8ea7fa5e4a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 17:18:02 +02:00
Thomas Schmidts 87e0d54f04 small changes for new documentation in code-docu 2014-06-03 14:55:39 +02:00
Esteban Lombeyda 3ec823c804 Error string for remove, replace, update modified 2014-06-03 14:35:06 +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
Jan Steemann 07e2fce6b8 fixed keepNull in cluster 2014-06-03 10:13:19 +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
Frank Celler 8db4667755 cleanup of version-check, added option check-version 2014-06-01 13:37:21 +02:00
Jan Steemann d4dd58b264 merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +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
Jan Steemann ed6a55abb9 specialized primary index for faster comparisons and less datafile lookups 2014-05-29 03:35:37 +02:00
Jan Steemann 350e8fc8fe fast path for named property access 2014-05-28 21:35:42 +02:00
Esteban Lombeyda a4a4d770b6 more documentation 2014-05-28 10:29: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
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
Jan Steemann 558048d267 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-23 09:34:33 +02:00
Jan Steemann ea97d443b0 use wal shape and attribute markers 2014-05-22 16:00:00 +02:00
Esteban Lombeyda bcd8490c1b Supporting new signature for remove function 2014-05-22 14:35:17 +02:00
Jan Steemann ac7e73f6e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 13:11:39 +02:00
Jan Steemann c5103e28b3 fixed edges 2014-05-22 11:27:17 +02:00
Esteban Lombeyda 15cb6e3f0d documentation was adapted to new signatures 2014-05-22 11:09:47 +02:00
Jan Steemann dc742f255a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 10:52:37 +02:00
Jan Steemann cf099a629b dump markers 2014-05-22 10:52:12 +02:00
Esteban Lombeyda f8c330ce54 Supporting new signature for replace function 2014-05-22 10:31:01 +02:00
Jan Steemann 0caa570274 update() 2014-05-21 18:05:08 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Esteban Lombeyda 0b6846e963 Supporting new signature for JS update function 2014-05-21 11:52:06 +02:00
Jan Steemann cdb4eaff99 fixed conversion warning 2014-05-19 11:31:40 +02:00
Jan Steemann 1328aed652 small refactoring 2014-05-17 12:17:58 +02:00
Jan Steemann e9c4a759f7 add string length to object creation 2014-05-17 01:37:36 +02:00
Jan Steemann b0f119e88c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-13 13:39:52 +02:00
Jan Steemann 9f7923ace3 fixed VS warnings 2014-05-13 13:39:42 +02:00
Jan Steemann 1e99992a4e added note about non-functional `options` attribute 2014-05-13 12:58:24 +02:00
Jan Steemann 14813638dd removed boost 2014-05-12 17:22:42 +02:00
Jan Steemann 9a45d9379a issue #854: Cleanup collection figures 2014-05-12 09:43:41 +02:00
Max Neunhoeffer 809625a1ad Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-05-09 16:35:26 +02:00
Max Neunhoeffer 19289b6d37 First working version of arangorestore for clusters. 2014-05-09 16:33:54 +02:00
Jan Steemann dfec7b7f3c pass v8 handles by value, not by reference (as recommended in their manual) 2014-05-09 15:23:21 +02:00
Jan Steemann 80aea14a00 fixed memory error 2014-05-09 15:05:32 +02:00
Jan Steemann 78185a60d7 fixed return code for async job cancellation 2014-05-08 18:27:46 +02:00
Jan Steemann d2732aa929 don't leak barriers 2014-05-08 16:14:33 +02:00
Jan Steemann 5d3d854495 issue #848: db.someEdgeCollection.inEdge does not return correct value when called the 2nd time after a .save to the edge collection 2014-05-08 13:38:06 +02:00
Max Neunhoeffer df68f47338 Use StringBuffer in SimpleHttpResult rather than stringstream. 2014-05-07 16:35:40 +02:00
Jan Steemann 0a5e641f97 added index memory usage statistics 
this also adds index memory usage to the output of the `figures` method
 2014-05-02 22:05:29 +02:00
Jan Steemann 18302b3ab4 do not segfault on cancellation 2014-04-25 12:45:31 +02:00
Jan Steemann ae153598a3 issue #810: documented immutability of returned objects 2014-04-22 14:26:05 +02:00
Frank Celler 6cdfa029c9 added more error information, fixed try catch 
Conflicts:
	CHANGELOG
	arangod/V8Server/ApplicationV8.cpp
 2014-04-21 13:35:06 +02:00
Max Neunhoeffer d3df2a16e9 Improve the documentation of _create with respect to shardKeys. 2014-04-04 17:13:49 +02:00
Jan Steemann e2f1d0dfb6 fixed issues in arango-dfdb 2014-03-27 12:29:32 +01:00
Jan Steemann fa391e0636 slight GC improvements 2014-03-24 16:12:59 +01:00
Jan Steemann 9b0bb25cc5 don't requeue identical global context methods 2014-03-13 21:48:27 +01:00
Jan Steemann ef45f43be9 fixed arango-dfdb issues 2014-03-13 20:56:45 +01:00
Jan Steemann 7df402d1cd removed command line option `--database.remove-on-drop` 2014-03-10 17:03:17 +01:00
Jan Steemann ec9e3f2402 debug information 2014-03-07 12:17:38 +01:00
Jan Steemann 415055705f adjusted documentation 2014-03-04 18:45:56 +01:00
Jan Steemann 65bc5dddad documentation 2014-03-03 10:40:29 +01:00
Jan Steemann 8041752f4f documentation 2014-03-03 10:33:29 +01:00
Jan Steemann 3478c8bc74 cppcheck 2014-03-03 09:12:34 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Jan Steemann fd08bb0feb use indexes in AQL 2014-02-28 13:50:39 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
Jan Steemann 076b8f1029 fixed test 2014-02-27 14:03:23 +01:00
Jan Steemann a0c32e90d7 fixed edge access in coordinator 2014-02-27 13:14:02 +01:00
Jan Steemann ef84dc23e2 fixed segfault 2014-02-27 09:16:07 +01:00
Jan Steemann f5269fa3de fixed traversals 2014-02-26 21:28:40 +01:00
Jan Steemann fe74e030ea fixed keygen test 2014-02-26 16:47:38 +01:00
Jan Steemann 7f9ae2292c fix geo index comparison 2014-02-26 15:11:07 +01:00
Jan Steemann 4137eb72ae prevent segfault 2014-02-26 15:03:58 +01:00
Jan Steemann b086729d1b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-26 14:23:13 +01:00
Jan Steemann 42465ce876 properly return collection status 2014-02-26 14:23:06 +01:00
Max Neunhoeffer c1ac5eeecf Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-26 13:58:26 +01:00
Max Neunhoeffer 54d62007f2 Create users in new cluster database (if given). 2014-02-26 13:28:20 +01:00
Jan Steemann 8e05df9950 split tests 2014-02-26 13:21:10 +01:00
Jan Steemann e0ec5768a5 disallow dropping certain system collections 2014-02-26 12:04:28 +01:00
Jan Steemann 0b50c0353d disallow dropping certain system collections 2014-02-26 12:01:56 +01:00
Jan Steemann 9a56f68468 fixed return value for remove 2014-02-26 11:07:32 +01:00
Max Neunhoeffer 6d88ec3dde Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-25 14:24:41 +01:00
Max Neunhoeffer 4add2b4c9f The sin of the day: Disable transactions on coordinators. 2014-02-25 14:24:22 +01:00
Jan Steemann e1f3b6f2d4 react on empty shard lists 2014-02-25 14:08:00 +01:00
Jan Steemann af96607fc1 fixed index tests 2014-02-25 11:19:51 +01:00
Jan Steemann a907fa332c fixed wrong condition 2014-02-24 15:56:17 +01:00
Jan Steemann ea717607e1 implemented missing useDatabase for coordinator 2014-02-24 15:43:02 +01:00
Jan Steemann 4988abb3fd prevent segfault 2014-02-24 15:03:34 +01:00
Jan Steemann 018a8390ce refactored create/drop database 2014-02-24 14:50:31 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Jan Steemann 0480dbb404 added collection.revision() 2014-02-20 17:30:26 +01:00
Jan Steemann a820a74a6b added collection.figures() for sharded collections 2014-02-20 17:06:36 +01:00
Jan Steemann 9666407721 sped up property lookup for db 2014-02-20 12:52:41 +01:00
Jan Steemann ba8a1fb51f disallow key generators 2014-02-20 09:34:11 +01:00
Jan Steemann 4f48172323 some renames 2014-02-20 09:16:25 +01:00
Jan Steemann 66bc4c9a41 allow unique index creation on shard keys only 2014-02-19 10:30:41 +01:00
Jan Steemann dc8e590bca inedges, outedges, edges 2014-02-18 13:46:09 +01:00
Max Neunhoeffer 640b7c1530 Start fixing post-database creation actions for coordinator. 2014-02-17 16:31:43 +01:00
Jan Steemann 3fd053eb1e updated tests 2014-02-14 18:44:36 +01:00
Jan Steemann 87eba429fe updated documentation 2014-02-14 10:37:46 +01:00
Jan Steemann 0f0ef8a33f updated index docs 2014-02-14 10:30:05 +01:00
Jan Steemann f2cd112bf5 index ids 2014-02-13 16:30:48 +01:00
Jan Steemann c9c8f4e62a added tests 2014-02-13 16:12:57 +01:00
Jan Steemann 7970881b22 single-threaded plan changes 2014-02-13 15:33:29 +01:00
Jan Steemann 4fc8cae57d index creation with ids 2014-02-13 11:00:08 +01:00
Jan Steemann 70988aa215 removed withStats option 2014-02-13 08:48:22 +01:00
Jan Steemann df22a09d7f fixed compile error in non-sharding configuration 2014-02-12 17:51:51 +01:00
Jan Steemann c4d52ff133 getIndexes, dropIndex 2014-02-12 17:09:47 +01:00
Jan Steemann ce248b3107 documentation 2014-02-12 15:02:33 +01:00
Jan Steemann 2cbf050a43 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-02-12 14:56:39 +01:00
Jan Steemann 9dc4c9f6c1 getIndexes, coordinator 2014-02-12 14:53:37 +01:00
Max Neunhoeffer a3c7166805 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-02-12 14:45:22 +01:00
Max Neunhoeffer dd4bba8bb2 Remove undocumented saveOrReplace functionality. 2014-02-12 14:44:58 +01:00
Jan Steemann 6dd81767c9 cleanup 2014-02-12 14:16:27 +01:00
Jan Steemann f7413df4cc fix auto-completion 2014-02-12 13:58:29 +01:00
Jan Steemann 50ef0a64c0 fixed autocompletion 2014-02-12 13:10:27 +01:00
Jan Steemann 492caeb047 dont prevent embedded transaction in index lookups 2014-02-12 12:50:00 +01:00
Jan Steemann 3dad329979 ensureIndex 2014-02-12 12:47:51 +01:00
Jan Steemann 8d8d5f5804 added ensureIndex function 2014-02-12 10:40:36 +01:00
Jan Steemann 4a00b3ed98 pass index id 2014-02-11 09:27:55 +01:00
Jan Steemann d52724475f cap constraints 2014-02-10 17:46:54 +01:00
Jan Steemann 0479fd652f geo indexes 2014-02-10 15:53:33 +01:00
Jan Steemann 88bfe8f18c fulltext indexes 2014-02-10 14:55:27 +01:00
Jan Steemann 399ddebbd3 ensureIndex 1st 2014-02-10 14:36:32 +01:00
Jan Steemann 3408aaf038 cppcheck 2014-02-07 14:04:29 +01:00
Jan Steemann 6c4a9d45d7 fixed memleaks 2014-02-07 12:58:45 +01:00
Jan Steemann b4d9f10f17 fixed some database methods 2014-02-06 15:54:34 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
 2014-02-06 13:18:52 +01:00
Jan Steemann 10eb807366 fixed HTTP CRUD operations 2014-02-05 17:19:45 +01:00
Jan Steemann 58b3e0f99d splitted a few tests 2014-02-05 15:15:51 +01:00
Jan Steemann dafa0a3760 added test cases 2014-02-04 17:53:38 +01:00
Jan Steemann 52040eaad6 added tests, fixed segfault 2014-02-04 09:54:56 +01:00
Jan Steemann 9956ca920b fixed failing tests 2014-02-03 11:40:52 +01:00
Jan Steemann 27f62dcbfd disallow changing shardkeys in replace() 2014-02-03 11:23:40 +01:00
Jan Steemann dbbd7af9e0 disallow changing of shard attributes on update 2014-02-03 09:47:32 +01:00
Jan Steemann 545742a5fd added option `--server.disable-authentication-unix-sockets` 
with this option, authentication can be disabled for all requests coming
in via UNIX domain sockets, enabling clients located on the same host as
the ArangoDB server to connect without authentication.
Other connections (e.g. TCP/IP) are not affected by this option.

The default value for this option is `false`.
Note: this option is only supported on platforms that support Unix domain
sockets.
 2014-02-02 00:22:07 +01:00
Jan Steemann 6b8169ee7b fix invalid caching of sharded collection names in db.<obj> 2014-01-31 15:20:07 +01:00
Jan Steemann 8f8c664c5d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-31 11:29:44 +01:00
Jan Steemann 83af3c9617 truncate sharded 2014-01-31 11:29:36 +01:00
Max Neunhoeffer 915b31bddb Remove unnecessary and wrong "NOT_YET_IMPLENENTED". 2014-01-31 11:02:34 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-01-30 19:40:21 +01:00
Max Neunhoeffer ced1048cbc Add V8 add edge for cluster. 2014-01-30 18:24:14 +01:00
Jan Steemann b65637e924 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-30 17:30:57 +01:00
Jan Steemann 51a58b7844 collection.any() sharded 2014-01-30 17:30:39 +01:00
Max Neunhoeffer 3a5a085bc5 Sort out mess with collection name/id lookup in cluster. 2014-01-30 17:27:06 +01:00
Jan Steemann 9ebd765fcc allow passing of documents without _rev attribute 2014-01-30 12:31:38 +01:00
Jan Steemann 4741d2c8ff added count() 2014-01-29 18:49:11 +01:00
Max Neunhoeffer ed39834029 CRUD basically working on cluster. 2014-01-29 16:23:17 +01:00
Max Neunhoeffer 60f47e1f21 Fix body management in asyncRequest. 2014-01-29 13:21:53 +01:00
Max Neunhoeffer 35c6a3ffdc Use shared_ptr for CollectionInfo(Current) export. 
This at the same time fixes an allocation bug with TRI_json_t*.
 2014-01-29 09:21:09 +01:00
Jan Steemann e906f68235 windows fixes 2014-01-27 17:46:15 +01:00
Max Neunhoeffer 98df540266 Add support for GET and HEAD on cluster. 2014-01-27 10:41:35 +01:00
Max Neunhoeffer af8a51c3de Implement remove document in V8server on coordinator. 2014-01-24 22:22:39 +01:00
Jan Steemann 5a585db592 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-24 13:19:18 +01:00
Jan Steemann dc14fdf9e1 fixed compile error in non-cluster configuration 2014-01-24 13:18:29 +01:00
Max Neunhoeffer 4526181f82 Implement C of CRUD on cluster for V8 calls. 2014-01-24 13:11:20 +01:00
Jan Steemann 27276205c4 collection property changes 2014-01-22 17:46:26 +01:00
Jan Steemann 39fd7611ed load/unload of collections 2014-01-22 17:20:06 +01:00
Jan Steemann 8009885d72 quick fix for property access 2014-01-21 09:37:53 +01:00
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-01-21 09:29:45 +01:00
Jan Steemann f59d861df4 dont throw exception in v8 property getter 2014-01-18 01:07:15 +01:00
Jan Steemann 6e166c63ae allow direct access from the `db` object to collections whose names start with an underscore (e.g. db._users). 
Previously, access to such collections via the `db` object was possible from arangosh, but not from arangod (and thus Foxx and actions). The only way to access such collections from these places was via the `db._collection(<name>)` workaround.
 2014-01-18 00:16:13 +01:00
Jan Steemann b074028339 removed invalid conversion 2014-01-17 23:18:17 +01:00
Jan Steemann bfc05ae0b9 removed superfluous macro and check 2014-01-17 23:16:18 +01:00
Jan Steemann 435b56bea2 fixed dropping of collections 2014-01-17 18:27:55 +01:00
Jan Steemann 87702e3953 fixed too eager return 2014-01-17 14:35:55 +01:00
Max Neunhoeffer e8f7dbbf5b Consider Plan for current state of collections. 2014-01-17 13:43:02 +01:00
Jan Steemann 07c0ed3bab creation/removal of local shards 2014-01-17 12:43:34 +01:00
Jan Steemann 7c23c9527a removed nrShards attribute from Json 2014-01-17 10:53:29 +01:00
Max Neunhoeffer 8fe85a021b Try to return a collections object after creation. 
This is still buggy: ClusterInfo does not yet know about the new
setup with many entries of the form
  Current/Collections/<DB-Name>/<Coll-ID>/<shard-ID>
 2014-01-16 16:18:13 +01:00
Max Neunhoeffer 5960c103bc Create/drop Database/Collection compiles. 2014-01-16 15:01:36 +01:00
Max Neunhoeffer 8a9fe34ad6 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-01-16 12:12:29 +01:00
Max Neunhoeffer 78716f841f State before moving DB/Coll Ops to ClusterInfo. 2014-01-16 12:10:42 +01:00
Jan Steemann 405d05ecff added symbolic name 2014-01-16 12:10:31 +01:00
Jan Steemann 481cd2d1be added collection._dbName 2014-01-16 11:10:37 +01:00
Max Neunhoeffer 784bd4375d Use ClusterInfo::listDatabases with reload in JS_ListDatabases_Coordinator. 2014-01-16 08:54:12 +01:00
Jan Steemann 3b192782c5 removed some code 2014-01-15 17:22:13 +01:00
Jan Steemann c0e185c859 don't throw in autocompleter 2014-01-15 16:27:13 +01:00
Jan Steemann 7f757801b6 force reload of databases 2014-01-15 16:21:56 +01:00
Max Neunhoeffer 97476ccf08 Create Collection completed. Use new AgencyComm. 2014-01-15 13:59:41 +01:00
Max Neunhoeffer 6a427af052 Nearly finished with CreateColl and DropDatabase for coordinator. 2014-01-15 13:36:04 +01:00
Max Neunhoeffer bd5f58ff8b Temporary version of Create DB and Drop DB. 2014-01-15 12:46:32 +01:00
Jan Steemann e02b0b52e1 renamed methods 2014-01-15 10:52:56 +01:00
Jan Steemann 2495b6e720 removed unused variables 2014-01-15 09:52:47 +01:00
Max Neunhoeffer 7aa29fda5b Merge Jan's changes and preliminary version of CreateDB. 2014-01-15 08:52:10 +01:00
Jan Steemann ee186c2c6b added locking check 2014-01-14 17:17:25 +01:00
Jan Steemann 7803abe384 removed unused variables 2014-01-14 16:25:35 +01:00
Jan Steemann 2aba046c7d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 16:21:57 +01:00
Jan Steemann ce2627619e create collection stub 2014-01-14 16:21:48 +01:00
Max Neunhoeffer f7a9acf592 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-14 15:05:41 +01:00
Max Neunhoeffer fc96df2244 Separate out ConnectionManager from ClusterComm. 2014-01-14 15:04:55 +01:00
Jan Steemann 9c63246d1c added TRI_SHARDING_COLLECTION_NOT_IMPLEMENTED macro 2014-01-14 14:04:29 +01:00
Jan Steemann 4ec6f04932 return collection properties 2014-01-14 13:19:43 +01:00
Jan Steemann fde16194ff don't throw in propertygetter 2014-01-13 17:30:26 +01:00
Jan Steemann 9d7bd04d99 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/Cluster/AgencyComm.cpp
 2014-01-13 16:33:32 +01:00
Jan Steemann ffa919d716 some modifications for collection accessing 2014-01-13 16:32:40 +01:00
Max Neunhoeffer 8c8c0bff69 Create database in cluster done. 2014-01-13 15:07:32 +01:00
Jan Steemann 01df0fafab Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-13 08:59:36 +01:00
Jan Steemann 0e9a28ccc7 added missing delete 2014-01-13 08:59:20 +01:00
Max Neunhoeffer 70977f2e8e Start of _createDatabase in cluster on coordinator. 
Unfinished but compiles.
 2014-01-10 12:22:29 +01:00
Max Neunhoeffer 57f18783c4 Implement asking for databases in a cluster. 2014-01-09 14:56:44 +01:00
Jan Steemann 5b965b2a21 added initialised() method 2014-01-07 17:50:52 +01:00
Jan Steemann 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Jan Steemann 7980a51e26 moved cluster JS functions to its own files 2014-01-02 13:49:00 +01:00
Jan Steemann 8070db37a2 changed heartbeat watch implementation 2014-01-02 13:36:26 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2013-12-20 15:35:50 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann 5b0713af9c added recursive watches and structured get 2013-12-12 11:16:41 +01:00
Jan Steemann 620f4b1c47 added agency tests 2013-12-11 18:37:15 +01:00
Jan Steemann 5e5a5fb32b added JS bindings for agency 2013-12-11 09:56:54 +01:00
Max Neunhoeffer 317304542a Remove index garbage collector. 2013-11-25 10:57:23 +01:00
Jan Steemann 1bdf666da2 fixed multi-threading issues found during commando 2013-11-21 15:12:49 +01:00
Jan Steemann 72aaacbb54 removed priority queues 
this feature was never advertised nor documented nor tested.
 2013-11-18 11:12:36 +01:00
Jan Steemann a8914abae2 fix error messages 2013-11-16 00:01:37 +01:00
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes 
Conflicts:
	arangod/VocBase/document-collection.c
 2013-11-14 01:01:24 +01:00
Max Neunhoeffer e257f9dd92 Add the option to return numUsed for each index in getIndexes. 
This is currently implemented only for skip list indices and hash
indices, but not for full text, geo or bitarray, since these do not
export or even count this number.
 2013-11-13 12:49:23 +01:00
Max Neunhoeffer fc027e260b Correct a typo. 2013-11-12 16:36:24 +01:00
Max Neunhoeffer b240e62653 Fixed typo in documentation. 2013-11-11 15:06:13 +01:00
Max Neunhoeffer fd3f0e9f98 Fixed typo in documentation. 2013-11-11 15:04:59 +01:00
Jan Steemann dc82642998 issue #662: ArangoDB on Windows hanging... 
fix unloading of collections which prevented some collections from being dropped
 2013-11-11 13:51:58 +01:00
Jan Steemann 0384a17186 updated documentation for database creation 2013-11-07 13:46:34 +01:00
Jan Steemann 7055299a6e removed shape collections 2013-11-06 17:05:16 +01:00
Jan Steemann c46d6b99f4 add users when creating a database 2013-11-06 16:48:18 +01:00
Jan Steemann a977c5662a removed --database.force-sync-shapes option 2013-11-05 18:20:55 +01:00
Jan Steemann c5619d0795 removed unused resolver 2013-11-05 10:52:00 +01:00
Jan Steemann 6c0a452c98 flush authentication cache 2013-11-04 17:43:57 +01:00
Jan Steemann 7924f657d4 added `/_api/database/user` method 2013-11-04 14:22:00 +01:00
Jan Steemann dd88487b0f issue #654: bitarray index makes server down 2013-11-04 09:01:14 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 536d27acb1 fixed freeing of key 2013-10-28 16:11:23 +01:00
Jan Steemann df42f2a806 fixed memleak 2013-10-28 14:34:49 +01:00
Jan Steemann 21d25d0ccc removed resourceholder 2013-10-17 10:43:07 +02:00
Jan Steemann e89b0d539d allow specifying database name for replication sync command and replication applier 2013-10-01 17:59:26 +02:00
Jan Steemann 9d3ecd3584 make database name configurable for replication applier and sync command 2013-10-01 17:45:51 +02:00
Jan Steemann b4cdc79697 added db._id() 2013-09-30 13:44:28 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann 46895b4ec2 updated documentation 2013-09-24 15:40:37 +02:00
Jan Steemann 5fb61e7020 updated documentation 2013-09-24 15:05:47 +02:00
Jan Steemann 8e627fd3fa updated documentation 2013-09-24 13:40:58 +02:00
Jan Steemann 324d7fab03 documentation 2013-09-23 17:49:25 +02:00
Jan Steemann 73f0405ead added documentation for endpoints 2013-09-23 16:21:02 +02:00
Jan Steemann 2e75c872f4 persist list of endpoints 2013-09-23 13:14:54 +02:00
Jan Steemann 9155b16252 caching for db[...] 2013-09-21 00:12:35 +02:00
Jan Steemann 1867fd8591 turned off caching 2013-09-20 10:28:34 +02:00
Jan Steemann 5c0fd200f7 more OOM awareness 2013-09-19 08:44:12 +02:00
Jan Steemann 8a996c5b60 less dependency on regex.h, also fixes some speed problems for key validation 2013-09-19 08:20:35 +02:00
Jan Steemann 0bdae05b96 changed reference counting for cursors 2013-09-16 13:51:33 +02:00
Jan Steemann 8b5f4e2e65 changed mutex into rw-lock 2013-09-13 11:16:44 +02:00
Jan Steemann f99dde5f2e reload routing after dropping database 2013-09-13 10:28:28 +02:00
Jan Steemann 6ff314de0e runtime addition and removal of endpoints 2013-09-12 18:07:39 +02:00
Jan Steemann 6bbfb65f7c prevent usage of db._useDatabase() in HTTP requests 2013-09-12 11:13:47 +02:00
Jan Steemann 4a2626525c async dropping of databases 2013-09-12 11:00:11 +02:00
Jan Steemann 7d5e4f875f runtime configuration of endpoints, unfinished 2013-09-11 18:24:51 +02:00
Jan Steemann 7caac08466 updated documentation 2013-09-11 17:25:45 +02:00
Jan Steemann 3a6cabfe44 creating/dropping 2013-09-11 17:16:43 +02:00
Jan Steemann 85362b3c18 simplified error messages 2013-09-11 14:35:50 +02:00
Jan Steemann fde7793137 refactored database options 2013-09-11 13:22:52 +02:00
Jan Steemann 5bc1e5ecea dropping databases, unfinished 2013-09-11 12:47:27 +02:00
Jan Steemann 42441b208f refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
Jan Steemann ac4ed728c0 renamed collection `_graphs` to `arangodb_graphs` 2013-09-09 11:07:10 +02:00
Jan Steemann 369433f1e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/SimpleHttpClient/SimpleHttpClient.cpp
 2013-09-05 12:34:45 +02:00
Jan Steemann 897412b4de initial dropping of databases 2013-09-04 13:04:13 +02:00
Jan Steemann bae9f097fc added _dropDatabase() 2013-09-02 18:04:19 +02:00
Jan Steemann 0b3a0e7cc0 added exclusive lock for database creation 2013-09-02 14:50:30 +02:00
Jan Steemann 41acd59698 added _createDatabase(), _listDatabases() 2013-09-02 10:55:41 +02:00
Jan Steemann a53c1e493b multiple database, becoming standard 2013-09-02 09:52:52 +02:00
Jan Steemann 2556b0714f fixed issues reported by VS 2012 2013-08-29 16:43:56 +02:00
Jan Steemann 0aca109a89 removed html/admin, / now redirects to /_admin/aardvark by default 2013-08-29 12:59:56 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann b94ee1042c cppcheck 2013-08-27 16:13:44 +02:00
Jan Steemann d30e407c4a only create new journal file when requested 
make collection.rotate() publicly available
 2013-08-27 14:39:28 +02:00
Jan Steemann dbaadcdcd3 updated docs 2013-08-21 14:23:05 +02:00
Jan Steemann 38abd5bf9e issue #576 2013-08-21 14:02:09 +02:00
Jan Steemann 3871fb7af3 improved error messages 2013-08-20 11:48:08 +02:00
Jan Steemann 9eb1752a7e use AQL LIMIT but still return the unlimited count value 
Still needs documentation and tests
 2013-08-19 18:41:00 +02:00
Jan Steemann bfc6648588 added server startup options `--server.disable-replication-logger` and `--server.disable-replication-applier` 2013-08-02 16:17:51 +02:00
Jan Steemann e86fff18e2 added chunkSize for replication-applier 2013-08-02 11:03:54 +02:00
Jan Steemann d8690e5fa6 make collection revision id a real revision id 2013-08-02 09:37:46 +02:00
Jan Steemann a7c5350455 added server-id method 2013-08-01 18:27:42 +02:00
Jan Steemann 949c194653 updated replication configuration 2013-08-01 15:50:30 +02:00
Jan Steemann c6d3c0bee7 conditionalised transactional skiplists with TRI_SKIPLIST_EX until fully integrated and tested 2013-08-01 14:55:09 +02:00
Jan Steemann 05a7f79941 re-configuration of logger, cap constraint 2013-07-31 14:39:33 +02:00
Jan Steemann 936fb6c6a6 better progress reports for replication applier 2013-07-31 10:01:56 +02:00
Jan Steemann 78601319fb updated replication API 2013-07-30 18:40:35 +02:00
Jan Steemann 461001efd2 split of initial and continuous sync, currently not working 2013-07-30 14:13:49 +02:00
Jan Steemann 002ebd48bc removed all replication conditionals 2013-07-30 13:16:37 +02:00
Jan Steemann 6b5900e8e0 updated replication api 2013-07-30 09:54:39 +02:00
Jan Steemann 9a5a1b02c1 fixed server crash when using firstExample/byExample in a transaction 2013-07-27 17:25:57 +02:00
Jan Steemann 0adbe8410f log "rev" 2013-07-23 18:00:29 +02:00
Jan Steemann 5fe1844ee1 replication tests 2013-07-23 15:03:59 +02:00
Jan Steemann bf12b6ec5a fixed journalSize 2013-07-23 11:57:56 +02:00
Jan Steemann f49ae77bc5 include replication tests 2013-07-23 11:19:41 +02:00
Jan Steemann c4f82088dd replication tests 2013-07-22 18:12:56 +02:00
Jan Steemann 05860edd2f better output for explain 2013-07-18 15:06:16 +02:00
Jan Steemann 088d8aebf8 more tailored AQL error messages in case collection cannot be found 2013-07-18 10:48:02 +02:00
Jan Steemann 5cf234b40d simplified query testing and query interface a bit 2013-07-18 02:15:22 +02:00
Jan Steemann 08b9f57166 stoppable replication applier 2013-07-17 10:58:10 +02:00
Oreste Panaia b8163e79c4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-12 22:40:37 +08:00
Jan Steemann dcd8b63db3 added configuration 2013-07-12 15:40:18 +02:00
Jan Steemann 0266e2339a replication apply state tracking 2013-07-12 15:06:52 +02:00
Jan Steemann 1f564ef6ae linkage between C and C++ 2013-07-11 17:50:48 +02:00
Jan Steemann 98dd1c2522 moved replication parts into separate files 2013-07-11 14:44:09 +02:00
Jan Steemann 3cc4405c18 added collection.checksum() 2013-07-10 11:10:00 +02:00
Jan Steemann c5e693c814 create/drop collections/indexes 2013-07-09 16:41:46 +02:00
Jan Steemann 304d6dc3ab change type to number 2013-07-09 14:37:38 +02:00
Jan Steemann dfd9117fd1 some cleanup, initial implementation of log dump 2013-07-08 12:27:20 +02:00
Oreste Panaia 752a60025c merge conflicts 2013-07-08 16:47:39 +08:00
Oreste Panaia a7661542a2 windows 2012 fixes 2013-07-08 16:44:32 +08:00
Jan Steemann d79d95a3a7 moved attribute names to defines 2013-07-05 14:41:23 +02:00
Jan Steemann a0c1308edb initial synching of collections 2013-07-04 15:53:51 +02:00
Jan Steemann 8b8cd1fc74 stubs 2013-07-03 17:47:37 +02:00
Jan Steemann ef8d26d30e changed memory zone 2013-07-02 17:07:53 +02:00
Jan Steemann 2115d97036 added simple start/stop functionality for replication 2013-06-27 15:21:14 +02:00
Jan Steemann 14422986e0 added option --server.authenticate-system-only 2013-06-26 23:23:37 +02:00
Jan Steemann f7fcd6119d added tests for special collections 2013-06-26 17:46:43 +02:00
Jan Steemann 0de3bd4213 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-26 12:05:11 +02:00
Jan Steemann 6e9c3e8e2c replication logging 2013-06-26 12:04:55 +02:00
Jan Steemann 1b01bced08 updated CHANGELOG 2013-06-25 17:31:11 +02:00
Jan Steemann 2cf2bdc906 move shaper initialisation 2013-06-25 09:56:44 +02:00
Jan Steemann 8f15e31076 comments 2013-06-24 20:55:45 +02:00
Jan Steemann 0f7c632f0f less strlen 2013-06-24 17:31:37 +02:00
Jan Steemann 654ea77f25 extended cap constraints with size constraints 2013-06-22 02:44:48 +02:00
Jan Steemann 2d7edbef96 added db._exists() 2013-06-21 21:50:00 +02:00
Jan Steemann 140fc280e6 free later 2013-06-21 17:46:06 +02:00
Jan Steemann d9c0d588f9 added internal.adminDirectory 2013-06-20 15:47:48 +02:00
Jan Steemann 9dfb7483ff "doCompact" attribute for collections 2013-06-19 16:51:16 +02:00
a-brandt 69fd2b5bb1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-06-13 10:48:45 +02:00
a-brandt 9fa28224e8 added PARSE_DATETIME function 2013-06-13 10:48:05 +02:00
Oreste Panaia 81f20c7ba0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-12 17:03:29 +08:00
a-brandt c9cb2a2008 deleted unused variable 2013-06-12 09:12:07 +02:00
a-brandt 8850add4e5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-06-11 17:20:32 +02:00
a-brandt 3cc5843247 deleted _path 2013-06-11 17:16:04 +02:00
a-brandt 9d29619897 deleted function TRI_WrapVocBase 2013-06-11 11:17:55 +02:00
a-brandt d9fc2a6c60 Merge branch 'devel' into multiple_databases 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/primary-collection.c
 2013-06-11 11:17:41 +02:00
a-brandt aadec76f8e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-06-11 10:59:24 +02:00
a-brandt a3fad4484f added function JS_getIcuTimezones, JS_getIcuLocales and JS_formatDatetime 2013-06-11 10:59:13 +02:00
Jan Steemann 564523896a compaction tests 2013-06-11 10:10:58 +02:00
Oreste Panaia 35ab2e6f62 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-10 17:05:58 +08:00
Jan Steemann 40781d558b more error checking for halfway-created v8 objects 2013-06-07 11:39:21 +02:00
a-brandt 793dc6077d Merge branch 'devel' into multiple_databases 2013-06-05 17:29:34 +02:00
a-brandt 967e45e103 added adding of enpoints and prefix to database mappings 2013-06-05 17:29:00 +02:00
Oreste Panaia 2afd8a742c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-05 19:53:25 +08:00
Jan Steemann b94feca02c fixed documentation errors 2013-06-04 22:55:07 +02:00
a-brandt 21f9da2104 moved database version check to VocbaseManager 2013-06-04 13:05:06 +02:00
a-brandt 1c0578c2b5 Merge branch 'devel' into multiple_databases 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase.c
	lib/HttpServer/ApplicationEndpointServer.cpp
	lib/HttpServer/ApplicationEndpointServer.h
	lib/HttpServer/HttpCommTask.h
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/Rest/HttpRequest.cpp
	lib/Rest/HttpRequest.h
 2013-06-03 17:05:01 +02:00
Oreste Panaia 70bc62a5a5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-05-21 17:47:22 +08:00
Oreste Panaia ee757b3f47 extended errors for skiplist 2013-05-21 17:46:57 +08:00
Jan Steemann ab6ca2f017 ported all recent fixes from 1.3 2013-05-16 21:04:04 +02:00
Jan Steemann 8ad21ec2cf fixed cursor leak for very small batch sizes 2013-05-07 18:48:41 +02:00
Jan Steemann ee7ab712d6 issue #495 2013-05-03 11:08:58 +02:00
a-brandt 234b1460f8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-23 09:55:08 +02:00
Frank Celler cbc2ab93ba fixed _shallowCopy, fixed creating of unknown attributes 2013-04-22 16:48:36 +02:00
a-brandt 7a0a9ff3b4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-22 14:53:33 +02:00
Jan Steemann a241c6959e fixed segfault 2013-04-22 13:11:52 +02:00
Frank Celler df03d38ee2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-21 21:46:00 +02:00
Frank Celler d2ea4e9bd2 added SlowBuffer from node 2013-04-21 21:32:32 +02:00
Jan Steemann 7b9cad3ce0 added db._query() to auto-completion 2013-04-21 19:29:21 +02:00
Jan Steemann cdb7705380 issue #481 2013-04-21 12:12:51 +02:00
Jan Steemann 8ea6915b55 added IndexedPropertyGetter for ShapedJson 2013-04-19 11:35:55 +02:00
a-brandt 58de325e98 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-17 16:58:23 +02:00
a-brandt fcae2b2961 added RequestContext 2013-04-17 16:56:48 +02:00
Jan Steemann 30b2b2ef3e adjusted locks 2013-04-16 11:23:21 +02:00
Jan Steemann 8e4af7a952 fixed some locking 2013-04-15 12:43:53 +02:00
Jan Steemann c945dbd2cd updated transaction API 2013-04-15 11:54:36 +02:00
Jan Steemann 3f698acef8 transaction API, unfinished 2013-04-12 18:42:01 +02:00
Jan Steemann d17fc17bf2 updated documentation 2013-04-12 18:09:48 +02:00
a-brandt 0a44b019db Merge branch 'devel' into multiple_databases 2013-04-12 14:16:25 +02:00
a-brandt aa216c2edb changes for multiple databases 2013-04-12 14:15:06 +02:00
Jan Steemann f41e8e1da0 added _drop to auto-completion 2013-04-12 11:28:16 +02:00
Jan Steemann 9b5849f650 updated documentation 2013-04-12 00:42:02 +02:00
Jan Steemann 23a929a957 disallow creation of pqindexes 2013-04-11 21:07:09 +02:00
Jan Steemann b6925a7b7b transactions 2013-04-11 19:06:55 +02:00
Frank Celler e10f6bc01d fixed deprecated warnings 2013-04-11 14:16:53 +02:00
Frank Celler 142cc08704 replaced more deprecated calls 2013-04-11 13:55:33 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Frank Celler 1d98c4b0f0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-09 16:26:12 +02:00
Frank Celler c4223c5437 added saveOrReplace 2013-04-09 13:50:34 +02:00
Frank Celler b71f31bcbb fixed wrong error message 2013-04-06 23:43:25 +02:00
Frank Celler 38a2ff49c2 fixed wrong length check 2013-04-06 23:05:03 +02:00
Frank Celler 6c8ec64dae comment out unfinished stuff 2013-04-06 22:00:50 +02:00
Frank Celler c567f0a81d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-06 21:58:05 +02:00
Frank Celler 5b5e2b4dae removed DATABASEPATH (same as db._path) 2013-04-06 11:19:24 +02:00
Frank Celler a0278476da Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	lib/Basics/StringUtils.cpp
 2013-04-06 10:19:09 +02:00
Frank Celler 1d7ee507e2 added TRI_ERROR_ARANGO_DOCUMENT_KEY_MISSING 2013-04-06 10:18:29 +02:00
Jan Steemann 0d1076211a fixed memleak 2013-04-05 14:26:58 +02:00
Jan Steemann 225f623d90 added alias for getRows() 2013-04-05 12:51:23 +02:00
Jan Steemann 1417def879 disallow create/drop/rename operations inside transactions 2013-04-04 09:41:44 +02:00
Jan Steemann f7a5cf4cf3 transactions 2013-04-03 14:40:23 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 42b92c794f fixed error messages and tests 2013-04-02 17:46:19 +02:00
Frank Celler 3512fa6ff0 fixed error handling 2013-04-02 15:00:55 +02:00
Frank Celler cb5427cbce replaced throwing of strings by real objects 2013-04-02 11:27:31 +02:00
Jan Steemann 0fc4d233a1 extended documentation on key generators 2013-03-28 16:56:27 +01:00
Jan Steemann 6b3b181930 pass transaction collection into CRUD operations 2013-03-28 13:26:49 +01:00
Jan Steemann 771b03ced3 fixed exception handling in ArangoSh 2013-03-26 16:01:05 +01:00
Jan Steemann 54dbcb8121 fixed some caching issues 2013-03-25 12:23:42 +01:00
Frank Celler 1736221bac fixed cyclic objects 2013-03-24 10:57:44 +01:00
Frank Celler b99ee9517f cached collection in db 2013-03-23 19:50:31 +01:00
Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/bootstrap/module-fs.js
 2013-03-23 14:36:45 +01:00
Jan Steemann c473e42f77 fixed memleak 2013-03-22 18:38:17 +01:00
Frank Celler f5ef270d50 Merge branch 'devel' of github.com:triAGENS/ArangoDB into feature/v8cleanup 2013-03-22 14:47:29 +01:00
Frank Celler 12f0c901e5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into feature/v8cleanup 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangosh/V8Client/arangosh.cpp
 2013-03-22 14:47:17 +01:00
Jan Steemann ccc7c3665b locking 2013-03-22 11:31:36 +01:00
Jan Steemann 9b282ab74c some cleanup of transaction code 2013-03-21 18:54:38 +01:00
Jan Steemann b40ade45ce simplified code 2013-03-21 10:09:52 +01:00
Jan Steemann 40199d64b7 fixed handling of empty and reserved attribute names in documents 
specifying an empty attribute name in a document may have led to segmentation faults
when the document was unpacked later.
 2013-03-20 11:48:33 +01:00
Jan Steemann 61af5f27da added startup option `--database.force-sync-properties` 2013-03-14 13:48:58 +01:00
Jan Steemann 276627fd4c only free pointers if set 2013-03-14 11:51:51 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Jan Steemann 206681159f fixed memory zone mismatches 2013-03-11 11:10:08 +01:00
Jan Steemann 660610ae71 fixed memory zone mismatches 2013-03-11 10:30:54 +01:00
Jan Steemann 83c0326145 disallow specifying indexes on internal attributes (_key, _from, _to etc.). 
This has never worked before and will never work, so return an error if this is tried
 2013-03-08 17:26:47 +01:00
Jan Steemann e6c28d50b3 cleanup: removed TRI_HAVE_ICU and internal.HAVE_ICU (always true) 2013-03-08 16:09:47 +01:00
Jan Steemann 99630450c2 removed checks for TRI_HAVE_ICU because ICU is a prerequisite for using ArangoDB 2013-03-08 16:03:54 +01:00
Jan Steemann 0a883f4076 merged some changes from trx branch into devel 2013-03-08 14:22:25 +01:00
Jan Steemann 5631314bc7 issue #212: added auto-increment support for collections 
the feature can be used by creating a collection with the extra `keyOptions`
attribute as follows:

    db._create("mycollection", { keyOptions: { type: "autoincrement", offset: 1, increment: 10, allowUserKeys: true } });

The `type` attribute will make sure the keys will be auto-generated if no `_key` attribute is specified for a document.
The `allowUserKeys` attribute determines whether users might still supply own `_key` values with documents or if this
is considered an error.
The `increment` value determines the actual increment value, whereas the `offset` value can be used to seed to value
sequence with a specific starting value. This will be useful later in a multi-master setup, when multiple servers can use
different auto-increment seed values and thus generate non-conflicting auto-increment values.

The default values currently are:

- `allowUserKeys`: `true`
- `offset`: `0`
- `increment`: `1`

The only other available key generator type currently is `traditional`. The `traditional` key generator
will auto-generate keys in a fashion as ArangoDB always did (some increasing integer value, with a more or less unpredictable
increment value).

Note that for the `traditional` key generator there is no the option to disallow user-supplied keys and give the
server the sole responsibility for key generation.
 2013-03-08 11:54:03 +01:00
Jan Steemann a6dde1423d disallow defined, but non-string keys 2013-03-07 18:12:07 +01:00
Jan Steemann 4f59917201 added lost docs for collection.save() 2013-03-07 13:19:53 +01:00
Jan Steemann 424ab3e759 removed redundant function 2013-03-07 01:30:34 +01:00
Jan Steemann 2a6180b5fe fixes 2013-03-06 17:10:52 +01:00
Jan Steemann d93c0693d0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-06 14:33:40 +01:00
Jan Steemann bdf906ef89 fixed a memleak for barriers 2013-03-06 14:33:23 +01:00
a-brandt 82bf2bca17 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-06 14:06:07 +01:00
Jan Steemann 5098792b4f fixed invalid pointers when compacting deletion markers 
fixed invalid pointers for updates
 2013-03-06 14:02:32 +01:00
Frank Celler dfd20cd4e2 use TRI_AddGlobalVariableVocbase 2013-03-05 14:49:19 +01:00
a-brandt e41847c336 moved random generators and nonce functions to internal and crypto module 2013-03-04 16:18:00 +01:00
a-brandt 58148f33a4 changed nonce handling 2013-03-04 14:03:22 +01:00
a-brandt d6392971bf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-04 09:06:45 +01:00
Jan Steemann d2469bf46d constified 2013-03-01 18:14:40 +01:00
a-brandt 354a540636 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-01 16:49:27 +01:00
a-brandt 8d78bb1c60 added rondom generator and nonce support 2013-03-01 16:48:37 +01:00
Jan Steemann f613c3c4d9 fixed race conditions when reading/deleting documents 2013-03-01 16:44:40 +01:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Jan Steemann bed09cbbe2 fixed deleting indexes by numeric id 2013-02-25 13:52:50 +01:00
Jan Steemann b3f52d0bfc fixed dropping of indexes 2013-02-25 13:36:17 +01:00
Frank Celler ced7b05cca added fix for TRI_ENABLE_LOGGING from Jan 2013-02-16 14:03:35 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 8365c4294c small mods 2013-02-12 18:16:23 +01:00
Jan Steemann ca84aacd1d issue #395 2013-02-12 11:47:43 +01:00
Frank Celler 77c3b233dc moved .dox to .md 2013-02-09 23:37:34 +01:00
Jan Steemann 8eea104b39 remove 1.2 & 1.1 travis builds 2013-02-07 17:19:58 +01:00
Jan Steemann 7273af5c53 fixed arango-dfdb to not segfault that often when reading corrupt datafile 2013-02-06 14:26:18 +01:00
Jan Steemann dbcc86171f added more crash-protection when reading corrupted collection files at startup 2013-02-06 12:34:53 +01:00
Jan Steemann f17629817a make getindexes and count nestable 2013-02-05 11:36:16 +01:00
Jan Steemann 923027bfdd unify collection names returned by rest API 2013-02-04 19:52:05 +01:00
Jan Steemann 38bceb5df5 make functions private 2013-02-04 18:51:38 +01:00
Jan Steemann 8a6225865f removed lock classes 2013-02-04 14:40:14 +01:00
Jan Steemann a1dc59e85b moved AQL stuff into AhuacatlTransaction 2013-02-04 13:51:09 +01:00
Jan Steemann b12dda013c removed transactioncollection 2013-02-04 13:26:23 +01:00
Jan Steemann de0b290bcd moved AQL to use AhuacatlTransaction 2013-02-04 11:25:03 +01:00
Jan Steemann f6cf885ed2 removed unused function 2013-02-01 17:09:41 +01:00
Jan Steemann eaf4166b3e more tests, less collection loading 2013-02-01 15:20:01 +01:00
Jan Steemann 9a1bac1d69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-02-01 13:43:48 +01:00
Jan Steemann ca8935ae2a fix collection name handling in the face of parallel renames 2013-02-01 13:43:14 +01:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
Jan Steemann 47ad5e1139 removed dead configure option for 1.2 2013-01-30 13:19:20 +01:00
Jan Steemann 6e81f7f6fa return collection ids, cursor ids, and index ids as stringified integers, too 2013-01-28 20:11:29 +01:00
Jan Steemann 1de10d6ea4 make collection id be returned as a string so it cannot overflow 2013-01-28 18:30:48 +01:00
Jan Steemann 17530a5e45 added number of shapes in return value of figures() 2013-01-25 10:19:02 +01:00
Jan Steemann 19da33abb7 use own vocbase 2013-01-21 20:14:58 +01:00
Jan Steemann 0ce5d965e7 some cleanup 2013-01-21 19:52:50 +01:00
Jan Steemann 65d637e488 removed some stuff for 1.2 2013-01-21 12:53:18 +01:00
Jan Steemann 08516043eb added documentation for collection.revision() 2013-01-21 09:19:03 +01:00
Jan Steemann 9a003247d0 removed the _bidirectional attribute for edges 
This will be reimplemented later on collection, and not on individual edges level.
Lucas & the others were sure directed & undirected edges should not be mixed in the same collection
 2013-01-18 17:02:30 +01:00
Jan Steemann 52309cf188 fixed tests & segfault during tests 2013-01-18 00:58:14 +01:00
Frank Celler 670dc221ab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/client/client.js
	js/common/bootstrap/module-internal.js
	js/common/modules/org/arangodb/simple-query-common.js
	js/server/ahuacatl.js
 2013-01-17 23:56:31 +01:00
Jan Steemann 301d297536 updated documentation 2013-01-17 18:10:10 +01:00
Frank Celler 3c21a87366 more cleanup 2013-01-17 16:01:15 +01:00
Jan Steemann bbade8c0b8 removed the non-working indexSubstrings property for fulltext indexing 2013-01-17 15:58:28 +01:00
Jan Steemann 913480e881 make revision ids strings so they do not clip in clients that do not support 64 bit integers 2013-01-17 15:02:55 +01:00
Jan Steemann adb5d32918 allow using of non-loaded collections when referring to them from an edge collection 2013-01-16 17:15:39 +01:00
Jan Steemann 4b15da54ba removed assertion 2013-01-16 11:15:05 +01:00
Jan Steemann 7a6db16241 added db._version() 2013-01-15 16:44:48 +01:00
Jan Steemann 4818f22b21 fixes 2013-01-14 02:58:19 +01:00
Jan Steemann 975ef80e99 fixed 1.1 to 1.2 upgrade for big document ids 2013-01-13 10:58:44 +01:00
Jan Steemann 819f6775d7 fixed comment 2013-01-10 16:31:18 +01:00
Jan Steemann 485d10ad51 added collection.revision() method 2013-01-10 02:02:32 +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
Jan Steemann 187d8ecc69 some transaction rework 2013-01-08 17:26:16 +01:00
Frank Celler 99b42b90b7 updated documentation for deployment and removeByExample 2013-01-08 11:02:14 +01:00
Jan Steemann 07aa2a3b68 re-added missing function 2013-01-07 22:32:40 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Frank Celler e3c1aeec53 fixed typo in documentation 2013-01-05 16:20:46 +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 51305de692 in-memory collections, seem to work now 
documentation and some helper functions are still missing
 2013-01-04 17:04:15 +01:00
Jan Steemann 0471ee8a0d memory collections, intermediate commit 2013-01-04 15:50:29 +01:00
Jan Steemann 8128a6377d memory-collections, intermediate commit 2013-01-04 12:12:46 +01:00
Frank Celler 8564443078 delete is remove 2013-01-03 17:14:03 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01:00
Frank Celler 621e4409bc Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	.gitignore
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	Installation/epm/arangodb.list
	Makefile.in
	README
	README.md
	VERSION
	aclocal.m4
	arangod/HashIndex/hasharray.c
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	config/config.guess
	config/config.sub
	config/depcomp
	configure
	configure.ac
	html/admin/js/master.js
	js/server/arango-password.js
	js/server/version-check.js
	lib/BasicsC/files.c
	lib/BasicsC/logging.c
	utils/Makefile.files
 2012-12-18 13:37:34 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Jan Steemann 0a9ed409ab fixed wrong memory zone and wrong documentation 2012-12-11 18:58:42 +01:00
Jan Steemann fb4afd0353 fulltext index 2012-12-10 12:16:48 +01:00
Jan Steemann cbaa57a1bd cleanup of fulltext indexes, resizing etc. 2012-12-07 18:00:01 +01:00
Jan Steemann 1811ce9186 fixed some issues found by cppcheck 2012-12-04 18:21:29 +01:00
Frank Celler 5283ec7bfa fixed documentation 2012-12-04 16:25:51 +01:00
Jan Steemann efde7b5efa first test cases for fulltext index 2012-12-03 23:55:46 +01:00
Jan Steemann cdbb96788f issue #313 2012-12-03 15:30:01 +01:00
Frank Celler e5ee30f30b added bitarray documentation, added TOC 2012-12-03 15:20:49 +01:00
Jan Steemann d2aef2dcdc add words to fulltext index 
this parses the fulltext-indexed attributes of documents when there's a fulltext index, and adds the individual words to the index.
As the fulltext index is case-sensitive, all words are added to the index in lower case.
The text tokenisation implementation is still very naive and currently works properly only for character ranges [a-z] and [A-Z].
Unicode words are also supported, but they are not normalised nor lower-cased yet. Additionally, unicode punctuation characters are not excluded and will also be added to the index.
Updating documents that are fulltext-indexed currently does not work.
 2012-12-02 00:55:59 +01:00
Jan Steemann f517aa0059 ensureFulltextIndex 2012-11-30 17:53:02 +01:00
Jan Steemann 27883efbee updated documentation 2012-11-29 10:44:14 +01:00
Jan Steemann 9481e588db fixed index access by id only 2012-11-28 13:37:33 +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 687eac97b5 fix type errors 2012-11-23 09:00:11 +01:00
Jan Steemann aaf34f44f4 fixed lots of compile warnings 2012-11-22 21:20:22 +01:00
Jan Steemann ad855bd2bd fixed doxygen errors 2012-11-21 18:10:45 +01:00
Jan Steemann f3fe1c3896 added a missing release 2012-11-20 17:07:39 +01:00
Jan Steemann 2efa2f32db added server version check 2012-11-20 09:27:28 +01:00
Jan Steemann 85a8f56a34 complain about non-expected database directory versions 2012-11-20 01:41:41 +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 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 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 3009bdfcfd issue #277 2012-11-15 22:55:59 +01:00
Jan Steemann ace85c43c9 nesting transactions from v8-vocbase... 2012-11-15 18:55:52 +01:00
Jan Steemann fe7e061a27 transaction nesting 2012-11-15 18:14:20 +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 9e40045025 changed document CRUD API signatures 2012-11-14 17:11:16 +01:00
Jan Steemann cdd163cc8a added TRANSACTION() JS function 2012-11-13 18:45:27 +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 b7b2c87ea8 re-used function declaration functions in v8-query 2012-11-08 18:44:10 +01:00
Jan Steemann 64c6bc5cb0 renamed marker member _deletion to _validTo, some cleanup 2012-11-08 17:47:18 +01:00