1
0
Fork 0
Commit Graph

5723 Commits

Author SHA1 Message Date
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