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

308 Commits

Author SHA1 Message Date
Jan Steemann 81b94bff94 added missing error handling for importing edges 2013-06-25 16:22:10 +02:00
Jan Steemann 2ef2f60cc4 removed unused section 2013-06-19 14:04:24 +02:00
a-brandt 9e0335a1bf Merge branch 'devel' into multiple_databases 2013-06-06 16:12:44 +02:00
Thomas Richter dc691ca6c2 examples generated in api-simple.js 2013-06-06 14:43:36 +02:00
a-brandt 384b3c283c Merge branch 'devel' into multiple_databases 2013-06-04 13:07:06 +02:00
Jan Steemann c259f8ff4a fixed typo 2013-06-04 10:29:01 +02:00
a-brandt aeec284400 Merge branch 'devel' into multiple_databases 2013-06-03 17:09:21 +02:00
a-brandt 1c0578c2b5 Merge branch 'devel' into multiple_databases 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase.c
	lib/HttpServer/ApplicationEndpointServer.cpp
	lib/HttpServer/ApplicationEndpointServer.h
	lib/HttpServer/HttpCommTask.h
	lib/HttpServer/HttpHandlerFactory.cpp
	lib/HttpServer/HttpHandlerFactory.h
	lib/Rest/HttpRequest.cpp
	lib/Rest/HttpRequest.h
 2013-06-03 17:05:01 +02:00
Thomas Richter c230a87879 minor changes 2013-05-31 16:40:24 +02:00
Thomas Richter 33563c3d37 names changed in Examples 2013-05-31 10:08:39 +02:00
Jan Steemann d7b64d4ae2 merged patches by @guidoreina 2013-05-21 11:33:43 +02:00
Jan Steemann ac8e947fb6 typo 2013-05-16 20:53:04 +02:00
Thomas Richter b09be801b9 swagger for RestDocumentHandler finished 2013-05-16 14:59:51 +02:00
Thomas Richter a11a0633b8 examples created until document PUT 2013-05-15 16:07:05 +02:00
Jan Steemann 0d05d53670 switched examples back to English 2013-05-13 21:20:51 +02:00
Thomas Richter dbdd9b2b80 some REST documentation adapted for swagger 2013-05-13 16:30:23 +02:00
Jan Steemann 7f5884626c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-05-13 09:01:29 +02:00
Jan Steemann c7d2f8f8cd some json / shaped-json and string handling improvements 2013-05-13 09:01:07 +02:00
Jan Steemann 841d7d7355 English 2013-05-10 14:06:15 +02:00
Jan Steemann 5b94d9af98 less malloc/free for JSON parsing 2013-05-08 23:32:14 +02:00
Thomas Richter 0562e5c94d Header with 304 returncode fixed 2013-05-08 15:38:12 +02:00
Jan Steemann bfb35a4b3c issue #495 2013-05-03 11:38:10 +02:00
Jan Steemann fde26e6913 fixed doxygen errors 2013-05-03 11:25:24 +02:00
Jan Steemann ee7ab712d6 issue #495 2013-05-03 11:08:58 +02:00
Thomas Richter 85a5f05c93 swagger documentation for api-grap.js 2013-04-30 14:52:35 +02:00
Thomas Richter 1d232d6967 some fixes in generateSwagger 2013-04-30 11:40:19 +02:00
a-brandt 6839fe7701 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-24 17:46:36 +02:00
Thomas Richter cb940c85bd added some query and header parameters to the swagger tags 2013-04-24 15:28:31 +02:00
Thomas Richter 2fdada8724 backtick problem in REST-URL fixed 2013-04-23 12:25:16 +02:00
a-brandt 234b1460f8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-23 09:55:08 +02:00
Thomas Richter 62b870e725 in REST-documentation @LIT{} and @FA{} replaced by backticks 2013-04-22 15:42:59 +02:00
Thomas Richter 874b855fe8 in REST-documentation @LIT{} and @FA{} replaced by backticks 2013-04-22 15:39:43 +02:00
a-brandt 58de325e98 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-17 16:58:23 +02:00
a-brandt fcae2b2961 added RequestContext 2013-04-17 16:56:48 +02:00
Jan Steemann 30b2b2ef3e adjusted locks 2013-04-16 11:23:21 +02:00
Jan Steemann 8e4af7a952 fixed some locking 2013-04-15 12:43:53 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Thomas Richter f876e30816 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-02 09:38:45 +02:00
Jan Steemann ba0d608a25 renamed function 2013-03-28 14:13:11 +01:00
Jan Steemann 6b3b181930 pass transaction collection into CRUD operations 2013-03-28 13:26:49 +01:00
Thomas Richter f77fa798c8 generateArangoshRun db._collections() error fixed 2013-03-27 14:37:28 +01:00
Jan Steemann 81d5c71cf3 fixed documentation 2013-03-26 10:08:26 +01:00
Thomas Richter 9a08a1d609 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
work in progress swagger
 2013-03-26 09:14:05 +01:00
