1
0
Fork 0
Commit Graph

5503 Commits

Author SHA1 Message Date
Jan Steemann 3f913f96d7 less copying of RangeInfoBounds 2015-03-31 14:53:14 +02:00
Jan Steemann 6f4fadd630 removed .o files 2015-03-31 14:45:22 +02:00
Frank Celler ffbc45d2e2 new HttpServer & HttpCommTask
Conflicts:
	Makefile.in
	arangod/Aql/RestAqlHandler.cpp
	arangod/Aql/grammar.cpp
	arangod/Cluster/RestShardHandler.cpp
	lib/GeneralServer/GeneralServer.h
	lib/GeneralServer/GeneralServerDispatcher.h
	lib/HttpServer/HttpServerJob.h
	lib/HttpServer/HttpsCommTask.h
	lib/SimpleHttpClient/SslClientConnection.cpp
2015-03-31 09:12:01 +02:00
Jan Steemann c508eb0a81 removed some debugging features 2015-03-30 22:05:31 +02:00
Jan Steemann 925f4fbab6 cleanup of some static const variables 2015-03-30 21:43:55 +02:00
Jan Steemann 3ac535bb69 fixed startup 2015-03-27 18:33:05 +01:00
Jan Steemann 3057cf7a74 added edge index iterator
Conflicts:
	arangod/Aql/ExecutionBlock.h
2015-03-27 17:24:47 +01:00
Jan Steemann 50b531666c optimization for AQL CONCAT()
Conflicts:
	arangod/Aql/AqlValue.cpp
	arangod/Aql/AqlValue.h
	arangod/Aql/Ast.cpp
2015-03-27 17:18:27 +01:00
Jan Steemann 9c3419fda3 fixed extern type 2015-03-27 17:09:17 +01:00
Jan Steemann 6957de23d2 fixed name qualification 2015-03-27 17:06:58 +01:00
Jan Steemann 960b464c57 issue #1054: add info whether server is running in service or user mode? 2015-03-27 16:49:47 +01:00
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 3555cdb0fe removed unused method 2015-03-25 17:00:47 +01:00
Jan Steemann e230ac11c0 fixed leak 2015-03-25 16:55:45 +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 cbee2c6466 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-23 22:28:58 +01:00
Jan Steemann 7d5cc17d98 added tests 2015-03-23 22:28:26 +01:00
Willi Goesgens 486d86e0cb add new file from a1af44bf4900600f54d4b8dc233429df488633db to CMake too. 2015-03-23 17:47:34 +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
Frank Celler 3c52dcde6d changed _api/query to C++
Conflicts:
	CHANGELOG
	Makefile.in
	README
	arangod/RestServer/ArangoServer.cpp
2015-03-23 10:51:14 +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
Willi Goesgens 07b3720e6d Fix windows error buffer handling 2015-03-20 13:21:59 +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 dfa702ba47 add trace output 2015-03-19 16:20:36 +01:00
Jan Steemann 7dc3fc3d5c safely create collections and databases 2015-03-19 15:56:12 +01:00
Jan Steemann 74816d107b added assertion, fixed wrong catch handler
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
2015-03-19 13:08:25 +01:00
Willi Goesgens 4c359f98f0 OS-specific error messages for systemcalls also for windows users. 2015-03-19 12:58:13 +01:00
Jan Steemann 7cce25967e fixed potential undefined behavior 2015-03-19 11:05:49 +01:00
Jan Steemann 57daabee81 fix for potential undefined values 2015-03-19 10:59:29 +01:00
Jan Steemann 85308fa7f3 removed remainder of development mode 2015-03-19 10:33:31 +01:00