1
0
Fork 0
Commit Graph

919 Commits

Author SHA1 Message Date
Jan Steemann 1be3733a64 moved some handlers around
fix disappeared handlers
2015-08-20 01:26:52 +02:00
Jan Steemann ea382e1f4c removed triagens::rest::Handler 2015-08-20 01:26:50 +02:00
Jan Steemann f587b2ca6a replication refactoring 2015-08-19 16:13:53 +02:00
Jan Steemann 878641f674 some replication refactoring 2015-08-19 15:32:24 +02:00
Max Neunhoeffer ff135a10ad Add some overrides to silence a clang compiler warning. 2015-08-19 14:46:06 +02:00
Jan Steemann 8677da48b1 replication API enhancements, not yet ready 2015-08-18 18:08:20 +02:00
Jan Steemann 338dd7e100 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-17 18:41:13 +02:00
Jan Steemann 4e771b2728 replication improvements 2015-08-17 18:41:05 +02:00
Jan Steemann ffe4fb556b pacify VS 2015-08-17 17:05:52 +02:00
Jan Steemann 22cff81a5c added status methods for logfiles 2015-08-17 15:04:26 +02:00
Jan Steemann 95a346edd2 fix leak 2015-08-14 18:17:22 +02:00
Jan Steemann 57e9b55739 use TRI_CHAR_NODE_PAIR() 2015-08-14 00:54:59 +02:00
Jan Steemann fe6d67daf4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-13 15:40:35 +02:00
Willi Goesgens 209cbc9768 Move documentation into the source. 2015-08-13 15:37:43 +02:00
Jan Steemann 5b82096145 honor indexBuckets attribute in restore operation of collection 2015-08-13 15:37:32 +02:00
Willi Goesgens bbb8198d2b Add a @brief to all descriptions, remove stray markup. 2015-08-12 16:58:06 +02:00
Willi Goesgens 096ad46f05 revert ad5a2c49f1c8479fb4896a28b178d34fcfe3abe8 - arangodump isn't a plain json. 2015-08-11 14:49:06 +02:00
Willi Goesgens b6613208d0 switch to logging json formatted response for better user experience. 2015-08-11 14:15:15 +02:00
Jan Steemann b659d9fa07 use unique_ptr 2015-08-07 16:48:35 +02:00
Jan Steemann 5d82f0b385 some cleanup 2015-08-07 15:16:33 +02:00
Jan Steemann 30839600e6 use unique_ptr 2015-08-06 22:13:33 +02:00
Jan Steemann 22e734a940 use unique_ptr 2015-08-05 21:03:52 +02:00
Jan Steemann 7ad99087ee use unique_ptr 2015-08-03 09:18:20 +02:00
Jan Steemann 6d7ccd7699 move shaper to cxx 2015-07-28 17:38:31 +02:00
Frank Celler 35a3c6421c moved dispatcher to atomic 2015-07-23 15:40:34 +02:00
Jan Steemann 4d0872f2b9 more cxx 2015-07-20 18:42:02 +02:00
Jan Steemann 124fe7a34c use new/delete for TRI_vocbase_t 2015-07-20 12:08:13 +02:00
Jan Steemann c71dc4d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-query-cache 2015-07-13 10:49:14 +02:00
Frank Celler 27f9af2808 added more info about expect and received value 2015-07-09 16:17:40 +02:00
Willi Goesgens f442455fdd Fix memleak - Replace creates a copy. 2015-07-02 10:55:42 +02:00
Willi Goesgens 1dea6b29a5 Fix memleaks in coordinator. 2015-06-30 14:36:37 +02:00
Jan Steemann 1f5e047486 query cache, now with result limitations, HTTP and JavaScript APIs 2015-06-27 01:12:32 +02:00
Willi Goesgens df031a9f2a Find the right place where the json wasn't free'd 2015-06-25 09:45:05 +02:00
Willi Goesgens 29366dff96 Fix memleaks. 2015-06-24 17:42:26 +02:00
Jan Steemann 83b326cfc7 moved PUT /_api/simple/all to C++ 2015-06-18 15:34:45 +02:00
Jan Steemann 5a5407f516 constified methods 2015-06-17 23:22:45 +02:00
Jan Steemann b76cb5caee use nullptr 2015-06-02 23:39:41 +02:00
Jan Steemann 49fb7effb3 issue #1353: Windows: HTTP API - incorrect path in errorMessage
Do not return path part, collection name and key part in error response
2015-06-02 10:26:37 +02:00
Jan Steemann 4dde6e49cd goodbye barriers, welcome ditches 2015-05-28 10:23:30 +02:00
Jan Steemann 4b67c7a735 several fixes for indexes 2015-05-26 13:35:11 +02:00
Jan Steemann a9f2769ffa now compiles and links 2015-05-23 04:31:13 +02:00
Michael Hackstein 86c7f87dd3 Merge branch 'cppTrav2' into devel 2015-05-19 16:17:27 -07:00
Jan Steemann b6142f475c micro optimizations 2015-05-15 17:40:41 +02:00
Jan Steemann 541257c537 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-05-12 14:53:15 +02:00
Jan Steemann f6bc0a05e3 added `limit` parameter for export API 2015-05-12 14:16:27 +02:00
Jan Steemann 5cd7b64ce8 fixed potential race during arangob runs 2015-05-11 22:57:30 +02:00
Jan Steemann 8c3e72d33c added waitForSync option 2015-05-11 13:09:37 +02:00
Jan Steemann 5ad7dea0c8 use auto for HTTP response headers iteration 2015-05-08 17:44:33 +02:00
Jan Steemann 6b412a1c01 Merge branch 'json-privatisierung' of https://github.com/arangodb/arangodb into json-privatisierung 2015-05-07 13:05:12 +02:00
Jan Steemann 855c1465fd added documentation for new simple methods 2015-05-07 11:42:58 +02:00
Jan Steemann e93225d7f5 fix cluster document fetching 2015-05-06 11:00:41 +02:00
Jan Steemann 46cdf686c4 documentation update 2015-05-05 18:23:07 +02:00
Jan Steemann c677ea8b88 added tests for collection.lookupByKeys() and collection.removeByKeys() 2015-05-05 17:57:33 +02:00
Jan Steemann 63138def67 fix location response headers with special characters 2015-05-05 14:00:06 +02:00
Jan Steemann a007a867ee "privatized" TRI_vector_t internals.
This allows changing the internals of TRI_vector_t structs in order to make the struct smaller.
On 64 bits, the size of TRI_vector_t is reduced from 48 bytes to 28 bytes.
TRI_json_t does benefit from this, as its biggest component is a TRI_vector_t.
2015-05-05 10:31:02 +02:00
Jan Steemann f09d8903a9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
Conflicts:
	Documentation/Scripts/generateExamples.py
