1
0
Fork 0
Commit Graph

326 Commits

Author SHA1 Message Date
Oreste Panaia 4d8d78e880 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
	arangod/Actions/RestActionHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	lib/ApplicationServer/ApplicationServer.cpp
2012-10-22 21:04:12 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00
Jan Steemann 4d6f32a5d4 more languages 2012-10-17 17:50:55 +02:00
Jan Steemann 6f5961a9eb added some extra comments 2012-10-17 16:05:51 +02:00
Jan Steemann be54759314 issue #245 2012-10-17 14:24:31 +02:00
Jan Steemann c2be68fc7f issue #245 2012-10-17 14:21:46 +02:00
Jan Steemann f0b615ab9e disable internal statistics by default 2012-10-16 17:43:11 +02:00
Jan Steemann 2369bc5bee disable internal statistics by default 2012-10-16 17:34:05 +02:00
Frank Celler 195d6903c1 added generated files 2012-10-14 16:23:48 +02:00
Frank Celler c0c869d1ff Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/ArangoShell/ArangoClient.cpp
	js/client/js-client.h
2012-10-13 16:28:09 +02:00
Jan Steemann cc371c4eb0 centralised and unified bye message 2012-10-12 21:46:58 +02:00
Frank Celler 7c3547e815 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Makefile.files
	Makefile.in
	js/actions/system/api-system.js
2012-10-11 23:18:55 +02:00
Jan Steemann 224e37a1ba fix some memory issues 2012-10-11 22:49:46 +02:00
Frank Celler bbd9698d22 removed generated files 2012-10-11 16:20:08 +02:00
Jan Steemann b642b48603 fixed memory issues 2012-10-11 14:08:38 +02:00
Jan Steemann 85cba473ba fixed memory clearing in TRI_EraseFrontStringBuffer for some cases 2012-10-11 13:31:43 +02:00
Jan Steemann 9ffc7a7cfd fix memory zone issues 2012-10-10 23:49:18 +02:00
Jan Steemann a4b979222f fixed memory zone issues, memleaks 2012-10-10 19:05:16 +02:00
Jan Steemann 31ce03b31d fixed some memory zone issues 2012-10-10 15:17:46 +02:00
Jan Steemann a08b5ac230 remove configure option --enable-lock-check. has done its purpose already 2012-10-10 14:21:25 +02:00
Oreste Panaia 0e835b90b2 windows 2012-10-08 23:29:29 +08:00
Oreste Panaia ab15e33b89 memory mapped files extensions for windows 2012-10-08 17:17:03 +08:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Jan Steemann 3b5d4a4fc9 issue #204: allow import of tab-separated values
this enables the user to specify the tab as separator for arangoimp.
the separator and eol values used by arangoimp can now also consist of
more than one character.

updated documentation and added test cases
2012-09-30 01:38:32 +02:00
Oreste Panaia 6bdf3ae565 usual mysteries with git
Conflicts:
	lib/Rest/Endpoint.cpp
2012-09-28 17:56:05 +08:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08:00
Oreste Panaia a4d551653d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 19:11:18 +08:00
Oreste Panaia ba63b36b53 With git you never know 2012-09-26 19:10:48 +08:00
a-brandt e957c99b14 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 12:39:09 +02:00
a-brandt 03249fc953 fixed warning 2012-09-26 12:38:34 +02:00
a-brandt 04308d6cb6 bugfix: zero length strings 2012-09-26 09:26:58 +02:00
Jan Steemann 0a2466fdd6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 08:44:39 +02:00
Jan Steemann 89754433dd switched to C mersenne twister implementation in BasicsC 2012-09-25 22:57:47 +02:00
Jan Steemann 10d6167d45 removed some unused compile options 2012-09-25 21:24:02 +02:00
Jan Steemann 01d0089e51 some minor optimisations for json to string conversion 2012-09-25 18:34:36 +02:00
Jan Steemann ce3936df9a some cleanup 2012-09-25 16:12:20 +02:00
Jan Steemann 89cffbe083 set log level to info (which is the default otherwise) for unknown log levels 2012-09-24 16:59:35 +02:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +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 b191e9c464 Merge pull request #199 from triAGENS/1.0
1.0
2012-09-19 05:35:53 -07: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
Oreste Panaia c7e5eae52d Added additional error numbers for bitarray index creation 2012-09-17 19:57:10 +08: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
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +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 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 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
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 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 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 a4be6724db deleted NCURSES 2012-09-10 15:09:32 +02:00
a-brandt 6762b7cf85 using ioclt() instead of ncurses 2012-09-10 14:48:47 +02:00
a-brandt b355c908b3 using ioclt() instead of ncurses 2012-09-10 13:48:33 +02:00
Jan Steemann 1ef35bab96 added comment 2012-09-07 16:52:08 +02:00
Jan Steemann 00ba8a1862 prevent valgrind from complaining about uninitialised memory 2012-09-06 14:02:24 +02:00
Jan Steemann 9b75a646e0 fixed a valgrind warning 2012-09-04 16:06:12 +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 374b65e0d7 issue #177: fixed wrong error message 2012-08-31 10:49:36 +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
Jan Steemann b36776efb3 issue #110: add PATCH method for documents 2012-08-20 19:16:45 +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
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 63f4ab1248 free memory for copied environ variables properly 2012-08-06 17:38:32 +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 325a4d59bb datafile check 2012-07-28 20:57:03 +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 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +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
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
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 f00d11f9ae added macro TRI_TIMER_DUMP 2012-07-18 08:40:20 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +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 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 de187b1625 added wake-up call for synchroniser 2012-07-10 15:06:34 +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
Frank Celler 84903ace48 added log option 2012-07-04 23:02:45 +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
Oreste Panaia a9f9c3af55 trying to upload bitarrays 2012-06-27 14:21:21 +08: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
Oreste Panaia 20bbdab435 Bitarray index first draft 2012-06-26 20:05:49 +08:00
Jan Steemann 27da220b4f issue #72: fixed memleak for cap constraints 2012-06-25 10:03:15 +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 fffd1c4fc0 added log.filter 2012-06-19 17:30:08 +02:00
Frank Celler a3dae7083b ZeroMQ batch job and threads 2012-06-19 12:01:05 +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 3f5b54258b partial ZeroMQ integration 2012-06-13 11:39:00 +02:00
Frank Celler 73e50d932f added name for pthreads 2012-06-13 00:12:45 +02:00
Frank Celler 57353e1e79 the great rename III 2012-06-08 15:21:31 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00