1
0
Fork 0
Commit Graph

1143 Commits

Author SHA1 Message Date
Jan Steemann 92739aa04d indentation 2014-08-23 02:58:28 +02:00
Jan Steemann dcfa59806e more C++11 2014-08-23 00:51:13 +02:00
Jan Steemann 835b26f17c only initialize v8 dispatcher when there is a dispatcher
when the server is started with the --no-server option, the v8 dispatcher
was still initialized and this always failed and printed error messages.
2014-08-22 21:51:53 +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 9f9277357b some more asserts 2014-08-22 17:57:47 +02:00
Jan Steemann 0a439474e5 cppcheck 2014-08-22 12:51:26 +02:00
Jan Steemann 2b27957546 added AQL_EXPLAIN() 2014-08-22 09:51:48 +02:00
Frank Celler bcf4902876 worker is now a function with context 2014-08-21 14:57:17 +02:00
Jan Steemann f7737e3b62 added stats 2014-08-21 12:36:30 +02:00
Jan Steemann 1442b9ebeb pass ExecutionEngine to ExecutionBlock, added stats for ExecutionEngine 2014-08-21 12:33:13 +02:00
Jan Steemann 1aeed2152c fixed de-serialization 2014-08-21 10:02:30 +02:00
Willi Goesgens d295bacb51 Json: add HTTP-Entrypoint into Javascript deserialisation. 2014-08-20 17:08:06 +02:00
Frank Celler 7b3cdf0bd0 fixed gc 2014-08-19 08:03:58 +02:00
Frank Celler 9fa3d22d6c towards new dispatcher interface 2014-08-18 23:37:32 +02:00
Frank Celler 986bf7d0e8 added dispatcherThreads 2014-08-18 12:08:33 +02:00
Jan Steemann f8cf5dc26d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-08-15 18:47:18 +02:00
Jan Steemann 97fd5a55ba renamed variable 2014-08-15 18:12:58 +02:00
Thomas Schmidts 415fefdafa Fixed small formatation error 2014-08-15 11:01:56 +02:00
Jan Steemann cfefe17a15 fixed types 2014-08-14 17:29:58 +02:00
James 6292cafa52 fixed bugs in last. 2014-08-14 17:17:37 +02:00
James eb6cf43efc added additional options to JS_ExecuteAql. 2014-08-14 17:00:20 +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
Willi Goesgens 8da5a6c0b3 Cleanup: killall tabs. 2014-08-14 13:17:21 +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 277290fc0e unification with aql2 code 2014-08-13 16:22:17 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
Frank Celler 7a6d5413a1 database version is now AABBCC, where AA = major, BB = minor, CC = patch 2014-08-12 09:58:42 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
Max Neunhoeffer 13ef2912a3 Better error message and remove unnecessary file. 2014-08-08 16:30:05 +02:00
Willi Goesgens 6522df2e52 v8-vocbase split: clean up includes - more includes to get rid of. 2014-08-08 13:48:28 +02:00
Jan Steemann d30914afb2 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Aql/ExecutionBlock.h
	arangod/Aql/ExecutionEngine.cpp
2014-08-07 17:25:37 +02:00
Willi Goesgens bfdc940450 v8-vocbase split: clean up includes
- Move includes from Types .h -> .cpp
 - Move forward Declerations to their respective headers.
2014-08-07 16:17:40 +02:00
Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-08-07 16:12:14 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Willi Goesgens 9f03c16a6b v8-vocbase split: clean up includes - more tricky hidden dependencies can be removed. 2014-08-07 15:50:50 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Willi Goesgens ba5365d9e9 v8-vocbase split: clean up includes. 2014-08-07 11:55:22 +02:00
Willi Goesgens 226790a353 v8-base splitting: adjust filenaming to the convention. 2014-08-06 12:54:24 +02:00
Willi Goesgens b068fa92ed v8-vocbase splitting: fix initialisation. 2014-08-06 12:49:59 +02:00
Willi Goesgens a7d241cdd8 Split v8-vocbase.cpp into handy bits. 2014-08-05 18:59:40 +02:00
Jan Steemann ae04cb95d9 fixed compile errors 2014-08-05 15:04:42 +02:00
James 1d912648cd removing previous use of queryResult.json in JS_ExecuteAql. 2014-08-05 14:43:51 +02:00
James fbc6ae2267 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 14:37:29 +02:00
James 6772762c60 preparing json return value for queryResult. 2014-08-05 14:37:08 +02:00
Max Neunhoeffer 5cbbd8a4c4 Fix barrier and documentCollection access in Expressions.
Still does not link.
2014-08-05 14:33:54 +02:00
Jan Steemann 196441b9b4 improved v8 object generation 2014-08-05 13:23:37 +02:00
Jan Steemann 932aac9d06 added method signature 2014-08-05 10:58:58 +02:00
Jan Steemann 4603d2a1dd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-01 17:54:41 +02:00
Max Neunhoeffer 390f0fe605 Implement distributeShardsLike 2014-08-01 17:05:04 +02:00