Thomas Richter 48df7ab80a work in progress 2013-03-26 09:13:56 +01:00
Jan Steemann 0e6c21e4e7 removed NEW_BORN collection status in server 2013-03-25 15:51:42 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Jan Steemann d9595caaf5 added upload API 2013-03-24 13:17:50 +01:00
Thomas Richter f14efc0278 swagger added 2013-03-22 12:21:55 +01:00
Jan Steemann ccc7c3665b locking 2013-03-22 11:31:36 +01:00
Jan Steemann 9b282ab74c some cleanup of transaction code 2013-03-21 18:54:38 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Jan Steemann af2d966559 fixed a typo 2013-03-08 22:31:17 +01:00
a-brandt e952b28aab changed http return codes for document update and delete 2013-03-08 16:56:15 +01:00
Jan Steemann 2b97f97765 issue #212 2013-03-08 12:18:32 +01:00
Jan Steemann a716f300a1 less strlen() calls 2013-03-07 00:58:08 +01:00
Jan Steemann a73d32c553 initialise lists to the correct size 2013-03-07 00:46:27 +01:00
Frank Celler dd96bb4abd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-03 22:40:55 +01:00
Frank Celler 60037971dc rewrote statistics 2013-03-03 22:39:41 +01:00
Jan Steemann f613c3c4d9 fixed race conditions when reading/deleting documents 2013-03-01 16:44:40 +01:00
Frank Celler f78dc0f5a6 added _admin/statistics and _admin/statistics-description 2013-03-01 13:40:49 +01:00
Jan Steemann 47bce0a0b4 issue #436 2013-02-27 14:47:05 +01:00
Jan Steemann ebc653a0bd issue #435 2013-02-26 12:11:13 +01:00
Jan Steemann 71459b680f issue #426 2013-02-22 23:26:52 +01:00
Frank Celler 11cfadbf05 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-22 21:36:21 +01:00
Frank Celler 3af1f5c2e8 new documentation format for REST calls, hopefully allowing swagger.it like output 2013-02-22 21:36:11 +01:00
Jan Steemann 7f3a54f4cd removed resultgenerator and variant stuff for document operations 2013-02-22 16:44:28 +01:00
Jan Steemann 4f37fada0d some mini-modifications for slightly higher throughput 2013-02-19 09:54:36 +01:00
Jan Steemann d321f32523 moved some const value out of loop 2013-02-15 11:35:48 +01:00
Jan Steemann 2543eeca2d moved containsMore member 2013-02-15 10:26:02 +01:00
Frank Celler dd1657a1f8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-14 16:47:45 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 831b84ab2e fixed issue #348 2013-02-14 15:19:08 +01:00
Jan Steemann 0f29e2b7dd pass request body to user-defined PATCH action 2013-02-12 18:17:07 +01:00
Jan Steemann 8365c4294c small mods 2013-02-12 18:16:23 +01:00
Jan Steemann 8eea104b39 remove 1.2 & 1.1 travis builds 2013-02-07 17:19:58 +01:00
Jan Steemann 577941bf23 unify collection names returned by ArangoDB 2013-02-04 23:04:56 +01:00
Jan Steemann 3d589a9562 some cleanup 2013-02-04 20:06:06 +01:00
Jan Steemann 923027bfdd unify collection names returned by rest API 2013-02-04 19:52:05 +01:00
Jan Steemann 8a6225865f removed lock classes 2013-02-04 14:40:14 +01:00
Jan Steemann b12dda013c removed transactioncollection 2013-02-04 13:26:23 +01:00
Jan Steemann ca8935ae2a fix collection name handling in the face of parallel renames 2013-02-01 13:43:14 +01:00
Jan Steemann 17098dd4ef added support for HTTP OPTIONS method, pt 1 2013-01-25 19:11:33 +01:00
Jan Steemann 13953ddbd6 slightly adjusted 2013-01-25 17:51:49 +01:00
Jan Steemann 7254487e14 added --progress option for arangoimp. make arangod show import errors 2013-01-22 15:04:06 +01:00
Jan Steemann 0ce5d965e7 some cleanup 2013-01-21 19:52:50 +01:00
Jan Steemann 9a003247d0 removed the _bidirectional attribute for edges 
This will be reimplemented later on collection, and not on individual edges level.
Lucas & the others were sure directed & undirected edges should not be mixed in the same collection
 2013-01-18 17:02:30 +01:00