2015-05-04 17:47:31 +02:00
Jan Steemann 244cc2d66d added some batch processing methods 2015-05-04 17:46:47 +02:00
Willi Goesgens 312972a4ec Modify examples so they clean up after their run. 2015-05-04 17:22:25 +02:00
Jan Steemann 0099fe260a return value optimization for AQL 2015-04-30 23:38:27 +02:00
Max Neunhoeffer 1dd7802450 Fix error reporting at import. 2015-04-26 12:53:02 -07:00
Jan Steemann f985c8eef9 removed duplicate examples 2015-04-20 16:17:19 +02:00
Jan Steemann 6e23c5330f added restrictions for export API 2015-04-17 00:24:43 +02:00
Jan Steemann 6624c00215 explicitly set clientTaskId 2015-04-15 17:30:14 +02:00
Jan Steemann 92fcdd3e56 issue #1298: Bulk import if data already exists
This change extends the HTTP REST API for bulk imports as follows:

When documents are imported and the `_key` attribute is specified for them, the import can be
used for inserting and updating/replacing documents. Previously, the import could be used for
inserting new documents only, and re-inserting a document with an existing would have failed
with a *unique key constraint violated* error.

The above behavior is still the default. However, the API now allows controlling the behavior
in case of a unique key constraint error via the optional URL parameter `onDuplicate`.

This parameter can have one of the following values:

- `error`: when a unique key constraint error occurs, do not import or update the document but
  report an error. This is the default.

- `update`: when a unique key constraint error occurs, try to (partially) update the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. Only the attributes present in the import data will be
  updated and other attributes already present will be preserved. The number of updated documents
  will be reported in the `updated` attribute of the HTTP API result.

- `replace`: when a unique key constraint error occurs, try to fully replace the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. The number of replaced documents will be reported in the
  `updated` attribute of the HTTP API result.

- `ignore`: when a unique key constraint error occurs, ignore this error. There will be no
  insert, update or replace for the particular document. Ignored documents will be reported
  separately in the `ignored` attribute of the HTTP API result.

The result of the HTTP import API will now contain the attributes `ignored` and `updated`, which
contain the number of ignored and updated documents respectively. These attributes will contain a
value of zero unless the `onDuplicate` URL parameter is set to either `update` or `replace`
(in this case the `updated` attribute may contain non-zero values) or `ignore` (in this case the
`ignored` attribute may contain a non-zero value).
2015-04-14 11:44:33 +02:00
Jan Steemann 2299d2916d initial commit to satisfy #1298 2015-04-13 18:26:33 +02:00
Jan Steemann 92c8dc9429 fixed documentation
Conflicts:
	Documentation/Scripts/generateSwaggerApi.py
2015-04-03 13:22:44 +02:00
Jan Steemann 0f1244f72d better export API cleanup 2015-03-31 18:44:51 +02:00
Jan Steemann 6dfb4d4b09 Merge branch 'devel' of https://github.com/arangodb/arangodb into cursor-refactoring
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpServerJob.h
2015-03-31 15:13:31 +02:00
Jan Steemann 6f4fadd630 removed .o files 2015-03-31 14:45:22 +02:00
Frank Celler ffbc45d2e2 new HttpServer & HttpCommTask
Conflicts:
	Makefile.in
	arangod/Aql/RestAqlHandler.cpp
	arangod/Aql/grammar.cpp
	arangod/Cluster/RestShardHandler.cpp
	lib/GeneralServer/GeneralServer.h
	lib/GeneralServer/GeneralServerDispatcher.h
	lib/HttpServer/HttpServerJob.h
	lib/HttpServer/HttpsCommTask.h
	lib/SimpleHttpClient/SslClientConnection.cpp
