1
0
Fork 0
Commit Graph

1169 Commits

Author SHA1 Message Date
Jan Steemann 14097f5473 create fake transaction for loading collections 2014-06-10 14:01:35 +02:00
Jan Steemann 0883a973aa set header fid 2014-06-10 13:44:25 +02:00
Jan Steemann aa173b315b update cap constraint sizes 2014-06-10 13:40:33 +02:00
Max Neunhoeffer d4b5ee25ee Fix protection assertions. 2014-06-10 13:16:01 +02:00
Max Neunhoeffer d0ba832ffb Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/Utils/Transaction.h
2014-06-10 13:05:33 +02:00
Max Neunhoeffer 3c0c785ba5 First set of protection assertions. 2014-06-10 13:03:04 +02:00
Jan Steemann 85a773e177 cleanup 2014-06-10 12:03:55 +02:00
Jan Steemann da9f8247fb barriers are now created automatically by transactions 2014-06-10 11:56:40 +02:00
Jan Steemann 3f22fa03be fixed some indexes 2014-06-08 03:03:16 +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 f6a157b3af removed unused function 2014-06-06 23:06:59 +02:00
Jan Steemann 3f6cb4d9ed fixed update policy 2014-06-06 22:53:59 +02:00
Jan Steemann ed0377f671 moved calculation into function 2014-06-06 22:01:41 +02:00
Jan Steemann 85aa80ede7 mini cleanup 2014-06-06 21:56:01 +02:00
Jan Steemann c8702aaa02 moved declarations 2014-06-06 21:49:06 +02:00
Jan Steemann 368091d7c3 function cleanup 2014-06-06 21:35:34 +02:00
Jan Steemann 982673ef52 read "old" transactions when loading a database 2014-06-06 18:32:48 +02:00
Jan Steemann cb4ca68c41 treat transaction markers in datafiles as garbage and ignore them 2014-06-06 17:24:36 +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 c2dbce8290 fixed null 2014-06-06 15:10:45 +02:00
Frank Celler 315232f2c8 fixed order of checks 2014-06-06 15:10:27 +02:00
Jan Steemann 3b3d15b3e4 removed useless broadcast 2014-06-06 14:17:31 +02:00
Jan Steemann 4b568e6069 comments 2014-06-06 13:11:10 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +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 797ef2e2ca slightly changed return values in TRI_ExtractShapedJsonVocShaper 2014-06-05 22:28:27 +02:00
Jan Steemann 0f25f8a2b0 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/Wal/CollectorThread.cpp
2014-06-05 18:14:45 +02:00
Jan Steemann b9b1db3e02 WAL logfile collection 2014-06-05 18:06:42 +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 537160f2d5 Do not copy TRI_doc_mptr:t structs one more time. 2014-06-05 14:03:00 +02:00
Max Neunhoeffer 6c4e7408ac Fix deallocation of TRI_doc_mptr_t structs. 2014-06-05 13:56:03 +02:00
Max Neunhoeffer 5389b91c8b Remove DumpHeaders. 2014-06-05 13:30:15 +02:00
Max Neunhoeffer 3e256a8aee Fix allocation of TRI_doc_mptr_t structs. 2014-06-05 13:14:30 +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 ec8742f920 removed separate index lock 2014-06-05 11:39:14 +02:00
Jan Steemann ed37f50b8e calculate hash outside of lock 2014-06-05 01:12:11 +02:00
Jan Steemann 8e1d9d05d8 simplified save API 2014-06-04 20:35:53 +02:00
Jan Steemann ebabc0e4e2 removed unused property 2014-06-04 20:26:15 +02:00
Jan Steemann 3d4873457b unload 2014-06-04 18:21:06 +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 3ad1940ce9 Looked through _headersPtr. 2014-06-04 16:23:07 +02:00
Max Neunhoeffer d2c893d8a9 One more proof of protection. 2014-06-04 16:00:54 +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
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 3c25b12aa9 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-04 14:31:56 +02:00
Max Neunhoeffer f3653015b6 First part of protection proof. 2014-06-04 14:31:38 +02:00
Jan Steemann 1a6fb79d81 added missing files 2014-06-04 14:28:28 +02:00
Jan Steemann b1e2990172 wal collection 2014-06-04 14:28:11 +02:00
Max Neunhoeffer c68093eefb Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 22:27:33 +02:00
Max Neunhoeffer 13541cf4ec Rename component _data -> _dataptr in master pointer. 2014-06-03 22:27:08 +02:00
Jan Steemann 8f7272dfaa wrote procedure for copying markers, not yet functional 2014-06-03 21:13:06 +02:00
Jan Steemann 52dc9a91b8 added more markers and tests 2014-06-03 19:30:40 +02:00
Jan Steemann 30384bf491 prevent copying 2014-06-03 18:14:36 +02:00
Jan Steemann 3876df9b25 raii 2014-06-03 18:12:44 +02:00
Jan Steemann 399a843e23 use and release databases and collections during collection 2014-06-03 17:17:41 +02:00
Jan Steemann 7501fad516 removed VocBase/marker.h and VocBase/marker.cpp 2014-06-02 18:06:50 +02:00
Jan Steemann 3f8455685c make debug output configurable 2014-06-02 17:57:19 +02:00
Jan Steemann 3c4f986fc2 hand over fail information for transactions 2014-06-02 16:24:16 +02:00
Jan Steemann e39e39b524 removed synchroniser 2014-06-02 16:04:56 +02:00
Jan Steemann bccd6f3112 update sealedInfo 2014-06-02 15:45:51 +02:00
Jan Steemann 8ba93e25a2 use marker protectors 2014-06-02 11:00:05 +02:00
Jan Steemann b08e100336 simplified writing of markers 2014-06-02 10:41:48 +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
Jan Steemann d4dd58b264 merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Jan Steemann cce2942dd5 cleanup 2014-05-30 20:55:52 +02:00
Jan Steemann fb6b97b9b9 re-added transactions 2014-05-30 17:42:39 +02:00
Jan Steemann 8d97f4f978 added comments 2014-05-30 14:17:21 +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 39afcff925 type casts 2014-05-30 12:27:13 +02:00
Frank Celler c8ddff2a9b fixed shutdown for busy V8 contexts 2014-05-30 11:39:11 +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 4283664a65 added assert 2014-05-28 21:11:52 +02:00
Jan Steemann e52f6f9d05 reworked 2014-05-27 18:42:40 +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
Jan Steemann dc1fd1f617 added reserve function 2014-05-26 17:24: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
Max Neunhoeffer 45a687dbd1 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-23 10:32:35 +02:00
Max Neunhoeffer ba270940f6 Silence a few compiler warnings. 2014-05-23 10:30:30 +02:00
Jan Steemann 0d5c01cf48 removed old functions 2014-05-23 09:33:33 +02:00
Jan Steemann ea97d443b0 use wal shape and attribute markers 2014-05-22 16:00:00 +02:00
Jan Steemann 430d5ee9f2 added wal shape and attribute markers 2014-05-22 13:28:48 +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 081b7fd394 fixed key generators 2014-05-22 11:59:33 +02:00
Jan Steemann c5103e28b3 fixed edges 2014-05-22 11:27:17 +02:00
Max Neunhoeffer ca019f6a26 Make TRI_EXTRACT_SHAPE_IDENTIFIER_MARKER static inline. 2014-05-22 10:56:23 +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
Jan Steemann 0f3590315c Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 15:00:41 +02:00
Jan Steemann e67f130f70 removed debug output 2014-05-21 14:53:15 +02:00
Max Neunhoeffer 9d947dcc9d Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 14:47:04 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Jan Steemann 2d725da543 fixed document removal 2014-05-21 14:22:30 +02:00
Jan Steemann a10fbf36ae Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 14:18:14 +02:00
Jan Steemann c38de677d0 cleaned up WAL markers 2014-05-21 14:17:58 +02:00
Max Neunhoeffer aa731f5eb0 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 13:57:26 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann 0933555a3e fixed saving of documents 2014-05-21 13:41:55 +02:00
Jan Steemann 74aa2d6cee fixed compile error 2014-05-21 12:46:08 +02:00
Max Neunhoeffer 9d948618f3 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 11:31:08 +02:00
Max Neunhoeffer 786ea250ba Snapshot. 2014-05-21 11:20:03 +02:00
Jan Steemann b10ef2335c split Marker.h 2014-05-21 10:28:24 +02:00
Max Neunhoeffer fdba62a957 Implement TRI_EXTRACT_SHAPED_JSON_MARKER as static inline.
Also consider WAL.
2014-05-21 08:59:03 +02:00
Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	lib/ShapedJson/Legends.cpp
	lib/ShapedJson/Legends.h
