1
0
Fork 0
Commit Graph

2571 Commits

Author SHA1 Message Date
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
Simon Grätzer 97473e3223 Spelling fixes, reduce log spam 2017-01-31 16:42:17 +01:00
jsteemann 4fa2a6a1d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 14:57:17 +01:00
Simon Grätzer cec711bc85 Fixed test 2017-01-31 14:13:58 +01:00
Max Neunhoeffer c4d5d982c7 Fix bugs of threads not announcing that they are busy. 2017-01-31 14:07:54 +01:00
jsteemann d96ce9af37 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-30 12:53:10 +01:00
Michael Hackstein 72b8945254 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-01-28 21:20:16 +01:00
Michael Hackstein 0027bc54c8 Create a StorageEngine-specific IndexFactory. Moved EnhanceIndexJson v8 -> IndexFactory. 2017-01-28 21:19:50 +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 db9b4ace6d fix lock timeout calculation 2017-01-28 00:05:34 +01:00
Simon Grätzer 64343cd579 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	scripts/startLocalCluster.sh
2017-01-27 15:58:22 +01:00
jsteemann f0d4770879 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-27 11:16:37 +01:00
Michael Hackstein d5d316b971 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-27 09:58:02 +01:00
Frank Celler e0c00c6de6 improved statistics 2017-01-26 23:43:27 +01:00
Michael Hackstein f61a27d0e6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-26 09:50:00 +01:00
jsteemann 6a4842b229 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-01-25 16:30:33 +01:00
Michael Hackstein ef32c991ff Moved knowledge of StorageEngine out of some V8-Related files. JS_Near and JS_Within will now directly use AQL. The existing index check was deleted. 2017-01-25 16:15:35 +01:00
jsteemann d5f318603b fix error message 2017-01-25 15:58:18 +01:00
Michael Hackstein 00448bfc26 Transaction::invokeOnAllElements now works with a callback taken DocumentIdentifierTokens instead of IndexElements. 2017-01-25 15:03:08 +01:00
jsteemann 4e0a07411f fix timeout 2017-01-25 13:28:53 +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
jsteemann 619e73b659 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-01-25 10:48:30 +01:00
Michael Hackstein 78b83eefc4 Renamed => getMoreMptr in OpCursor to getMoreTokens, Removed default Parameter 2017-01-25 10:46:37 +01:00
jsteemann a812e69ce7 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-25 09:41:26 +01:00
Andreas Streichardt d91a6af1a7 Remove singletransaction and fetch collection from vocbase directly 2017-01-24 18:51:05 +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
jsteemann 69c3d0ddb9 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-01-24 12:10:22 +01:00
Michael Hackstein 1da0a37e36 Reduced default batchsize for getMoreMptr function. It allocated uint64_max many elements by default ;( 2017-01-24 10:58:28 +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 c2cbce507f added exclusive locks 2017-01-23 13:16:28 +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 b69fa07aca Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-22 15:55:06 +01:00
Frank Celler f12c38dc0b added work context 2017-01-22 12:53:52 +01:00
Simon Grätzer 1bd1a52163 Fixed pregel API 2017-01-21 19:00:37 +01:00
Simon Grätzer dd14b7b2dd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 15:56:11 +01:00
Kaveh Vahedipour d2760f4ef1 pushing avoidServers property 2017-01-20 15:15:03 +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
Kaveh Vahedipour 6c56f9f05c available for use: avoidServers 2017-01-20 11:58:32 +01:00
Kaveh Vahedipour 648160c68a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 09:35:45 +01:00
Kaveh Vahedipour a372cf71b4 avoidServers getting there 2017-01-20 09:35:42 +01:00
Kaveh Vahedipour 40c6e2b48c unobserve should not create entries in agency, if empty before 2017-01-20 08:06:27 +01:00
Andreas Streichardt 5a101ed6f0 Fix unloading collections 2017-01-19 17:05:41 +01:00
Andreas Streichardt a9ccdf86c1 Several movement fixes 2017-01-18 17:48:01 +01:00