2015-03-31 09:12:01 +02:00
Jan Steemann c508eb0a81 removed some debugging features 2015-03-30 22:05:31 +02:00
Jan Steemann 925f4fbab6 cleanup of some static const variables 2015-03-30 21:43:55 +02:00
Jan Steemann e672d791b5 refactored cursor API, added export API 2015-03-30 18:03:42 +02:00
Jan Steemann 80a99ab23e refactored cursor API 2015-03-30 14:58:51 +02:00
Jan Steemann c352ba6a03 small logging refactoring 2015-03-26 03:09:07 +01:00
Jan Steemann e230ac11c0 fixed leak 2015-03-25 16:55:45 +01:00
Frank Celler 4c5d57f1b8 merged Exceptions.h and Exception.h 2015-03-23 14:05:19 +01:00
Frank Celler 3c52dcde6d changed _api/query to C++
Conflicts:
	CHANGELOG
	Makefile.in
	README
	arangod/RestServer/ArangoServer.cpp
2015-03-23 10:51:14 +01:00
Jan Steemann 7f121fc352 use barrier 2015-03-04 11:35:32 +01:00
Jan Steemann 68c57ce061 fix Visual Studio undefinedness 2015-02-26 18:07:25 +01:00
Willi Goesgens dcac88c35a Fix error message on tempfile creation 2015-02-23 15:28:46 +01:00
Willi Goesgens d61fc4343a Set debug message trap for failing windows arangobench tests. 2015-02-17 14:27:25 +01:00
Jan Steemann 320d7c3e8f reduce var scope 2015-02-03 16:20:41 +01:00
Jan Steemann 8273970856 fixed leak 2015-01-30 12:37:31 +01:00
Jan Steemann 2ad6f4179f fixed leak 2015-01-29 15:37:23 +01:00
Jan Steemann ddc8e52a59 fixed leak 2015-01-29 15:31:55 +01:00
Patrick Huber 387c7686e7 document how the http status code and lastincluded http headers relate to each other 2015-01-28 11:04:18 +01:00
Jan Steemann 81db41763f foxx file upload 2015-01-23 11:23:58 +01:00
Jan Steemann 8aeded5c86 fixed documentation 2015-01-22 13:36:01 +01:00
Jan Steemann f75e4dfbb3 issue #1219: /_api/replication/logger-state clients field 2015-01-22 11:06:55 +01:00
Jan Steemann 957fa189d2 better diagnostics for arangoimp 2015-01-15 13:42:31 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Max Neunhoeffer 05c069f361 Another fix for the distributed locking problem in cluster AQL. 2014-12-23 14:35:19 +01:00
Max Neunhoeffer e50a705d9a Squashed commit of the following: organise locking in distributed AQL
Locking is now done in an extra round after the query is fully
instanciated in the cluster. All participating shards are locked
in alphabetical order of their shard ID (local collection name).
For this to work there is a new action in the RestAqlHandler plus a
mechanism to prevent the usual locking from happening: Each thread has a
thread local static class variable of
  triagens::arango::Transaction::_makeNolockHeaders
which is of type std::unordered_set<std::string>*.
Whenever this is not equal to nullptr and a local collection name is
stored in there, no locking or unlocking takes place. This information
is forwarded by the X-Arango-Nolock HTTP header, whenever an HTTP
request is sent via ClusterComm to a shard.
2014-12-22 14:40:22 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Jan Steemann 04bcf3f362 issue #1184: use error codes more consistently 2014-12-15 16:22:18 +01:00
Jan Steemann 4b12897026 issue #1184: return error codes more consistently 2014-12-15 16:18:49 +01:00
Tomas Bosak 32bc422ad5 Improve edge API docs.
- create edge operation with 202 result is returned when waitForSync was
set to false
- add missing If-None-Match header parameter description to read head
operation
- add information about _key attribute in result for replace, update and
delete operations
2014-12-12 17:33:30 +01:00
Tomas Bosak 953d5efa7a Add 'mergeObjects' description to edge API docs.
Description of 'mergeObjects' parameter was missing in edge update
(PATCH) operation.
2014-12-10 23:24:32 +01:00
Tomas Bosak d0b041842a Update document API description.
Include information about _key attribute which is also returned along
with _id and _rev for replace, update and delete document operations.
2014-12-09 10:50:06 +01:00
Jan Steemann 12c155636a updated docs for mergeObjects 2014-12-08 11:00:31 +01:00
Jan Steemann d9a945e33a include or exclude system collections from replication 2014-12-05 14:58:43 +01:00
Tomas Bosak 259c3152cd Fix typo and add '_key' attribute description. 2014-12-04 17:57:13 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Jan Steemann 223820eba3 removed some macros 2014-10-16 16:31:49 +02:00
Jan Steemann dcb9427b6f rewrote transaction contexts 2014-10-16 15:53:28 +02:00
Jan Steemann 8294e54f32 faster import 2014-10-08 17:01:45 +02:00
Jan Steemann d8934a025f make parseDocumentId more strict again 2014-10-03 01:23:07 +02:00
Jan Steemann 7a4c8f69db speed up parseDocumentId 2014-10-03 00:49:46 +02:00
Jan Steemann f8cf3d1951 fixed memleak 2014-10-01 12:21:37 +02:00
Jan Steemann f3186fa065 cppcheck 2014-09-29 17:02:40 +02:00
Jan Steemann db0fdf24ec less string operations during batch request header parsing 2014-09-29 13:56:45 +02:00
Max Neunhoeffer 046d4f524d Implement getSome for RemoteBlock. 2014-09-26 16:19:25 +02:00
Max Neunhoeffer 0466873092 First step towards correct setup of HTTP API for AQL. 2014-09-19 13:14:19 +02:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 953b8cdfe3 renamed files 2014-09-13 00:34:48 +02:00
Jan Steemann 0dc0bc834f more files renamed 2014-09-13 00:20:30 +02:00
Jan Steemann 87afcf5e8d the great rename 2014-09-13 00:10:11 +02:00
Jan Steemann aadd0f9254 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Utils/CollectionNameResolver.h
	arangod/V8Server/v8-vocbase.cpp
