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

5749 Commits

Author SHA1 Message Date
Oreste Panaia f93eef34d7 git 
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

Conflicts:
	lib/ShapedJson/json-shaper.c
 2012-09-10 20:53:41 +08:00
a-brandt 6762b7cf85 using ioclt() instead of ncurses 2012-09-10 14:48:47 +02:00
Oreste Panaia 6134497b5d Merge https://github.com/triAGENS/ArangoDB into devel 2012-09-10 20:42:48 +08:00
a-brandt b355c908b3 using ioclt() instead of ncurses 2012-09-10 13:48:33 +02:00
Jan Steemann 451487fd68 fixed locking issues 2012-09-07 17:24:47 +02:00
Jan Steemann 112019c7e2 fixed some locking issues 2012-09-07 17:18:16 +02:00
Jan Steemann 595956a6b5 added missing unlocks in case of memory errors 2012-09-07 16:53:14 +02:00
Jan Steemann 1ef35bab96 added comment 2012-09-07 16:52:08 +02:00
Jan Steemann 442c033122 start statistics thread even in supervisor mode 2012-09-07 15:29:30 +02:00
Jan Steemann 80373334b3 removed dependency on JsonParserX and Variant*, fixed a small memleak 2012-09-06 16:44:25 +02:00
Jan Steemann 5bb195af9b added timed wait method for ConditionLocker 2012-09-06 14:03:47 +02:00
Jan Steemann 00ba8a1862 prevent valgrind from complaining about uninitialised memory 2012-09-06 14:02:24 +02:00
Jan Steemann c973adc724 reduce log file spamming in case when running out of file descriptors 2012-09-05 16:56:07 +02:00
Jan Steemann a667f633d5 issue #150 2012-09-04 22:30:44 +02:00
Jan Steemann 7c50dc7dca clear existing sessions on shutdown. this prevents a valgrind warning 2012-09-04 16:52:15 +02:00
Jan Steemann 9b75a646e0 fixed a valgrind warning 2012-09-04 16:06:12 +02:00
Jan Steemann f4b3e6605e fixed doxygen error 2012-09-04 12:30:30 +02:00
Jan Steemann 27a3036158 issue #181: removed the function that called gethostbyname() because the function itself was not used. 2012-09-03 08:46:32 +02:00
Jan Steemann dff40494c3 issue #175: add hidden option --server.http-port for downwards compatibility 2012-08-31 18:21:34 +02:00
Jan Steemann 374b65e0d7 issue #177: fixed wrong error message 2012-08-31 10:49:36 +02:00
Frank Celler 2ab77278d9 changes to allow SUBDIR build 2012-08-30 18:06:23 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling 
moved common functions to ArangoClient
 2012-08-30 16:54:42 +02:00
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Jan Steemann 78e9da2992 fixed unicode unescape problem, added tests 2012-08-27 16:02:43 +02:00
Jan Steemann 434f4cf611 fixed Unicode unescaping for certain characters, added test case 2012-08-27 16:01:49 +02:00
Jan Steemann 00ec11ff23 fixed Unicode unescaping issue for certain characters, added test case 2012-08-27 16:01:02 +02:00
Frank Celler d26b082ef6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	UnitTests/Makefile.files
 2012-08-24 09:59:16 +02:00
Jan Steemann b36776efb3 issue #110: add PATCH method for documents 2012-08-20 19:16:45 +02:00
Jan Steemann 4b16882b44 issue #131: make keep alive timeout configurable 2012-08-20 15:42:11 +02:00
Jan Steemann d602942925 preparation for issue #110: added HTTP patch method 2012-08-20 13:50:24 +02:00
Frank Celler fa41864b7a Merge remote-tracking branch 'origin/1.0' into devel 
Conflicts:
	Installation/MacOSX/MacPorts/arango.conf
	Installation/arangod.conf.in
	Makefile.in
	arangod/RestServer/ArangoServer.h
	configure
	lib/V8/v8-utils.cpp
 2012-08-18 09:00:43 +02:00
