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

1471 Commits

Author SHA1 Message Date
Jan Steemann 22200118e1 added method getCoordinators() 2015-03-06 14:02:16 +01:00
Willi Goesgens 73086d9176 wrong index on the strings. 2015-03-05 15:55:32 +01:00
Willi Goesgens d2230b3811 Add logging of V8 shutdown, relax timeout for Valgrind. 2015-03-05 10:56:06 +01:00
Jan Steemann 1461d75ed4 improve collection loading time 
This patch reduces collection loading time by preallocating enough space in primary index ahead of time.
When a collection is closed, the number of documents in the collection will be stored in the collection's JSON info file.
This value is used to determine the initial size for the primary index when the collection is loaded next time.

Datafile iteration has also been made slightly faster.

The above changes will have a significant benefit when the collection's datafiles are already in the OS buffer cache, and when there are no secondary indexes.
Loading datafiles from disk or building secondary indexes may be more time-consuming than the improvements reapable by this patch, but the patch shouldn't hurt anyway.
 2015-02-26 16:35:51 +01:00
Jan Steemann 05fadde9e2 small changes 2015-02-19 13:58:50 +01:00
Jan Steemann 59936f1f98 small optimizations 2015-02-19 09:31:00 +01:00
Jan Steemann 83ea75fa8f removed unused config options 2015-02-18 16:40:15 +01:00
Jan Steemann f29591135a adjusted geo index API 2015-02-18 14:59:46 +01:00
Jan Steemann 9ba591e961 handle call to sync() with wrong parameter type 2015-02-12 00:29:23 +01:00
Jan Steemann b1d023821e fixed tests 2015-02-11 18:46:52 +01:00
Jan Steemann 6f12e69bae Merge branch 'devel' of https://github.com/arangodb/arangodb into sparse-indexes 2015-02-11 09:51:16 +01:00
Frank Celler 3e35e94a83 added hidden option --fronend-version-check 2015-02-10 21:24:24 +01:00
Jan Steemann a0309c44e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into sparse-indexes 
Conflicts:
	.travis.yml
 2015-02-09 20:32:18 +01:00
Jan Steemann 82c7522d4e test fixes 2015-02-09 20:08:06 +01:00
Max Neunhoeffer dd0d57b41a Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2015-02-07 21:35:18 +01:00
Max Neunhoeffer 134aa7fce8 Add breakpoint facility via console for JavaScript code in server. 2015-02-07 21:34:20 +01:00
Jan Steemann 003d7e9112 sparse indexes, initial commit, untested 2015-02-07 03:07:41 +01:00
Jan Steemann acc354839d made functions static 2015-02-06 21:15:05 +01:00
Willi Goesgens b17abadd42 Put error messages of simple http client into cluster comm results. 2015-02-04 11:25:12 +01:00
Jan Steemann 423d22ed71 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-02-02 18:56:17 +01:00
Frank Celler 23e66107a5 moved try/catch into a block 2015-02-02 17:07:31 +01:00
Jan Steemann 39603ebaf4 added selectivity estimates for some index types 2015-01-30 23:04:46 +01:00
Willi Goesgens ba387a0483 Initialize the platform pointer. 2015-01-29 19:02:31 +01:00
Willi Goesgens e666fd6dfc Properly shut down V8 to make Valgrind happy 2015-01-29 17:31:30 +01:00
Frank Celler 7aa4591678 arangod/Aql/Expression.cpp 2015-01-29 15:21:14 +01:00
Willi Goesgens 293a3fe7d3 Differenciate whether we fail to locate or execute a script in error messages. 2015-01-27 12:25:40 +01:00
Jan Steemann 6a433177c0 use Escape 2015-01-24 14:06:20 +01:00
Jan Steemann 0d8bf44215 gc adjustment 2015-01-23 20:51:42 +01:00
Jan Steemann 0f94293efd shutdown time 2015-01-23 18:56:01 +01:00
Jan Steemann 5d12a3da3b garbage collection 2015-01-23 16:45:00 +01:00
Jan Steemann 8aeded5c86 fixed documentation 2015-01-22 13:36:01 +01:00
Willi Goesgens b1f881254d Upgrade V8 to 3.31.74.1 2015-01-19 19:29:31 +01:00
Jan Steemann d534a41e21 recovery tests 
Conflicts:
	arangod/Wal/LogfileManager.cpp

