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

3180 Commits

Author SHA1 Message Date
Jan Steemann eba885d583 fixed member initialization in second constructor 2014-06-10 17:41:11 +02:00
Max Neunhoeffer dd9c4810e1 Revert "Add protector assertions in voc-shaper." 
This reverts commit f0ed0d9122fa6470ff9a30d4cb732becc206886c.
 2014-06-10 16:46:18 +02:00
Jan Steemann 2a13bc9527 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 16:43:12 +02:00
Max Neunhoeffer eb8453e455 Add protector assertions in voc-shaper. 2014-06-10 16:42:46 +02:00
Jan Steemann dfc34c0c98 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 16:42:43 +02:00
Jan Steemann 7c599ef893 barriers 2014-06-10 16:42:15 +02:00
Max Neunhoeffer 12a5ba03fd Move class TransactionBase to voc-types.h 2014-06-10 16:37:35 +02:00
Max Neunhoeffer e405d06370 AQL syntax now "REMOVE d IN coll" instead of "FROM" to avoid keyword FROM. 2014-06-10 16:05:17 +02:00
Max Neunhoeffer c49f1a80d6 Went through all TRI_doc_mptr\(_copy\)_t ... 
... to see whether _copy is needed.
 2014-06-10 16:04:30 +02:00
Max Neunhoeffer e575b94222 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 15:56:31 +02:00
Max Neunhoeffer 30e16bc127 Fix two comments. 2014-06-10 15:51:53 +02:00
Jan Steemann c686c13c91 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 15:42:46 +02:00
Jan Steemann ede9c634c3 assert 2014-06-10 15:42:39 +02:00
Jan Steemann 7e181d0bfa changed keywords 2014-06-10 15:42:05 +02:00
Max Neunhoeffer f07cba1cc3 Remove Hans accidentally committed. 2014-06-10 15:20:42 +02:00
Max Neunhoeffer 7f867a0940 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 15:19:40 +02:00
Max Neunhoeffer 02a8b4e388 Edge index lookup returns now TRI_doc_mptr_copy_t. 
Move TRI_document_edge_t to voc-types.h.
 2014-06-10 15:19:11 +02:00
Jan Steemann 43600f712f Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 15:06:04 +02:00
Jan Steemann 511a9c6fca let collectorthread adjust sizes 2014-06-10 15:05:48 +02:00
Max Neunhoeffer ea837012f0 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 14:33:25 +02:00
Max Neunhoeffer dbfe62fd66 TRI_SelectByExample now uses copies of master pointers. 2014-06-10 14:32:57 +02:00
Jan Steemann a8e28a01b6 properly return logfile id 2014-06-10 14:32:28 +02:00
Jan Steemann 2d8408dba5 add fake transaction object while collecting 2014-06-10 14:04:14 +02:00
Jan Steemann 14097f5473 create fake transaction for loading collections 2014-06-10 14:01:35 +02:00
Max Neunhoeffer 3f03956fe8 Fake TransactionBase. 2014-06-10 14:00:27 +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 2dc70409cf Fix protection assertion system one more time. 2014-06-10 13:28:58 +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 370d7bc083 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-10 11:56:56 +02:00
Jan Steemann da9f8247fb barriers are now created automatically by transactions 2014-06-10 11:56:40 +02:00
Max Neunhoeffer f7e5e28780 Create thread global transaction protection assertions. 2014-06-10 11:31:07 +02:00
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
Jan Steemann bc90d77421 turn off trace logging 2014-06-05 01:12:28 +02:00
Jan Steemann ed37f50b8e calculate hash outside of lock 2014-06-05 01:12:11 +02:00
Jan Steemann d18264b1a6 less thread-local lookups 2014-06-05 01:11:43 +02:00
Jan Steemann 1b1f2140b9 no memset 2014-06-05 01:11:21 +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 f7049b8922 fixed startup race conditions 2014-06-04 15:18:20 +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 ad1feb0ed4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-04 14:30:28 +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
Frank Celler eda4b0cde4 fixed dfdb 2014-06-04 11:02:42 +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 240bda8b06 use DatabaseGuard 2014-06-03 19:44:37 +02:00
Jan Steemann 52dc9a91b8 added more markers and tests 2014-06-03 19:30:40 +02:00
Jan Steemann 577860c978 renamed struct attribute 2014-06-03 19:15:01 +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 8ea7fa5e4a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 17:18:02 +02:00
Jan Steemann 399a843e23 use and release databases and collections during collection 2014-06-03 17:17:41 +02:00
Jan Steemann fb87b35dec initial implementation of wal logfile collection, scans markers only atm 2014-06-03 16:39:49 +02:00
scottashton 8f347f2b54 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-03 16:25:26 +02:00
scottashton 006eb3b61b calculation of measurements for graphs added and changed calculation of shortst paths to Floyd–Warshall algorithm 2014-06-03 16:25:13 +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 715d11cb22 removed consts 2014-06-03 10:17:09 +02:00
Jan Steemann 07e2fce6b8 fixed keepNull in cluster 2014-06-03 10:13:19 +02:00
Jan Steemann 6403b2c569 removed mr leftovers 2014-06-03 08:56:54 +02:00
Jan Steemann 7501fad516 removed VocBase/marker.h and VocBase/marker.cpp 2014-06-02 18:06:50 +02:00
Jan Steemann f7f1b3116a Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-02 17:57:31 +02:00
Jan Steemann 3f8455685c make debug output configurable 2014-06-02 17:57:19 +02:00
Jan Steemann c6388411ef removed unused test thread 2014-06-02 17:56:43 +02:00
Max Neunhoeffer 11012c1d2b Remove unnecessary file. 2014-06-02 16:33:58 +02:00
Max Neunhoeffer 70362d48c2 Silence bison warning. 2014-06-02 16:25:02 +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
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 cce2942dd5 cleanup 2014-05-30 20:55:52 +02:00
Jan Steemann 19b0642d08 removed fsrt.inc 2014-05-30 20:39:02 +02:00
Jan Steemann 186c1b9257 removed fsrt 2014-05-30 20:23:15 +02:00
Jan Steemann 1fd155edc4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-30 19:15:07 +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 72541e5046 prevent small leak in case of shutdown 2014-05-29 15:06:07 +02:00
Jan Steemann ed6a55abb9 specialized primary index for faster comparisons and less datafile lookups 2014-05-29 03:35:37 +02:00
Max Neunhoeffer 04a3dfff7b Fix logic of abort in handlePlanChangeCoordinator. 2014-05-29 00:32:13 +02:00
Max Neunhoeffer 283af09657 Fix startup race bug in cluster. 
If a coordinator cannot get the users of a database, it just gives
up and immediately tries again in the next heartbeat.
 2014-05-28 23:18:30 +02:00
