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

1241 Commits

Author SHA1 Message Date
Jan Steemann 7e52ebbc3b fixes for Visual Studio 2014-06-20 15:46:33 +02:00
Jan Steemann 09a64c1f7f fixed compile warnings 2014-06-20 14:30:36 +02:00
Jan Steemann 9b713fccba renamed macro 2014-06-20 13:43:29 +02:00
Jan Steemann a56a0e457c fixed edge index hashing error 2014-06-20 13:37:52 +02:00
Jan Steemann 56b032c688 more tests 2014-06-20 09:38:35 +02:00
Jan Steemann cc35e4696c added more tests 2014-06-20 09:20:27 +02:00
Jan Steemann c60bde28b6 added crash tests 2014-06-20 08:36:36 +02:00
Jan Steemann 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +02:00
Jan Steemann d266bedd38 removed now obsolete functions 2014-06-19 12:08:01 +02:00
Jan Steemann 5fb901d713 cppcheck 2014-06-18 21:27:53 +02:00
Jan Steemann 9fc03ec85f cppcheck 2014-06-18 21:13:20 +02:00
Jan Steemann e11581b430 removed now obsolete functions 2014-06-18 17:26:04 +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
Jan Steemann 091491d13b crash recovery tests 2014-06-17 15:30:11 +02:00
Frank Celler f794ee8368 fixed datafile debugger 
Conflicts:
	CHANGELOG
 2014-06-17 09:22:56 +02:00
Jan Steemann 74fb8fe2ad issue #906: changed returned field in primary index description from `_id` to `_key`. 2014-06-16 17:08:45 +02:00
Jan Steemann 2a0e0b18d0 added many tests 2014-06-16 14:39:26 +02:00
Jan Steemann ae6ac271e3 index rework 2014-06-14 23:40:56 +02:00
Jan Steemann 37a30b420d prevent exceptions 2014-06-14 15:05:54 +02:00
Jan Steemann 964af24fe7 fixed compiler warnings 2014-06-14 01:49:17 +02:00
Jan Steemann b54b89d68d key generator rework 2014-06-14 00:33:40 +02:00
Jan Steemann 35a81dc54d more asserts 2014-06-13 21:40:34 +02:00
Jan Steemann 0c5950507c fixed test 2014-06-13 17:50:44 +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 80a70667c0 made headers a real class 2014-06-13 11:31:40 +02:00
Jan Steemann d5e695e63f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/ArangoServer.h
	arangod/VocBase/server.cpp
	js/common/bootstrap/errors.js
 2014-06-13 02:23:03 +02:00
Jan Steemann bbdbbd5736 removed implicit parameter from function signature 2014-06-13 01:59:19 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +02:00
Jan Steemann 41dc6a808e fixed recovery 2014-06-13 00:20:24 +02:00
Jan Steemann 2fc5647892 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 18:13:57 +02:00
Jan Steemann bc52f3408f recovery, not functional yet 2014-06-12 18:13:48 +02:00
Max Neunhoeffer 982ca7460b Implement StringifyMarkerDump for WAL markers. 
This implements a LegendReader class inheriting from TRI_shaper_t,
to allow for TRI_StringifyArrayShapedJson to work.
 2014-06-12 15:30:18 +02:00
Max Neunhoeffer 9f4a2236e0 Adjust some comments. 2014-06-12 12:07:48 +02:00
Max Neunhoeffer d939dce2e1 Fix compilation for arangodump. 2014-06-12 10:45:00 +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 1cc46c4626 copy WAL documents 2014-06-12 10:26:24 +02:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +02:00
Jan Steemann 89f6070e01 cppcheck 2014-06-11 17:53:44 +02:00
Jan Steemann 9de0b212c4 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-11 17:39:06 +02:00
Jan Steemann cc115a2766 removed outdated upgrade methods 2014-06-11 17:38:49 +02:00
Max Neunhoeffer 1d8e5f73d0 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-11 16:11:49 +02:00
Max Neunhoeffer f83a845c31 Activate shaper protection runtime check. Fix bugs. 2014-06-11 16:11:26 +02:00
Jan Steemann 9535779916 removed lol message 2014-06-11 15:52:58 +02:00
Jan Steemann 772ed8bccc hash index optimization 2014-06-11 15:46:55 +02:00
Max Neunhoeffer 88a19e5928 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	lib/ShapedJson/Legends.cpp
 2014-06-11 14:22:53 +02:00
Max Neunhoeffer b8ac498e8b Add shaper test (inactive for now). 2014-06-11 14:21:48 +02:00
Jan Steemann 28d2ae151e flush 2014-06-11 14:18:04 +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 6b31c2ddb1 Sort out deallocation of TRI_document_collection_t and TRI_collection_t. 2014-06-11 10:56:28 +02:00
Max Neunhoeffer c2bddb1c19 Let TRI_document_collection_t inherit from TRI_collection_t. 2014-06-11 10:51:47 +02:00
Max Neunhoeffer af17694ec1 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-11 09:37:43 +02:00
Max Neunhoeffer 2527e34d9d stuct TRI_collection_t and struct TRI_document_collection_t 2014-06-11 09:37:07 +02:00
Jan Steemann 5a8cdb0ec5 wal flush 2014-06-11 09:32:20 +02:00
Max Neunhoeffer c5e5e64135 Initialise _dataptr in constructor. 
Fix a bug found by a unittest.
 2014-06-10 21:42:23 +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 30e16bc127 Fix two comments. 2014-06-10 15:51:53 +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
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 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