Jan Steemann 24933367e2 fixed doxygen error 2012-08-14 16:00:21 +02:00
Jan Steemann b95b25d621 increased sleep value in statistics loop from 10 to 500 us 2012-08-10 18:15:50 +02:00
Frank Celler e78f7f5a3e fixed doc 2012-08-10 15:30:31 +02:00
Jan Steemann 25c8555135 fixed some invalid free I introduced when running binaries without command line arguments 2012-08-09 19:26:25 +02:00
Jan Steemann f226fc9fb2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-08-09 17:11:41 +02:00
Jan Steemann 3e947bdca2 more macros 2012-08-09 17:11:00 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
 2012-08-09 15:25:29 +02:00
Frank Celler 302339ce09 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-08-08 15:43:28 +02:00
Frank Celler c9673e08b3 added internal.wait 2012-08-08 15:33:11 +02:00
a-brandt e8d7ecc79a changed "false" to "NULL" 2012-08-08 11:31:32 +02:00
Frank Celler 38b0113afb fail on mem error 2012-08-08 09:26:59 +02:00
Frank Celler a95e881013 added memory reserve 2012-08-08 08:46:46 +02:00
Jan Steemann 1278f6e8ea issue #131: added basic keep-alive timeout 2012-08-06 18:20:46 +02:00
Jan Steemann 63f4ab1248 free memory for copied environ variables properly 2012-08-06 17:38:32 +02:00
Jan Steemann 61ddc95a56 fixed memleak when wrong options were specified on command-line 2012-08-06 16:56:09 +02:00
Jan Steemann 496155fe7e fixed a typo 2012-08-06 15:56:39 +02:00
Jan Steemann 814add4eb7 fix clang++ warning 2012-08-06 14:08:26 +02:00
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
 2012-08-05 22:46:55 +02:00
Frank Celler 85ff668369 fixed pid removal 2012-08-05 20:41:46 +02:00
Frank Celler 6ea7a4e626 added shutdown message in ps 2012-08-03 15:37:18 +02:00
Frank Celler 640e2a3587 fixed pid file 2012-08-03 12:58:59 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
 2012-08-02 17:17:36 +02:00
Oreste Panaia b798b1d53f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
 2012-08-02 15:28:49 +08:00
Oreste Panaia 03cce62c3a bitarray index now support explicit values 2012-08-02 15:20:43 +08:00
Frank Celler ae31f9a885 fixed deadlock 2012-07-31 17:50:30 +02:00
Jan Steemann 590855f633 made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00
Jan Steemann 6b5b2cdea7 removed dependency on scheduler 2012-07-30 17:17:30 +02:00
Jan Steemann 3d019115cf removed http dependencies 2012-07-30 17:15:22 +02:00
Jan Steemann 020480bfe7 binary listeners are now started, but do not work 2012-07-30 16:01:25 +02:00
Jan Steemann 5c24872306 moved endpoint option parsing into ApplicationEndpointServer class 2012-07-30 15:50:34 +02:00
Jan Steemann acdfbf8a20 more refactoring 2012-07-30 15:37:54 +02:00
Jan Steemann 2d480a4350 added binary servers 2012-07-30 15:33:19 +02:00
Jan Steemann e47b44bedc more refactoring 2012-07-30 15:03:36 +02:00
Jan Steemann 603747b024 refactoring 2012-07-30 14:56:02 +02:00
Jan Steemann 886739a679 further refactoring of HttpServer 2012-07-30 14:48:12 +02:00
Jan Steemann 7af489934e some refactoring of http and https servers 2012-07-30 14:07:59 +02:00
Jan Steemann 59484b82ba added GeneralHttpServer template class 2012-07-30 12:25:25 +02:00
Jan Steemann ddc8703d54 renamed HttpsAsyncCommTask to SslAsyncCommTask 2012-07-30 08:39:21 +02:00
Jan Steemann 404a80bc84 moved files from HttpsServer to HttpServer directory 2012-07-30 08:32:53 +02:00
Jan Steemann 9d87988bf5 renamed ApplicationHttpServer to ApplicationEndpointServer 2012-07-30 08:26:16 +02:00
Frank Celler 325a4d59bb datafile check 2012-07-28 20:57:03 +02:00
Frank Celler 818b6d9ec2 datafile debugger 2012-07-28 09:32:45 +02:00
Jan Steemann 243aa0242c removed ApplicationHttpsServer 2012-07-27 15:59:58 +02:00
Jan Steemann 3b7b14454c added abstract EndpointServer, starting to combine ApplicationHttpServer and ApplicationHttpsServer 2012-07-27 15:38:27 +02:00
Jan Steemann cf47541e1e added debug output 2012-07-27 13:52:18 +02:00
Jan Steemann 570e0a5189 virtual 2012-07-27 11:41:37 +02:00
Jan Steemann a2ddf69ba3 unit test for Endpoint classes 2012-07-26 16:41:45 +02:00
Jan Steemann eaeb9b42da completed documentation for ssl options 2012-07-26 15:09:26 +02:00
Jan Steemann daa6ca8b5e added documentation for ssl options 2012-07-26 13:39:21 +02:00
Jan Steemann eeeb78c2e7 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Installation/arangod.conf.in
	Makefile.in
	arangod/Makefile.files
	arangod/RestHandler/RestBatchHandler.cpp
	arangod/RestHandler/RestBatchHandler.h
	arangod/RestServer/ArangoServer.cpp
	bin/arango-password.in
 2012-07-26 12:03:03 +02:00