Jan Steemann 913480e881 make revision ids strings so they do not clip in clients that do not support 64 bit integers 2013-01-17 15:02:55 +01:00
Jan Steemann 187d8ecc69 some transaction rework 2013-01-08 17:26:16 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Jan Steemann 1811ce9186 fixed some issues found by cppcheck 2012-12-04 18:21:29 +01:00
Jan Steemann 8c7ca55512 issue #300 2012-12-01 03:15:39 +01:00
Jan Steemann 6e3211334f documentation fixes 2012-11-29 13:36:44 +01:00
Jan Steemann 27883efbee updated documentation 2012-11-29 10:44:14 +01:00
Jan Steemann 8d2db81042 document key handling 2012-11-29 09:49:11 +01:00
Jan Steemann 634768da20 do not return collection id in location 2012-11-28 17:29:44 +01:00
Jan Steemann cbad6b526a make collections accesible via name instead of id. 
this allows using the collection name instead of ids in _from, _to, _id etc.
 2012-11-28 13:16:15 +01:00
Jan Steemann 2466927764 force usage of collection names instead of collection ids 2012-11-27 17:19:17 +01:00
Jan Steemann fdc3e5705a fixed an error introduced with last commit 2012-11-27 15:24:39 +01:00
Jan Steemann 9818e55efe use resourceholder 2012-11-27 14:47:49 +01:00
Jan Steemann 71b28c541d return _bidirectional and _vertices 2012-11-22 16:50:56 +01:00
Jan Steemann 6e1fe6a423 delete now uses transaction semantics 2012-11-19 11:00:25 +01:00
Jan Steemann 3eda13c181 update and replace now use transaction semantics 2012-11-19 10:42:20 +01:00
Jan Steemann b416bc1a4b removed JsonContainer, introduced more general ResourceHolder class 2012-11-16 13:29:19 +01:00
Jan Steemann 2849b4555f fixed wrong path in error message 2012-11-15 22:23:41 +01:00
Jan Steemann 9ac2e4235e issue #277 2012-11-15 22:20:37 +01:00
Jan Steemann fe7e061a27 transaction nesting 2012-11-15 18:14:20 +01:00
Jan Steemann 1ff2430e39 transaction refactoring 2012-11-15 13:53:11 +01:00
Jan Steemann 12d76b8306 introduced additional transaction type for import 2012-11-15 09:52:47 +01:00
Jan Steemann 9e40045025 changed document CRUD API signatures 2012-11-14 17:11:16 +01:00
Jan Steemann 30ba8771a7 pluggable key generators 2012-11-14 12:44:56 +01:00
Jan Steemann 57f0677d7b split self-contained transactions into read & write transactions 2012-11-13 17:56:13 +01:00
Jan Steemann b8655965f4 some transaction changes 2012-11-13 17:36:24 +01:00
Jan Steemann 64c6bc5cb0 renamed marker member _deletion to _validTo, some cleanup 2012-11-08 17:47:18 +01:00
Jan Steemann d9f34fd88e refactored and simplified document CRUD methods 2012-10-31 18:04:12 +01:00
Jan Steemann 6e22aef697 parameter reduction 2012-10-31 15:06:58 +01:00
Jan Steemann b9008cbdd5 removed TRI_voc_did_t, removed some deprecated typedefs 2012-10-29 15:45:52 +01:00
a-brandt 7daa018969 removed "reuseID" 2012-10-26 12:36:13 +02:00
a-brandt 58926a145a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-10-26 12:28:42 +02:00
a-brandt aa265caee2 update 2012-10-26 12:28:22 +02:00
Jan Steemann cb6c8c8e7e added bidirectional edges, fixup edges index 2012-10-25 17:18:54 +02:00
a-brandt c2d0749178 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/RestHandler/RestImportHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
	arangod/VocBase/primary-collection.c
	arangod/VocBase/primary-collection.h
 2012-10-24 10:46:38 +02:00
