1
0
Fork 0
Commit Graph

526 Commits

Author SHA1 Message Date
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
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
Jan Steemann 61d49924be more binary handling 2012-09-20 13:11:33 +02:00
Frank Celler c57ffb7e8f updated mruby to 15cf8fdea4a6598aa470e698e8cbc9b9b492319d 2012-09-20 12:41:25 +02:00
a-brandt c90d7f5f27 Added option --default-language to arangod 2012-09-19 16:57:34 +02:00
a-brandt d51383d081 Added HAS_ICU to shell and console 2012-09-19 11:23:23 +02: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
Oreste Panaia 43ee2e1a58 unittests 2012-09-19 15:19:39 +08:00
Jan Steemann 614187c885 draft of benchmark client 2012-09-18 18:25:33 +02:00
Frank Celler 8f5b31177b added redirect 2012-09-18 16:33:16 +02:00
a-brandt d077c97f2c ICU updates 2012-09-18 15:42:46 +02:00
Frank Celler de4b01b766 Merge branch '1.0' of github.com:fceller/ArangoDB into 1.0 2012-09-18 15:12:19 +02:00
Frank Celler acfa466f88 fixed typo 2012-09-18 15:12:01 +02:00
Frank Celler 2ce0c4336a added module in database 2012-09-18 15:07:57 +02:00
a-brandt 1a9961cb4c Added COMPARE_STRING function 2012-09-18 13:13:26 +02:00
a-brandt 3019983dc7 ICU changes 2012-09-18 10:41:37 +02:00
Frank Celler 88b72adea4 more actions example, reloadCache added 2012-09-17 18:08:28 +02:00
Jan Steemann 7ad38b946c updated batch handler 2012-09-17 17:18:28 +02:00
Jan Steemann bb14df164d if 0'lled unused functions 2012-09-17 17:04:39 +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
Jan Steemann 2379e1f0c3 fixed broken grammar file 2012-09-17 16:37:21 +02:00
Frank Celler 0ee09438c2 cleanup doc 2012-09-17 13:59:49 +02:00
Oreste Panaia c7e5eae52d Added additional error numbers for bitarray index creation 2012-09-17 19:57:10 +08:00
Jan Steemann f4adf94748 some simplification 2012-09-17 13:32:20 +02:00
Jan Steemann b8cc79296b some simplification 2012-09-17 12:15:01 +02:00
Jan Steemann cc637aa091 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-17 11:55:16 +02:00
Jan Steemann 3d6dfb6042 indentation 2012-09-17 11:54:52 +02:00
Jan Steemann 76674bad52 moved primaryIndex and lock from document-collection to primary-collection 2012-09-17 11:43:48 +02:00
Jan Steemann 1ef037ce8c renamed indexes to secondaryIndexes 2012-09-17 09:54:12 +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
Jan Steemann 7c4b13f19d slightly simplified locking 2012-09-17 09:05:13 +02:00
Frank Celler 4f6762436c added first go at user actions 2012-09-16 17:25:57 +02:00
Frank Celler 9212351c13 added path and prefix 2012-09-16 17:25:38 +02:00
Jan Steemann 9698fba8aa removed session handler documentation 2012-09-14 15:41:56 +02:00
Jan Steemann 7d512be4bb make clean deletes more 2012-09-14 15:40:29 +02:00
Jan Steemann f7e98df4a3 removed unused error codes 2012-09-14 15:18:28 +02:00
Jan Steemann 07ccc2083b further renamings 2012-09-14 14:57:26 +02:00
Jan Steemann b2e47ae2b8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 14:46:56 +02:00
Jan Steemann 1b1d7ba877 renamed simple_collection to document_collection 2012-09-14 14:46:37 +02:00
Oreste Panaia 305031a0f7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-14 18:19:52 +08:00
Oreste Panaia c0e9f488c9 ruby unit tests for some index tasks 2012-09-14 18:18:57 +08:00
Jan Steemann 9bc99b7c9d renamed document collection to primary collection 2012-09-14 10:19:41 +02:00
a-brandt b26a96619c added NORMALIZE_STRING function 2012-09-14 10:13:53 +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
Jan Steemann 1b6efb38d9 virtual 2012-09-14 08:47:56 +02:00
Jan Steemann a51fa9d4d9 fixed some doxygen errors 2012-09-13 20:08:18 +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 5c32ae5869 removed boost exceptions 2012-09-13 15:09:02 +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 6e6db55258 issue #195 2012-09-12 21:56:24 +02:00
Jan Steemann 650261faed issue #195: make arango-upgrade write VERSION file, add global Javascript variable DATABASEPATH 2012-09-12 21:53:01 +02:00
Jan Steemann 5fa11516f3 fixed documentation and typos 2012-09-12 15:20:44 +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 d670fbca5b issue #150, issue #188 2012-09-12 09:32:25 +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 d4d2656364 no complaining about "lock" file 2012-09-11 18:11:27 +02:00
Jan Steemann c365468e26 fixed thread race condition on shutdown 2012-09-11 18:10:57 +02:00
Jan Steemann b24ee5aab4 issue #194: potential race condition between creating and dropping collections 2012-09-11 17:15:46 +02:00
Jan Steemann b6c46979f5 downgraded write-lock to a read-lock 2012-09-11 16:31:13 +02:00
Jan Steemann 31676da1ff made deletion of cursors an atomic operation 2012-09-11 16:30:23 +02:00
Jan Steemann 9660404328 enforce a minimum gc frequency of 1 second, not less 2012-09-11 12:59:59 +02:00
Jan Steemann 5c2b89ea38 did not remove enough code last time. fixed 2012-09-11 10:56:19 +02:00
Jan Steemann cfe44acda4 moved variable to top-level scope. otherwise bad(TM) things may happen 2012-09-11 10:45:47 +02:00
Jan Steemann 135af312da removed some old debug macros 2012-09-11 09:56:57 +02:00
Jan Steemann 65fb4fa84f less long locking 2012-09-11 09:45:58 +02:00
Jan Steemann 21ff560bce removed senseless macro 2012-09-11 09:43:57 +02:00
Jan Steemann 41bdeeecdd minor message change 2012-09-11 08:54:52 +02:00
Jan Steemann 12598c2804 added leak check 2012-09-11 00:23:02 +02:00
Jan Steemann be09205940 fixed doxygen error 2012-09-11 00:15:26 +02:00
Jan Steemann 4587d5db3c added configure option --enable-lock-check 2012-09-10 18:17:57 +02:00
Jan Steemann 336195dff5 more verbosity in trace mode 2012-09-10 18:15:16 +02:00
Jan Steemann 94e1a80efa removed ncurses from documentation 2012-09-10 15:51:45 +02:00
Jan Steemann 2fa8760235 fix compile warning 2012-09-10 15:42:36 +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
Jan Steemann c0268ce475 try to avoid duplicate read-locking from AQL queries 2012-09-10 14:44:29 +02:00
Oreste Panaia 6134497b5d Merge https://github.com/triAGENS/ArangoDB into devel 2012-09-10 20:42:48 +08:00
Oreste Panaia 8847d87580 added limited AQL support for bit indexes 2012-09-10 20:42:14 +08:00
Jan Steemann fde8af7b2f do not ignore out of memory 2012-09-07 17:46:32 +02:00
Jan Steemann 6a17f7c1e8 do not ignore out-of-memory 2012-09-07 17:44:19 +02:00
Jan Steemann 559b0f9767 do not ignore oom cases 2012-09-07 17:43:00 +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 442c033122 start statistics thread even in supervisor mode 2012-09-07 15:29:30 +02:00
Jan Steemann 2bca2a964b more trace messages 2012-09-07 11:23:46 +02:00
Jan Steemann 1a400f22c0 added AhuacatlContextGuard for safer deallocation 2012-09-07 10:10:02 +02:00
Jan Steemann b1395cb1ad add V8 version to trace output 2012-09-07 10:08:53 +02:00
Jan Steemann 7626972890 issue #155 2012-09-06 17:48:06 +02:00
Jan Steemann 2072bb6fb8 improved debug logging and early deletion of cursor 2012-09-06 17:46:15 +02:00
Jan Steemann b4f5cd6aa2 simplified code for issue #188 2012-09-06 14:10:00 +02:00
Jan Steemann 743efe30a7 some minor cleanups 2012-09-06 14:03:07 +02:00
Jan Steemann 7a20b188ba issue #188 2012-09-06 13:35:01 +02:00
Jan Steemann 5e931b4e06 issue #150 2012-09-06 11:52:03 +02:00
Jan Steemann 37914fcf34 issue #188, issue #150: introduce periodic garbage collection for V8 contexts, fix issue with server-side cursor refcounts 2012-09-06 11:37:01 +02:00
Jan Steemann 22f860d9db some obvious cleanups 2012-09-06 10:03:11 +02:00
Jan Steemann c91bd73720 added missing private specifier 2012-09-05 17:09:55 +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 6f1e2c95b3 call releaseCollection() in dtor of RestHandlers 2012-09-05 16:12:12 +02:00
Jan Steemann c1d08176b5 fixed some edge cases in which no proper error messages got generated 2012-09-05 15:41:19 +02:00
Jan Steemann 6a4c9c1c07 fixed potential crash when parameter file cannot be created 2012-09-05 11:43:57 +02:00
Jan Steemann 55907a5548 fixed potential crash when parameter file cannot be created 2012-09-05 11:42:23 +02:00
Jan Steemann 0712114f27 fixed potential crash in case parameter file cannot be created 2012-09-05 11:41:34 +02:00
Jan Steemann ff03b3c63f issue #150 comments 2012-09-04 23:58:37 +02:00
Jan Steemann 39dbfbff7c fix for issue #150 patch 2012-09-04 23:04:13 +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 febd5bfa8e removed member TRI_doc_mptr_t->_document 2012-09-04 13:20:01 +02:00
Jan Steemann 0f7ee2a433 updated documentation 2012-09-04 12:27:11 +02:00
Jan Steemann 9ef51c883f updated some documentation 2012-09-04 12:11:29 +02:00
Jan Steemann 95db9cf429 removed some dead code 2012-09-04 10:05:36 +02:00
Jan Steemann c1ebdabcf3 renamed blob_collection to shape_collection 2012-09-04 09:32:18 +02:00
Jan Steemann 9ff624c2d2 had to change collection version from 1 to 2 because the "status" attribute now may have a different meaning than before 2012-09-03 17:09:25 +02:00
Jan Steemann 64cb6d63e0 removed attachment collection type 2012-09-03 16:56:13 +02:00
Jan Steemann e40b84d33e fixed typos in documentation 2012-09-03 16:37:44 +02:00
Jan Steemann 67dd26fcef removed previous implementation of attachments 2012-09-03 16:21:47 +02:00
Jan Steemann ac708b7fec issue #182: added manpage for rcarangod 2012-09-03 15:34:30 +02:00
Jan Steemann b8c5c4e3c0 issue #182 2012-09-03 13:44:58 +02:00
Jan Steemann ffc5f9ed6d man pages 2012-09-03 13:02:19 +02:00
Oreste Panaia d632fb820b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-03 17:09:00 +08:00
Oreste Panaia b7d239f629 draft index interface 2012-09-03 17:05:39 +08:00
Frank Celler d3f0de4701 image cleanup 2012-09-02 10:56:59 +02:00
Frank Celler 2ac17fa841 fixed warning 2012-08-31 23:13:45 +02:00
Jan Steemann f70cdc8fcb issue #169: adjusted documentation 2012-08-31 18:08:36 +02:00
Jan Steemann e4e73a7a56 issue #169: missing argument for simple queries 2012-08-31 17:32:53 +02:00
Jan Steemann 3b54e55562 correct parameter name in error message 2012-08-31 15:28:11 +02:00
Jan Steemann 72d2798368 improved error message for imports 2012-08-31 13:29:51 +02:00
Jan Steemann 203aae2c2b issue #176: added example 2012-08-31 12:02:28 +02:00
Jan Steemann 374b65e0d7 issue #177: fixed wrong error message 2012-08-31 10:49:36 +02:00
Frank Celler 3e35942af5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-08-31 09:31:57 +02:00
Jan Steemann b38f28b920 issue #179: fixed documentation error 2012-08-31 09:23:29 +02:00
Jan Steemann a556984ed0 issue #179: fixed documentation error 2012-08-31 09:22:48 +02:00
Jan Steemann f9e0d9fb28 issue #179: fixed documentation error 2012-08-31 09:22:04 +02:00
Frank Celler 6d38486be1 Merge branch 'master' of https://github.com/fceller/ArangoDB into devel 2012-08-31 09:00:42 +02:00
Frank Celler 8b34bbb9de fixed permission 2012-08-31 08:59:59 +02:00