1
0
Fork 0
Commit Graph

1696 Commits

Author SHA1 Message Date
Jan Steemann 5599259075 fixed Visual Studio compile errors 2015-03-26 10:34:38 +01:00
Jan Steemann c352ba6a03 small logging refactoring 2015-03-26 03:09:07 +01:00
Jan Steemann 9703f04621 fixed wrong return value 2015-03-25 13:03:49 +01:00
Jan Steemann 2f58e4ea61 small cleanup 2015-03-25 12:42:44 +01:00
Jan Steemann 59053df10a issue #1285: allow bind parameter names starting with underscores 2015-03-24 18:43:53 +01:00
Jan Steemann b98f8f7e29 fix initialization 2015-03-24 18:42:24 +01:00
Jan Steemann 0ceff3f1b0 added cluster tests 2015-03-24 18:28:55 +01:00
Jan Steemann 01745402f3 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-24 14:34:20 +01:00
Jan Steemann a3c0612798 added cluster tests 2015-03-24 14:34:09 +01:00
Willi Goesgens 44101c621d Fix macos warning: declaring & calling in one line seems to be undeclared. 2015-03-24 11:33:19 +01:00
Jan Steemann 66e2273482 added documentation for UPSERT 2015-03-24 00:44:52 +01:00
Jan Steemann 7d5cc17d98 added tests 2015-03-23 22:28:26 +01:00
Jan Steemann ac44597788 removed unused files 2015-03-23 15:46:31 +01:00
Jan Steemann c62c26e088 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-23 15:31:41 +01:00
Jan Steemann e3bf1c709c upsert blocks 2015-03-23 15:31:07 +01:00
Frank Celler 4c5d57f1b8 merged Exceptions.h and Exception.h 2015-03-23 14:05:19 +01:00
Jan Steemann 3b6dfc868e Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-20 23:23:13 +01:00
Jan Steemann facc9bceea trap killing of AQL queries inside subqueries 2015-03-20 23:07:39 +01:00
Jan Steemann d63f47e840 added possibility to kill JS traversals 2015-03-20 23:05:41 +01:00
Jan Steemann 186c25f3bb Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-20 22:03:18 +01:00
Jan Steemann cc8ec1750c fixed function name in error message 2015-03-20 21:55:50 +01:00
Jan Steemann 8e48f98045 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification
Conflicts:
	arangod/Aql/Collection.cpp
	arangod/Aql/ExecutionBlock.cpp
2015-03-20 21:54:39 +01:00
Jan Steemann a1c348e7c6 added more tests for out-of-memory situations 2015-03-20 11:52:55 +01:00
Jan Steemann 1298bd40a8 added tests for out-of-memory situations 2015-03-20 08:54:15 +01:00
Jan Steemann a9cddb824f more usage of unique_ptrs 2015-03-20 00:05:32 +01:00
Jan Steemann 50c4682655 added more tests 2015-03-19 18:21:00 +01:00
Jan Steemann 74816d107b added assertion, fixed wrong catch handler
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
2015-03-19 13:08:25 +01:00
Jan Steemann 85308fa7f3 removed remainder of development mode 2015-03-19 10:33:31 +01:00
Max Neunhoeffer 3bd55fa26f Set correct root block for newly instanciated ExecutionEngine. 2015-03-17 15:30:30 -07:00
Jan Steemann 13ddb8b34b fixed some cluster plans 2015-03-17 13:52:09 +01:00
Jan Steemann 6b24da1036 in the middle of refactoring 2015-03-17 09:08:25 +01:00
Jan Steemann 34e101725f fixed assertion 2015-03-16 17:28:54 +01:00
Jan Steemann d91cc3e9b3 added more tests 2015-03-14 20:49:22 +01:00
Jan Steemann ce0a543d25 added flag for disabling query tracking `--database.disable-query-tracking`
Conflicts:
	arangod/RestServer/ArangoServer.cpp

Conflicts:
	Documentation/Books/Users/ConfigureArango/Arangod.mdpp
	arangod/RestServer/ArangoServer.cpp
2015-03-13 13:51:23 +01:00
Jan Steemann 7ed7dd4bdf fixed VS compile errors 2015-03-12 17:05:39 +01:00
Jan Steemann 22dcbef6cb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-12 16:53:26 +01:00
Jan Steemann 70ce59abb6 log when killing a query 2015-03-12 15:10:33 +01:00
Jan Steemann dfb70d7d96 added cancellation points
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
2015-03-12 15:00:23 +01:00
Jan Steemann f035ea1c3b kill AQL queries
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
2015-03-12 15:00:14 +01:00
Jan Steemann 75c4451469 enable query tracking by default 2015-03-12 13:02:13 +01:00
Jan Steemann b98c4c2d5b added documentation, fixed potential UTF-8 truncation 2015-03-12 13:02:13 +01:00
Jan Steemann 64d77cbe24 added query tracking feature 2015-03-12 13:02:13 +01:00
Jan Steemann a6473338b3 optimization for extractKey 2015-03-11 15:26:08 +01:00
Jan Steemann c4f17bb244 issue #1265: arangod crashed with SIGSEGV 2015-03-11 12:19:34 +01:00
Michael Hackstein c5adf7b089 Fixed tests for foxx on multiple databases. And added generated files 2015-02-25 10:44:15 +01:00
Jan Steemann 654d282088 added fpconv_dtoa from https://github.com/night-shift/fpconv/ 2015-02-23 22:27:02 +01:00
Jan Steemann 7c5cc16a8a less locking for cluster status checks 2015-02-18 18:14:12 +01:00
Jan Steemann fd5ca65f2d include stdint early 2015-02-17 16:52:36 +01:00
Jan Steemann 424d349464 less compile warnings in VS? 2015-02-17 16:13:06 +01:00
Jan Steemann 205736a028 added optimizer rule "propagate-constant-attributes" 2015-02-15 13:29:53 +01:00