Max Neunhoeffer cf35550057 Reduce timeout to get users data on coordinator. 2014-05-28 23:18:12 +02:00
Jan Steemann 4cbdbba633 unregister all user tasks on shutdown 2014-05-28 21:36:05 +02:00
Jan Steemann 350e8fc8fe fast path for named property access 2014-05-28 21:35:42 +02:00
Jan Steemann 4283664a65 added assert 2014-05-28 21:11:52 +02:00
Jan Steemann bd9e8b0478 fixed too eager iteration over skiplists 2014-05-28 15:19:57 +02:00
Max Neunhoeffer 0b2544910e Fix database order to do _system first in handlePlanChangeCoordinator 2014-05-28 15:16:57 +02:00
Jan Steemann 4f3ed048e4 fixed disconnect of agency connections, use less CPU while spinning in agency methods 2014-05-28 13:44:35 +02:00
Esteban Lombeyda 6d76e8c6ac Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-28 10:29:45 +02:00
Esteban Lombeyda a4a4d770b6 more documentation 2014-05-28 10:29:10 +02:00
scottashton 504a167077 added commonNeighbors and commonProperties to ahuacatl and general-graph 2014-05-28 09:59:10 +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
Jan Steemann adfaf9b760 garbage collection 2014-05-26 16:06:18 +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
scottashton 51cc041052 added GRAPH_VERTICES 2014-05-23 14:29:53 +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 558048d267 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-23 09:34:33 +02:00
Jan Steemann e198c2f926 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-23 09:33:38 +02:00
Jan Steemann 0d5c01cf48 removed old functions 2014-05-23 09:33:33 +02:00
scottashton 25d6bf15f1 cleaned up merge conflict 2014-05-22 17:54:13 +02:00
scottashton 3bec9b4c93 refactored aql 2014-05-22 17:49:20 +02:00
Jan Steemann 922d4890f2 Fixes to compile under Visual Studio. 2014-05-22 16:27:30 +02:00
Jan Steemann bd6ca1aeb2 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 16:00:21 +02:00
Jan Steemann ea97d443b0 use wal shape and attribute markers 2014-05-22 16:00:00 +02:00
Max Neunhoeffer bb5b341ba6 Get rid of many "using namespace ..." occurrences in header files. 2014-05-22 15:13:16 +02:00
Esteban Lombeyda bcd8490c1b Supporting new signature for remove function 2014-05-22 14:35:17 +02:00
Jan Steemann 430d5ee9f2 added wal shape and attribute markers 2014-05-22 13:28:48 +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 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
Esteban Lombeyda 15cb6e3f0d documentation was adapted to new signatures 2014-05-22 11:09:47 +02:00
Jan Steemann 045ed83270 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 10:58:14 +02:00
Max Neunhoeffer d58d66c8a3 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 10:56:47 +02:00
Max Neunhoeffer ca019f6a26 Make TRI_EXTRACT_SHAPE_IDENTIFIER_MARKER static inline. 2014-05-22 10:56:23 +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 01a4c43b81 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 10:52:23 +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
Max Neunhoeffer 2820afdcc2 Remove many extern "C" declarations that are no longer needed. 2014-05-22 10:19:03 +02:00
Jan Steemann 06a56a7d36 removed MRuby for arangod 2014-05-21 18:11:59 +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