1
0
Fork 0
Commit Graph

1626 Commits

Author SHA1 Message Date
Andreas Streichardt 4d7e6a8fba Properly generate an error message during import 2017-04-18 12:05:31 +02:00
Dan Larkin 97d525e9b7 Revert "Fixed primary index cluster bug."
This reverts commit 8c4214625c.
2017-04-17 17:06:23 -04:00
Dan Larkin 8c4214625c Fixed primary index cluster bug. 2017-04-13 21:44:51 -04:00
Dan Larkin 2e0fdbf666 Fixed some bugs. 2017-04-13 20:06:25 -04:00
Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
Max Neunhoeffer 53b3a73486 Add a timeout option to <collection>.drop().
This is in particular used to allow the Schmutz to make progress
in the case of a long running transaction.
2017-04-07 15:52:19 +02:00
Dan Larkin f056aeee42 Fixed unloaded collection status reporting issue. 2017-04-06 16:21:51 -04:00
jsteemann f59c78b587 add engine capabilities 2017-04-06 14:50:27 +02:00
jsteemann 429869d4f4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 15:27:38 +02:00
hkernbach c270667062 added log topic attribute to /_admin/log api 2017-04-04 12:06:44 +02:00
jsteemann c92ec139a7 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 10:34:50 +02:00
jsteemann 77cddde70b improve error message in case wrong JSON is sent to the server 2017-03-31 10:32:03 +02:00
jsteemann fdd5b3036d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 09:34:06 +02:00
Jan Christoph Uhde 95007fe28e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result
* 'engine-api' of https://github.com/arangodb/arangodb: (46 commits)
  Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
  fix handling of externals
  fix toArray()
  fix returning documents
  Added hash-, skip list, persistent indexes
  harmonize filtering - filter on full filename.
  mini modifications
  standardize starting of servers for replication tests
  Edge index compliant with design doc
  another fix for #2404
  Moved „removeLargeRange“ method to commons
  Added length byte to IndexValue keys.
  fixed issue #2404
  Added drop to primary index
  Added drop() to indexes
  Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
  Fixed edge index
  Expand on CORS documentation
  Let ArangoDB handle the allow-credentials header
  make the authentication tests run on directories
  ...
