1
0
Fork 0
Commit Graph

638 Commits

Author SHA1 Message Date
Simon 3bec336aff TransactionState::addCollection refactoring (#5606) 2018-06-14 15:34:58 +02:00
Vasiliy a5f274234a issue 380.2.2: remove extraneous pointers from StorageEngine API (#5589) 2018-06-13 15:22:51 +03:00
Simon 35992ad67b Coordinator storage engine (#5405) 2018-05-22 19:30:27 +02:00
Vasiliy d9cda9666f issue 389.8: remove redundant function from Methods, convert Syncer API to user TRI_ocbase_t& wherever possible (#5408) 2018-05-22 16:10:24 +03:00
Vasiliy 843e584746 issue 389.5: refactor StandaloneContext to be constructed with a TRI_vocbase_t& (#5370)
* issue 389.5: refactor StandaloneContext to be constructed with a TRI_vocbase_t&

* backport: address build issues
2018-05-17 01:15:50 +03:00
Wilfried Goesgens b17628e804 msvc can't distinguish these (#5345) 2018-05-14 19:13:44 +03:00
Vasiliy 6a53154160 issue 389.2: use static strings for Index definition json attributes, use TRI_vocbase_t references instead of pointers in V8Context, use TRI_vocbase_t references instead of pointers in DatabaseInitialSyncer (#5344) 2018-05-14 19:06:24 +03:00
Simon 17b1a2aafb Rest middleware refactoring (#5332) 2018-05-14 17:43:10 +02:00
Simon 08e355aed8 Simple dump speedup (#5298) 2018-05-09 12:51:04 +02:00
jsteemann 7f8a1cc614 Merge branch 'bug-fix/add-missing-overrides-and-final' of https://github.com/arangodb/arangodb into devel 2018-05-07 23:02:46 +02:00
Vasiliy 2ce20e86d7 issue 373.1: move globally-unique id generation from collection into data-source (#5182) 2018-05-07 22:14:40 +03:00
Simon fdee0544b7 Using asio::io_context::strands instead of locks (#5266)
* initial try adding strands

* working, stable amount of threads

* improve shell_client cluster

* Fixing some accounting for the scheduler

* Fix accounting

* Fixing wrong strand usage

* add missing return

* Fixing thread accounting

* More scheduler accounting issues

* Fixing various things

* Fixing some stuff

* Fixing some stuff

* Some more subtle bugfixes

* Some cleanup code

* fixing some stuff

* adding some more fixes

* Fixing possible issues

* Fixing missing _storeResult

* Fixing some stuff

* Reducing lambda stack, perhaps fixing hangups

* Fix writeunlocker

* Fixing possible issues

* adding some debugging stuff

* refactor sockets

* possible fixes

* Adding more job guards

* Fixin possible bug

* cleaning up some stuff

* working impl

* Remove debugging output

* Fixing build

* fixing import

* Fixing another bug

* removing debug log

* Removing examples

* Reverting scheduler working code

* Cleanup

* Addressing review comments
2018-05-07 15:58:19 +02:00
jsteemann 52de92d334 add missing override specifiers, add final specifiers 2018-05-04 09:01:50 +02:00
Mark 34709327ef Fix windows compile errors (#5254) 2018-05-03 11:48:55 +02:00
Wilfried Goesgens 357ec8ebef prohibit the use of sleep() in the source (#5178) 2018-04-30 10:23:22 +02:00
Simon 468231efc5 AQL Profiling code (#5165)
* initial start of profiling

* adding profiling code

* Fixing remote block tracing, fixing width and units

* Fixing some tests

* Various fixes

* adressing review comments
2018-04-24 16:17:30 +02:00
Jan 2b84348b77
remove call to requiresElevatedPrivileges with default value (#5172) 2018-04-23 11:28:24 +02:00
Vasiliy 9062c41592 issue 383.3: implement remainder of IResearchViewDBServer tests, use the data-source id (primary key) instead of an arbitrary instance for dropCollection()/dropView(), backport from iresearch upstream: ensure block is flushed if key index is full (#5176) 2018-04-23 00:33:46 +03:00
Simon 8be273efb8 Replication cleanup (#5105) 2018-04-17 08:17:42 +02:00
Vasiliy f392925903 issue 374.3: use a reference to vocbase instead of a pointer in DatabaseGuard 2018-04-13 09:56:49 +03:00
Andrey Abramov 04bb3da337
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug-fix/internal-issue-#345 2018-03-20 19:04:54 +03:00
Michael Hackstein c1650702bf
Feature/aql server based locking (#4783)
* Started Implementing the ServerBasedlocking. There now is a container that can contain multiple query snippets. It now has to setup the necessary calls to the Servers

* Added backwards linking of QueryEngines, sth. DBServers can contact their Coordinators.

* Added LogTopic AQL

* Made AccessMode::Type Hashable

* Created a Mapping Server => LockLevel => Shard and createad a JSON object containing the Lock information for a complete AQL query per server

* Added code to build coordinator engines

* Finished with first draft of Coordinator-side of new DBServer based locking.

* Added a _api/aql/setup route that creates and locks all snippets/collections for one DBServer in a single go

* Fixed some Coordinator parts

* Index node now gracefully reports if it could not find it's collection when created from vpack. Otherwise it just hardly crashed...

* Modified the Coordinator Snippet collector to be able to handle subqueries properly.

* Started adding GraphNode handling. WIP. Need to deploy engines properly. Coordinator crashes on Graph tests

* Fixed compiler errors

* WIP: EngineInfoContainer

* Separated the EngineInfoContainers for Coordinator and DBServer into different files. They diverged more than anticipated

* Added forgotten files. THe DBServer container now creates the TraverserEngine Mapping and moves it into the Infos. They are not keeping it yet and need to add it to the message as well.

* The DBServer engine infos now persist the TraverserEngine infos. Need to add them to messages though.

* The new aql exec-engine now sends out traverserEngines as well

* Formatting and adding DEBUG level output

* Made the RestAQLHandler aware of the TraverserEngineRegistry. Also created the engines now. Return format changed server-side coordinator side needs fix.

* Adapted the Coordinator side for the DBServer based Shard Locking

* The DBServer based Locking now honors restrictions to certain shards

* Fixed a strange double lock bug in the new AQL Server based locking technique. Add some DEBUG output

* Fixed usage of MAINTAINERMODE macro. The assertion was never active

* Added TestCase for ContainerCoordinatorTest to cmake

* Added -DTEST_VIRTUAL to CMAKE. This is used to define virtual functions for mocking ONLY on test-builds.

* Fixed usage of ENABLE_MAINTAINER_MODE ifdef. CLANG format

* On non-enterprise builds ENTERPRISE_VERT defaults to TEST_VIRTUAL => virtual in test else non-virtual

* Added TEST_VIRTUAL to ExecutionEngine, Query and QueryRegistry

* Added first testcase for EngineInfoContainerCoordinator not yet ready.

* Mode CreateBlock a member function of engine, we have the engine in our hands anyways no need to make it static. Included some more TEST_VIRTUAL functions.

* Fixed clang/MacOs compile error. Added some more TEST_VIRTUAL declarations

* Finally fixed the first buildEngines UnitTest \o/

* Added a unit-test for backward linking of dependencies in CoordinatorPlanner

* Added multi-snippet test for EngineInfoContainerCoordinator

* Removed QueryRegistry.h from central header files and replaced by a forward declartion.

* Added a createBlocks method on the ExecutionEngine. It should be responsible to create all those blocks at once. Adapted the UnitTests as well. Not included Tests for the new createBlocks functionality. Need to mock the options feature first

* Added another test that Coordinator Snippets of queries can be created correctly

* Fixed Coordinator-site cleanup of QueryRegistry, if any of the query creations fails with error, incl UnitTest.

* Added first test for RestAqlHandler::setup. It does only test the setup and gives prepartion for real testing.

* Added a assertion of http return code. Still no creation of queries is tested. Requires a huge amount of mocking.

* fix some deadlocks found by evil lock manager (tm)

* fix duplicate lock

* fix indentation

* ensure proper lock dependencies

* fix lock acquisition

* removed useless comment

* do not lock twice

* create either a V8 transaction context or a standalone transaction context, depending on if we are called from within V8 or not

* AQL micro optimizations

* use explicit constructor

* only use V8DealerFeature's ConditionLocker for acquiring a free V8 context

entering and exiting the selected context is then done later on without having to hold the ConditionLocker

* remove some recursive locks

* Disable custom deadlock detection when Thread Sanitizer is enabled

* Changing ifdef's

* grr

* broke gcc

* Using atomic for ApplicationServer::_server

* fix premature unlock

* add some asserts

* honor collection locking in cluster

* yet one more lock fix

* removed assertion

* Allow the clustercomm to send nolock headers on count. This is used form within AQL

* IsLocked on transactions will now always yield true IF LOCK_NEVER is set. We simply assume someone else holds the lock for us. Also LOCK_NEVER is now set on collection/count if noLock header is send.

* Moved the flag if collections need to be locked into the TraverserEngines.

* Added enterprise-satellite hooks in EngineInfoContainerDBServer

* Removed now obsolete code

* Replaced throwing of Exception by an ResultObject

* Added some more tests and moved adding snippet to query engine more to the outside.

* Added the AQL result type

* Make the branch compile again

* Register WITH collections for Graphs in the new Collector.

* Fixed test code for failing query clone. Idea was to once clone successfully and second time to fail, we verify that first clone is cleaned up properly. However test failed on first clone...

* Removed a double builderClose

* Added Changelog entry

* Removed empty if

* Removed obsolete todo

* Properly initialize the AqlResult with nullptr on error case

* Updated comment

* Simplified Assertion

* Removed debug output object...

* Added additional catch case for std::exception to get some more error info

* Clarified evaluation order for move case

* Added Explicit

* Fixed cleanup of Coordinator if Registry fails to insert query.

* Allow to use other locks than Read/Write for AQL collections. Not yet in API.

* Updated Comments for other Locks on DBSide. Adapted Destruction CatchTests

* Fixed double builderClose and removed unnecessary double commits

* Added a comment to clarify the state

* Moved error output to trace. Leftover from debugging

* Added some tests for complex subquery patterns

* Added a 'fireAndForgetRequests' methods to cluster comm which allows to send out a bunch of messages but does not wait for their results

* Properly cleanup leftovers of queries if the instantiation step already failed

* Added code comment for fireAndForget

* Added indexes to subquery test to make the plan a bit easier

* The cleanup on DBServerEngines in error case now also cleans up traverser engines.

* Removed unnecessary includes

* Removed debug logging

* Fixed hidden merge conflict
2018-03-20 16:52:19 +01:00
Andrey Abramov 01d9baf359 remove TRI_ERROR_ARANGO_VIEW_NOT_FOUND, rename TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND to TRI_ERROR_ARNANGO_DATA_SOURCE_NOT_FOUND 2018-03-17 19:36:14 +03:00
Vasiliy 06eb8ade01 issue 344.7: remove more redundant functions (#4863)
* issue 344.7: remove more redundant functions

* backport: fix missed functions under USE_ENTERPRISE
2018-03-15 17:10:28 +01:00
Vasiliy 148bdb7158 issue 344.6: remove some redundant functions (#4842) 2018-03-15 11:03:35 +01:00
Vasiliy c8739cd3cd manually-merge: cache data-sources in CollectionNameResolver 2018-03-14 10:11:50 +03:00
Simon 1b572c52c2 Active-Failover VelocyStream Fixes (#4715) 2018-03-05 15:54:19 +01:00
Simon 345fc3c0b7 Refactor Authentication Layer (devel) (#4592)
* Cherry Picking LDAP changes

* Adding missing merges

* Fixing remaining mentions of FeatureCacheFeature

* Fix jslint

* Fixing some failed tests

* Fixing cluster authentication issue, red tests

* Fixing ldap testsuite, adding trace logging

* Fixint ldap tesuite setup and LDAP recognition

(cherry picked from commit 686d28a779)

* Fixing wrong assert

* Adding changelog entry, making requested changes from code review

* Fixing dump_authentication, fix typos

* improvements found during code review

* oops

* more use of sessionstorage

* fix tests

* Fixing broken handling, disallowing adding of local users when disabled

* Fixing testInvalidGrants

* Removing undefined auth level externally

* Fixing previous commit

* added tests for ldap search mode

* intentionally removed `after` methods from tests

because they are executed before the tests start
no cleanup is performed right now after the authentication tests
however, a cleanup is done at start of every test

* ldap tests all modes

* forward port changes from 3.3

* added generated files

* forward port missing changes for web UI

* added generated files

* added generated files
2018-02-28 13:24:28 +01:00
Simon cde96d97aa RocksDB replication hardening & cleanup (#4639) 2018-02-23 18:15:04 +01:00
Jan 852b4e4923
in case of an id conflict, truncate or drop/recreate an existing collection (#4628) 2018-02-20 12:50:20 +01:00
jsteemann aa5e02c82d make syncer more compatible and ignore revs if not present 2018-02-19 18:44:08 +01:00
Jan b3556f7b17
some fixes for replication (#4621) 2018-02-19 15:54:55 +01:00
Jan f8eef7f61c
fix HTTP response code for HTTP 503 (#4609) 2018-02-19 08:34:50 +01:00
Jan 935e2790ad
forward port of replication bugfixes from 3.2 (#4572) 2018-02-12 18:13:51 +01:00
Jan 5acaf9b5a3
Bug fix/carnival (#4562) 2018-02-12 09:01:57 +01:00
Wilfried Goesgens 16648fc628 fix windows compile (#4557) 2018-02-11 18:56:13 +01:00
Simon 35136a89c0 Fix some problems with active failover (#4540) 2018-02-09 15:11:53 +01:00
Jan 8da61a9875
Bug fix/more replication tests (#4500) 2018-02-09 13:06:47 +01:00
Jan fe0fca9029
Bug fix/restore unlock (#4387) 2018-01-25 15:56:27 +01:00
Jan 1e116a9f6d
slight cleanup of replication-related code (#4286) 2018-01-17 16:56:40 +01:00
Jan b2b6c06cbf
Feature/efficiency (#3736) 2018-01-05 16:51:31 +01:00
Jan 7d2d9be179
Bug fix/pre release woes (#4088)
* make global applier restart on server restart as well

* added %a prompt meta character
2017-12-19 21:39:42 +01:00
Jan a7d8f5ea48
don't make the syncer fail when it is restarted (#4031) 2017-12-14 23:46:56 +01:00
Simon Grätzer 19f68df395 Use uuid in Initial sync to ensure proper collection mapping (#3965)
* Use uuid in initalsync to ensure proper collection mapping

* fix compile error after merge
2017-12-13 22:12:47 +01:00
Jan 73bce34174
potentially fix send request timeout (#4026) 2017-12-13 17:54:12 +01:00
Jan 9c76613e63
fix premature unlock (#3802)
* fix some deadlocks found by evil lock manager (tm)

* fix duplicate lock

* fix indentation

* ensure proper lock dependencies

* fix lock acquisition

* removed useless comment

* do not lock twice

* create either a V8 transaction context or a standalone transaction context, depending on if we are called from within V8 or not

* AQL micro optimizations

* use explicit constructor

* only use V8DealerFeature's ConditionLocker for acquiring a free V8 context

entering and exiting the selected context is then done later on without having to hold the ConditionLocker

* remove some recursive locks

* Disable custom deadlock detection when Thread Sanitizer is enabled

* Changing ifdef's

* grr

* broke gcc

* Using atomic for ApplicationServer::_server

* fix premature unlock

* add some asserts

* honor collection locking in cluster

* yet one more lock fix

* removed assertion

* some more bugfixes

* Fixing assert

(cherry picked from commit 1155df173bfb67303077fbe04ee8d909517bfd21)
2017-12-13 13:27:42 +01:00
Jan 3143805c6f
make replication abortable (#4016) 2017-12-13 12:32:04 +01:00
Jan be019ffaad
improve compatibility when replicating from a 3.2 (#3865) 2017-12-08 15:52:31 +01:00
Jan 282be208cc
remove TRI_usleep and TRI_sleep, and use std::this_thread::sleep_for … (#3817) 2017-12-06 18:43:49 +01:00
Jan 73b3c65153
fix revision id vs local document id usage in incremental sync (#3887) 2017-12-06 16:33:57 +01:00
Jan f3e4e84778
add a test for replication applier restarts (#3750) 2017-12-06 11:09:36 +01:00
Jan b235af0fbf
fix version check (#3781) 2017-12-06 11:05:40 +01:00
Jan 833f026160
fix issues found by codescan (#3870) 2017-12-06 10:44:19 +01:00
Simon Grätzer 0e485f7441 Fixing collection name collection handling in Syncer (#3710) 2017-11-17 16:36:57 +01:00
Jan b4f6ee9273 Feature/improved index api for unique constraints and replication (#3715) 2017-11-16 21:02:01 +01:00
Jan fce593b724 removed `--recycle-ids` option for arangorestore (#3713) 2017-11-16 14:25:54 +01:00
Jan 3b0a8a9cdf make the replication applier auto-start for the RocksDB engine if con… (#3647) 2017-11-15 12:02:37 +01:00
Simon Grätzer c6fe726901 Removing unsafe asserts in wal tailing v3.3 (#3672) 2017-11-13 17:41:57 +01:00
Jan 8a467e74db try to not crash when encountering a collection that is not present (#3660) 2017-11-11 19:30:37 +01:00
Simon Grätzer 87f441753b RocksDB WAL tailing fixes (#3595) 2017-11-10 09:31:53 +01:00
Jan 720e6df82e Bug fix/fixes 1910 (#3471)
* properly initialize all properties

* use faster comparison

* properly detect and handle "method not allowed"

* code-style

* remove unused variable

* narrow variable scope

* handle non-existance of AuthenticationFeature

* remove dead code

* replace some C string handling with std::strings

* moved assertion to the correct place

* honor number of array members for IN operator

* slightly adjust error messages

* slighty adjust some error messages

* try to fix issue with lingering replication contexts on shutdown

* clean up heartbeat thread a little bit

* small fixes
2017-10-23 09:17:36 +02:00
Simon Grätzer fd3f9d99d9 Fixing webinterface access (#3464)
* intermediate commit

* Refactoring the ExecContext

* Fixing authentication

* Added start script

* some fixes

* fixed access to nullptr

* some c++

* fixed misleading message

* Made DatabaseGuard movable. Also adapted map insertions to _vocbase in Syncer classes, which failed to compile under older GCC versions

* added support for global flag to replication handler

* Started Refactoring in replication-static

* Fixing syncer code

* store applier configuration

* Static replication tests now test replication in a non system Database

* added flags to replication feature

* Adding some extra checks

* Fixing issue with rocksdb rest replication handler

* replication static now runs _system and otherdatabase replication tests.

* Fixing crash on startup

* Replication_sync now tests _system as well as other Database

* Fixing up heartbeat thread, adding global flag to rest handler

* Fixing wrong assert

* some cleanup, probably some tests are broken

* Made non-system db version of replication-ongoing tests

* fix determine-open-transaction

* Fixed ongoing tests. And added a test where we drop a database on slave while replication is still ongoing

* test fixes

* Activated ongoing other db tests. Also added a test that drops the DB on master, while the slave is still syncing.

* some better error reporting

* gradually switch to Result

* createCollection -> create

* re-activate using of collection ids for now

* enable auto-start

* Fixed create collection in replication ongoing test

* Added first draft of a test for global replication

* move to Result

* use system database for global applier

* improved error reporting

* fixed invalid URLs

* add test case filter

* load existing global applier configuration

* improve error reporting

* Added further tests for global replication

* Fixed global replication test, it now properly waits for replication. Timeouts after 10 seconds.

* Removed erronious assertion

* improve error reporting

* intermediate commit

* Added a test-case for global replication where the Master already has some data and the slave is clean

* fix deletion of replication contexts

* Fixed JSLint

* compiling code

* fix typo

* do not fail for global applier when no database is configured

* intermediate commit

* syncer supports switch for 3.3 / 3.2

* fixed errors

* Fixing some replication bugs

* Fixing some assertions

* Fixed missing commit markers

* Fixing assertion on database drop

* Attempt to fix deadlock in applier and assertion

* Fixing some stupid things

* Support for collection parameter

* Acidentally turned off some tests

* Grrr

* Fixing wrong method call

* Fixed startscript

* Fixed assignmet instead of equality check typo

* Added a test far interrupted replication. For now it justs tests basics on _system database.

* Improved index tests on replication.

* properly initialize variable

* fixed some replication problems

* MMFiles wal access support

* fix replication issues

* Started mmfiles replication support

* fixing a bug

* Fixing an issue

* fixing some mmfiles stuff

* fix test

* reload users

* prevent pure virtual method call

* intermediate commit

* Making from exclusive

* do not call getMasterState if child syncer

* some reformatting

* Adding global support for handleCommandSync

* Fixing assertion

* removing some debug logs

* Changing return codes

* Fixing some issues in the rest handler

* Make replication less susceptible to errors

* remove some debug output

* return last log tick

* remove waits from tests

* fix two tests

* changing header for open-transactions call

* some fixes

* fix test

* invalidate cached databases

* merging request and execcontext

* try to fix assertion error

* renamed method

* fix compile warning

* small changes

* Always use execcontext

* Fixing an assert

* fix replication issues

* try to fix collection lookups

* try to fix master/slave start

* Changing comments in heartbeat thread

* fix wrong signature of READ_LOCKER_EVENTUAL

* log server role in testing mode

* Fixed authentication, removed execContext in favor of request context

* Adding cluster rest api

* Fixing cluster rest handler

* Fixing cluster callback

* Some refactoring

* Queue creation is not a single operation

* Allowed for leader redirects

* Setting start of batch

* Disabling 2.8 compat tests

* fix start/stop bugs

* jslint

* various little changes

* add flag for exposing jwt

* indentation

* cleanup

* Some changed to guid

* fixing tcp to http, vst

* changed endpoint header

* small fixes

* Reorder servers by health status

* Higher timeout

* Changing error messages

* update the fromTick when fetching multiple batches from the coordinator

* more debug info

* Reducing copy pasted code

* change uid generation

* reducing logspam

* more exceptions for redirects

* more exceptions

* attempt to fix uniqids in cluster

* centralize printing of HTTP errors in replication

* debug output

* fix messages for authentication

* cleanup

* removing --cluster.my-id, --cluster.my-local-info

* Added leadership race to bootstrap, determine foxxmaster on boostrap, removing obsolete code

* improve error reporting in RestAqlHandler

* Changing heartbeat thread, fixing cluster_sync

* some more debug output

* added master

* attempt to make tests more deterministic

* added logging about indexes

* added some safety checks to the logger

* slighty better error messages

* fix location header for SSL

* fix error message

* try to make tests more deterministic

* change error code from TRI_ERROR_INTERNAL (which we want to avoid) to TRI_ERROR_FAILED

* Fixing broken webinterface access

* reverting groovy change

* Fixing read-only internal users

* Using superuser rights for dashboard now

* Adding mode field to _admin/server/role

* added mode TRYAGAIN

* remove inventory lock (does not seem necessary here)

* remove invalid assertion

* fixing agency bugs

* Removing debug output

* return proper errors in case of "method not allowed"

* Fixed up some info messages

* jslint
2017-10-20 18:06:59 +02:00
Jan 7840d3f824 Bug fix/fixes 1810 (#3460)
* improve error reporting in RestAqlHandler

* added logging about indexes

* added some safety checks to the logger

* slighty better error messages

* fix location header for SSL

* fix error message

* try to make tests more deterministic

* change error code from TRI_ERROR_INTERNAL (which we want to avoid) to TRI_ERROR_FAILED
2017-10-19 11:28:01 +02:00
Simon Grätzer 7c31960cf2 Feature/async failover (#3451) 2017-10-18 23:59:29 +02:00
Jan 0561bf45ce Bug fix/isrestore (#3283)
* Make isRestore work in the cluster.

This covers sharded collections with default sharding and non-default
sharding.

* always use locally generate revision ids for storing and looking up documents
2017-10-03 11:53:49 +02:00
Jan 5165155ed1 Bug fix/fixes 0609 (#3227)
* do not use V8 variant of AQL functions in early optimization stage when a C++ variant is available

* additionally, simplify AQL function definitions and aliases

* warn when more than 90% of max mappings are in use

* added C++ variant of replication catchup

* added `--log.role` option

* updated CHANGELOG

* removed non-existing scheduler.threads option from config

* removed useless __FILE__, __LINE__ invocations

* updated CHANGELOG

* allow a priority V8 context

* remove TRI_CORE_MEM_ZONE

* try to fix Windows errors & warnings

* cleanup

* removed memory zones altogether

* exclude system collections from collection tests
2017-09-13 16:28:21 +02:00
Simon Grätzer ffc465433a No access collections Improvements (#3190)
* consolidated EdgeDocumentToken

* optimizing cluster traversal

* adding skip collection checks

* API cleanup

* copying AQLValue to avoid use-after-free bugs

* Fixing rocksdb SingleServerEdgeCursor

* Fixing a collection resolving issue
2017-09-07 14:55:07 +02:00
m0ppers 9a0bc716d0 Do not allow replication to create/drop collections (#2898)
In the cluster case the only one who is allowed to do this is the schmutz
2017-07-28 14:24:02 +02:00
m0ppers 589ffd5c59 Feature/improve logging (#2881)
* Improve logging in various places

* Fix jslint
2017-07-28 09:23:18 +02:00
Max Neunhöffer 2f874249bb Bug fix/adjust agency comm timeouts (#2765)
* Take out 503 timeouts altogether.
* Overhaul of AgencyComm::sendWithFailover loop.
* Let performRequests optionally ignore 404 coll not found.
* Fix error message "database not found" when AgencyComm failed.
* Add log entries in Agency if locks are acquired too slowly.
* Reexecute the javascript cluster sync stuff even if there was no plan/current change...So failed sync jobs can retry later...
* Cover callbacks in Communicator by lock. This fixes https://github.com/arangodb/planning/issues/370
* Put in delay in waiting for leader in agency test.
* Schmutz logging to heartbeat topic.
* Add more lock time diagnostic in agent.
* Switch on agencycomm tracing in coordinator.
2017-07-13 00:44:28 +02:00
Frank Celler 2807ef559c Feature/move shard fix (#2626)
Major overhaul of handling of synchronous replication.
2017-06-26 16:55:01 +02:00
Jan ebaeb639b2 Bug fix/incremental replication syncs too much (#2631)
* fix too much synchronization
* fix incremental sync for RocksDB engine
2017-06-21 14:56:33 +02:00
Max Neunhoeffer a97ec1cc29 Try to handle another shutdown hanger. 2017-06-09 00:42:31 +02:00
Max Neunhoeffer 99d6624fd4 Detect a tick zero response in logger-state in replication. 2017-06-08 22:45:24 +02:00
jsteemann 40cf731cd7 fixed typos in error messages 2017-06-08 15:54:57 +02:00
Simon Grätzer 2f2d07ab9a Multihreaded import 2017-05-24 18:37:45 +02:00
jsteemann 0366fba276 try to fix thread joining for replication applier 2017-05-18 21:05:57 +02:00
jsteemann 226920d7fa optimizations 2017-05-17 23:41:16 +02:00
jsteemann 6adebcb893 fix access mode in ReplicationTransaction 2017-05-17 11:53:34 +02:00
jsteemann c5a195d62c attempt to fix races in replication 2017-05-10 14:32:16 +02:00
jsteemann 62aa9a1b0a use exclusive transaction in syncer 2017-05-10 14:29:33 +02:00
Dan Larkin d77efe38dc Added explicit WAL file lifecycle management to reduce space overhead from replication. 2017-05-04 15:16:24 -04:00
jsteemann f2be898664 fix replication tests 2017-05-04 17:46:43 +02:00
Jan Christoph Uhde 3cb1cc7a52 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  Fixing index markers
  exclusive locks for indexes
  better incremental sync
  grunt build
  Avoid log spam.
  Removed code paths that wrote objectIds into the Agency. This did break replication.
  WAL: honor tick end value
  WAL fiter after collection
  Reactivated client-side filtering of unnecessary markers
  Added an Assert when persisting an index it's objectId is not allowed to be 0
  The RestReplicationHandler now inserts new ObjectIds when replicating collections
  moved files
  add dependencies for TransactionManager
  fix include
  move engine-specific test into engine test
2017-05-02 16:41:43 +02:00
Jan Christoph Uhde da02fd36c6 move engine specific syncer code into engines 2017-05-02 16:36:27 +02:00
jsteemann 45096dd503 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-02 16:09:35 +02:00
Simon Grätzer e335a29326 better incremental sync 2017-05-02 15:08:05 +02:00
jsteemann 910f5680b0 moved files 2017-05-02 12:34:28 +02:00
Jan Christoph Uhde a9d2b4dc7e redo: remove unnecessary code 2017-04-28 14:59:13 +02:00
Jan Christoph Uhde cb868d36a9 remove unnecessary code 2017-04-28 14:44:04 +02:00
jsteemann 3b48b6bd51 update safeResumeTick as well 2017-04-27 14:47:22 +02:00
Simon Grätzer 14a3168e40 Working initial sync 2017-04-26 17:01:35 +02:00
Simon Grätzer bdd002d6ec Fixing incremental sync deletion 2017-04-26 14:11:51 +02:00
Simon Grätzer 02e41de608 Working on replication 2017-04-26 13:32:12 +02:00
Simon Grätzer a8285641fb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 11:30:44 +02:00
Simon Grätzer 6472c4928d Various warnings 2017-04-26 11:26:08 +02:00
jsteemann 664c6fc83c added more marker types 2017-04-26 11:15:33 +02:00
Simon Grätzer d228a94462 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/Replication/InitialSyncer.cpp
2017-04-26 11:06:09 +02:00
jsteemann 6b8c818e2d remove unused variable 2017-04-26 09:59:19 +02:00
jsteemann 404ef431ae cppcheck 2017-04-26 09:50:55 +02:00
Jan Christoph Uhde 26112be584 do checking before creating copy of slice 2017-04-26 08:33:23 +02:00
Dan Larkin 20dc8b4fa0 Fixed duplicate objectIds in InitialSyncer. 2017-04-25 16:51:38 -04:00
Simon Grätzer 3aada2afe0 Fixed double handled case 2017-04-25 16:03:51 +02:00
Jan Christoph Uhde e4b3f5c4ac fix warning 2017-04-25 15:12:22 +02:00
Jan Christoph Uhde e06efa6420 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
* 'devel' of https://github.com/arangodb/arangodb:
  fix compile warnings
  Fixed build
  add missing signaling of crashed state
2017-04-25 15:08:17 +02:00
Jan Christoph Uhde fca8f01df6 create logger state just in one place 2017-04-25 14:58:32 +02:00
jsteemann 26d4fd61db fix compile warnings 2017-04-25 14:56:00 +02:00
Simon Grätzer 2f968d649a Fixed build 2017-04-25 14:53:59 +02:00
Simon Grätzer 69c2faf592 Fixed synced 2017-04-25 14:27:34 +02:00
Simon Grätzer 5d20b79c0f Incremental Sync 2017-04-25 12:01:58 +02:00
Simon Grätzer 91fe0f01ea formatting 2017-04-24 15:55:21 +02:00
Simon Grätzer 7176d34169 Fixed incremental synced 2017-04-24 15:40:48 +02:00
Jan Christoph Uhde 2269ca7b0a add batchId and logging 2017-04-24 11:47:54 +02:00
jsteemann f69e8e25da replication bugfixes 2017-04-20 15:08:14 +02:00
jsteemann 5f8d9c4eb8 attempt to fix synchronization 2017-04-18 15:33:56 +02:00
jsteemann ece6a0c035 improve error messages 2017-04-18 15:22:52 +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
jsteemann 81dcfbbe3d pass trx into numberDocuments 2017-03-31 11:33:16 +02:00
Jan Christoph Uhde b83ae2ab82 refactor some code to make use of arangodb::Result 2017-03-30 09:39:21 +02:00
jsteemann 2aa2fd65a4 more startup 2017-03-24 14:20:51 +01:00
jsteemann 328346719a increase max wait time 2017-03-24 12:09:50 +01:00
jsteemann a87b8c4f25 generalize usleep argument 2017-03-16 16:27:40 +01:00
Michael Hackstein 83663c47b2 Deleted CollectionResult. It is identical to arangodb::Result introduced later. 2017-03-10 17:18:12 +02: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
Michael Hackstein 489f0d12b8 Moved the decision to write a marker into the databaseFeature, it is not triggered from outside any more. Furthermore renameCollection write marker is now done in MMFiles. 2017-03-08 14:54:25 +01:00
jsteemann e37e94adbe Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 14:38:35 +01:00
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
Michael Hackstein ae14ae99a5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-27 13:01:12 +01:00
jsteemann 90f32ed525 renamed classes 2017-02-27 11:40:15 +01:00
jsteemann 94ce6a65f8 renamed methods 2017-02-27 11:22:44 +01:00
Michael Hackstein c8f03d16e3 updateProperties now returns an CollectionResult container with errorMessage and code. Moved error reporting logic for cluster-case into this function. 2017-02-24 17:00:41 +01:00
Michael Hackstein 5d452edec6 Moved ditches into MMFiles. 2017-02-23 09:02:34 +01:00
Michael Hackstein a359424af0 Moved logic of write Marker out of the dropIndex API from Logical collection. Can be derived from the engine internally. 2017-02-22 12:32:54 +01:00
Jan Christoph Uhde d73d25a310 remove some includes 2017-02-21 14:43:21 +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 6e1f77be24 remove ditches from interface. the ditches concept needs fixing!! 2017-02-21 10:53:51 +01:00
Michael Hackstein 92f52b13d3 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-17 17:29:53 +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
jsteemann c652a313da Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-17 14:03:59 +01:00
jsteemann 3e7432ccd6 clean up write lockers a bit 2017-02-16 15:44:45 +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 d49c5c3fc0 simplified internal APIs a bit 2017-02-15 12:42:07 +01:00
jsteemann df3a3eff9f refactoring 2017-02-15 10:26:05 +01:00
Michael Hackstein 32bd15d098 Renamed collection->update() to update the properties of a collection to collection->updateProperties(). There is another update() which is used for the stored Documents. 2017-02-14 10:32:24 +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
jsteemann 2c9e220f03 refactoring 2017-02-07 14:36:03 +01:00
jsteemann 0cb7d416d0 moved transaction collections into their own files 2017-01-26 16:51:57 +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
jsteemann de41509d9d factored out TransactionState 2017-01-25 15:55:01 +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 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 e3bcb90916 remove revisions cache 2017-01-24 10:48:07 +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 cdabaa931f renaming 2017-01-16 14:48:13 +01:00
jsteemann a7616ed0f6 fix potential nullptr dereference 2016-12-27 18:42:22 +01:00
jsteemann b96897e296 fixed some issues detected by coverity build tool 2016-12-12 15:41:54 +01:00
Andreas Streichardt 60bca789f8 Improve error messages 2016-11-21 17:47:05 +01:00
jsteemann ab4933c994 performance optimizations 2016-11-09 14:46:50 +01:00
jsteemann de9dc289c0 Squashed commit of the following:
commit f14e88b6259212b33843653292d95a607ff894a3
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Oct 23 11:03:30 2016 +0200

    clang does not like reinterpret_cast

commit 96920079514965e792bf9688cb51cdad944692f4
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Oct 22 13:52:47 2016 +0000

    honor minimal

commit a460c3df878b9e8b544812f0fda471c1fe519458
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Oct 22 12:23:16 2016 +0000

    added hidden options server.maximal-threads and server.minimal-threads

commit 38713a0a614550b38f4eb650ff62300732f90298
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 11:17:17 2016 +0200

    fix test

commit 532d65e0d22fc6916b36d6fda23ab95cd34c1ac2
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 11:17:03 2016 +0200

    re-added methods needed by EE

commit b7624580e7809baa0cdf9145e2102952e872346b
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:11:50 2016 +0200

    cppcheck

commit da5e02351ec7872302840ca14f67aeda8ab3150b
Merge: e216800 d19beb6
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:04:51 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e2168009bde63971d5c7a17653c26a6f9ae23c3c
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:04:30 2016 +0200

    fix non-deterministic inserts into edge index

commit 6b131ee1143f17f5465a8423921b7a96c382013e
Merge: 8ebf7f0 285ddb8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 12:23:53 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8ebf7f043efcda7fd31e1e78c6a0da99cc461b89
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 12:23:36 2016 +0200

    micro optimizations

commit ad32930b9e50ea52cb9821508912ddd80564193f
Merge: b40cfb4 fdb2104
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 09:10:31 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b40cfb44dd4861471385d30f3777b17ba2995ef1
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 16:07:40 2016 +0200

    share some context

commit 2411e59f2bcbd96889aac36e0a38ad62dca1ea65
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:48:05 2016 +0200

    remove unused functions

commit c422037e97572605cce4895c5cdb4b8ffa30f287
Merge: 9e9a2f7 88ea314
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:31:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 9e9a2f7c9428f333fa3c7674bb82853574ea2f2c
Merge: cedced5 638ce07
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:30:27 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cedced52c3dfcefdc8d5ca57924064b350e338e8
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:30:14 2016 +0200

    experimental improvements

commit 455cb59bc641d8137d635d1ff6a137183c455b00
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:25:36 2016 +0200

    pass argument by reference

commit b922a14d984dc82d55d54297552778342b6cea64
Merge: 8afd5d3 0883c49
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:19:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8afd5d35d562de4596af5b5acf1909f3c232ed60
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:19:47 2016 +0200

    micro optimizations for shortest path

commit e92edcc7f5dcb1429052d337eeb10b087f5dfac0
Merge: eb2d774 084961a
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:50:42 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit eb2d7747d81bc0105579ad2e6f19a4743bd217a8
Merge: 146d3e3 b376769
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:30:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 146d3e3b90304897459ecde3b9d9b282042a412f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:29:41 2016 +0200

    mini optimizations for traversal

commit a8cfa933c8f96840a4dca355a1efee2086a5cf2d
Merge: b990d0f c3de3ca
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 10:37:35 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b990d0f6914d4c483f9e521d0132937eb0aa5bc4
Merge: deea0b0 090a591
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 10:37:31 2016 +0200

    Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache

commit 090a59103feac32b848f18fafdb4f97816bf92f6
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 09:14:52 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit deea0b00b1ac35b4b23756218d2c12ab72185b09
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 09:14:40 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit d8537ef56e537356e32b82e10cd2b9833c542bb8
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 17:16:42 2016 +0200

    potential performance improvements

commit 828ac8743ce67a964bd2d622689cf3c69b7aa22e
Merge: e696a95 76ec1fd
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:38:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e696a95b50db1a8819247ef855b0dad710b4cc62
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:37:07 2016 +0200

    dont pass nullptrs

commit 5b31ff978091fa1ae80d59b6ba7bad63f0c83ef7
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:36:45 2016 +0200

    fixed shutdown order

commit 8698892b6e9395151dcfdca778ad9177b19b1614
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:25:21 2016 +0200

    added assertions

commit 8bcc2d4610ae0c15f6406b82568e3a15a8f6df5a
Merge: 1f0676b 92b5887
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:16:24 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1f0676b9e95dc47a2c573380c6d165f875fe6e87
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:15:06 2016 +0200

    potential performance fixes

commit 3eeee4a904079d33d6fd695100afc080acde1dc7
Merge: c111396 14d8d35
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 11:39:22 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c1113968db5fd9e4cefa8be0150dafc37cf1e25f
Merge: 4db8b2c cd3a5b4
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 09:08:28 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 4db8b2cbb75218391b6499de7a35bca480546031
Merge: 241e0ab e181457
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 17:48:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 241e0abbee7d040eeadfa2d0fd195f21a4eac0d4
Merge: ed309a9 93c5672
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 17:48:05 2016 +0200

    Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache

commit ed309a9abaf3185af7e4ed75278eb78716e18935
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:25:32 2016 +0200

    fix compile error

commit a53793c63988ac4e4ba8a074f61e8130c01aea04
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:13:32 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 93c567295186197236fd8d4a2f25109167e57c6c
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:07:10 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ddfc6ebbd475a238cfe23ed9b9860ea8ed840355
Merge: 762d01e 0d1572c
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:40:57 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 762d01ed7c58c2981c8f7ff8f0736e47d34006df
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:40:45 2016 +0200

    hold mutex for shorter period

commit 74f5e8a402ec7f94606053acf3361225d7140bee
Merge: ece92b5 6bc276e
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:30:36 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ece92b50a7f87685e7b3e9b2503ec224573b7663
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:30:17 2016 +0200

    performance optimizations

commit 979b5e29a3f707104fe70e632fc2f701fc8b731b
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:29:56 2016 +0200

    don't use pointers

commit 3f30c6d849d586c01020bb093d094dce91f14d13
Merge: ab3af79 0baecf1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 14:16:36 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ab3af79ca3f608df621bc98966e8d93bd848d401
Merge: 818f576 3c96c6f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 14:14:37 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 818f576580683704147f113208f2376de8eed9da
Merge: 19e1488 1c1a659
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 09:24:15 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 19e1488220cecfb0588f9b49b9f6cc26ea6fa93f
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:55:25 2016 +0200

    use half of RAM for target size

commit aef5156b7d131b47d7deacf30f20ad1dde79b843
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:51:28 2016 +0200

    revert boost changes

commit 294517d36f2c35757593b705ac2a5e56f3d9b9dc
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:51:20 2016 +0200

    fix compile error

commit 80b7560a041fd80e5b0199b5ae1cbe0a96d118a5
Merge: b220f79 f748bab
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:42:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b220f795b686a1b7a8c7f1eb50b32eee5ff573ae
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:42:16 2016 +0200

    stability fixes

commit 4751c25ef42cbc2f688dbe9761453e6a1209d959
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:42 2016 +0200

    silence boost compile warnings spam

commit f7f7cbeedc8881feb4eec45591f70b24a3d9292b
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:29 2016 +0200

    fix compile warnings

commit d1e3f35e55963666d85c5084cb01dc8330866249
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:14 2016 +0200

    change warning to fatal error

commit e858e5f6bbfd1ad5a32eea66fe7881d795527af4
Merge: cbe8299 0586862
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:58:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cbe8299d8b127588533d8a292e46d77f889a8845
Merge: 4859562 df391b2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:30:24 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 48595629fe43531d9fbbd5b982cb3c78b18b17f2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:30:03 2016 +0200

    move most-accessed property to the front of the struct

commit 660e3e3b94bc0b2ef5783097886939c67c6b1d27
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:29:52 2016 +0200

    don't create too many lookup contexts

commit 6c8a93b9ed4157511b04262bc429ae4df3531575
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:21:21 2016 +0200

    no copying of results in HashIndex

commit b91c040b70afc02b1e7a22a9b6e223bbac254f55
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:57:48 2016 +0200

    privatize methods

commit 70d8d6e50545b097e9e5c7dfdd0cc210af8ce3b8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:43:07 2016 +0200

    don't spam on shutdown

commit c3d37194513f4576a41cc41408af4bac7a5084ca
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:42:58 2016 +0200

    share IndexLookupContext

commit ed8362422d3bb8d8462820581ea029209fb80387
Merge: e674f2b 73f87e8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 14:17:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e674f2bd5f419243461c5b34fa507277fabdffb3
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 14:17:22 2016 +0200

    transition static array chunks cache into an unordered set

commit ceb1dc126efa28a2cfca2f73037b6a3df57d99b2
Merge: 254e167 0a82f16
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 13:31:20 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 254e167f5195cd316dda8a79bd3103848bd09ba8
Merge: ce5ea17 f1c3c89
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ce5ea175f0dec9634577d9f8bf691aea8985b9d4
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:32 2016 +0200

    remove locks in case they are unnecessary

commit 0277c938871cee66e9ef1486efe8ab0d3be24885
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:11 2016 +0200

    fixed bad optimization

commit 2db9e3534e4b9f7cb54c7b8ce52913334535b876
Merge: e408593 8c7034e
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 10:47:57 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e40859312d25a42ee41640341ece78255ab5d0df
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 10:47:41 2016 +0200

    performance optimizations

commit 6c9f19b06fc428581bee193cd7a3b9ce5a7219bb
Merge: baf397b df977e6
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 11:16:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit baf397befd61cbb072c0cebc27bf72726f22d21a
Merge: 2c43c62 d229ac3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 09:41:40 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2c43c6242ea606428789b2e33295610e1b2d15f0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 09:41:24 2016 +0200

    performance optimizations

commit 6304f67551dbdfc82579e37d5b02f1c73bdfe4e4
Merge: 8504836 bf8da24
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:30:34 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8504836efa2da621cb15e028dfae2f7608d37383
Merge: c4e27d0 48d29c9
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:30:28 2016 +0200

    Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache

commit c4e27d0ad85fcef3b5456bf9a2e43d717fa634e9
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:19:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 48d29c9abe585801c1df96fcbac73498d5f41fa7
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:19:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 95aad698140f38e07d19b693075b008fbb0c5681
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:18:42 2016 +0200

    use relative include path

commit 7e410c86cf6e5f5e2431801728f9683daa70a8c0
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:18:26 2016 +0200

    simpler iteration over all documents in a collection

commit 49eec355dfbc4a5812245adc7199de0ae74a35c3
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:11:45 2016 +0200

    micro optimizations

commit f7e2d008f32d9526a525ddb15ac696b2af6eacae
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:10:16 2016 +0200

    move seldomly-used code into own function

commit 7fb500e0bf97fa9b1be497cbae4c0022bb101615
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:09:56 2016 +0200

    micro optimizations

commit debf61f9563f00a34028e31ea91fdd8274b5c401
Merge: 1a1024d 053e7fc
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 12:15:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1a1024d38563f4cb08c68be0d5a891fcb2414954
Merge: 89414ef 001407d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 08:47:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 89414efadcfc3db01e43d2baa5ef6d12f627aa17
Merge: 221ae0d 0bfe447
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 17:12:03 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 221ae0d34e6d6316dd7079c3c025a5b890a7a273
Merge: ee038eb e75b8f5
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 16:46:09 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ee038eb2115b021de5f5301edb8c4e4337e3faad
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 16:45:49 2016 +0200

    index refactoring

commit 20739bdffca0104bceb603073f7a50023febbdf1
Merge: 9c356e4 5d65b0b
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 09:11:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 9c356e462ebcf05dd37ba424d2d9b1d007d3164c
Merge: e50a934 8aa34ec
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 16:19:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e50a934b151e7a92d916ce8ffb0ca167bfb02e10
Merge: 00e1fff 51dd5a9
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 16:19:08 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 00e1fff3b0e7bff7afd74023aa24b2abd061fe42
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 15:15:34 2016 +0200

    changed primary index to not use pointers

commit 0318f177e13a2c9d5e3f8473d8b63de505f5d80b
Merge: 6230439 3fc8677
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:28:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 6230439538c73bd3e2bf553bea6a53f91db1db28
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:28:05 2016 +0200

    remove _extraMemory

commit bf5b4f957751fa0fc6702da62ce46a008613a99d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:27:52 2016 +0200

    index API preparation

commit 5a2d19daa5f0c95131733eb94ea9182fa5b8f822
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:19:15 2016 +0200

    fix API

commit 4835ba6ca3ed071e477bf69cec4eec1b9b46b12a
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:19:08 2016 +0200

    removed garbage

commit a8f29ad166d50cb85bf0f95a0594d8a8baf3043b
Merge: d559c31 f790795
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:02:29 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit d559c316922e06c3cf5da6654afe9aeae15a8d5f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:13:58 2016 +0200

    cppcheck

commit 89f525278e87d0ae926367f5c2fdb08faba4932f
Merge: 6ba81c2 21beb09
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:05:19 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 6ba81c27e6cfa425c2a59569a371707abd2aa8f3
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:04:59 2016 +0200

    enable disabling _rev checks for pre-release 3.1 data

commit 21b701c1792d8eeaa0321ce494fafe9102c1ba9a
Merge: 1bddd76 11a9d3b
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:24:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1bddd7645fb3761eb2946b21f08f5189dadadf11
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:24:00 2016 +0200

    free unused cache memory more eagerly

commit 0136e2f0514c9fc2b35a5d21b72a3ebb64c0aaaf
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:23:52 2016 +0200

    renamed variable

commit 9c276a069a24f5d4544b7147efe57679c039eebf
Merge: 7c70abb 93cb87e
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:37:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 7c70abb2ce45858aaa77e08785bf635e699428f0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:37:34 2016 +0200

    platform-specific target size for revisions cache

commit 817561b1c220a4bf82b5a554efd1b70980eaa406
Merge: cb4b9e7 750b562
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:30:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cb4b9e75ffac7f33041562c57e2a062ffc8f7aa0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:58:53 2016 +0200

    fixed crash

commit c5dbd81bd6405bb4247d57fa6afdf39f48f0922c
Merge: 8dad7b3 ca102fc
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:55:07 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8dad7b3de027a29acab9c97ec00a21baf8fb36d9
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:54:51 2016 +0200

    fix garbage collection

commit 8cac202eb8f2d05a42fc64922096e7e814de23a3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:32:55 2016 +0200

    API cleanup

commit 728429981af90b9a0207646acd9b4e32fa78f7d3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:22:47 2016 +0200

    make option hidden

commit c3fd3621d4f929c860a19ee99b523c71e5510b48
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:20:53 2016 +0200

    remove OtherEngine

commit dd069158ed9be8aca4d9221d38e16771f424081e
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:18:40 2016 +0200

    preparation for results aggregation

commit 983980afd2bdbc3602676b305dea3f816b12bd78
Merge: c46fd98 8a5bc21
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 15:23:16 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c46fd98516ba5674e0a3abad544c2b5cae7e340e
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 15:23:02 2016 +0200

    use own hash tables

commit 1e11621149dfd8d98cc78adcae9181778454abf1
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:15:37 2016 +0200

    fix another crash

commit 0bd000c880afa78d45b215adff7dcf055ee9eb8e
Merge: 7e5da3d 69e453a
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:12:54 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 7e5da3d08667823af80d75e0eaf7af41d8cebd4a
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:12:40 2016 +0200

    fix crash

commit d2c9ae228de019380091fdccafb50960d1ae17ac
Merge: a2571d5 2d4bcaf
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:47:49 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit a2571d581cd3e52941846c4ce8f488b9220af0ea
Merge: d02b002 1f0ecf9
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:04:53 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit d02b0026fa8cbcec0539985ba9f5fc5ca2eb1592
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:04:31 2016 +0200

    garbage collection

commit 04794a8b5cfea93f9d0e620119941753052609de
Merge: c38c2b7 454e0bf
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 17:38:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c38c2b74955b33046ecb1d459a98c76b7f908aa4
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 17:37:55 2016 +0200

    fix shutdown

commit 3d0f7d3daedd9332222648f8e096dd84d9eba142
Merge: 2bbe5a0 54a0d45
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 16:38:05 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2bbe5a02aa2d9010056ec09bb526024fce9ed108
Merge: 8442ea6 0ea2ca2
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 16:35:29 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8442ea63e5bc84705b844066e11dd4c334b0d796
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 15:00:35 2016 +0200

    read caching

commit 0cb85c8d9fb7092ad5365de69cc51b989ab84449
Merge: 5baa73d 44edc6c
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 12:52:39 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 5baa73d63eb9dd4a6b5168da636bd8b89958883a
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 12:43:39 2016 +0200

    preparation for read cache

commit 55445bfb85374fd1b88ebfc29151ac60e10d1d81
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 08:50:42 2016 +0200

    refactoring

commit f1cf513a8c1359a9e4e8f18b8a6af0c5440bc091
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 16:19:58 2016 +0200

    refactoring

commit 2ab07bb6efda66b22cff2b02b64e7d17157ea56f
Merge: aa8327c 1bdf414
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:51:11 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit aa8327c151b7ae06046ad5ce95aed3d3e5c45a10
Merge: c55fd03 35e14fd
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:14:00 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c55fd031c612aee1479e361d51d92212a4e74d19
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:12:36 2016 +0200

    fix replication

commit 51164b4e70f6a6a16f841f369ecde1e906abb102
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:12:30 2016 +0200

    refactoring

commit 548c7f60dd14d834f796f7dde6d90feb9ba1be8e
Merge: 6be89c3 9b951ff
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 12:21:22 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 6be89c3013e5fb1eddf83befcdaf5d5ff935e9f1
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 12:20:52 2016 +0200

    allow storing arbitrary data elements in AssocUnique/AssocMulti

commit 73e5b06a050db6c3994abeba14675fe93e0c5b3b
Merge: ab5bb48 d9d0926
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 10:22:01 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ab5bb486bcb2e4eb8fb7267a68a7939c85e64f5b
Merge: 345963c a94db7d
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 20:50:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 345963cb6931fc7ce1f2714735f4bfbc60ca50e1
Merge: db3a071 d6a3b81
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 16:42:20 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit db3a07134341156c1489399e33368858059094df
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 16:30:52 2016 +0200

    removed last occurrences of master pointers

commit 29222e71415120a9c7163cbc420414b93acad988
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:14:20 2016 +0200

    pass Transaction in API so we can make sure a transaction is ongoing

commit 78ba63060d1675eec6d35abe056d22c2cb6b91fb
Merge: 906dc42 560da96
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:00:52 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 906dc428ddf8ef079f7fa3664cb89df3fbf07c21
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:00:23 2016 +0200

    pass initialCount to physical

commit 46971f72b09dd2dbbd8e20fad7be138298ec0180
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:39:05 2016 +0200

    privatization

commit 7ec3508bb0be4b56de9fec42e1417000efe20ad7
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:37:17 2016 +0200

    move master pointer management into engine

commit 667fbef8ce5ec426e3a16a5ef377ff0e42b42444
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:18:50 2016 +0200

    index cleanup

commit 8fc5c764044438f2fc854f48c517a811e31f2df1
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 22:45:32 2016 +0200

    constexpressified basic VPackSlices

commit ae8bc45a3fb34cf8f9a39548e22039d505619038
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 21:51:55 2016 +0200

    renaming

commit ba1b68c468e20a3d5282a937efd8a2e063c1abac
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 21:38:05 2016 +0200

    move last master pointers into engine

commit 179741cd1711954f91d8ec53fad7221977c4bfc3
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 20:50:41 2016 +0200

    remove includes

commit ea4e5ac9d0c0479ccc34e91f7fdc08e605005681
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 18:06:54 2016 +0200

    removed TRI_doc_mptr_t

commit 40c7ce768898f0e4f09b133dedc335a65d1b0a21
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 16:43:44 2016 +0200

    removed more TRI_doc_mptr_t

commit 3450bcc042d4caf8499af3c5454e37b1eeaf8a28
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 16:43:23 2016 +0200

    removed more TRI_doc_mptr_t

commit 64e17c8744330d2835c39523c7b15f9b79c429ef
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 13:56:08 2016 +0200

    cleanup

commit 38feed51f15bdefa95e18dab0b694eccfe1d6a3b
Merge: dbbdeb4 ec15c72
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 11:03:08 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit dbbdeb44f17f804fa798e2ee4d677543fec1b05b
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 11:02:45 2016 +0200

    make geo and fulltext index more robust given different platforms

commit c4e90fcf6a44390ecacacd6dbca3e5cf43179484
Merge: 86603e0 049471d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:38:56 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 86603e04710170108d8ef4c023fa68f9366e628e
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:38:37 2016 +0200

    removed unused struct

commit 86b1b2568aefaba5ab7f621cb27b0ae5841b4da5
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:22:12 2016 +0200

    less TRI_doc_mptr_t

commit 30c3077002f23970e689ac422371b4e8054797db
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 16:49:09 2016 +0200

    less TRI_doc_mptr_t

commit ddb8ea6e958464f12a20a5d9e29772074dab22db
Merge: 14b9b5e d4d5e15
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:50:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 14b9b5e22030c98459b5b547cb0417a0be7970a2
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:49:44 2016 +0200

    remove mptr from method

commit cc0ed4046fcef91571f0b9b612fb290d2c19791f
Merge: 8b2b849 6fa99b6
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:27:30 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8b2b849e8c256559fc579da74863b2005356481c
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:26:57 2016 +0200

    create separate mptrs on update/replace, and dont mess up the existing ones

commit 88b885e2aa36b33feb3983a4c822c593fcfbf165
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 13:11:38 2016 +0200

    cleanup

commit 851e62ef0697c60590da7f26524dd824192e6a78
Merge: 05f2fcf f510773
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 12:53:19 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 05f2fcf5ea52baf45aa8fff4624d9fe08fd9b4c7
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 12:53:11 2016 +0200

    a bit more cleanup

commit 4928db648984811c58cb3e33be672f9c46c79320
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 10:42:49 2016 +0200

    remove occurrences of TRI_doc_mptr_t

commit 8c1f0cbec38a4c62c1d481d291a7b913273f5271
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 09:13:17 2016 +0200

    partly move master pointers into engine

commit f80bf0c097f9439a8f3b3db8bac27d63086f4de9
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 15:43:26 2016 +0200

    refactoring

commit 407ddd508aa6016e99bf311df13c8aa0f8ae94c3
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 15:34:46 2016 +0200

    refactoring

commit a40c87ead0b6ad3cdccdc826ad178b25f5ea466e
Merge: df3ceea e245e15
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 09:11:48 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit df3ceea699ab4f41501bb79eb206fa54bd502383
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 11:21:48 2016 +0200

    cleanup

commit e5ff73bf80c064a4c92372ea80c3a2351973df1c
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 10:37:17 2016 +0200

    cleanup

commit 44f42b25f09a2110b60d042635f8213242483f8f
Merge: 2bf7e33 fad7efe
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 10:00:38 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2bf7e3373b0ad7e2a2fed7ccf883be05a51e4a22
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 17:21:51 2016 +0200

    unify index iterators a bit

commit e83455dece1bd014a126e9a5554f9a7c1fe4de3f
Merge: c83eab8 c912d96
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 14:07:52 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c83eab87106ca6f5123a4a4747a730deb71069eb
Merge: fb4c5c3 b9b7d8d
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 13:59:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit fb4c5c3108af5ae8bd5bdd70748687e24b983b37
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 13:58:58 2016 +0200

    bugfixes

commit 7643365abca94aca5d138bd46341d086c1f0fb14
Merge: dabddf7 7e866a8
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:37:19 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit dabddf728932cc00abc6052370cab9d081eb1025
Merge: 1662199 abb16ee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:34:00 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1662199d843256c0002c59c85b5f013306098cee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:17:25 2016 +0200

    cleanup

commit 3ce9cf9de45f324af07112b2ac0c79ef22805cb1
Merge: e5d9703 135edf1
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 09:29:38 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e5d970356041123b92a6ee20e4e800175e04f548
Merge: cd2def8 542f4bb
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:44:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cd2def8762859d1cafbe066936a22a5ef27ae508
Merge: 9baaf4b a9cb076
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:20:43 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 9baaf4b32d6356d3defdfd8a4b1c0cf3f7ebfacf
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:20:24 2016 +0200

    intermediate commit. not working yet

commit 0ec0a7ce2598f4fb7a55880611947e12112e14b3
Merge: 66c6bbe 1a2a3ba
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 14 09:43:27 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 66c6bbe68fd20cfd9c2b8c00b2220294f29124ef
Merge: f5aadb1 b5ccbd1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 17:02:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit f5aadb1b82a85334b3a26b6fd6b9f00bebfa65f1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 17:02:08 2016 +0200

    some index refactoring

commit 23e5db5bdb2a192cb4e7fe9b4572fb1e272c4a11
Merge: 25355ed 84fbc98
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 12:52:30 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 25355edc43111717de0d80101e56f44c99d84a56
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 12:52:19 2016 +0200

    removed dead code

commit 9dd274a1c1694c53987dc6d77526711b46ba996c
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 12 09:20:34 2016 +0200

    some refactoring

commit 049c11769dd38b7afac9cb85ef03ce617f96140f
Merge: ee75b21 a620690
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 12 08:43:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ee75b2169b533bafaac49752ca3b11b43940b928
Merge: 4f3a3ac 9539f2f
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 17:07:05 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 4f3a3ace83b301aa5e86e4b85b1b03f02f3dd0ea
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 17:06:46 2016 +0200

    refactoring

commit 190520d23d89c5435e4b5fce4ed7dd6dbdcc9d6c
Merge: eacd578 61c6e3b
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 16:34:00 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit eacd578f1d837a622a69fdf1b7d0ca03fbe7d5bb
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 16:33:47 2016 +0200

    refactoring

commit 7dbac24e00e39943130cfcc3e8a9923fda15c663
Merge: 7a62bb8 2761b7d
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 15:20:49 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 7a62bb830749a661c189d96d6931ba3993bc00ee
Merge: 8d40248 4cebbf9
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 15:09:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8d40248badbf0f11abbd67a21dc356bb6c5d7ee2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 14:45:39 2016 +0200

    renaming

commit bedbe0f5105ba682552ad8192a6753ed68fe899d
Merge: c1321a3 1fcc5b1
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 13:57:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c1321a37e06fbf56e66456fb8341cce46bd2ae37
Merge: 13c14b9 884b6d5
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 13:53:51 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 13c14b96ac95331171013ca2283cb5c6923d7489
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 10:29:27 2016 +0200

    renamed

commit 60b8189cf9b045493fb863bc5988e55f865a6280
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:42:03 2016 +0200

    use algorithm::transform

commit 9019c3247db8b75340721d949754a90da648d511
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:41:37 2016 +0200

    get rid of free()

commit 2c6ab07b469d86297131d420c1a14a95771017b8
Merge: c49664d 331c4e3
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:30:21 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c49664d95b308c4b59b9ff07fe1f1d68f9742778
Merge: b42aaeb 01e445a
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:22:56 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b42aaeb3dfda6fce26eab0de47b617601a7cbfb6
Merge: 964fa6a 64da7d0
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 08:56:54 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 964fa6a2d656fed8bc89e4da445892df9d20046f
Merge: 24fd06e d7b4ad5
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 17:30:09 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 24fd06e5263d2b82e32f128270fc16af06839095
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 17:29:40 2016 +0200

    added initial cache

commit 6f092c2d8828b86627fbd80e67be8a5985bda88b
Merge: 2733228 df4dabc
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 15:48:33 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2733228be753bc5425adca5963b865f7d5168a46
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 14:37:32 2016 +0200

    cleanup
2016-10-24 10:18:30 +02:00
Andreas Streichardt 60871645bb Unused variable 2016-10-18 10:35:14 +02:00
Andreas Streichardt 1318fa313b Implement cluster authentication 2016-10-17 13:35:55 +02:00
Frank Celler eed90fc588 fixed cppcheck warnings 2016-09-09 15:08:48 +02:00
jsteemann f5f5c773e4 make error message unambiguous 2016-09-05 13:55:04 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +02:00
jsteemann 4839d65b36 moved things out of TRI_collection_t 2016-09-02 11:56:48 +02:00
jsteemann 2c92879161 cleanup 2016-09-02 10:26:43 +02:00
jsteemann 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
Michael Hackstein 82edb8707a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 10:12:36 +02:00
Michael Hackstein 7cf7b89c6d Removed more usage of VocbaseCollectionInfo and replaced it by LogicalCollection. It's getting better now. State still not green. 2016-08-29 18:44:34 +02:00
jsteemann e8c8f286cb cleanup 2016-08-29 08:53:23 +02:00
Michael Hackstein b01a7ac0d5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 08:02:54 +02:00
jsteemann 999e2dab1b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 15:38:12 +02:00
Jan Steemann 34a31f2b97 issue #2006: added more diagnostic output for some replication errors 2016-08-25 14:02:35 +02:00
jsteemann 396ab41736 allow dropping system collections in some rare cases 2016-08-25 12:47:06 +02:00
Michael Hackstein 1f3dabc8e1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:08:39 +02:00
Michael Hackstein 2af30f056d Moved index creation to use LogicalCollection instead of TRI_collection_t. Involved changes of the constructor, all can now be created using iid and Slice. Removed specialized functions to create/find indixes in v8-voc index. Also the iteration is modified. This commit compiles but tests will fail. Merge commit. 2016-08-25 09:57:36 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Michael Hackstein 635641d4e5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-19 13:15:48 +02:00
jsteemann f6ca78f9e7 removed JsonParser 2016-08-19 12:39:26 +02:00
Michael Hackstein dce3cf412d Removed warnings. 2016-08-17 15:57:33 +02:00
Michael Hackstein 17a6da8afb Removed all references on TRI_vocbase_col_t and replaced them by LogicalCollection class. Not everything is properly moved and implemetned yet. This commit causes crashes. 2016-08-17 11:10:39 +02:00
jsteemann 95ac01313b privatization 2016-08-04 17:06:51 +02:00
jsteemann dd30b47b9d make _state private 2016-08-02 15:31:55 +02:00
jsteemann 9677210e57 refactoring 2016-08-02 15:00:25 +02:00
jsteemann d92f15aeed entirely removed TRI_document_collection_t 2016-07-29 17:48:51 +02:00
jsteemann 59ed0a902c refactoring 2016-07-29 17:07:16 +02:00
jsteemann 329b733090 moved dropCollection into TRI_vocbase_t 2016-07-28 13:14:12 +02:00
jsteemann b3bdd3a66a more refactoring 2016-07-28 11:47:20 +02:00
jsteemann 31407c3561 refactoring 2016-07-27 17:15:52 +02:00
jsteemann 10a60b5458 refactoring 2016-07-27 15:40:25 +02:00
jsteemann 89e0c11b44 refactoring 2016-07-26 16:25:38 +02:00