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

95 Commits

Author SHA1 Message Date
Max Neunhoeffer 53cebee93b Remove an unused "using namespace triagens;". 2014-06-12 16:28:07 +02:00
Max Neunhoeffer 369ea69d28 Take care of primitive shapes in LegendReader. 2014-06-12 16:04:32 +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 d916d5d714 Fix Legendung. 2014-06-11 15:47:42 +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 1ab7aa6c7c Fix bug in array legendung. 2014-06-11 14:20:56 +02:00
Max Neunhoeffer 0bf6ad1189 Correct documentation of offsets. 2014-06-11 14:19:48 +02:00
Jan Steemann 63288f7405 legend fix 2014-06-11 14:18:11 +02:00
Jan Steemann 28d2ae151e flush 2014-06-11 14:18:04 +02:00
Max Neunhoeffer cf83fecda2 Explain offsets are relative to... 2014-06-11 14:04:07 +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
Frank Celler 315232f2c8 fixed order of checks 2014-06-06 15:10:27 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +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
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
Jan Steemann ed0af6e7a4 less memset 2014-06-05 01:15:12 +02:00
Jan Steemann e31a91affe calculate lengths only once during dump() 2014-06-05 01:14:38 +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 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 cb2f826494 Document legend format and fix offsets. 2014-05-22 14:08:03 +02:00
Max Neunhoeffer 12684aeb9b Add source code comments to Legends.{cpp,h}. 2014-05-22 11:10:04 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann b20240b829 added legend 2014-05-20 14:37:57 +02:00
Max Neunhoeffer 0dab3706c5 Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:27:57 +02:00
Max Neunhoeffer b5df264cdb First draft of legend generator. 2014-05-20 13:27:09 +02:00
Max Neunhoeffer dbd973164b Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:24:29 +02:00
Max Neunhoeffer 72b923325a First draft of legend generator. 2014-05-18 15:53:30 +02:00
Jan Steemann 1328aed652 small refactoring 2014-05-17 12:17:58 +02:00
Jan Steemann 0a2e155f12 don't copy bytecode after creation 2014-05-17 12:05:15 +02:00
Jan Steemann 93179cc03b removed unused variable 2014-05-16 21:16:45 +02:00
Jan Steemann d5200f26d7 moved magic number to function 2014-05-16 19:05:54 +02:00
Jan Steemann 81c68927aa remove no-ops from shape-accessor 2014-05-16 18:39:23 +02:00
Jan Steemann 2bc4aa90af fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Jan Steemann 9bfcca67a0 fixed compile warning regarding assigned-only variables 2014-04-23 21:30:20 +02:00
Jan Steemann de38d8c0ea simplify serialisation of JSON into string-buffer 2014-04-07 21:31:23 +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
Jan Steemann 9aaeafda10 cpp 2014-04-04 10:21:54 +02:00
Jan Steemann 79defc2ef1 -Wunreachable-code reverted. Visual Studio doesn't like it 2014-03-06 11:36:58 +01:00
Jan Steemann c5c294aa6b -Wunreachable-code 2014-03-06 11:30:38 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Jan Steemann e79134799c mini optimisations for shaping 2013-11-22 02:41:39 +01:00
Jan Steemann 4de873d3e3 indent 2013-11-08 16:54:20 +01:00
Jan Steemann f69ae8f2a9 do not access shaper but use memory zone variable 2013-11-08 13:42:16 +01:00
Jan Steemann 7055299a6e removed shape collections 2013-11-06 17:05:16 +01:00
Jan Steemann 978c12815a share basic shape types 2013-11-05 20:21:48 +01:00