1
0
Fork 0
Commit Graph

151 Commits

Author SHA1 Message Date
Jan Steemann a43d5c3f7d Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-04 14:49:29 +02:00
Jan Steemann c5154fede7 use external index locking 2014-06-04 14:49:22 +02:00
Max Neunhoeffer f3653015b6 First part of protection proof. 2014-06-04 14:31:38 +02:00
Max Neunhoeffer 13541cf4ec Rename component _data -> _dataptr in master pointer. 2014-06-03 22:27:08 +02:00
Jan Steemann 240bda8b06 use DatabaseGuard 2014-06-03 19:44:37 +02:00
Jan Steemann 8ba93e25a2 use marker protectors 2014-06-02 11:00:05 +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 e52f6f9d05 reworked 2014-05-27 18:42:40 +02:00
Jan Steemann 6ad1ba13cc fixed mutex in key generator 2014-05-22 13:11:23 +02:00
Jan Steemann de14fa5944 removed old CRUD methods 2014-05-22 12:17:51 +02:00
Jan Steemann 5373f1cea0 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/VocBase/edge-collection.h
2014-05-21 18:06:44 +02:00
Jan Steemann 0caa570274 update() 2014-05-21 18:05:08 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Jan Steemann 0933555a3e fixed saving of documents 2014-05-21 13:41:55 +02:00
Jan Steemann 4529560ad2 adding edges 2014-05-20 16:58:05 +02:00
Jan Steemann cdad1f19fe moved marker definitions 2014-05-20 14:21:12 +02:00
Jan Steemann c93871166a added save() method, still broken 2014-05-20 11:31:42 +02:00
Jan Steemann f7797ab6c9 added locker objects 2014-05-20 11:22:27 +02:00
Jan Steemann 168fdcf6ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	UnitTests/Basics/bson-test.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Basics/BsonHelper.h
2014-05-19 11:21:58 +02:00
Jan Steemann d16535351a reserve space in result vector 2014-05-17 00:49:52 +02:00
Jan Steemann 300da03c5c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-12 17:25:01 +02:00
Jan Steemann 14813638dd removed boost 2014-05-12 17:22:42 +02:00
Jan Steemann 86398d7cde insert standalone marker 2014-04-11 13:01:00 +02:00
Jan Steemann fb130a3c45 empty() instead of size() 2014-04-07 21:03:29 +02:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Jan Steemann ef84dc23e2 fixed segfault 2014-02-27 09:16:07 +01:00
Jan Steemann 002938aa04 AQL in coordinator 2014-02-07 16:38:35 +01:00
Jan Steemann 58b3e0f99d splitted a few tests 2014-02-05 15:15:51 +01:00
Max Neunhoeffer 3a5a085bc5 Sort out mess with collection name/id lookup in cluster. 2014-01-30 17:27:06 +01:00
Max Neunhoeffer 1edcd6a9e9 Report cluster wide collection name in _id 2014-01-29 11:24:09 +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 f69ae8f2a9 do not access shaper but use memory zone variable 2013-11-08 13:42:16 +01:00
Jan Steemann 46d4e14f7b issue #650: Randonmess of any() should be improved 2013-10-31 10:09:01 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 21d25d0ccc removed resourceholder 2013-10-17 10:43:07 +02:00
Jan Steemann 6a353a4c38 resolve collection names on reimport 2013-10-10 12:33:27 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann e3ac7ed04c no need to use policy 2013-09-20 08:27:16 +02:00
Jan Steemann 5c0fd200f7 more OOM awareness 2013-09-19 08:44:12 +02:00
Jan Steemann 42441b208f refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
Jan Steemann a53c1e493b multiple database, becoming standard 2013-09-02 09:52:52 +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 05a7f79941 re-configuration of logger, cap constraint 2013-07-31 14:39:33 +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