2014-08-30 17:35:08 +02:00
Jan Steemann c0463a1797 added `type` option for `GET /_api/document?collection=...`
Conflicts:
	CHANGELOG
2014-08-30 17:26:24 +02:00
Jan Steemann 86bf8e3c4f removed unused function argument 2014-08-23 00:50:37 +02:00
Jan Steemann 0a439474e5 cppcheck 2014-08-22 12:51:26 +02:00
Jan Steemann 97fd5a55ba renamed variable 2014-08-15 18:12:58 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
Michael Hackstein a5b35f224a Fixed REST API documentation. Some values were not recognized as paramters by swagger script 2014-08-07 14:52:55 +02:00
Max Neunhoeffer 4e95044faa Hand on --force option of arangorestore. 2014-07-10 14:34:21 +02:00
Max Neunhoeffer 4f88753ea5 Improve error handling in arangorestore.
In particular:
  - Notice if collections mentioned in _from and _to fields of edges
    do not exist.
  - In cluster case make the coordinator report errors from the
    DBservers better.
  - Fail more quickly if arangorestore does not go well.
2014-07-10 14:06:26 +02:00
Thomas Schmidts c2fa9cb091 Erased useless @startDocuBlocks 2014-07-08 11:16:56 +02:00
Jan Steemann fcadb40af6 updated replication documentation 2014-07-06 15:59:52 +02:00
Jan Steemann a5cf53d417 fixed examples 2014-07-01 16:48:47 +02:00
Max Neunhoeffer b2f7793c26 Let DBservers report the cluster-wide collection name instead of the
shard name in error messages for single document operations.
2014-07-01 15:55:41 +02:00
Thomas Schmidts 9e2a538096 Changed API documentation in code 2014-06-30 17:29:15 +02:00
Thomas Schmidts d9b733b997 Fixes some documentation pages for API. fixes #922 2014-06-30 14:22:17 +02:00
Jan Steemann 57b5cde21e nullptr 2014-06-27 23:58:13 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00
Jan Steemann 07d244488d changed crud signatures 2014-06-26 12:37:01 +02:00
Jan Steemann 66ffe61a76 renamed enum values 2014-06-24 17:32:43 +02:00
Jan Steemann 97e36a7eb0 fixed examples 2014-06-24 11:26:51 +02:00
Jan Steemann cc041c4851 typecasts 2014-06-24 08:20:35 +02:00
Jan Steemann d56719ae4d simplification of signatures 2014-06-24 00:32:40 +02:00
Jan Steemann 53909c0dcd adjusted tests 2014-06-23 18:45:06 +02:00
Jan Steemann 13e061bd76 fixed tests 2014-06-23 17:46:00 +02:00
Jan Steemann b31c2330d4 exclude collections 2014-06-23 14:24:12 +02:00
Jan Steemann 3b0d8b15d6 re-added replication 2014-06-23 13:22:38 +02:00
Jan Steemann fc823938c0 nullptr 2014-06-21 03:27:38 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Frank Celler 4dcf5dc817 updated disclaimer 2014-06-20 16:40:35 +02:00
Jan Steemann fabc51f889 fixed wrong ASSERT usage 2014-06-13 12:10:35 +02:00
Jan Steemann bbdbbd5736 removed implicit parameter from function signature 2014-06-13 01:59:19 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +02:00
Jan Steemann bc52f3408f recovery, not functional yet 2014-06-12 18:13:48 +02:00
Jan Steemann 0c8e01ca40 fixed assertion fail 2014-06-12 12:00:58 +02:00
Max Neunhoeffer 82ab5bc0ac More checks for protected getShaper accesses.
Also: Make arangodump possible using fake trx objects.
2014-06-12 10:38:39 +02:00
Jan Steemann b802973273 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/Wal/CollectorThread.cpp
2014-06-11 11:33:48 +02:00
Jan Steemann 7e6750c397 wal flush w/ collection unload 2014-06-11 11:33:02 +02:00
Max Neunhoeffer f0bef2496f Make _shaper private and use getter/setter. 2014-06-11 11:18:22 +02:00
Max Neunhoeffer c2bddb1c19 Let TRI_document_collection_t inherit from TRI_collection_t. 2014-06-11 10:51:47 +02:00
Max Neunhoeffer 2527e34d9d stuct TRI_collection_t and struct TRI_document_collection_t 2014-06-11 09:37:07 +02:00
Jan Steemann eba885d583 fixed member initialization in second constructor 2014-06-10 17:41:11 +02:00
Jan Steemann 7c599ef893 barriers 2014-06-10 16:42:15 +02:00
Jan Steemann da9f8247fb barriers are now created automatically by transactions 2014-06-10 11:56:40 +02:00
Jan Steemann 72a102e794 major internal changes 2014-06-08 00:12:53 +02:00
Jan Steemann ca959cab9d simplified usage of transactions 2014-06-06 23:28:34 +02:00
Jan Steemann 3f6cb4d9ed fixed update policy 2014-06-06 22:53:59 +02:00
Jan Steemann 368091d7c3 function cleanup 2014-06-06 21:35:34 +02:00
Max Neunhoeffer fd2c99443f Introduce TRI_doc_mptr_copy_t for copies of master pointers.
Did not yet run through all occurrences of TRI_doc_mptr_t to see
whether they have to be TRI_doc_mptr_copy_t.
2014-06-06 16:59:32 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann cb5bb4eb0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/Makefile.files
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/voc-shaper.cpp
2014-06-05 22:58:49 +02:00
Jan Steemann 17981a92c2 more barriers
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-06-05 22:23:48 +02:00
Max Neunhoeffer 2776dc78fa Make TRI_doc_mptr_t a C++ struct. 2014-06-05 12:03:57 +02:00
Max Neunhoeffer a7792a5306 Looked through TRI_EXTRACT_MARKER_KEY for protection. 2014-06-04 15:40:09 +02:00
Max Neunhoeffer f3653015b6 First part of protection proof. 2014-06-04 14:31:38 +02:00
Max Neunhoeffer 13541cf4ec Rename component _data -> _dataptr in master pointer. 2014-06-03 22:27:08 +02:00
Jan Steemann fb87b35dec initial implementation of wal logfile collection, scans markers only atm 2014-06-03 16:39:49 +02:00
Jan Steemann 715d11cb22 removed consts 2014-06-03 10:17:09 +02:00
Jan Steemann d4dd58b264 merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
2014-05-30 12:51:20 +02:00
Jan Steemann ed6a55abb9 specialized primary index for faster comparisons and less datafile lookups 2014-05-29 03:35:37 +02:00
Max Neunhoeffer bb5b341ba6 Get rid of many "using namespace ..." occurrences in header files. 2014-05-22 15:13:16 +02:00
Jan Steemann 6ad1ba13cc fixed mutex in key generator 2014-05-22 13:11:23 +02:00
Jan Steemann de14fa5944 removed old CRUD methods 2014-05-22 12:17:51 +02:00
Max Neunhoeffer 2820afdcc2 Remove many extern "C" declarations that are no longer needed. 2014-05-22 10:19:03 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann b811d21fad issue #862: added `--overwrite` option for arangoimp 2014-05-16 21:29:20 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann 14813638dd removed boost 2014-05-12 17:22:42 +02:00
Jan Steemann 204a16c224 fixed compiler warning 2014-05-12 13:55:58 +02:00
Frank Celler 16d5c6bfa2 windows does not like cast from double to enum 2014-05-10 17:36:21 +02:00
Max Neunhoeffer 2ee2700096 If a collection cannot be dropped during restore, truncate it. 2014-05-09 23:18:27 +02:00
Max Neunhoeffer c181e15906 Silence a compiler warning about signedness. 2014-05-09 22:59:34 +02:00
Max Neunhoeffer 7c8fc95de8 arangorestore/cluster: default to 1 shard.
If shards is not given in the structure description, take 1 shard.
2014-05-09 22:58:08 +02:00
Max Neunhoeffer 19289b6d37 First working version of arangorestore for clusters. 2014-05-09 16:33:54 +02:00
Jan Steemann 20f1940458 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 00:42:32 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Max Neunhoeffer 9b5f015747 Prepare setup for cluster arangorestore. 2014-05-08 22:38:52 +02:00
Max Neunhoeffer 8dc74b9958 Fix result structure of clusterInventory. 2014-05-08 10:22:01 +02:00
Max Neunhoeffer a312d496a9 Finish server functionality for cluster dump. 2014-05-07 16:36:47 +02:00
Max Neunhoeffer 272aa89904 More trampoline functionality in coordinator.
inventory and dump (not yet working).
restore-data (not yet tested).
2014-05-06 21:36:52 +02:00
Max Neunhoeffer 271e33be48 Implement trampoline for /_api/replication/batch. 2014-05-06 16:27:27 +02:00
Jan Steemann e968d62367 re-use planId 2014-03-05 15:33:49 +01:00
Esteban Lombeyda 39b0b759e9 bug fix: compiling error 2014-03-05 09:00:23 +01:00
Frank Celler 5a2fa4f37d stop if upgrade is needed 2014-03-01 16:14:29 +01:00
Jan Steemann 978e784462 disable replication handlers for coordinators 2014-02-28 21:51:02 +01:00
Jan Steemann 629348d696 properly acquire shape write locks 2014-02-28 18:43:09 +01:00
Jan Steemann 897d6f4dcd fixed cluster authentication 2014-02-27 17:45:03 +01:00
Jan Steemann a0c554fa22 fixed tests 2014-02-27 14:58:01 +01:00
Jan Steemann a0c32e90d7 fixed edge access in coordinator 2014-02-27 13:14:02 +01:00
Jan Steemann 42465ce876 properly return collection status 2014-02-26 14:23:06 +01:00
Frank Celler 3c5f3a656b Merge branch 'sharding' of github.com:triAGENS/ArangoDB into sharding 2014-02-25 15:32:12 +01:00
Frank Celler f2121ff442 cleanup 2014-02-25 15:32:07 +01:00
Jan Steemann 00cd7cd936 fix error message for udf document keys 2014-02-25 14:23:59 +01:00
Frank Celler 42fb8244e1 added requeue 2014-02-25 12:07:16 +01:00
Jan Steemann 7a0aac82e2 re-create database objects on coordinator now, and switch into them 2014-02-21 17:40:00 +01:00
Jan Steemann 4ee05d303c invalidate caches 2014-02-06 14:14:52 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
2014-02-06 13:18:52 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Jan Steemann 10eb807366 fixed HTTP CRUD operations 2014-02-05 17:19:45 +01:00
Jan Steemann 58b3e0f99d splitted a few tests 2014-02-05 15:15:51 +01:00
Jan Steemann e7d7f3e00a updated documentation 2014-02-04 12:41:52 +01:00
Jan Steemann 599a7edfda return document etag in response to HTTP HEAD requests that return an HTTP 412 error 2014-02-04 12:01:28 +01:00
Jan Steemann 67a3f306d6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-03 18:25:13 +01:00
Jan Steemann 18b38771dc added cluster CRUD tests 2014-02-03 18:24:57 +01:00
Jan Steemann fbf6954bd7 updated documentation 2014-02-01 00:26:02 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Jan Steemann 04d40c10e9 fixed wrong REST API parameter type in documentation 2014-01-31 13:56:24 +01:00
Jan Steemann 9a7781474f fixed broken symbol 2014-01-31 13:20:39 +01:00
Jan Steemann 9643469631 do not allow changing shard key attributes 2014-01-31 13:19:03 +01:00
Max Neunhoeffer f92456b851 Report URLs of edges correctly. 2014-01-31 11:02:51 +01:00
Max Neunhoeffer 4d3b747182 Add getAllDocumentsOnCoordinator and fix bugs. 2014-01-31 01:02:51 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Max Neunhoeffer 3a5a085bc5 Sort out mess with collection name/id lookup in cluster. 2014-01-30 17:27:06 +01:00
Max Neunhoeffer ed39834029 CRUD basically working on cluster. 2014-01-29 16:23:17 +01:00
Max Neunhoeffer c3f01237b0 Implement replace and update on cluster.
This still has a freeing too early bug with TRI_json_t.
2014-01-28 16:49:44 +01:00
Jan Steemann 7f240a1625 fixed segfault in import API 2014-01-27 16:12:39 +01:00
Jan Steemann 945031cfb5 updated documentation 2014-01-27 12:15:56 +01:00
Max Neunhoeffer 98df540266 Add support for GET and HEAD on cluster. 2014-01-27 10:41:35 +01:00
Max Neunhoeffer 7d5723756f Implement DELETE REST method on the coordinator. 2014-01-24 21:31:58 +01:00
Max Neunhoeffer fe348a36ca Start support for create edge in coordinator in cluster. 2014-01-24 16:47:29 +01:00
Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
2014-01-24 14:50:09 +01:00
Max Neunhoeffer 4526181f82 Implement C of CRUD on cluster for V8 calls. 2014-01-24 13:11:20 +01:00
Max Neunhoeffer f5c274e8c0 Fix error handling and another bug in create document for cluster. 2014-01-24 10:35:37 +01:00
Max Neunhoeffer 9230f5020c First case of create document is working on cluster. 2014-01-23 16:16:06 +01:00
Max Neunhoeffer 165d98578a First hack at create document via REST on cluster. 2014-01-23 13:00:44 +01:00
Max Neunhoeffer 3887303a82 Prepare creation of a document in the coordinator. 2014-01-22 23:57:41 +01:00
Jan Steemann f5039a4f54 make usage of batch API easier 2014-01-21 17:56:49 +01:00
Jan Steemann 12dbcc535d updated import manual 2014-01-21 09:16:42 +01:00
Jan Steemann 30b866405e issue #732: Rest API GET revision number 2014-01-13 17:30:17 +01:00
Jan Steemann 7d11d1b172 updated documentation 2014-01-10 18:38:34 +01:00
Jan Steemann 0ae9a69c6a updated documentation 2014-01-10 18:38:25 +01:00
Jan Steemann fd334b14e1 fixed small typo in documentation 2014-01-10 16:45:20 +01:00
Jan Steemann e1dd2cb4db allow \n as line terminator in batch requests 2014-01-03 12:12:40 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
2013-12-13 17:58:24 +01:00
Jan Steemann 865b70862e some minor adjustments for arangodump and arangorestore 2013-12-13 11:54:00 +01:00
Jan Steemann 1bdf666da2 fixed multi-threading issues found during commando 2013-11-21 15:12:49 +01:00
Jan Steemann c5e9538547 Merge remote-tracking branch 'origin/devel' into inline-shapes
Conflicts:
	arangod/VocBase/document-collection.c