Conflicts:
	arangod/Wal/LogfileManager.cpp
 2015-01-19 18:14:03 +01:00
Jan Steemann 578afe98d9 removed documentation for removed methods 2015-01-15 23:06:04 +01:00
Jan Steemann b9c52dca9e fix for intermittent 404 errors in Foxx and other actions 2015-01-15 23:06:04 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Jan Steemann 25d30c2b96 indentation 2015-01-09 16:51:00 +01:00
Willi Goesgens aa1cdc09e2 Make shure we leave all contexts we open in the propper sequence. 2015-01-08 17:53:13 +01:00
Jan Steemann 5f4fe21681 added asserts for context locker 2015-01-08 16:41:12 +01:00
Willi Goesgens 9e26914696 After freeing the locker, null its struct member so we remain to know its gone. 2015-01-08 16:20:30 +01:00
Jan Steemann 74bb6b6dc3 fix isolates and contexts 2015-01-07 18:15:29 +01:00
Jan Steemann be4512fad3 removed duplicate method 2015-01-07 17:40:40 +01:00
Jan Steemann ac0bb85c3d issue #1201: better error checking for fulltext index with multiple attributes 2015-01-05 09:41:56 +01:00
Frank Celler 1748e403e4 added TRI_FORCE_ARMV6 2014-12-23 16:31:20 +01:00
Jan Steemann d358b80080 ES6 2014-12-20 04:02:24 +01:00
Jan Steemann a82ac45190 fixed tests on ARM 2014-12-19 17:59:36 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Willi Goesgens 807643f000 the context-cope exits the context for us - we don't need to do this anymore by ourselves. 2014-12-17 14:32:03 +01:00
Willi Goesgens fb3ec155a8 Re-Instanciate the context-scope guard were needed. 2014-12-17 13:59:56 +01:00
Max Neunhoeffer bf915da2e3 Use an unordered_map for JSBarriers. 2014-12-16 09:57:44 +01:00
Jan Steemann ac9836421d removed todo 2014-12-15 21:48:49 +01:00
Jan Steemann 2e77d31d11 removed TODO 2014-12-15 21:47:01 +01:00
Jan Steemann a90ee78ae1 fixed segfault 2014-12-15 20:48:10 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Jan Steemann 6aaa5f05a4 nullptr 2014-12-09 16:27:14 +01:00
Jan Steemann 23203a5437 indenting 2014-12-08 11:23:45 +01:00
Jan Steemann d9a945e33a include or exclude system collections from replication 2014-12-05 14:58:43 +01:00
Jan Steemann 399176cf67 fixed cursor ttl issue 
Conflicts:
	CHANGELOG
 2014-12-05 09:18:32 +01:00
