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

63 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
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
Jan Steemann 7cee00a060 fixed g++ compile error 2012-09-19 10:32:01 +02:00
Jan Steemann 614187c885 draft of benchmark client 2012-09-18 18:25:33 +02:00
Jan Steemann 7ad38b946c updated batch handler 2012-09-17 17:18:28 +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 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 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
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
Frank Celler 5c32ae5869 removed boost exceptions 2012-09-13 15:09:02 +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 7e5aa4490d removed user manager 2012-09-12 23:37:35 +02:00
Jan Steemann daa43b467a fixed dead-locking 2012-09-12 13:40:10 +02:00
Jan Steemann 12598c2804 added leak check 2012-09-11 00:23:02 +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 febd5bfa8e removed member TRI_doc_mptr_t->_document 2012-09-04 13:20:01 +02:00
Jan Steemann 72d2798368 improved error message for imports 2012-08-31 13:29:51 +02:00
Jan Steemann ed395ab8ce issue #153 2012-08-28 13:06:04 +02:00
Jan Steemann bc56546f23 issue #110: allow partial updates 2012-08-21 11:50:55 +02:00
Jan Steemann b36776efb3 issue #110: add PATCH method for documents 2012-08-20 19:16:45 +02:00
Jan Steemann d602942925 preparation for issue #110: added HTTP patch method 2012-08-20 13:50:24 +02:00
Jan Steemann 0c822a8da1 issue #156: fixed memleaks in /_api/import 2012-08-15 14:24:59 +02:00
Jan Steemann d320eaae97 unified error messages for /_api/import 2012-08-15 10:44:51 +02:00
Jan Steemann 384384932e issue #59: added tests for /_api/import 2012-08-15 10:31:25 +02:00
Jan Steemann 590855f633 made BatchJob and BatchSubjob template classes, fixed unittests 2012-07-31 11:00:05 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Jan Steemann 8620bffa84 renamed a lock 2012-07-17 18:18:24 +02:00
Jan Steemann 0ce6e565c8 clearly note who finalised a batch job 2012-07-17 16:56:52 +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
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 ab4d52963e fixed statistics: no deviation for request-statistics, distribution for connection-statistics 2012-07-09 15:24:28 +02:00
Frank Celler ab306f7f4b added connection-statistics 2012-07-05 22:08:21 +02:00
Frank Celler 56bdef98b8 added ConnectionStatisticsHandler 2012-07-05 18:02:43 +02:00
Frank Celler 4403da5568 added base class 2012-07-05 17:59:42 +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 0b7c4ecee2 added all 2012-07-04 22:54:04 +02:00
Frank Celler 795b2a9178 added statistics 2012-07-04 18:33:13 +02:00
Frank Celler af82d87ae5 added BatchJob and BatchSubjob 2012-07-02 11:18:44 +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 2cfcfe4e96 some cleanup 2012-06-27 15:37:50 +02:00
Jan Steemann 75bd9acfba fixed some things in the batch handler 2012-06-27 15:19:09 +02:00