a-brandt 9a599e468a added "_key" attribute 2012-10-23 15:58:09 +02:00
Jan Steemann 75c5a660ed made target revision handling more clear 2012-10-23 10:11:06 +02:00
Jan Steemann a1051183b8 remove unnecessary response headers in sub responses 2012-10-15 22:09:08 +02:00
Jan Steemann 412dc52109 fixed memory zone issues 2012-10-14 21:35:41 +02:00
Jan Steemann 89f46f25ae fixed typos in documentation 2012-10-10 18:34:02 +02:00
Jan Steemann dca19fcd32 move edge-related functionality to file of its own 2012-10-10 11:42:52 +02:00
Jan Steemann 957d4d7402 documentation and some cleanup for issue #213 2012-10-09 17:56:31 +02:00
Frank Celler f7c990ce1a Merge pull request #216 from jsteemann/issue213 
possible implementation for issue #213
 2012-10-09 07:51:15 -07:00
Jan Steemann 994a3e3424 issue #224: allow optional content-id for batches 
this allows clients to send a content-id for each batch part
the server will return the content-id in each part response so the client can more easily map requests and responses

the content-id will not be validated or checked for uniqueness by the server. it is up to the client to send sensible content-ids to the server
currently, the server will not store the content-ids anywhere. they are just used within one batch request and then "forgotten"
 2012-10-09 14:50:20 +02:00
Jan Steemann e51656767e possible implementation for issue #213 2012-10-04 15:04:20 +02:00
Jan Steemann 43b14d0254 fixed compile warnings when compiled with --disable-logger 2012-09-28 14:29:32 +02:00
Jan Steemann 66d91c4677 also allow \n as delimiters 2012-09-28 11:32:42 +02:00
Jan Steemann bcd521f44f removed unused subclass HttpRequestPlain. we only have HttpRequest from now on 2012-09-27 11:24:20 +02:00
Jan Steemann 5a4a1b5fce added test cases, removed class HttpResponsePart 2012-09-27 11:04:15 +02:00
Jan Steemann 210bfe7771 generalised arangob test cases 2012-09-26 10:29:32 +02:00
Jan Steemann 705c0e5579 inject authorization header into subparts 2012-09-26 09:32:07 +02:00
Jan Steemann ce3936df9a some cleanup 2012-09-25 16:12:20 +02:00
Jan Steemann 0619c9960c fixed arangob for batch requests 2012-09-25 11:46:15 +02:00
Jan Steemann bf7ddd5356 added X-Arango headers 2012-09-25 09:41:29 +02:00
Jan Steemann 68b3d7e4f9 some multipart fixes 2012-09-24 17:35:07 +02:00
Jan Steemann 4ad85e7037 added HttpResponsePart class 2012-09-24 16:59:19 +02:00
Jan Steemann f08a788f7c removed protocol buffers 2012-09-24 13:44:30 +02:00
Jan Steemann 14fe763ec9 rewrote batch processor to use MIME requests 2012-09-24 13:16:50 +02:00
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