1
0
Fork 0
Commit Graph

1445 Commits

Author SHA1 Message Date
Simon Grätzer 4edba27b41 Fixed log topic 2017-02-10 16:31:38 +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
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +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