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

605 Commits

Author SHA1 Message Date
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