1
0
Fork 0
Commit Graph

433 Commits

Author SHA1 Message Date
Jan Steemann a3dee04647 removed zeromq 2012-09-24 15:27:27 +02:00
Jan Steemann 3526804033 removed protocolbuffers 2012-09-24 13:53:14 +02:00
Jan Steemann f08a788f7c removed protocol buffers 2012-09-24 13:44:30 +02:00
Jan Steemann 4ea0364efd removed unnecessary dependency to Boost 2012-09-24 12:34:57 +02:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +02:00
Jan Steemann 942f8e0534 do not deleted derived files if configure options do not allow this 2012-09-24 10:17:56 +02:00
Frank Celler 4181fd5cc4 regenerated files 2012-09-21 17:44:25 +02:00
Frank Celler 403b4db931 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-09-21 10:12:12 +02:00
Frank Celler 352c093f81 merged with 1.0 2012-09-21 10:10:34 +02:00
Jan Steemann bea699b734 some fix for json conversion 2012-09-21 09:26:53 +02:00
Jan Steemann dc7c47ae84 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-20 18:14:23 +02:00
Jan Steemann 18cd515737 added protobuf to json converter 2012-09-20 18:14:00 +02:00
Frank Celler e9b1e1c58f Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	3rdParty/mruby/include/mrbconf.h
	3rdParty/mruby/include/mruby.h
	3rdParty/mruby/include/mruby/array.h
	3rdParty/mruby/include/mruby/khash.h
	3rdParty/mruby/include/mruby/object.h
	3rdParty/mruby/include/mruby/variable.h
	3rdParty/mruby/mrblib/error.rb
	3rdParty/mruby/mrblib/print.rb
	3rdParty/mruby/src/array.c
	3rdParty/mruby/src/cdump.c
	3rdParty/mruby/src/class.c
	3rdParty/mruby/src/codegen.c
	3rdParty/mruby/src/error.c
	3rdParty/mruby/src/gc.c
	3rdParty/mruby/src/init.c
	3rdParty/mruby/src/kernel.c
	3rdParty/mruby/src/math.c
	3rdParty/mruby/src/numeric.c
	3rdParty/mruby/src/object.c
	3rdParty/mruby/src/parse.y
	3rdParty/mruby/src/pool.c
	3rdParty/mruby/src/proc.c
	3rdParty/mruby/src/range.c
	3rdParty/mruby/src/sprintf.c
	3rdParty/mruby/src/state.c
	3rdParty/mruby/src/string.c
	3rdParty/mruby/src/struct.c
	3rdParty/mruby/src/symbol.c
	3rdParty/mruby/src/time.c
	3rdParty/mruby/src/variable.c
	3rdParty/mruby/src/vm.c
	3rdParty/mruby/src/y.tab.c
	3rdParty/mruby/test/assert.rb
	3rdParty/mruby/test/t/array.rb
	3rdParty/mruby/test/t/exception.rb
	3rdParty/mruby/test/t/kernel.rb
	3rdParty/mruby/test/t/math.rb
	3rdParty/mruby/test/t/module.rb
	3rdParty/mruby/test/t/string.rb
	3rdParty/mruby/test/t/struct.rb
	3rdParty/mruby/test/t/time.rb
	3rdParty/mruby/tools/mirb/mirb.c
	3rdParty/mruby/tools/mruby/mruby.c
	Doxygen/arango-html.doxy
	Doxygen/arango.template
	Makefile.am
	Makefile.in
	UnitTests/HttpInterface/api-http-spec.rb
	aclocal.m4
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-query.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/V8Server/v8-vocbase.h
	arangod/VocBase/compactor.c
	arangod/VocBase/compactor.h
	arangod/VocBase/shadow-data.c
	arangod/VocBase/simple-collection.c
	arangod/VocBase/simple-collection.h
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
	arangoirb/MRClient/arangoirb.cpp
	config/compile
	config/depcomp
	config/install-sh
	config/missing
	configure
	js/actions/demo/geo.js
	js/actions/demo/hallo-world.js
	js/actions/system/api-collection.js
	js/actions/system/api-edges.js
	js/actions/system/api-system.js
	js/actions/system/documents.js
	lib/BasicsC/locks-posix.c
	lib/BasicsC/operating-system.h
	lib/HttpServer/HttpCommTask.cpp
	lib/HttpServer/HttpCommTask.h
	lib/MRuby/MRLineEditor.cpp
	lib/MRuby/mr-utils.c
	m4/Makefile.doxygen
	m4/all-in-one.mruby