Jan Steemann cc81db31a8 doxygen fixes 2012-07-26 09:46:22 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Jan Steemann 4f2229124f added --server.disable-authentication option 2012-07-26 08:49:56 +02:00
Frank Celler b2a334a063 added datafile map for collection 2012-07-25 20:56:34 +02:00
Jan Steemann 435a01b6b3 added authorization for arangosh and arangoimp 2012-07-25 19:49:52 +02:00
Jan Steemann d88bfddb49 added more error handling in arangosh, e.g. for case of 401 errors 2012-07-25 18:48:09 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Jan Steemann ceda8b686a ssl connections 2012-07-25 15:08:17 +02:00
Frank Celler 97ff940736 fixed merge 2012-07-24 23:07:31 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
 2012-07-24 22:56:03 +02:00
Frank Celler 041eb53b10 Merge branch '1.0' of github.com:triAGENS/ArangoDB into 1.1 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangoirb/MRClient/arangoirb.cpp
	lib/GeneralServer/GeneralServer.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/HttpsServer/ApplicationHttpsServer.cpp
 2012-07-24 22:19:46 +02:00
Jan Steemann 7ea8cff7c8 some connection refactoring 2012-07-24 18:42:31 +02:00
Jan Steemann 68249d4eaa removed dead members 2012-07-24 15:02:57 +02:00
Jan Steemann adede89619 moved common ssl error function to file of its own 2012-07-24 12:20:51 +02:00
Jan Steemann 406a47008e properly shutdown SSL tasks 2012-07-24 11:44:15 +02:00
Jan Steemann 649657d2c4 validate SSL protocol 2012-07-24 10:00:23 +02:00
Jan Steemann 57e681b314 added ssl-cipher-list option, added cipher-server-preference, changed protocol to TLSv1 by default 2012-07-24 09:26:43 +02:00
Oreste Panaia 53e4fb7f12 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/BitIndexes/bitarrayIndex.c
 2012-07-24 14:56:04 +08:00