2014-05-20 17:03:49 +02:00
Jan Steemann 4529560ad2 adding edges 2014-05-20 16:58:05 +02:00
Jan Steemann c14b3888f0 removed unused defines 2014-05-20 16:16:22 +02:00
Jan Steemann b20240b829 added legend 2014-05-20 14:37:57 +02:00
Jan Steemann cdad1f19fe moved marker definitions 2014-05-20 14:21:12 +02:00
Jan Steemann 029b7333ba added remove marker struct 2014-05-20 13:17:01 +02:00
Jan Steemann 57753f84dd added new structs for WAL documents and edges 2014-05-20 11:49:12 +02:00
Jan Steemann 52be779997 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:40:19 +02:00
Jan Steemann c9e49c5446 reverted struct change 2014-05-20 11:39:15 +02:00
Jan Steemann 6ecfc44f11 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:32:02 +02:00
Jan Steemann c93871166a added save() method, still broken 2014-05-20 11:31:42 +02:00
Jan Steemann 8879e27738 removed unused struct 2014-05-20 11:30:02 +02:00
Jan Steemann af7992fad7 extended markers 2014-05-19 18:01:54 +02:00
Jan Steemann 931ba36daf write transaction markers into WAL 2014-05-19 15:49:58 +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 d5200f26d7 moved magic number to function 2014-05-16 19:05:54 +02:00
Jan Steemann 6da081474c explicitly name test cases 2014-05-16 18:38:53 +02:00
Jan Steemann 2bc4aa90af fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
Jan Steemann abe2f55542 fixed bug in too eager datafile removal 2014-05-14 12:28:29 +02:00
Jan Steemann 9f7923ace3 fixed VS warnings 2014-05-13 13:39:42 +02:00
Jan Steemann 3f6d28de8d fixed VS warnings 2014-05-13 12:44:00 +02:00
Jan Steemann 027ec2d3f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/V8Server/V8PeriodicTask.cpp
	arangod/V8Server/V8PeriodicTask.h
	arangod/V8Server/v8-actions.cpp
	js/common/bootstrap/module-internal.js
	js/server/server.js
	lib/Dispatcher/ApplicationDispatcher.cpp
	lib/Dispatcher/RequeueTask.cpp
	lib/GeneralServer/GeneralListenTask.h
	lib/Scheduler/ApplicationScheduler.cpp
	lib/Scheduler/PeriodicTask.cpp
	lib/Scheduler/Scheduler.cpp
	lib/Scheduler/Scheduler.h
	lib/Scheduler/Task.cpp
	lib/Scheduler/Task.h
	lib/Scheduler/TimerTask.cpp
	lib/Scheduler/TimerTask.h