2012-09-20 16:39:59 +02:00
Frank Celler d8a43e6f86 added dep for protoc 2012-09-20 14:21:12 +02:00
Jan Steemann 61d49924be more binary handling 2012-09-20 13:11:33 +02:00
Frank Celler b36fa7c582 Merge branch 'master' of github.com:triAGENS/ArangoDB into 1.0 2012-09-20 12:42:41 +02:00
Frank Celler c57ffb7e8f updated mruby to 15cf8fdea4a6598aa470e698e8cbc9b9b492319d 2012-09-20 12:41:25 +02:00
Jan Steemann dba9e6e29c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-20 11:33:39 +02:00
Jan Steemann 879573944c bugfixes, accept longer binary messages 2012-09-20 11:33:14 +02:00
a-brandt cb3770a9ae Change to work with ICU 48 2012-09-20 10:13:08 +02:00
Jan Steemann cd7178f9c5 fixed serialisation/deserialisation of length 2012-09-19 19:12:36 +02:00
Jan Steemann 837c339e45 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 18:35:57 +02:00
Jan Steemann f9ea645a4e fixed UTF-16 comparison 2012-09-19 18:35:37 +02:00
Jan Steemann 29778d0b4d added binary client 2012-09-19 18:03:43 +02:00
a-brandt c3a5855689 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 16:58:54 +02:00
a-brandt c90d7f5f27 Added option --default-language to arangod 2012-09-19 16:57:34 +02:00
Jan Steemann 7bd8063468 before adding binary protocol 2012-09-19 15:48:24 +02:00
Frank Celler b191e9c464 Merge pull request #199 from triAGENS/1.0
1.0
2012-09-19 05:35:53 -07:00
Jan Steemann 7cee00a060 fixed g++ compile error 2012-09-19 10:32:01 +02:00
Jan Steemann eb1c4cec6d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 09:30:37 +02:00
Jan Steemann b682fa0fdb compiled with Bison 2.5 2012-09-19 09:29:55 +02:00
Oreste Panaia bd8bebed86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 15:21:26 +08:00
Jan Steemann 614187c885 draft of benchmark client 2012-09-18 18:25:33 +02:00
a-brandt d077c97f2c ICU updates 2012-09-18 15:42:46 +02:00
Oreste Panaia 2ec059e758 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.y
2012-09-17 23:01:26 +08:00
Oreste Panaia f5316acb9d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
2012-09-17 22:40:12 +08:00
a-brandt b505cb77c8 bug fix: wrong default locale 2012-09-17 14:02:38 +02:00
Oreste Panaia c7e5eae52d Added additional error numbers for bitarray index creation 2012-09-17 19:57:10 +08:00
a-brandt 73d2c59836 bug fix: empty strings 2012-09-17 10:47:41 +02:00
a-brandt 4e2cbfbb15 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-17 09:51:21 +02:00
a-brandt 3666069569 Added UTF8/UTF16 normalize and compare functions (uses libicu) 2012-09-17 09:49:41 +02:00
Frank Celler 9212351c13 added path and prefix 2012-09-16 17:25:38 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 1b1d7ba877 renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
a-brandt 1e98579792 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 10:14:32 +02:00
Jan Steemann 4790d0311c removed some unneeded globals 2012-09-14 09:34:43 +02:00
a-brandt fc2ab446fa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 09:19:42 +02:00
Frank Celler 4cb179cad5 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 2012-09-13 22:16:31 +02:00
Frank Celler 5ffae32016 fix path and removed duplicate const 2012-09-13 21:19:09 +02:00
a-brandt db00ed1502 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-13 17:47:48 +02:00
Jan Steemann 967716a27b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-13 17:41:21 +02:00
Jan Steemann a932d335cb added guards for collection locking and read/write transactions 2012-09-13 17:40:38 +02:00
a-brandt ccdc384fdf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	lib/BasicsC/strings.c
2012-09-13 16:45:05 +02:00
a-brandt 4dc64a546b added utf8 normalization function (uses icu) 2012-09-13 16:41:00 +02:00
Frank Celler 1d6bfbe4bc Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-09-13 15:09:25 +02:00
Frank Celler 5c32ae5869 removed boost exceptions 2012-09-13 15:09:02 +02:00
Jan Steemann 3deebd06de fixed authentication 2012-09-13 14:19:26 +02:00
Frank Celler 5075e1f764 removed JsonParserX 2012-09-12 23:50:22 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Frank Celler 7e5aa4490d removed user manager 2012-09-12 23:37:35 +02:00
Jan Steemann 28bb0da87f issue #195: added SYS_SAVE() function to save files 2012-09-12 21:52:04 +02:00
Jan Steemann 5fa11516f3 fixed documentation and typos 2012-09-12 15:20:44 +02:00
Jan Steemann aa6b84a048 made sched_yield call optional 2012-09-12 13:57:45 +02:00
Jan Steemann 1906f9c36b don't fail in case of EAGAIN rwlock acquisition, fixed locks error logging 2012-09-12 13:56:30 +02:00
Jan Steemann daa43b467a fixed dead-locking 2012-09-12 13:40:10 +02:00
Jan Steemann 9a58ffbb2d avoid deadlocking between synchroniser, compactor and data modification threads (e.g. POST /_api/document) 2012-09-12 09:07:51 +02:00
Jan Steemann 9a5177fc84 issue #193: REST API HEAD request returns a message body on 404 2012-09-12 08:52:36 +02:00
Jan Steemann 3ae11903e8 fixed a deadlock between compactor, synchroniser, and data modification threads (e.g. POST /_api/document) 2012-09-12 00:57:12 +02:00
Jan Steemann f8deb40580 issue #193: REST API HEAD request returns a message body on 404 2012-09-11 00:11:26 +02:00
Jan Steemann f812c6bd04 use caps, log warning when using unknown HTTP response codes 2012-09-10 22:06:22 +02:00
Jan Steemann a02905d12a use caps 2012-09-10 22:04:17 +02:00
Jan Steemann 1dee7cfa96 fixed incorrect error message for HTTP 405 2012-09-10 22:03:23 +02:00
Jan Steemann 4211c4756f fixed incorrect error message for HTTP 405 2012-09-10 22:02:37 +02:00
Jan Steemann 4dd8f64d87 fixed incorrect response message for HTTP 405 2012-09-10 22:01:16 +02:00
Jan Steemann 4587d5db3c added configure option --enable-lock-check 2012-09-10 18:17:57 +02:00
Jan Steemann 62847ba88a fixed typos in comments 2012-09-10 18:16:07 +02:00
Jan Steemann 94e1a80efa removed ncurses from documentation 2012-09-10 15:51:45 +02:00
a-brandt a6fef2c026 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-10 15:10:29 +02:00
a-brandt a4be6724db deleted NCURSES 2012-09-10 15:09:32 +02:00
Oreste Panaia 51af3c1182 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-10 21:03:59 +08:00
Oreste Panaia ed85c7c331 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-10 20:54:36 +08:00
Jan Steemann 7c35909c27 fixed broken state 2012-09-10 14:54:12 +02:00
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