2013-11-14 01:01:24 +01:00
Jan Steemann f69ae8f2a9 do not access shaper but use memory zone variable 2013-11-08 13:42:16 +01:00
Jan Steemann 96dc8e3879 free json in case of error 2013-11-05 12:42:50 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 02736666b1 fixed small memleak 2013-10-29 11:10:13 +01:00
Jan Steemann 2e301f118d issue #648: /batch API is missing from Web Interface API Docummentation (Swagger) 2013-10-29 04:43:34 +01:00
Jan Steemann 43b4f78b62 issue #620 2013-10-28 19:38:19 +01:00
Jan Steemann 54c7386d6c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-10-17 11:12:10 +02:00
Jan Steemann d71ee7ff6f fixed issue #615 2013-10-17 11:12:02 +02:00
Jan Steemann 21d25d0ccc removed resourceholder 2013-10-17 10:43:07 +02:00
Jan Steemann 79f70c7eea replication applier will now preferrably use collection names instead of collection ids when applying events 2013-10-14 13:45:44 +02:00
Jan Steemann b8318609e2 updated arangorestore 2013-10-10 16:58:21 +02:00
Jan Steemann 6a353a4c38 resolve collection names on reimport 2013-10-10 12:33:27 +02:00
Jan Steemann 13b51eb849 use batches in arangodump 2013-10-10 09:08:02 +02:00
Jan Steemann af07091d1c Windows fixes 2013-10-09 15:33:38 +02:00
Jan Steemann fbcb7ecb17 fix temp file creation on Windows 2013-10-09 13:58:01 +02:00
Jan Steemann 0c15f387ae added collection id translation for dumps 2013-10-09 13:46:12 +02:00
Jan Steemann 406a1b7d4c fix filename 2013-10-09 11:24:05 +02:00
Jan Steemann 857c69d5a6 added `--server.allow-method-override` startup option 2013-10-08 17:06:42 +02:00
Jan Steemann 63f6cb91f4 added `details` URL parameter for `/_api/import` 2013-10-08 01:34:16 +02:00
Jan Steemann d6149c9a9a added documentation for /_api/import 2013-10-02 14:22:25 +02:00
Jan Steemann e5bde25f3b make source database name configurable for replication applier 2013-10-01 17:36:30 +02:00
Jan Steemann 04df715864 applied fixes that occurred during build 2013-09-30 18:03:52 +02:00
Jan Steemann 709198c340 updated docs for /_api/jobs 2013-09-28 00:44:03 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann ed163164c4 fixed queue naming 2013-09-20 13:17:32 +02:00
Jan Steemann 0bdae05b96 changed reference counting for cursors 2013-09-16 13:51:33 +02:00
Jan Steemann a120a4dbe6 reverted name change for _graphs collection 2013-09-12 18:15:34 +02:00
Jan Steemann 3a6cabfe44 creating/dropping 2013-09-11 17:16:43 +02:00
Jan Steemann c22fd49d84 small cleanup 2013-09-11 14:21:54 +02:00
Jan Steemann 1c4581c525 fixed batch handler 2013-09-11 13:58:39 +02:00
Jan Steemann fde7793137 refactored database options 2013-09-11 13:22:52 +02:00
Jan Steemann 42441b208f refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
Jan Steemann ac4ed728c0 renamed collection `_graphs` to `arangodb_graphs` 2013-09-09 11:07:10 +02:00
Jan Steemann c6c4c70333 activated arangodump and arangorestore 2013-09-06 00:54:58 +02:00
Jan Steemann ca2f5feb4b fixed redirect URLs 2013-09-04 17:30:37 +02:00
Jan Steemann 1af5aa6b45 block compaction & datafile removal while dumping 2013-08-30 17:25:09 +02:00
Jan Steemann 6c64a35895 restore client, unfinished 2013-08-30 01:14:21 +02:00
Jan Steemann a42be561fd added includeSystem URL parameter 2013-08-29 21:15:47 +02:00
Jan Steemann e72c6ab20c fixed a memleak in /_api/replication/dump 2013-08-29 11:46:33 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann b94ee1042c cppcheck 2013-08-27 16:13:44 +02:00
Frank Celler 487af3bc0d fixed (hacked) display of swagger for dev apps 2013-08-07 13:30:28 +02:00
Jan Steemann 1fc1bb108d added replication client tests 2013-08-02 11:45:55 +02:00
Jan Steemann e86fff18e2 added chunkSize for replication-applier 2013-08-02 11:03:54 +02:00
Jan Steemann 9b6b6e669d added `totalEvents` for logger 2013-08-02 10:11:13 +02:00
Jan Steemann 8fb5f6bc32 lol swagger 2013-08-01 19:03:18 +02:00
Jan Steemann df7a0af4ce swag... 2013-08-01 18:46:06 +02:00
Jan Steemann 38d8b0b598 adjusted tests and docs 2013-08-01 18:41:13 +02:00
Jan Steemann a7c5350455 added server-id method 2013-08-01 18:27:42 +02:00
Jan Steemann 11eece3f6f decreased memory usage 2013-08-01 17:02:31 +02:00
Jan Steemann f1418ec667 updated tests and docs 2013-08-01 16:53:29 +02:00
Jan Steemann 949c194653 updated replication configuration 2013-08-01 15:50:30 +02:00
Jan Steemann 11964f5720 display lastAvailableTick, fix cont. replication 2013-07-31 17:53:16 +02:00
Jan Steemann 48fbdb1b6a cap constraint for replication logger 2013-07-31 16:56:56 +02:00
Jan Steemann 05a7f79941 re-configuration of logger, cap constraint 2013-07-31 14:39:33 +02:00
Jan Steemann 2368adf250 updated documentation 2013-07-31 10:10:34 +02:00
Jan Steemann 936fb6c6a6 better progress reports for replication applier 2013-07-31 10:01:56 +02:00
Jan Steemann 78601319fb updated replication API 2013-07-30 18:40:35 +02:00
Jan Steemann 461001efd2 split of initial and continuous sync, currently not working 2013-07-30 14:13:49 +02:00
Jan Steemann 002ebd48bc removed all replication conditionals 2013-07-30 13:16:37 +02:00
Jan Steemann 6b5900e8e0 updated replication api 2013-07-30 09:54:39 +02:00
Jan Steemann 226667bea1 fixed doxygen generation 2013-07-29 13:38:00 +02:00
Jan Steemann 3b57e80241 simplified HTTP import API 2013-07-25 18:24:21 +02:00
Jan Steemann 9de2910717 updated replication documentation 2013-07-25 16:32:11 +02:00
Jan Steemann 051e898a8a updated replication documentation 2013-07-25 14:13:53 +02:00
Jan Steemann 8a254ea230 replication API documentation 2013-07-24 17:37:16 +02:00
Jan Steemann 39195af4c5 easier generation of swagger API docs 2013-07-24 15:24:27 +02:00
Jan Steemann 4f14062d10 replication tests 2013-07-24 15:22:45 +02:00
Jan Steemann 0adbe8410f log "rev" 2013-07-23 18:00:29 +02:00
Jan Steemann 47c8b7bfc8 fixed leaks 2013-07-23 15:37:12 +02:00
Jan Steemann 5fe1844ee1 replication tests 2013-07-23 15:03:59 +02:00
Jan Steemann f49ae77bc5 include replication tests 2013-07-23 11:19:41 +02:00
Jan Steemann 539954894f log last access time of clients 2013-07-22 18:13:21 +02:00
Jan Steemann c4f82088dd replication tests 2013-07-22 18:12:56 +02:00
Jan Steemann 08b9f57166 stoppable replication applier 2013-07-17 10:58:10 +02:00
Jan Steemann dcd8b63db3 added configuration 2013-07-12 15:40:18 +02:00
Jan Steemann 0266e2339a replication apply state tracking 2013-07-12 15:06:52 +02:00
Jan Steemann 1f564ef6ae linkage between C and C++ 2013-07-11 17:50:48 +02:00
Jan Steemann 98dd1c2522 moved replication parts into separate files 2013-07-11 14:44:09 +02:00
Jan Steemann ca6b184286 added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
Jan Steemann 7ef7ad297f added TRI_StealStringBuffer() 2013-07-10 12:02:42 +02:00
Jan Steemann a7c1ee0191 less lock 2013-07-09 13:36:38 +02:00
Jan Steemann 9fa91447ce renamed attributes 2013-07-09 12:58:10 +02:00
Jan Steemann ca94bf3f39 replication 2013-07-09 11:15:58 +02:00
Jan Steemann 48d851bb7b log dump 2013-07-08 16:33:47 +02:00
Jan Steemann dfd9117fd1 some cleanup, initial implementation of log dump 2013-07-08 12:27:20 +02:00
Jan Steemann d79d95a3a7 moved attribute names to defines 2013-07-05 14:41:23 +02:00
Jan Steemann ebb121b44a sync all collection markers 2013-07-05 13:59:48 +02:00
Jan Steemann 054ed3ca3f apply collection data dumps 2013-07-05 11:41:37 +02:00
Jan Steemann 10327f0870 initial code for collection data dump 2013-07-04 16:55:46 +02:00
Jan Steemann a0c1308edb initial synching of collections 2013-07-04 15:53:51 +02:00
Jan Steemann f5968a4646 handle a master's state response 2013-07-04 10:13:09 +02:00
Jan Steemann 7967936f67 added server id to output 2013-07-03 15:42:34 +02:00
Jan Steemann 7a7d833b18 intermediate commit 2013-06-28 19:04:08 +02:00
Jan Steemann d89262dc6a incremental collection dump 2013-06-28 12:07:13 +02:00
Jan Steemann 4b758eb0e8 moved functions 2013-06-28 10:25:45 +02:00
Jan Steemann cf10b0e8ff added missing ifdefs 2013-06-27 19:28:53 +02:00
Jan Steemann b643ff4b43 added dump command 2013-06-27 19:26:10 +02:00
Jan Steemann 1cb3296e70 implemented start/stop HTTP methods for replication 2013-06-27 16:10:01 +02:00
Jan Steemann 0de3bd4213 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-06-26 12:05:11 +02:00
Jan Steemann 6e9c3e8e2c replication logging 2013-06-26 12:04:55 +02:00
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