2017-03-30 19:46:17 +02:00
Dan Larkin 42807f17fb Added partialUpdate flag for view property modification. 2017-03-30 12:04:58 -04:00
jsteemann d563eb432f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-30 15:50:53 +02:00
Jan Christoph Uhde 36fb83efae fix bug in import handler 2017-03-30 15:00:46 +02:00
jsteemann ddb83c8075 fixed issue #2404 2017-03-30 14:18:38 +02:00
Jan Christoph Uhde b83ae2ab82 refactor some code to make use of arangodb::Result 2017-03-30 09:39:21 +02:00
jsteemann a0adeed1c3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 18:14:40 +02:00
Dan Larkin 7dcb555b72 Added PATCH support to view rest handler. 2017-03-29 12:13:55 -04:00
jsteemann 2aa2fd65a4 more startup 2017-03-24 14:20:51 +01:00
Max Neunhoeffer 29338899fd Finally port TraverserEngine locking bug fix manually. 2017-03-23 12:44:51 +01:00
Max Neunhoeffer 32953a4a97 Revert "Fix locking of shards in TraverserEngines."
This reverts commit 467088b8af.
2017-03-23 12:33:11 +01:00
Max Neunhoeffer 467088b8af Fix locking of shards in TraverserEngines. 2017-03-23 12:23:40 +01:00
jsteemann fbb14ceffc added db._engine() 2017-03-22 11:19:31 +01:00
Dan Larkin 6cedc0ba53 Merge branch 'views' into devel 2017-03-21 11:40:42 -04:00
Dan Larkin 85132e0eaf Finished adding view support to ArangoShell. 2017-03-21 11:40:14 -04:00
jsteemann 63868b4378 move collection keys into engine 2017-03-21 14:23:29 +01:00
jsteemann 7fb536387d move replication-dump into engine 2017-03-21 13:55:57 +01:00
jsteemann ec0e5e39a7 moved export into engine 2017-03-21 11:41:50 +01:00
jsteemann b8e011eee5 move attributes into engine 2017-03-21 10:31:50 +01:00
jsteemann e3d8ae142e some fixes for view handling 2017-03-17 11:18:46 +01:00
Dan Larkin a233b949c3 Updated rest handler and tests. 2017-03-16 22:36:15 -04:00
jsteemann 25a380f77c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 12:50:11 +01:00
jsteemann 238fcae46a some simplifications 2017-03-16 10:54:08 +01:00
Dan Larkin aa23074efd Added view retrieval via HTTP with tests and initial work on view factory. 2017-03-15 18:44:48 -04:00
jsteemann 49aef67cca use std::shared_ptrs for views 2017-03-15 13:07:08 +01:00
Dan Larkin 966e05b596 Added very basic rest handler for views. 2017-03-14 19:05:14 -04:00
Simon Grätzer 7b35f75b23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/GeneralServer/GeneralServerFeature.cpp
2017-03-13 12:25:28 +01:00
jsteemann 0a07bb3222 make RestWalHandler a handler of the MMFiles engine 2017-03-10 09:00:37 +01:00
Michael Hackstein 90b4876d3c Moved WriteMarker code Vocbase => MMFilesEngine. Also removed the decission to write a marker out of Vocbase-API 2017-03-09 11:12:39 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
Simon Grätzer a1752da492 Added single server support 2017-03-08 18:20:36 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
Michael Hackstein e6ab0afb50 Moved indexBuckets from Logical => MMFiles collection. 2017-03-07 14:07:32 +01:00
jsteemann 644ef08ce0 added "bindVars" to attributes of currently running and slow queries 2017-03-07 00:19:01 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
2017-03-04 02:08:27 +01:00
jsteemann e1d043e607 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-02 22:20:59 +01:00
jsteemann e6d5058557 fix error message 2017-03-02 17:53:33 +01:00
jsteemann 00631d0307 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-02 15:24:17 +01:00
jsteemann 7051f5d87a fixed --convert false in arangoimp 2017-03-02 15:05:06 +01:00
jsteemann 1b7b668066 simplify query list a great deal and use less dynamic memory for its entries 2017-03-02 13:20:37 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
2017-03-01 14:52:35 +01:00
jsteemann cf5d20ddee Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-28 17:02:42 +01:00
jsteemann b6a265068a fix velocypack-over-HTTP responses 2017-02-28 17:01:59 +01:00
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
jsteemann 94ce6a65f8 renamed methods 2017-02-27 11:22:44 +01:00
jsteemann d0df1952e8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-24 17:51:59 +01:00
jsteemann e14909966d issue #2326 2017-02-24 10:35:52 +01:00
Michael Hackstein de31c68539 Moved isVolatile into MMfiles collection. 2017-02-23 14:56:54 +01:00
Michael Hackstein 7cf3581812 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-21 13:25:18 +01:00
Michael Hackstein aacbb3e4cf This commit should fix cluster startup problems 2017-02-21 13:22:29 +01:00
Jan Christoph Uhde 071137adf6 move doCompact into PhysicalColletion 2017-02-20 10:53:11 +01:00
Michael Hackstein 91f303e963 Removed readRevision from LogicalCollection. You only get readDocument with a token. Moved it's logic into MMFilesCollection. removed the ignoreWal parameter from readDocumentConditional. It was always true anyways... 2017-02-17 17:29:49 +01:00
Michael Hackstein f0fbe78b2d Moved restoreIndex to Physical collection. 2017-02-16 15:01:00 +01:00
Michael Hackstein a3aae2e43b Moved saveIndex logic into the physical collection 2017-02-16 12:53:05 +01:00
jsteemann 089ff78d2d moved collection lock state into its own struct 2017-02-16 10:27:14 +01:00
jsteemann d49c5c3fc0 simplified internal APIs a bit 2017-02-15 12:42:07 +01:00
jsteemann 01bf68549d simplifications 2017-02-14 22:48:51 +01:00
jsteemann 80be198a39 moved helper classes into their own file 2017-02-14 12:35:34 +01:00
jsteemann 7e690a0c61 renaming 2017-02-13 15:18:40 +01:00
jsteemann 16189aa969 moved TransactionHints.h 2017-02-13 14:36:27 +01:00
jsteemann eb73dbf960 renaming 2017-02-13 13:30:57 +01:00
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
Simon Grätzer 4edba27b41 Fixed log topic 2017-02-10 16:31:38 +01:00
Michael Hackstein 01d5559ad5 Removed unnecessary includes 2017-02-10 16:28:05 +01:00
Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/Aql/FunctionDefinitions.cpp
#	arangod/Aql/Functions.h
#	arangod/Utils/ExplicitTransaction.h
2017-02-10 15:21:24 +01:00
Michael Hackstein d5f2e8fba5 Fixed a uniqueness bug in api/edges 2017-02-10 12:27:45 +01:00
Michael Hackstein 96e2f4a1a0 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-10 10:45:56 +01:00
Michael Hackstein 27c6756367 Readded POST _api/edges a client js module uses it ;( 2017-02-10 10:45:47 +01:00
jsteemann 103ceec2f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 09:43:23 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
Michael Hackstein b43cf48252 Added a self-contained edge condition builder that allows to create AQL conditions without actually having an AQL query. The RestEdgesHandler uses it to serve requests for edges now. Removed undocumented endpoints PUT/POST /_api/edges as obsolete. 2017-02-09 17:15:42 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +01:00
Michael Hackstein dfc9f29e69 Moved FunctionDefinitions to an AqlFunctionFeature. This now has a defined startup ordering 2017-02-08 15:45:59 +01:00
Max Neunhoeffer bde48d524d Change undocumented behaviour in case of invalid rev in JS document ops.
An invalid rev should lead to a 1200 ("conflict") error rather than a
1239 ("illegal document revision") error. This is more intuitive and
in line with the corresponding change in the HTTP API. No tests needed
adjustment.
2017-02-08 10:59:04 +01:00
jsteemann 01d3ad67b1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-08 00:59:16 +01:00
Max Neunhoeffer cbcda7932c Change undocumented behaviour in case of invalid rev in If-Match headers.
An invalid rev should lead to a 412 PRECONDITION FAILED rather than a
404 BAD error. This is more intuitive, in particular since we have
never documented what valid rev strings are. Also adjust tests and
CHANGELOG.
2017-02-07 22:37:38 +01:00
Simon Grätzer 9b9f91a81c Pegel: Adding support for "PREGEL_RESULT" in aql 2017-02-07 18:37:23 +01:00
Max Neunhoeffer 883c11ea45 Handle the case that ClusterComm is already shut down gracefully.
This touches every single place where ClusterComm is being used.
2017-02-07 15:31:40 +01:00
jsteemann f213d67de0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 13:04:40 +01:00
jsteemann d503a4d354 added reactor type 2017-02-07 12:41:41 +01:00
jsteemann 6b3a4d1dc3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 15:48:54 +01:00
Max Neunhoeffer 71dae630c3 Store ClusterComm singleton in shared_ptr. 2017-02-06 15:25:18 +01:00
Simon Grätzer 877aa43599 Fixing a bug 2017-02-02 16:49:39 +01:00
Michael Hackstein da32eef2ca RestEdgesHandler now uses Callback Based OpCursor API 2017-02-02 15:42:57 +01:00
Simon Grätzer 13f19fe51b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/RestServer/arangod.cpp
#	arangod/Utils/ExplicitTransaction.h
#	arangod/V8Server/v8-collection.cpp
2017-02-02 11:25:23 +01:00
jsteemann d96ce9af37 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-30 12:53:10 +01:00
Simon Grätzer 37243315e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-28 15:30:28 +01:00
jsteemann 0cb7d416d0 moved transaction collections into their own files 2017-01-26 16:51:57 +01:00
Michael Hackstein f61a27d0e6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-26 09:50:00 +01:00
jsteemann d7b131852c factored out transaction hints 2017-01-25 13:12:09 +01:00
jsteemann 00b1632ece factored out AccessMode from transaction.h 2017-01-25 11:57:21 +01:00
Michael Hackstein 78b83eefc4 Renamed => getMoreMptr in OpCursor to getMoreTokens, Removed default Parameter 2017-01-25 10:46:37 +01:00
Michael Hackstein 15bbfc7b0c Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-01-24 18:22:01 +01:00
Michael Hackstein 2133b1448c Moved index API to return DocumentIdentifierTokens which are independent of the underlying storage engine. The agreement is, that the Engine gives a uint64_t sized identifier which allows to fetch any document back again. For MMFiles Engine this identifier is the revision. 2017-01-24 18:19:25 +01:00
Simon Grätzer 4c370a09fe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/Cluster/ClusterInfo.h
2017-01-24 16:41:34 +01:00
jsteemann 37b73f7377 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-24 14:06:57 +01:00
Max Neunhoeffer 5e6d2c2045 Fix acquire of read locks for sync. replication. 2017-01-24 13:55:56 +01:00
jsteemann 26aa05897f Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-01-24 12:46:51 +01:00
Michael Hackstein 9d063ec5ba Fixed incorrect construction of VPack object. Lead to failing edge tests 2017-01-24 12:46:30 +01:00
jsteemann e3bcb90916 remove revisions cache 2017-01-24 10:48:07 +01:00
Michael Hackstein 8ebff4a5f8 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-01-23 17:29:00 +01:00
Michael Hackstein dc3a0e984f removed getMore() from OperationCursor 2017-01-23 17:27:57 +01:00
jsteemann c4d2ff3dce renaming 2017-01-23 15:36:11 +01:00
jsteemann 7fedb4e956 moved files into engine directory 2017-01-23 13:52:57 +01:00
Michael Hackstein 92ad574c97 Moved Indexes to StorageEngine 2017-01-23 13:32:23 +01:00
jsteemann 952c3f848e factored out transaction manager from logfile manager 2017-01-23 12:31:45 +01:00
jsteemann f9fb701505 moved LogfileManager into engine 2017-01-23 10:30:55 +01:00
Simon Grätzer d71ebf7c1d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 14:42:19 +01:00
Simon Grätzer d8ba7ffc34 Aggregator refactoring 2017-01-20 14:42:01 +01:00
jsteemann 112386d300 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-19 15:45:52 +01:00
jsteemann 6f9927fea0 avoid constructing temporary lookup strings 2017-01-19 14:27:04 +01:00
Andreas Streichardt a9ccdf86c1 Several movement fixes 2017-01-18 17:48:01 +01:00
Simon Grätzer 06ef7792fb Fixing some more 2017-01-16 17:48:38 +01:00
Michael Hackstein 4f67c8352c Renewed restore-collection in RestReplicationHandler. It now uses new API to create Collections, doing all sanity-checks etc. 2017-01-16 13:36:46 +01:00
Simon Grätzer 27dcb11af3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-13 15:00:59 +01:00
Michael Hackstein 1d33197a4f Updated the clusterInventory endpoint to use LogicalCollection instead of reading the Agency. 2017-01-12 13:39:46 +01:00
jsteemann ac7d9af48f attempt to validate utf8 sequences in vst 2017-01-12 13:22:19 +01:00
Michael Hackstein ce4d255669 Removed dead code. Cleaned Compilerror non enterprise 2017-01-11 18:38:34 +01:00
Michael Hackstein 1902b571fa Unified restore handler in cluster and local 2017-01-11 18:01:21 +01:00
Simon Grätzer 01ac5a51a3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 21:12:24 +01:00
Kaveh Vahedipour 0875353a26 all ArangoAgency.set rewritten in cluster.js 2017-01-09 17:30:36 +01:00
Simon Grätzer 20d32d05b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/VocBase/LogicalCollection.cpp
2017-01-09 13:34:37 +01:00
Michael Hackstein b612e34aa7 Refactoring in RestReplicationHandler. Preparation for Enterprise Restore version. 2017-01-06 18:09:11 +01:00
Michael Hackstein cd83ce24fc In case of INTERNAL_ERROR the restore-data handler will now correctly supply the error message 2017-01-06 15:24:50 +01:00
Simon Grätzer f1b6170e96 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-19 10:17:18 +01:00
jsteemann a655a0e5c8 removed unused parameter 2016-12-19 09:56:37 +01:00
Simon Grätzer 96925c0e76 Working single phase async 2016-12-19 07:25:52 +01:00
Simon Grätzer 63f87fbf52 reorganization 2016-12-13 13:54:14 +01:00
Simon Grätzer 3a4a07f13d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-12 13:21:51 +01:00
jsteemann f0a4d69b69 use bulk allocator for index elements 2016-12-09 21:40:49 +01:00
Simon Grätzer 730ea4755e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	scripts/startLocalCluster.sh
2016-12-09 14:30:19 +01:00
Andreas Streichardt 82682f8d25 Wait for synchronous replication to settle 2016-12-07 18:38:15 +01:00
Simon Grätzer 0f57b6633b Algorithms without combiners supported 2016-12-07 16:00:42 +01:00
Jan Steemann b8c72dece8 fixed issue #2211 2016-12-07 12:28:52 +01:00
Andreas Streichardt 11bd9381d5 Add satellite collections 2016-12-06 16:40:50 +01:00
Simon Grätzer b126e1dddb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-06 14:57:09 +01:00
jsteemann 369b2c7bc6 added optional memory limit for AQL queries 2016-12-06 13:23:41 +01:00