1
0
Fork 0
Commit Graph

214 Commits

Author SHA1 Message Date
Jan Steemann 7330597f15 fixed ambigious method JsonHelper::getStringValue 2014-08-22 21:53:29 +02:00
Jan Steemann a70a9613f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	lib/BasicsC/voc-errors.h
2014-08-22 21:51:38 +02:00
Max Neunhoeffer 3413eec1b7 Fix a merge mistake. 2014-08-22 17:03:45 +02:00
Max Neunhoeffer 4b229c5873 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	lib/Basics/JsonHelper.h
2014-08-22 17:02:06 +02:00
James 931aaee618 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Aql/OptimizerRules.cpp
2014-08-22 16:19:01 +02:00
James 4c49a3be5e deserialising of IndexRangeNode almost completed. 2014-08-22 16:17:10 +02:00
James 0c4f8c1466 adding some more helper functions to get json array entries. 2014-08-22 15:05:08 +02:00
Max Neunhoeffer e5f09bfd87 Fix an invalid throw() by removing it. 2014-08-22 13:46:33 +02:00
Jan Steemann 0f03ca0a2b cppcheck 2014-08-22 12:50:06 +02:00
Willi Goesgens 37a636d929 Add deleted constructor to avoid the compiler falling through to the bool constructor in case of missuse. 2014-08-20 16:56:52 +02:00
Jan Steemann 99ce138c12 fixed creation of subqueries from JSON input 2014-08-19 18:51:11 +02:00
Willi Goesgens 49126ea6c1 empty change 2014-08-19 16:10:38 +02:00
Frank Celler 9fa3d22d6c towards new dispatcher interface 2014-08-18 23:37:32 +02:00
Max Neunhoeffer 1e592cebb9 Delete const copy constructor for better error messages. 2014-08-15 16:38:34 +02:00
Max Neunhoeffer 86055a7773 Further cleanup of Json wrapper class. 2014-08-15 14:38:10 +02:00
Max Neunhoeffer 21eda8a212 Withdraw some operator magic for Json wrapper class. 2014-08-15 13:29:01 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
Jan Steemann a2061f66a3 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-11 14:54:25 +02:00
Jan Steemann 24f1f979d0 fixed jsonification of values 2014-08-11 14:54:14 +02:00
Max Neunhoeffer e065c1e507 Fix a bug in JsonHelper about autofree. 2014-08-11 14:28:34 +02:00
James a4f357c15e EnumerateListBlock now working for JSON lists and prepended "explicit" to Json constructors.. 2014-08-08 09:43:54 +02:00
Max Neunhoeffer 87a36596b1 Change Json format of ExecutionPlans. 2014-07-30 15:20:09 +02:00
Jan Steemann f4e8775ddc nicer parser error messages 2014-07-30 12:30:06 +02:00
Jan Steemann 641d35b906 added static v8-basic optimizations 2014-07-29 12:52:37 +02:00
Max Neunhoeffer f3a5aefffb Forgot one. 2014-07-28 16:26:50 +02:00
Jan Steemann 765e44e80b execution v0.0000001 2014-07-28 15:51:38 +02:00
Max Neunhoeffer aa7e24495f Take out debugging output. 2014-07-25 15:16:34 +02:00
Max Neunhoeffer 7c983d0f7b Fix memory allocation issues in Json class. 2014-07-25 15:09:13 +02:00
Max Neunhoeffer b6122ad3dc Snapshot, this version has memcheck problems. 2014-07-25 14:25:22 +02:00
Max Neunhoeffer 067b740146 Comment and finalise Json wrapper class. 2014-07-25 10:33:54 +02:00
Max Neunhoeffer fc83eed330 Add an explicit steal() method to Json. 2014-07-25 00:31:50 +02:00
Max Neunhoeffer f1bcf6e264 Fix operator= for Json objects. 2014-07-25 00:07:20 +02:00
Max Neunhoeffer 6a1203405f Add Json wrapper class to JsonHelpers. 2014-07-24 23:41:06 +02:00
Jan Steemann 0e5679693c fixed compile warnings 2014-07-01 13:17:46 +02:00
Jan Steemann f2ed881227 upgrade error message 2014-06-29 00:18:42 +02:00
Jan Steemann 76de1ae762 cppcheck 2014-06-27 22:20:17 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00
Frank Celler 28f4433bff Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/Wal/LogfileManager.cpp
2014-06-20 16:43:28 +02:00
Jan Steemann 5556cd8dad fixed startup on Windows 2014-06-20 16:42:21 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann 7e52ebbc3b fixes for Visual Studio 2014-06-20 15:46:33 +02:00
Jan Steemann a6bb3985bd removed doxygen comments 2014-06-18 22:15:10 +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 51cb9257e5 speed up string-buffer reusage by simplehttpclient 2014-06-14 01:24:43 +02:00
Jan Steemann dae5a5151d call (still empty) WAL recovery procedure at startup 2014-06-12 11:28:48 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann edd97f9bf3 removed doxygen comments 2014-06-03 17:35:44 +02:00
Jan Steemann b7b6dafce9 removed libraryloader 2014-06-02 15:46:54 +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