Oreste Panaia cd5ed3ac67 added http support for bitarray idnex creation 2012-07-24 14:30:38 +08:00
Jan Steemann 6b9e5dfd54 changed log level of SSL errors 2012-07-24 08:30:29 +02:00
Jan Steemann 33839809ab ssl 2012-07-23 18:17:45 +02:00
Jan Steemann 9a72ea4496 added https@ and http@ endpoints, https still unfinished 2012-07-23 17:32:59 +02:00
Jan Steemann a40b1ed511 renamed classes 2012-07-23 15:58:08 +02:00
Jan Steemann dca96749ff default value cleanup 2012-07-23 15:39:52 +02:00
Jan Steemann c079eda53b fixed doxygen errors 2012-07-23 15:24:53 +02:00
Jan Steemann ac0e4c1f59 removed AddressPort class 2012-07-23 14:04:58 +02:00
Jan Steemann 4e6c8024f6 added support for unix sockets, switched connection strings to endpoint syntax 2012-07-23 13:54:35 +02:00
Jan Steemann 8cfba96f28 removed option --server.admin-port 2012-07-20 15:05:18 +02:00
Jan Steemann 743a025e67 added EndpointSpecification classes 2012-07-20 14:51:03 +02:00
Jan Steemann 0dd0245ac4 fixed clang compile warnings and errors 2012-07-20 13:00:28 +02:00
Jan Steemann 07595218eb removed non-existing class 2012-07-20 12:26:49 +02:00
Jan Steemann 824206dd54 removed server startup options --server.require-keep-alive and --server.secure-require-keep-alive, small optimisations for HTTP request parsing and response header handling 2012-07-18 12:13:12 +02:00
Jan Steemann f00d11f9ae added macro TRI_TIMER_DUMP 2012-07-18 08:40:20 +02:00
Frank Celler dc05fc3562 Amazon Micro Instance 2012-07-17 17:16:01 +02:00
Jan Steemann 4904374cb9 intermediate version 2012-07-17 16:05:46 +02:00
Jan Steemann 6a4cb8625f further implementation of batch processing, still has segfaults 2012-07-16 17:53:04 +02:00
Frank Celler f126016484 added ExtractShapedJsonVocShaper 2012-07-16 15:42:41 +02:00
Frank Celler 994d48f600 fixed file perm 2012-07-16 13:46:06 +02:00
Jan Steemann 2884125e09 added ifdef for zeromq define 2012-07-16 13:28:05 +02:00
Jan Steemann 83f018e9ad batch job code can now be compiled without errors but still does not work 2012-07-16 13:23:39 +02:00
Frank Celler f7e1388e93 updated documentation 2012-07-15 17:31:59 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00
Frank Celler 1df2799005 added --javascript.script 
renamed --unit-tests to --javascript.unit-tests
 2012-07-15 00:50:05 +02:00