2014-05-12 16:49:20 +02:00
Max Neunhoeffer 19289b6d37 First working version of arangorestore for clusters. 2014-05-09 16:33:54 +02:00
Jan Steemann 3efb22ef4c fixed warning 2014-05-09 09:03:42 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Jan Steemann 20292af75c throw different type of debug error to prevent bogus "out-of-memory" errors 2014-05-08 23:00:18 +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
Jan Steemann 3ca5b286e5 fixed typo in edge index deletion 2014-05-02 22:11:19 +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 a723ff29d8 use TRI_voc_tid_t 2014-04-11 17:30:56 +02:00
Jan Steemann d0bcb02015 generate/validate keys 2014-04-11 16:19:00 +02:00
Jan Steemann 86398d7cde insert standalone marker 2014-04-11 13:01:00 +02:00
Jan Steemann 87b31f9793 VS fixes 2014-04-07 11:50:52 +02:00
Jan Steemann 282f510e34 fixed race conditions 2014-04-04 14:57:14 +02:00
Max Neunhoeffer 35da05277e Fix two more char const* compiler unhappinesses. 2014-04-04 09:00:36 +02:00
Jan Steemann 149f7378cb cpp 2014-04-03 23:22:32 +02:00
Jan Steemann 9c9f5f4edd VS 2014-04-03 17:58:13 +02:00
Jan Steemann bb24068029 cpp 2014-04-03 17:50:38 +02:00
Jan Steemann 17bf8ebafb fixed VS warnings 2014-04-03 16:13:56 +02:00
Jan Steemann ccf7bbb173 cpp 2014-04-03 15:23:20 +02:00
Jan Steemann 50f2ffaaaf fixed misbehaving memory barriers for Visual Studio 2013
seems we are affected by the issue described here:
http://lists.schmorp.de/pipermail/libev/2014q1/002318.html
2014-04-02 14:19:40 +02:00
Max Neunhoeffer 4ed8230b3a Merge branch 'devel' into associative_tests 2014-03-31 08:46:36 +02:00
Max Neunhoeffer f7476a36ef Take out some diagnostics. 2014-03-28 16:25:13 +01:00
Max Neunhoeffer 7f11440402 Repair graphs with new edge index. 2014-03-28 16:21:18 +01:00
Max Neunhoeffer 078687fe00 Change edge index. Compiles but does not work yet. 2014-03-28 11:10:49 +01:00
Max Neunhoeffer 05c9e4fd54 Cleanup resizing of MultiPointerHash 2014-03-28 09:14:20 +01:00
Max Neunhoeffer 3dc507d0ed Fix after merge from devel. 2014-03-27 16:37:10 +01:00
Max Neunhoeffer b4e80d5a26 Merge branch 'devel' into associative_tests 2014-03-27 16:32:56 +01:00
Max Neunhoeffer 650d852db9 Graph tests work again. 2014-03-27 16:32:24 +01:00
Jan Steemann e2f1d0dfb6 fixed issues in arango-dfdb 2014-03-27 12:29:32 +01:00
Jan Steemann cf0ea1b615 fixed deallocation of edges 2014-03-27 09:27:13 +01:00
Max Neunhoeffer 7b4f7f665c Lookup compiles, deletion planned. 2014-03-26 16:21:50 +01:00
Max Neunhoeffer c32f717a07 Merge branch 'devel' into associative_tests 2014-03-26 15:12:54 +01:00
Max Neunhoeffer 185d86c04f Snapshot before moving to indices in associative-multi. 2014-03-26 15:12:36 +01:00
Jan Steemann 92f87c1421 updated logfile manager 2014-03-25 18:21:31 +01:00
Max Neunhoeffer fd76cd6fad Experiments on hashing. 2014-03-25 16:24:27 +01:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
Jan Steemann d0189d1f9b remove unnecessary syscall 2014-03-25 00:47:43 +01:00
Max Neunhoeffer c17daf2ab9 Take out timing debugging output. 2014-03-24 14:21:34 +01:00
Max Neunhoeffer dde446fb28 Optimise hash tables by no longer using % for wraparound. 2014-03-24 14:04:24 +01:00
Jan Steemann 2aef412cd4 use sizeHint for hash index, too 2014-03-21 22:59:41 +01:00
Jan Steemann 272f7c6850 wal, fully non-functional, not used 2014-03-20 17:56:39 +01:00
Jan Steemann c760272a7f provide a sint hint to indexes when initially filling them
this may speed up building indexes when opening an existing collection
2014-03-17 11:29:13 +01:00
Jan Steemann b5b00ebdb0 set vocbase state for "artificial" databases 2014-03-17 09:00:15 +01:00
Jan Steemann a0da7e483d added diagnostic message at startup 2014-03-14 13:32:49 +01:00
Jan Steemann 1b69e337a6 fixed datafiles issues 2014-03-14 13:25:15 +01:00
Jan Steemann 40445d973e negate condition for iterate markers 2014-03-13 18:11:26 +01:00
Jan Steemann babaf2738b adjusted tests 2014-03-12 14:19:13 +01:00
Jan Steemann 35cf13a38c more tests for shapes 2014-03-12 13:26:09 +01:00
Jan Steemann 7df402d1cd removed command line option `--database.remove-on-drop` 2014-03-10 17:03:17 +01:00
Jan Steemann 3c88e45802 fixed too eager compaction
Conflicts:
	CHANGELOG
	arangod/VocBase/compactor.c
2014-03-10 16:55:15 +01:00
Jan Steemann ec9e3f2402 debug information 2014-03-07 12:17:38 +01:00
Jan Steemann b3b22a1f1c changed authentication procedure 2014-03-06 16:37:00 +01:00
Jan Steemann 4cbe5cf69a shutup VC warning 2014-03-06 10:34:00 +01:00
Frank Celler 2e80955b5f removed debug message 2014-03-03 11:12:08 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Jan Steemann 0b1dcc0deb include collection in inventory if id is equal to current server tick 2014-02-28 20:00:04 +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
Frank Celler 3afa2214f7 added disable-cluster-dispatcher 2014-02-27 11:47:26 +01:00
Jan Steemann 9ac1a7cc50 cluster-internal authentication 2014-02-26 12:01:41 +01:00
Jan Steemann 98ceb07b77 add initial user 2014-02-25 17:05:02 +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
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
2014-02-20 21:02:07 +01:00