1
0
Fork 0
Commit Graph

2995 Commits

Author SHA1 Message Date
Jan Steemann 00f593b8a9 cleanup 2014-06-10 09:55:44 +02:00
Jan Steemann d9653bc462 DML for AQL 2014-06-10 09:30:27 +02:00
Jan Steemann 3f22fa03be fixed some indexes 2014-06-08 03:03:16 +02:00
Jan Steemann 05ddccd515 fixed wrong sorts 2014-06-08 00:18:56 +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 df37bcad23 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-06 17:00:26 +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
Jan Steemann f730fc7ddc make collection more exception-aware 2014-06-06 16:46:39 +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 c251b3f586 finish ongoing collections and outstanding synchronisations on shutdown 2014-06-06 14:38:09 +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
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 797ef2e2ca slightly changed return values in TRI_ExtractShapedJsonVocShaper 2014-06-05 22:28:27 +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
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
scottashton e6b4fff2f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-05 16:59:53 +02:00
scottashton fe621c1723 finished measurements 2014-06-05 16:59:43 +02:00
Frank Celler c8fc7f00c3 splitted arangod into prog and lib 2014-06-05 16:11:38 +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 35e00a3a4d Revert "Do not copy TRI_doc_mptr_t."
This reverts commit ea1f82194dccdf212c9ef1f7ee8c5790b7e3c771.

We need to copy such that we can release the collection lock earlier.
2014-06-05 14:56:21 +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 95933fb3c1 Do not copy TRI_doc_mptr_t. 2014-06-05 13:56:26 +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 1925a16640 use namespace std 2014-06-05 01:29:01 +02:00
Jan Steemann 7783bc6687 made function private 2014-06-05 01:14:13 +02:00