Frank Celler 17cf74b080 fixed issue #88: fds not closed 2012-07-11 15:18:12 +02:00
Frank Celler 191b1338fe issue #98: Unable to change journalSize 2012-07-11 13:42:17 +02:00
Frank Celler ce7eb8b40e Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-07-11 11:27:00 +02:00
Frank Celler 24ead07956 clearified documentation, fixed paths for binary 2012-07-11 11:25:18 +02:00
Frank Celler 5ffff9edc4 added process title for supervisor 2012-07-11 10:46:04 +02:00
Frank Celler 9c92948872 Merge branch 'master' of https://github.com/fceller/ArangoDB into devel 2012-07-10 18:28:19 +02:00
Frank Celler be5bd3108b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-07-10 18:28:08 +02:00
Frank Celler 58d29a78ef fixed privileges 2012-07-10 18:27:50 +02:00
Jan Steemann bf8b57ac2a fixed doxygen error 2012-07-10 17:08:07 +02:00
Frank Celler de187b1625 added wake-up call for synchroniser 2012-07-10 15:06:34 +02:00
Frank Celler 3612c93cf0 fixed race condition 2012-07-09 16:41:31 +02:00
Frank Celler ab4d52963e fixed statistics: no deviation for request-statistics, distribution for connection-statistics 2012-07-09 15:24:28 +02:00
Frank Celler 53251dd770 fixed missing lock 2012-07-09 15:23:58 +02:00
Frank Celler 08ff930154 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-07-09 14:24:38 +02:00
Frank Celler ab306f7f4b added connection-statistics 2012-07-05 22:08:21 +02:00
Frank Celler 957bc347dc added connection statistics 2012-07-05 17:48:12 +02:00
Frank Celler c1892ff9b4 added doc for request statistics 2012-07-05 16:42:49 +02:00
Frank Celler 1fe03464c2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.1 2012-07-05 15:42:12 +02:00
Jan Steemann bba14bbff3 added timing functions 2012-07-05 15:01:07 +02:00
Jan Steemann c353846e52 replaced 1-byte-at-a-time algorithm with 8-bytes-at-a-time algorithm for CRC32 block calculation 2012-07-05 12:13:11 +02:00
Jan Steemann 829acdcbe9 some speedups for JSON parsing, correction of Unicode escape sequence handling 2012-07-05 09:31:56 +02:00
Jan Steemann 82ca4f24ce fixed compile errors 2012-07-04 23:22:07 +02:00
Frank Celler 89dcd4e5c8 added BatchJob and BatchSubjob 2012-07-04 23:21:45 +02:00
Frank Celler 84903ace48 added log option 2012-07-04 23:02:45 +02:00
Frank Celler 795b2a9178 added statistics 2012-07-04 18:33:13 +02:00
Jan Steemann 1b8bdad4a2 updated documentation for issue #122 2012-07-04 13:38:17 +02:00
Jan Steemann d9227ac680 issue #122: arangod doesn't start if <log.file> cannot be created 2012-07-04 13:34:26 +02:00
Frank Celler 935926bd8b added statistics 2012-07-03 16:34:49 +02:00
Jan Steemann 089ac79989 added server startup option --server.disable-admin-interface 2012-07-03 13:22:03 +02:00
Frank Celler d3e2bca5ff Merge branch 'master' of github.com:fceller/ArangoDB into 1.1-stat 2012-07-02 18:47:33 +02:00
Frank Celler 9e1acf7a75 yesterday 2012-07-02 18:47:12 +02:00
Frank Celler 6fbf548f87 added statistics classes 2012-07-02 18:44:40 +02:00
Frank Celler 0482963c7d Merge branch 'master' of github.com:fceller/ArangoDB into 1.1 2012-07-02 15:20:35 +02:00
Frank Celler fff2a9d656 cleanup mruby 2012-07-02 14:26:51 +02:00
Frank Celler af82d87ae5 added BatchJob and BatchSubjob 2012-07-02 11:18:44 +02:00
Frank Celler e9e4e555a3 fixed uninit mem 2012-07-01 17:39:52 +02:00
Frank Celler a9332a7ade raised initial size 2012-07-01 16:58:13 +02:00
Frank Celler e63c5833d3 switch to AssociativeArray 2012-07-01 16:50:21 +02:00
Frank Celler 74fd3af136 use mutex 2012-07-01 15:19:45 +02:00
Frank Celler 7e153d21ef added TRI_USE_SPIN_LOCK_GENERAL_SERVER 2012-07-01 15:14:31 +02:00
Frank Celler 89e5401d56 ignore protobuf 2012-07-01 14:43:36 +02:00
Frank Celler 4e82d631c2 fixed memleak 2012-07-01 14:34:03 +02:00
Frank Celler c47353157c fixed error handling of canceled thread 2012-07-01 14:23:19 +02:00
Frank Celler 479cb7b8b8 fixed shutdown 2012-07-01 14:10:01 +02:00
Frank Celler d0459a0851 new HttpServer & co implementation 2012-07-01 11:17:16 +02:00
Frank Celler fb4a7618e4 the great Scheduler & Dispatcher refactoring 2012-06-30 23:52:49 +02:00
Jan Steemann 7bbbd11ee8 not necessary anymore 2012-06-27 16:44:44 +02:00
Jan Steemann 75bd9acfba fixed some things in the batch handler 2012-06-27 15:19:09 +02:00
Jan Steemann 5cbc0ad3c7 added some error messages when using --pid-file 2012-06-27 11:38:43 +02:00
Jan Steemann ad456ded93 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-27 09:53:58 +02:00
Jan Steemann 3981974d1d working, but still blocking batch processing implementation 2012-06-27 09:53:37 +02:00
Oreste Panaia 9a8c0a4cd0 still trying to get this code up to github (maybe one day) 2012-06-27 14:43:00 +08:00
Oreste Panaia cfbe3a84e3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-27 14:34:38 +08:00
Oreste Panaia a9f9c3af55 trying to upload bitarrays 2012-06-27 14:21:21 +08:00
Frank Celler f35a0dc67f Merge branch 'master' of github.com:fceller/ArangoDB into devel 
Conflicts:
	lib/HttpServer/HttpHandler.cpp
 2012-06-26 23:23:33 +02:00
