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

3072 Commits

Author SHA1 Message Date
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 131da49f60 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 15:42:06 +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
Jan Steemann 93862b99ed add handlers for remove, update, save, replace 2014-06-12 14:00:52 +02:00
Max Neunhoeffer 9f4a2236e0 Adjust some comments. 2014-06-12 12:07:48 +02:00
Jan Steemann 0c8e01ca40 fixed assertion fail 2014-06-12 12:00:58 +02:00
Jan Steemann 101b5ac95f Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 11:29:08 +02:00
Jan Steemann dae5a5151d call (still empty) WAL recovery procedure at startup 2014-06-12 11:28: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 bca5b999d9 removed fcall 2014-06-12 10:26:53 +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 86171cd881 removed old-style comments 2014-06-11 17:48:09 +02:00
Jan Steemann fa6e98d94c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
 2014-06-11 17:40:15 +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
scottashton 8209796f7c added documentation to ahuacatl general graph functions and refactored common_Neighbors and common_properties 2014-06-11 15:45:31 +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 8b8d11eb61 Check in ahuacatl-grammar generated files. 2014-06-10 21:42:01 +02:00
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