Jan Steemann 0cb5b70a3e turned assertions into ifs 2014-12-04 11:15:33 +01:00
Frank Celler 77f544a554 Merge pull request #1144 from triAGENS/less-confusing-http-naming 
Renamed mergeArrays->mergeObjects (because it's actually about objects, not arrays)
 2014-12-03 14:48:04 +01:00
Jan Steemann 4ef82239a3 added optimizer statistics 2014-12-03 11:38:56 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Patrick Huber c9de415b1f space, typo. DatabaseMethods.mdpp references v8-vocbase.cpp but this doc block is in v8-collection.cpp... 2014-12-01 15:11:30 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
Thomas Schmidts c6b8e1a569 Fixed some dead links in the documentation 2014-11-21 09:13:50 +01:00
Jan Steemann da468b2f58 allow lazier querying of hash index 2014-11-18 14:16:36 +01:00
Jan Steemann a71bf1819c issue #1099: do not fail if general-graph.remove is used inside a transaction 2014-11-17 15:47:39 +01:00
Jan Steemann 21ef4579f5 updated documentation 2014-11-14 17:17:51 +01:00
Jan Steemann cf784816a8 hide function 2014-11-14 16:43:34 +01:00
Jan Steemann b0de1bb226 leaner and meaner error messages 2014-11-07 10:53:00 +01:00
Jan Steemann e93a9a8ce2 fixed documentation 2014-11-06 13:39:35 +01:00
Jan Steemann 22d2cfd876 fixed documentation 2014-11-06 13:14:47 +01:00
Jan Steemann 2fe79a65a4 speed up AQL queries with V8 expressions 2014-11-05 16:59:57 +01:00
Jan Steemann e5abbe92e9 fixed broken cursors if cursor size > batchSize 2014-11-05 12:19:36 +01:00
Willi Goesgens bab1762ee9 Directly route results to v8-objects instead of going via a json object when calling AQL from a V8 context 2014-11-05 10:56:10 +01:00
Jan Steemann 26c3b0174f fixed tests 2014-10-31 19:58:20 +01:00
Jan Steemann a5e7b26c81 added comment [skip ci] 2014-10-31 17:31:40 +01:00
Jan Steemann 4f68960ed7 removed Ahuacatl [skip ci] 2014-10-31 17:31:00 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Max Neunhoeffer c07bfb894d Fix a memleak in cluster. 2014-10-30 14:58:59 +01:00
Max Neunhoeffer 3960ff5667 Fix TRI_FreeBarrier by giving two variants. 2014-10-30 09:51:13 +01:00
Max Neunhoeffer 1d867643d5 Protect some flags in a barrier by the barrier lock. 2014-10-30 09:36:38 +01:00
Jan Steemann 7c180b31fb hide experimental functions for now 2014-10-29 20:53:50 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Thomas Schmidts d79ff5d74d Fixed broken links 2014-10-24 17:49:01 +02:00
Willi Goesgens 91e04e3230 Implement outputting of splitted plans which are to be distributed to the db servers 2014-10-24 17:14:13 +02:00
Jan Steemann bc4ae8e7df fixed leak in IndexOperator, simplified IndexOperator API 2014-10-24 12:57:09 +02:00
Jan Steemann 65a52df7d1 added assertions 2014-10-23 13:55:18 +02:00
Jan Steemann 3dc2f9b299 fixed test 2014-10-22 16:30:06 +02:00
Jan Steemann 4cbb5ea939 fixed wrong if statement 2014-10-20 09:58:46 +02:00
Jan Steemann 2b68d83072 added enterContext and exitContext to Query 2014-10-17 12:01:50 +02:00
Jan Steemann 0aa02a696b pass ApplicationV8 to queries 2014-10-17 10:35:02 +02:00
Jan Steemann 912a8162fb some renaming 2014-10-16 17:23:50 +02:00
Jan Steemann 223820eba3 removed some macros 2014-10-16 16:31:49 +02:00
Jan Steemann dcb9427b6f rewrote transaction contexts 2014-10-16 15:53:28 +02:00
Jan Steemann 688e8ebbc1 better support for handling multipart requests 2014-10-16 02:05:57 +02:00
Jan Steemann edae662eb4 added res.send() and res.sendFile() 2014-10-15 17:33:10 +02:00
Jan Steemann 6bd448be46 added support for reading / writing binary data in fs.readFileSync && fs.write 2014-10-14 19:07:16 +02:00
Jan Steemann dfb1905035 fixed tests 2014-10-14 12:03:25 +02:00
Jan Steemann f3e72a80dc fixed compile warnings 2014-10-14 11:13:01 +02:00
Jan Steemann 9d02516e19 potential fix for issue #1041 2014-10-11 21:42:58 +02:00
Jan Steemann 5abfa7fdbd whitespace 2014-10-10 13:42:20 +02:00
Jan Steemann 39c98c87f5 fixed memleak 2014-10-09 18:06:21 +02:00
Jan Steemann 6cdaaa1b85 fixes for Visual Studio 2014-10-09 10:45:31 +02:00
Jan Steemann 999d8ffd1d small optimizations 2014-10-08 16:10:27 +02:00
Jan Steemann ff80fafba5 fixed cached lookups of collections on the server, which may have caused spurious problems after collection rename operations 2014-10-08 14:59:02 +02:00
Jan Steemann 81ec1a2754 indentation 2014-10-03 00:12:00 +02:00
Jan Steemann e28ad821b0 fixed spuriously occurring "database not found" error 2014-10-02 15:34:38 +02:00
Jan Steemann 0d9cdfc87c struct Index 2014-10-01 15:35:16 +02:00
Jan Steemann 03790a75f2 hold logs for slightly shorter time 2014-09-30 23:20:43 +02:00
Jan Steemann c4ce98a442 fixed some bugs in distributed plan instanciation 2014-09-30 15:19:44 +02:00
Jan Steemann b78f54d94e lookup function for keys 2014-09-30 14:47:58 +02:00
Jan Steemann 691e9f315c cas adjustment for @mchacki 2014-09-29 16:09:45 +02:00
Jan Steemann ec02ed2ccf nullptr 2014-09-29 13:56:37 +02:00
Jan Steemann 0d075dca3f pass queryRegistry into the AQL functions 2014-09-29 09:30:32 +02:00
Jan Steemann c3ce45e0dd added block instanciation for coordinator, v0.0.0 2014-09-26 20:17:42 +02:00
Jan Steemann 3afadfdefa fixed compile warnings 2014-09-26 12:30:42 +02:00
Jan Steemann 8fa141e31b removed invalid sequence from file 2014-09-26 12:09:01 +02:00
Jan Steemann 6eca3d6cc4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-09-26 12:07:20 +02:00
Jan Steemann 046d2586ae added temporary function for @mchacki 2014-09-26 12:06:57 +02:00
Thomas Schmidts 2e151f7ab0 Added type definition to db._create documentation 2014-09-26 11:53:44 +02:00
Max Neunhoeffer f80f67f18b Remove unused variable. 2014-09-25 12:06:09 +02:00
Jan Steemann 9fe3fedb45 unique_ptr 2014-09-24 17:14:37 +02:00
Jan Steemann d5fb057603 less locking 2014-09-24 13:32:39 +02:00
Jan Steemann 1e66c86d08 fixed invalid document access 2014-09-24 12:27:36 +02:00
Jan Steemann ddfb5c965d merged experimental features 2014-09-24 09:42:16 +02:00
Jan Steemann f8599b0f0f removed unused instance variable 2014-09-23 13:14:53 +02:00
Jan Steemann 009396f7b0 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-wrapshapedjson.cpp
 2014-09-23 08:35:32 +02:00
Jan Steemann 80f18ad4b9 fixed copy-on-write for shaped json 2014-09-23 00:07:46 +02:00
Jan Steemann 92f87c19ce Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-22 23:51:16 +02:00
Thomas Schmidts e99a12c339 Fixed error in Documentation and changed visualization of deprecated chapters 2014-09-22 17:44:52 +02:00
Jan Steemann b75af455e4 fixed property query 2014-09-22 17:22:01 +02:00
Jan Steemann 79c584d362 less memory usage for ShapedJson documents 2014-09-22 16:43:31 +02:00
Jan Steemann 38fdaa4066 removed unused function parameter 2014-09-19 20:28:41 +02:00
Jan Steemann 3d686d4028 test 2014-09-19 16:07:22 +02:00
Jan Steemann 76aaed94a0 make interface more user-friendly 2014-09-19 12:44:29 +02:00
Jan Steemann 6f4e799ccc added `profile` option 2014-09-19 01:02:39 +02:00
Jan Steemann 1fff0ecac2 optimization for recovery of collections that are going to be dropped anyway 2014-09-18 18:20:56 +02:00
Jan Steemann e5e2cfe4da Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-17 11:50:42 +02:00
Jan Steemann d3f4f05df1 issue #1020 2014-09-17 11:42:01 +02:00
Jan Steemann 93ed0f2255 added reverse iteration for skiplists 2014-09-16 22:23:40 +02:00
Jan Steemann 5c820cea34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-16 16:33:47 +02:00
Frank Celler c577193ae4 added log of exception 2014-09-15 23:18:10 +02:00
Jan Steemann 481a16fd7a removed bitarray indexes 2014-09-15 14:19:38 +02:00
Jan Steemann 5a1dc63946 fixed tons of compile errors in VS 2014-09-15 12:04:49 +02:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 669cb3b235 renamed files 2014-09-13 01:44:01 +02:00
Jan Steemann 953b8cdfe3 renamed files 2014-09-13 00:34:48 +02:00
Jan Steemann 0dc0bc834f more files renamed 2014-09-13 00:20:30 +02:00
Jan Steemann 87afcf5e8d the great rename 2014-09-13 00:10:11 +02:00
Willi Goesgens ae6956b6b5 AQL_EXECUTEJSON: parse the options similar to AQL_EXPLAIN & AQL_EXECUTE. 2014-09-12 12:09:41 +02:00
Jan Steemann 611ef2b73c removed "old" AQL function AQL_EXPLAIN 2014-09-11 14:12:01 +02:00
Jan Steemann 672eec350e removed "old" AQL function 2014-09-11 13:56:15 +02:00
Jan Steemann cb4c60a36f explain tests 2014-09-11 09:54:59 +02:00
Jan Steemann c16ddedc83 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/modules/org/arangodb/aql-helper.js
	js/server/tests/shell-skiplist-index.js
 2014-09-09 22:18:52 +02:00
Jan Steemann 428865f3b5 issue #1014: WITHIN function returns wrong distance 
added attribute setters for ShapedJson so document attributes can be updated

Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-09 19:58:27 +02:00
Jan Steemann 41375624d2 optionally make AQL_EXPLAIN return all generated plans 2014-09-09 15:42:22 +02:00
Jan Steemann 3ea0c8ec28 remove pending dispatcher jobs on shutdown 2014-09-08 15:03:19 +02:00
Jan Steemann 72cc344935 fixed buffer memleak 2014-09-08 12:05:28 +02:00
Jan Steemann 7851e5e54c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-01 11:05:41 +02:00
Jan Steemann f60952a12e fixed compile warnings and errors in Visual Studio 2014-09-01 10:42:11 +02:00
Jan Steemann 7d500b7234 speed up instanciation of v8 ShapedJson objects 
now a static buffer is used to create multiple string values
such as `_id`, `_key`, `_rev`, `_from` and `_to`.
this saves a few memory allocations per document

Conflicts:
	arangod/Utils/CollectionNameResolver.h
	arangod/V8Server/v8-vocbase.cpp
 2014-08-30 01:47:58 +02:00
Jan Steemann 6844433558 do not complain about missing dispatcher when server is started with `--no-server` option 2014-08-30 01:34:10 +02:00
Jan Steemann c90777738d speed up instanciation of v8 ShapedJson objects 
now a static buffer is used to create multiple string values
such as `_id`, `_key`, `_rev`, `_from` and `_to`.
this saves a few memory allocations per document
 2014-08-30 01:32:20 +02:00
Jan Steemann 1367a016cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-29 20:38:30 +02:00
Jan Steemann 9530a12472 AQL_EXECUTE 2014-08-29 17:39:23 +02:00
Jan Steemann 3b2cf352ad added functionality to activate/deactivate optimizer rules 2014-08-29 16:31:07 +02:00
Thomas Schmidts 3a695c15fd Added text to documentation 2014-08-29 14:09:49 +02:00
Jan Steemann 910c029730 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 14:28:11 +02:00
Jan Steemann a2da3eb7ee removed debug output 2014-08-28 14:27:43 +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 5930c3db70 added NTH function 2014-08-28 11:03:48 +02:00
Jan Steemann 2628afb426 cleanup 2014-08-27 22:46:26 +02:00
Jan Steemann 5b20348d26 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-27 19:39:13 +02:00
Jan Steemann dfaca5523c initialize variable 2014-08-27 19:38:53 +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
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