Frank Celler 35d2d6db65 finish direct sd 2012-06-26 23:21:35 +02:00
Jan Steemann aa282cfcf9 some cleanup to reduce diff size 2012-06-26 17:25:25 +02:00
Jan Steemann af73c747a3 some cleanup to reduce diff size 2012-06-26 17:18:40 +02:00
Jan Steemann 3f36f50baf whitespace etc. to reduce diff size 2012-06-26 16:50:04 +02:00
Oreste Panaia 43309908ec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/BitIndexes/bitarray.c
	arangod/RestServer/ArangoServer.cpp
	configure
 2012-06-26 20:41:04 +08:00
Frank Celler 214f25aac2 added first try 2012-06-26 14:28:00 +02:00
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Frank Celler 6d21cbc1c3 removed duplicate includes 2012-06-26 12:07:54 +02:00
Frank Celler 0bde0c1c00 Merge branch 'master' of github.com:triAGENS/ArangoDB 2012-06-26 12:04:32 +02:00
Jan Steemann c858d39adc issue #115 2012-06-26 11:17:29 +02:00
Frank Celler be421504ab added missing include for CLANG 2012-06-26 10:37:59 +02:00
Frank Celler 02974e6ec5 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-06-25 16:24:55 +02:00
Frank Celler 5b07a9dea6 removed ZeroMQ / ProtoBuf coupling 2012-06-25 16:24:43 +02:00
Jan Steemann 27da220b4f issue #72: fixed memleak for cap constraints 2012-06-25 10:03:15 +02:00
Frank Celler 2c9d3ded48 regenerated files 2012-06-24 20:44:51 +02:00
Frank Celler af60ebe612 fixed doc errors 2012-06-24 16:43:20 +02:00
Frank Celler 38b5c0f561 fixed shutdown order 2012-06-22 17:21:22 +02:00
Frank Celler f99409f146 fixed unregistering of handlers 2012-06-22 17:08:52 +02:00
Frank Celler 3a151b5bbd fixed memory leaks 2012-06-22 15:15:09 +02:00
Frank Celler 4195060ed3 fixed memory leaks 2012-06-22 15:15:07 +02:00
Frank Celler 4e6f4a74a6 fixed memory leaks 2012-06-22 13:38:55 +02:00
Jan Steemann d1d5ab1436 added stub method because otherwise beginShutdown() would be pure virtual 2012-06-22 11:44:41 +02:00
Jan Steemann c9b379f879 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-06-22 11:38:07 +02:00
Jan Steemann 92e73b1bb8 issue #112: do not accept document with duplicate attribute names 2012-06-22 11:36:48 +02:00
Frank Celler b1a145c64a Merge branch 'master' of https://github.com/fceller/ArangoDB into devel 2012-06-22 11:03:40 +02:00
Frank Celler 6c55734753 added running check 2012-06-22 11:03:27 +02:00
Frank Celler 37d3ad8dc2 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Makefile.in
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/JavascriptDispatcherThread.cpp
	lib/Dispatcher/DispatcherQueue.cpp
	lib/HttpServer/HttpCommTask.cpp
 2012-06-21 23:17:48 +02:00
