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

1938 Commits

Author SHA1 Message Date
Jan Steemann 1367a016cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-29 20:38:30 +02:00
Willi Goesgens be1c84f480 Exceptions: don't print Backtraces if the exception is handled in the subsequent js code. 2014-08-29 12:15:19 +02:00
Jan Steemann 5928d285ad fixed WAL recovery which hung in certain conditions 2014-08-29 12:03:38 +02:00
Jan Steemann b54e791f8f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 22:23:25 +02:00
Jan Steemann d72354da66 issue #1003: added feature to use backslash escaping for CSV data in arangoimp 2014-08-28 21:03:58 +02:00
Jan Steemann a014b44ba4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Utils/Transaction.h
 2014-08-28 11:06:14 +02:00
Jan Steemann 81c095105b issue #1003 2014-08-28 10:32:32 +02:00
Jan Steemann cd1d0c45f8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-query.cpp
 2014-08-27 19:25:37 +02:00
Jan Steemann cda10393f5 some traversal speedups 2014-08-27 18:56:51 +02:00
Thomas Schmidts f964696ec1 Fixed wrong spelling in the errors 2014-08-25 15:56:34 +02:00
Willi Goesgens 91d420ea07 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-25 13:33:59 +02:00
Willi Goesgens e65a53475b improve Exceptionhandling 
- add backtraces
  - derive public from std::exception so the usual catch to these kicks in.
 2014-08-25 13:31:53 +02:00
James 776cb02f1e Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-25 13:12:54 +02:00
James 09f945eaf7 added some constructors for Json with TRI_json_t const* as arg. 2014-08-25 13:05:48 +02:00
Willi Goesgens 903a3f06ba Add function pointer to the demangled output of the backtrace, which can be used like this: 
addr2line -e bin/arangod 0xaddb74
to obtain the line number of the stackframe.
 2014-08-25 10:52:22 +02:00
Jan Steemann f6b424b833 use auto 2014-08-23 03:20:38 +02:00
Jan Steemann 6f5271823e use auto 2014-08-23 01:54:28 +02:00
Jan Steemann 51515afb68 optimization for the empty string 2014-08-23 01:28:40 +02:00
Jan Steemann dcfa59806e more C++11 2014-08-23 00:51:13 +02:00
Jan Steemann 86bf8e3c4f removed unused function argument 2014-08-23 00:50:37 +02:00
Jan Steemann 70732ce9ef added derived file 2014-08-22 21:53:54 +02:00
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
Jan Steemann 04fbe668cc Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-22 17:58:12 +02:00
Jan Steemann 9f9277357b some more asserts 2014-08-22 17:57:47 +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
Jan Steemann 45d5d0f53a cppcheck 2014-08-22 13:53:21 +02:00
Max Neunhoeffer e5f09bfd87 Fix an invalid throw() by removing it. 2014-08-22 13:46:33 +02:00
Jan Steemann c0d0c0c347 fail when using wrong memory zone 2014-08-22 13:07:00 +02:00
Jan Steemann 0f03ca0a2b cppcheck 2014-08-22 12:50:06 +02:00
Max Neunhoeffer 5d15b4fba5 Silence an (unjustified) compiler warning. 2014-08-22 09:33:26 +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
James b5327b3770 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-14 15:21:07 +02:00
James 392c1db4c3 JS_ExecuteAql now returns a cursor. 2014-08-14 15:20:52 +02:00
Max Neunhoeffer 2bf01eae1b Remove tabs. 2014-08-14 13:07:20 +02:00
Willi Goesgens a5c031505b Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-13 17:12:46 +02:00
Willi Goesgens dd1845ac8a Print beautiful stacktraces for C-Asserts. 2014-08-13 17:09:27 +02:00
Jan Steemann 30b32f1f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/V8Server/v8-vocbase.cpp
	js/server/tests/ahuacatl-general-graph.js
 2014-08-13 16:29:57 +02:00
Jan Steemann 0a70e979f8 call `toJSON` function of objects (if present) when serializing 2014-08-13 16:05:58 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00