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

642 Commits

Author SHA1 Message Date
Jan Steemann b0a924c5a8 sync 2015-09-11 11:56:38 +02:00
Willi Goesgens ac2acabd5d Work on formatting and grammer 2015-09-11 11:25:34 +02:00
Jan Steemann 41844d2b1e fixed typos 2015-09-11 10:32:37 +02:00
Jan Steemann bead727a32 initial work for better incremental synchronization 2015-09-10 18:17:58 +02:00
Willi Goesgens 778d2c84cb Work on sub-structured data to be propper formatted for swagger. 2015-09-10 10:57:42 +02:00
Jan Steemann f077af1594 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-09 17:43:38 +02:00
Jan Steemann 6e290db783 fixed typos 2015-09-09 17:43:34 +02:00
Willi Goesgens e1ae661ae0 Work on multi-dimensional swagger post data 2015-09-09 17:40:51 +02:00
Willi Goesgens eb9e03f3f0 Upgrade the REST-API documentation to to swagger V2.0 
Wrap lines in examples.
 2015-09-09 15:21:18 +02:00
Jan Steemann 0735277830 removed IndexWatermarks again... not needed 2015-09-09 14:22:58 +02:00
CoDEmanX 8aa78dcb7f Fix some more typos 2015-09-05 17:18:04 +02:00
Jan Steemann e602ca5662 issue #1471: document() vs documents() parameters (_key and _id) 2015-09-04 18:13:23 +02:00
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Jan Steemann f4c542795c getIndexes(true) 2015-08-26 09:48:48 +02:00
Jan Steemann 9374a25822 removed unused error code 2015-08-25 19:55:48 +02:00
Jan Steemann 52af8c5781 added comments 2015-08-25 13:16:07 +02:00
Jan Steemann 1af238a6d5 added tests for requireFromIncluded 2015-08-25 12:50:58 +02:00
Jan Steemann 37da76546c re-introduced tracking of replication "clients" 2015-08-24 12:02:57 +02:00
Jan Steemann b08713d768 added tests and documentation 2015-08-24 11:05:26 +02:00
Jan Steemann 9e08b1ebc5 add tickRanges() function 2015-08-21 17:00:32 +02:00
Jan Steemann 31a6547d4c fix replication resumption 2015-08-21 15:57:24 +02:00
Jan Steemann f0ef3d450f refactoring 2015-08-20 18:25:47 +02:00
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