Frank Celler 94c954b8fd application v8 2012-06-21 22:40:11 +02:00
Jan Steemann 074d0538e9 removed bogus FIXME comments 2012-06-21 16:46:57 +02:00
Jan Steemann f100e2ad82 changed async task handling 2012-06-21 16:32:54 +02:00
Frank Celler ea1243d3ce feature V8 2012-06-21 00:44:25 +02:00
Frank Celler 3fc8118904 cleanup ApplicationFeature 2012-06-20 20:52:15 +02:00
Frank Celler 0e7d6f8f2a added prepare and open 2012-06-19 23:20:33 +02:00
Frank Celler 8f16acdd86 added control to start & stop features 2012-06-19 22:12:49 +02:00
Frank Celler fffd1c4fc0 added log.filter 2012-06-19 17:30:08 +02:00
Frank Celler 1511e167aa Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	PerfTests/zclient.cpp
	lib/Dispatcher/DispatcherQueue.cpp
 2012-06-19 17:13:50 +02:00
Frank Celler 3ccc668dd9 removed debug output 2012-06-19 17:09:50 +02:00
Frank Celler a10151c26a added handler factory 2012-06-19 16:26:51 +02:00
Frank Celler cd93e52474 added ZeroMQQueueThread 2012-06-19 12:28:55 +02:00
Frank Celler a3dae7083b ZeroMQ batch job and threads 2012-06-19 12:01:05 +02:00
Jan Steemann 50216ab1fa fixed compile warning about initialisation order 2012-06-18 09:45:07 +02:00
Frank Celler 20e022125f added HttpRequestProtobuf 2012-06-17 21:50:03 +02:00
Frank Celler caf24bfb60 parse message body 2012-06-17 18:14:04 +02:00
Frank Celler a90635f636 fixed log msg 2012-06-17 18:13:51 +02:00
Frank Celler 47db93a546 added queue name in log 2012-06-17 18:13:31 +02:00
Frank Celler 2635b48208 added threads and concurrency for zeromq 2012-06-17 13:17:02 +02:00
Frank Celler 9beecf5ee4 protobug & zeromq tests 2012-06-15 14:03:54 +02:00
Frank Celler f48ac96d34 added SPIN/MUTEX flag 2012-06-14 21:37:03 +02:00
Frank Celler 704f921d0f new HttpRequest 2012-06-14 15:03:17 +02:00
Frank Celler 02e8d7382f trying to get an abstact class for HttpRequest 2012-06-13 23:29:27 +02:00
Frank Celler 54826adb83 cleanup HttpRequest as prep for ZeroMQ 2012-06-13 21:51:27 +02:00
Frank Celler 2e7a9926f3 start with a larger initial buffer 2012-06-13 15:06:15 +02:00
Frank Celler ae2c588caa using spin locks 2012-06-13 15:01:17 +02:00
Frank Celler 2c5f7e1993 fixed typos 2012-06-13 15:01:00 +02:00
Frank Celler 1c2661df3c replaced Mutex by spin 2012-06-13 14:06:26 +02:00
Frank Celler 00d1b9d0bf added /queued-version 2012-06-13 13:20:28 +02:00
Frank Celler b777deabd7 added /queued/version 2012-06-13 13:17:52 +02:00
Frank Celler 3f5b54258b partial ZeroMQ integration 2012-06-13 11:39:00 +02:00
Frank Celler fa5ba2d50f initial ZeroMQ 2012-06-13 00:13:22 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Frank Celler dd7fa848c0 alternative version if mruby supports define_method and attrib_reader 2012-06-12 17:28:53 +02:00
Frank Celler a92cd9ffd2 preparations for ZeroMQ, removed Scheduler and Dispatcher from ApplicationServer 2012-06-12 17:10:49 +02:00
Frank Celler 263a1c345c added protocol buffers 2012-06-11 17:58:05 +02:00
Frank Celler d120aa0026 very rudimentary execute action method 2012-06-10 00:15:49 +02:00
Frank Celler bb9253eeff fixed queue handling for MRuby, added mount for MRuby and mr_action_t 2012-06-09 11:15:18 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
 2012-06-08 15:57:33 +02:00
Frank Celler aeeadb7168 Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 2012-06-08 15:22:01 +02:00
Frank Celler 57353e1e79 the great rename III 2012-06-08 15:21:31 +02:00
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
 2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00