1
0
Fork 0
Commit Graph

227 Commits

Author SHA1 Message Date
Tobias Gödderz 1800a26297 Remove hasMore (#5810)
* Fixed hasMoreState remote communication; cleanup in RemoteBlock::getSome and ::skipSome

* Removed /_api/aql/hasMore and all ExecutionBlock::hasMoreState() methods

* Removed now useless method RestAqlHandler::getInfoQuery
2018-07-10 09:50:08 +02:00
Tobias Gödderz fc3e11dbbc Async AQL (#5806)
* Modified header to new initializeCursor API

* Adapted initializeCursor to DONE/WAITING API. Compiles but not tested and no one reacts to WAITING state, it is not returned anywhere yet

* Subqueries now expect a WAITING return from initilize cursor. However they will just return a nullptr and pretend the query is empty, this will be fixed later

* First attempt to simulate thread waiting over information within the query

* Small fix to allow for isDirect handlers to go to sleep.

* Waiting in the necessary places now for the async request to be send.

* Thank you auto-casting compiler, you are totally right i absolutely wanted to use this bool value as an index in may Array. How could i possibly not want to use it here?

* Include cond-var header

* Fixed mutex/cond_var usage

* Added oldAPI wrappers in AQL Blocks for get/skip some variants. This Commit compiles but is NOT tested

* Let getSome now return unique_ptr of AqlItemsBlocks. Also implemented the async variant of getSome in subqueries.

* Removed all references to OLD implementations in AQL. only the base wrappers are allowed to call OLD functions from now on. Now the testing part starts

* Fixed endless virtual recursion

* Implemented new getOrSkip API in SortBlock

* Implemented new getOrSkip API in LimitBlock

* Initilaize all variables

* Fixed logic bug in SubqueryBlock

* getBlock in ExecutionBlock now returns a state. All blocks need to handle this properly!

* Createad a wrapper getBlockOld that servers the old sync api and is used now in AQL. To be replaced overtime.

* Added IndexBlock::skipSome and IndexBlock::getSome

* getBlock now returns its old return value along with the state

* Switch from getBlockOld to getBlock in IndexBlock::skipSome

* Switch from getBlockOld to getBlock in IndexBlock::getSome

* ShortestPathBlock::skipSome is not implemented! Added a regression test

* Attempt to fix SubQueryResult memory management

* Fixed LIMIT Block

* Moved from ShortestPathBlock::getSomeOld to ::getSome

* Implemented ASYNC api on SingletonBlock

* Adapted EnumerateCollectionBlock to new async API

* Fixed FilterBlock and adapted return block to async API

* Adapted NORESULTS block to async AQL api.

* Adapted Modification Blocks to async API

* Fixed some initialize cursor functions to reset values required during get/skipSome

* First steps to adapt ClusterNodes to Async AQL api. Not there yet, need to implement the core still

* Added asnyc implementation for xxxForShard in ClusterBlocks. This commit changes internal logic of _doneForShard. Needs additional testing as soon as everything is in place.

* Adapted CalculationBlock to async API

* Adapted TraversalBlocks to ASYNC Aql. This is not optimal yet, we need a better decission if we are DONE or not on RETURN

* Adapted EnumerateListBlock to Async AQL api

* Adapted RemoteBlock to ASYNC API in getSome/skipSome. The whole thing is now LIVE in the cluster. Exetensive testing to be started now

* Fixed IndexBlock WAITING behaviour if Waiting occurs during a index processing

* Adapted IReasearchViewBlock to ASYNC AQL API

* Fixed SortingGatherBlock in WAITING state.

* Adapted IResearch ExecutionBlockMock to Async API

* Unified the HASMORE/DONE distinction. Code is much more readable now and harder to get incorrect 👍

* Implemented tonly heoretically reachable function of non void function.

* Fixed last commit

* Added inline TODO comments

* fix warning

* Fixed a clearing logic bug in RemoveNodes

* Fixed Error Handling in RemoteBlocks. Also fixed a logic bug (true/false simply has a 50% chance of getting it wrong) in Distribute and Scatter.

* remove unused methods

* Fixed failure test

* implement skipping

* Moved the Query Waiting out of the ExecutionEngine.

* changed one of the collect blocks

* Removed _upstreamState from ExecutionBlockMock, that is in the base-class now

* Added a Test Mock for a an ExecutionBlock that simulates the WAITING/HASMORE/DONE api.

* do not check "hasMore" if not necessary

* Added DistinctCollectBlock::getOrSkipSome from ~Old and changed its return type

(still uses getBlockOld)

* Save state to resume in DistinctCollectBlock::getOrSkipSome

* Extracted redundant code

* fixed some ops

* added one more test

* fix endless blocking

* fix compile error

* fix test

* Refactored HashedCollectBlock::getOrSkipSome

* Return blocks to the manager

* Replaced usage of getBlockOld in HashedCollectBlock::getOrSkipSome

* remove unused shutdown calls, simplify ownership for expressions

* Removed superfluous variable

* Capture const variable by value

* Removed SortedCollectBlock::getOrSkipSomeOld in favour of getOrSkipSome

* Added a working version of SortedCollectBlock::getOrSkipSome

Has yet to be cleaned up

* Removed isTotalAggregation special treatment

* On no input, return a group of nulls (instead of no group at all)

* Bugfixes

* Simplified code

* Move return to the end, eliminate duplicate code

* Corrected skipped count in HashedCollectBlock

* Aligned getNextRow() implementations

* Added comments

* some cleanup

* fix potential memleak

* Bugfix

* Fixed failure tests

* Removed usage of getBlockOld in ExecutionBlock::getOrSkipSome

* Replaced hasMore with an async implementation (mostly)

* Removed getBlockOld()

* Added hasMoreState to the AQL API (and renamed hasMore methods to hasMoreState)

* RemoteBlock now uses the async hasMoreState route

* remove job queue

* options

* Bugfixes in the async implementation of LimitBlock

* LimitBlock::getOrSkipSome now always skips when calculating the fullcount

* fix compile warnings

* restrict threads

* Fixed api of Waiting ExecBlockMock. Unused yet

* Made SortedGatherBlock async-capable

* Removed nonEmptyIndex hack

* Removed duplicate traceGetSome~ calls, moved all to getSome

* Added asserts before replacing getNr*Registers

* Added a TODO note and a comment

* Removed getSomeWithoutRegisterClearoutOld()

* Removed skip()

* Removed common code by using getNr*Registers()

* Use getNr*Registers() in the TraversalBlock as well

* started to add lane

* started to add lane

* added lane

* completed lane

* removed debug output

* fixed merge

* Began working on a test suite for AQL tracing/profiling

* Added more tests and asserts in aql-profiler

* Made some ExecutionBlocks final

* Added a type enum to all blocks and the per-block stats

* Add block type to stats nodes when tracing AQL on block level

* Removed initializeCursor call from instantiateFromPlan

* Avoided additional getSome calls after DONE

* Added more profiler tests

* Refactored ExecutionBlock::getOrSkipSome and fixed two bugs

- set _upstreamState also when skipping
- explicitly use xecutionBlock::getHasMoreState()

* Bugfix: update state

* Reuse parent _skipped wherever possible; rename where not (LimitBlock)

* Simplified SortedCollectBlock::getOrSkipSome and reused general pattern & code

* Implemented missing virtual function (with USE_FAILURE)

* Reset neccessary values during initializeCursor

* Simplified code in EnumerateListBlock a little

* Added a test for DistinctCollectBlock in aql-profiler

* Avoid redundant getSome calls in DistinctCollectBlock

* fix compilation

* Fixed DistinctCollectBlock profiler test

* Added a second profiler test for the DistinctCollectBlock

* Added a profiler test for EnumerateCollectionBlock

* Bugfix in EnumerateListBlock

* added --server.fifoN-size

* Simplified EnumerateCollectionBlock::getSome

* Simplified EnumerateCollectionBlock::getSome, and return HASMORE less often when DONE

* Fix testEnumerateCollectionBlock1 for mmfiles

* do not pass by reference

* Fixed compile error

* fixed merge conflicts

* Added profiler tests for EnumerateCollectionBlock

* Test fix for mmfiles

* Fixed IResearch tests

* Bugfix in DistinctCollectBlock and a regression test

* Updated comment

* Bugfix for query statistics in cluster

* Check plan in distinct test

* Fix aql-profiler tests in cluster

* Removed unused line / bugfix for single server test runs

* This commit implements waking up of AQL queries. (#5651)

* Non-compiling intermediate commit for handover.

* Make branch compile again

* Started implementation of continueable rest cursor handler by moving the callbacks to the outer part. This is not yet fully tested!

* Made finalizeExecute noexcept. We cannot react to this errors as the response was potentially written before. Also introduced continueExecution in the RestHandler engine.

* First successful query wakeup.

* The wakeup callback now posts on the scheduler directly. A resthandler only needs to provide a callback that encapsulates the continueExecution call on this handler

* renamed finalizeExecute to shutdownExecute

* Added a differentiation between Handler and Callback in Query continuation. Handler will be posted in IO service. Callback will be executed directly

* fix audit log

* Removed callback from deleteQueryCursor. This cannot be waiting

* use CONDITION_LOCKER

* removed yet another thread-local variable

* Fixed forward declaration

* Made RestAqlHandler repeatable

* Use defer to close the query in RestAqlHandler. Now waiting will close the query as well.

* Added a mutex in the RestHandlers to make sure if the callback over network is too fast that there is only one Thread running in the RestHandler

* Captured the GeneralCommTask if it is posted to a RestHandler. This is necessary in the PAUSED case

* Refactoring of _noLockHeader responsibilities. Now the BaseHandler selects them and resets them after it is done. Only Coordinators are allowed to define them if a query is loaded.

* Removed reaction to existing nolockheaders in Coordinator Query Planning Phase

* Removed incorrect assertion.

* Further refactoring of NoLockHeaders. Now there is a wrapper class around it which allows for debugging and logging. The state now seems to be better. Also all non-rest-handler triggered queries clean up the NoLockHeaders properly.

* Fixed UserManager, now deletes nolock headers properly

* Swing to the Symphony of Destruction

* Forgot about community build...

* Fixed compiling of Catch tests

* Fixed community build

* need thread for size

* Made the restSimpleHndler repeatable

* Implemented dump and dumpSync in Cursors, Sync will block a thread, dump allows to wait, only relevant for Streaming cursor

* Reactivated StreamingCursors

* Removed debug output.

* Fixed false query continuation

* Reset thread output to non-debug

* Added missing return statements

* Allow some CollectionMethods to hand-in a context that may contain a transaction. This is meant to honor nolock headers.

* Fixed hidden merge conflict

* Bugfix in aql-profiler.js: use plan.nodes order, not stats

* Added two profiler tests for filter

* Avoid too many getBlock calls in the FilterBlock

* Removed debug output

* RemoteBlock API will now send a done(bool) flag whenever we request documents from remote Servers. It is possible that we are DONE and have a result. The pre 3.4.0 API uses exhausted which is exclusive to a result. This API is still implemented for beckwards compatibility.

* Implemented an executeSync function in AqlQuery. This will block the thread until query execution is complete

* Added another test for FILTER, and one test for the HashedCollectBlock

* Added more tests for HashedCollectBlock; avoid unneccessary getSome calls

* Added an profiler IndexBlock test

* IndexBlock: avoid redundant getSome calls, added missing traceGetSomeEnd calls

* Added a second test profiling IndexBlock

* Added a third test for IndexBlock

* Moved general code to module

* Moved noncluster tests into a separate file

* Split aql-profiler testsuite into three files

* Added profiler tests for LimitBlock

* Added a test for NoResultsBlock

* Added profiler tests for TraversalBlock

* Shutdown of an AQL query is now asynchronous. However in Error-Cases it will be executed in a blocking way still

* Optimized TraversalBlock getSome calls due to new (nightly) test results

* Fixed std::min calls I broke

* Let shutdown calls in AQL wait, if the query is executed successfully.

* Fixed queryResult going out of scope

* fix compile error through merge conflict with devel

* Fixed compiler warning "mismatching tags"

* Removed debug log output

* Added TODO notes

* Fixed test fail due to devel merge

* Fixed some invalid sync waiting implementations

* Added a profiler test for SortBlock

* Added profiler tests for SortedCollectBlock

* Fixed bug introduced by devel merge

* Fixed Remoteblocks ignoring errors!

* Added some more continue Callbacks in used places. And removed debug log

* Removed debug log output

* Suppress clang warnings

* Bugfix: use of invalid stack pointer

* Bugfix: RemoteBlock::shutdown now sends code as int, not string

* Revert "Suppress clang warnings"

This reverts commit 05591649c59743c992edd5e78814edc8ca2a83e0.

* Bugfix: cleanup state in RemoteBlock ::shutdown, ::getSome and ::skipSome

* Bugfix in Subquery shutdown: don't skip subquery shutdown when main query shutdown failed

* Allow copy elision
2018-07-09 14:24:10 +02:00
Simon f47367a495 Allow dumping / restoring of views (#5774)
* allow dumping and restoring of views

* fix restore, adding some tests

* remove debug print

* fix global replication
2018-07-05 17:55:28 +02:00
Simon 5eea1d4199 adding ttl option for the query registry (#5677) 2018-06-27 09:05:43 +02:00
Simon 3bec336aff TransactionState::addCollection refactoring (#5606) 2018-06-14 15:34:58 +02:00
Jan cee529727c
Squashed commit of the following: (#4092) 2018-05-26 10:56:26 +02:00
Jan f55df6786a
blind commit of work, as I managed to break my local git repository (#5456) 2018-05-25 13:07:28 +02:00
Jan 72ec463a8d
Bug fix/cleanup 2005 (#5404) 2018-05-20 20:57:43 +02: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
Jan 9c0460acff
Feature/aql optimizations (#5237) 2018-05-03 16:55:58 +02:00
Jan 30b12e311b
Bug fix/remove most of aql js (#5223) 2018-04-30 11:17:11 +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
Vasiliy 012aaa9469 issue 383.4: push vocbase validity check up from Query constructor out into arangodb::consensus::State, StatisticsWorker and AQLUserFunctions calls (#5177) 2018-04-23 14:52:42 +03:00
Jan 1cc5d3a071
remove some unused AQL APIs (#5144) 2018-04-19 11:40:58 +02:00
Simon 7677afabf1 Remove copy of request body in rest handlers (#5104) 2018-04-16 14:49:51 +02:00
Vasiliy 635db3b409 issue 355.4: remove redundant methods and code, use 'cp' instead of 'cmake copy_directory' where possible, use vocbase reference instead of pointer 2018-04-04 10:53:48 +03:00
Jan 5105e2b3c0
Remove "atLeast" from the internal query APIs (#4848) 2018-03-21 09:10:28 +01: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
Simon 35136a89c0 Fix some problems with active failover (#4540) 2018-02-09 15:11:53 +01:00
Jan Christoph Uhde c8300db459 Improve error handling and tracing of getSome (#4123) 2018-01-03 16:01:36 +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 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 360184be87 fix misleading cluster AQL OOM messages (#3359) 2017-10-13 12:16:18 +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
Simon Grätzer f3eb0c2ac0 No access collections (#3088)
* Added virtual attributes for enterprise on Methods.cpp

* Working no access collections

* align a comment

* Documentation and test fix

* fixing community build
2017-08-25 13:59:03 +02:00
Max Neunhöffer 506bd0869b Fix a shutdown bug in the cluster: a destroyed query could still be u… (#2675) 2017-06-29 08:47:54 +02:00
m0ppers e158fb95bb Feature/aql satellite fixes (#2552)
* Better error messages

* Improve error message

* Refetch current state for comparison...fixing satellite joins
2017-06-12 18:12:29 +02:00
jsteemann a35f85bcc7 added proper docs for --query.fail-on-warning 2017-05-29 15:46:48 +02:00
jsteemann a4fde59fd2 some refactoring 2017-05-23 13:18:51 +02:00
jsteemann cf5d20ddee Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-28 17:02:42 +01:00
jsteemann b6a265068a fix velocypack-over-HTTP responses 2017-02-28 17:01:59 +01:00
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
jsteemann f5c8932744 initial version of query execution plan cache, still very rough 2017-02-21 11:58:38 +01:00
jsteemann ea87cc52b7 simplifications 2017-02-17 17:10:13 +01:00
jsteemann d49c5c3fc0 simplified internal APIs a bit 2017-02-15 12:42:07 +01:00
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
jsteemann 3c5edeb9b2 fix cluster AQL statistics 2017-02-03 11:47:36 +01:00
Max Neunhoeffer 91c97d301a Lower timeout in query registry to 10min from 1h. 2017-01-30 23:59:46 +01:00
jsteemann f0a4d69b69 use bulk allocator for index elements 2016-12-09 21:40:49 +01:00
Andreas Streichardt 11bd9381d5 Add satellite collections 2016-12-06 16:40:50 +01:00
jsteemann 369b2c7bc6 added optional memory limit for AQL queries 2016-12-06 13:23:41 +01:00
jsteemann 68c15ebc9e
do not url-decode paths eagerly 2016-11-15 15:46:21 +01:00
jsteemann 1e12406bbd remove log spam 2016-11-02 21:37:21 +01:00
Jan Christoph Uhde 620b0e6777 switch to boost asio
Squashed commit of the following:

commit 946c37a9247fc2c5bafb91d8ffd8d62096376214
Merge: 6b1957c 52877d3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 14:03:31 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      More logging of _role and _leaderID changes in agency.
      queryView #2111
      Better logging of redirects.
      Automate mac build - DRY for prefixes, directories etc. - possibility to provide build.sh with the prefix
      try to locate brew installations of openssl
      More logging in redirect case in AgencyComm.
      css
      ui query profiling
      Added Documentation for SmartGraphs via HTTP.
      return meaningful error message
      grunt build
      queryview bugfix
      typo
      fixed collection create bug
      typo
      Fixed JS syntax bug in gharial module
      added shards keys to coll. info view

    Conflicts:
    	Installation/Jenkins/build.sh

commit 6b1957c84276792c3ee32ec97ab5e943910498ec
Merge: 7235be0 79c0f54
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 11:28:33 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      Add more logging about shard creation/dropping/cleaning.

commit 7235be03b8152227e7b315045d90d9b995cd3036
Merge: ddbd020 c576426
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 11:02:51 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      Increase some timeouts from 60 to 90s to be more load tolerant.

commit ddbd0209ddbf0a2ed535c385ed0787533ed6c284
Merge: a5bf367 f949b49
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 10:17:36 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      Fix a typo.
      left-align table headers in query result view
      Work on the macos Bundle scripts

commit a5bf367b72f2679aa8ba83a2cd509028b6b6e924
Merge: 56aef8f a5e51e5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 13 10:17:12 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb: (30 commits)
      Further fixes in gharial for SmartGraph support.
      Increase timeout to test ttl.
      fix typo
      Fix AQL REPLACE for smart edges.
      semistandard
      Fix performRequests?
      Adjust comments about TRI_usleep and usleep.
      fixed compile warning
      queryview bugfix, color
      added missing legend and color
      "ressources" => "resources"
      add state "loading collections" to query profile results
      colors, gv
      query view, images
      performance optimization
      As we wait for arangodb to be up and running, we should also wait for its shutdown on deinstall.
      f*in with nsis
      fix one more typo
      Fix syntax error
      Work around more cmake / cpack / nsis vodoo
      ...

    Conflicts:
    	arangod/Cluster/ClusterComm.cpp
    	arangod/RestHandler/RestReplicationHandler.h

commit 56aef8f6a8d6106dd717ecde1cd37a6a87cc7fa4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 14:28:33 2016 +0000

    add missing function to RestDemoHandler.h

commit 819995d0a65fe5450f655e572086e4b4999b9e48
Merge: 0561bc8 300066f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 16:07:26 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (34 commits)
      More logging in case of strange timeouts.
      Different agents log in different files.
      Fix windows config paths for the PKGDATADIR
      Fix windows compile
      Remove debugging
      Another place we need the binaryPath for windows
      cppcheck
      Fix windows compile
      fix compile warning
      Added a new isEnterprise function in js internal module. Started to make gharial aware of SmartGraphs
      More places to pass along the binaryPath for teh windows
      fixed issue '"WARNING DefaultCustomTypeHandler called" on read'
      its nullptr on windows too.
      Protect memory accesses to _snapshot in Supervision.
      We also need to know the binary directory when looking up the config file; else we may miscalculate file locations.
      disable optimizations for package builds to least common denominator.
      - Fix enterprise package naming for windows & mac - add missing `make package` target for mac
      Fix a bug in RemoveBlock.
      Add support for AQL REMOVE for smart edge collections.
      Fix paths
      ...

commit 0561bc82374cb8ee61d8b5587ef10895a1bfe580
Merge: 302b5f2 682ec09
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 09:17:14 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
      dont re-send request in case of connection timeout
      fix segfault when connection is gone

commit 302b5f2a1311b0537246d3ca767edf213e27cff2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 12 09:15:55 2016 +0200

    add - extra log message for timeout)

commit 682ec09985f4c10f95022be3c11b5f5587793f57
Merge: 0251d33 2760ea0
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 10:55:49 2016 +0200

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

commit 0251d33da34b43758d71be98f675404c531b4def
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 10:55:36 2016 +0200

    dont re-send request in case of connection timeout

commit ca6565d9e20eaffb7786c6e13283640ed070b749
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 10:55:21 2016 +0200

    fix segfault when connection is gone

commit 2760ea03923e4a870c2b48fbfd40d6107faeb069
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 11 09:37:42 2016 +0200

    cancel keep alive timeout when calling handler

commit 0f0add4cf2da57464f3b7dbcbfc8db864b735bfb
Merge: 250dd05 0bfe447
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Oct 10 17:17:24 2016 +0200

    Merge remote-tracking branch 'origin' into boost_asio_mops_schleife

commit 250dd051114c120bcbc1dcaf2a7d10da609d9cf2
Merge: 5dd1e85 5a59619
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 11:47:05 2016 +0000

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:

commit 5dd1e85b699616fc5585c53d4cdaca6cdef76401
Merge: 58cf544 04c49f6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 13:46:18 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
      fix curls CMake

commit 5a59619599fc5c7d442af65906a00770602d953d
Merge: 1103c97 60f7d9d
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 13:42:52 2016 +0200

    Merge remote-tracking branch 'origin/devel' into curl-communicator

commit 58cf544f99c51232a8dc5ed2664be4001068eceb
Merge: 6563b98 60f7d9d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 13:40:38 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (35 commits)
      Fix dump/restore tests.
      Add a sensible default.
      MSC_VER is an integer
      fix compilation on windows broken by 4e8fc9b665
      overview documentation of agency
      overview documentation of agency
      fixed license path
      Added agency HTTP API
      switch to bold
      Update Version.cpp
      extend the compiler type with compiler-version
      creating snap package (with -DUSE_SNAPCRAFT=ON)
      Create snap.cmake
      Create snapcraft.yaml.in
      Link jemalloc staticaly.
      overview documentation of agency
      Revert "Fix return value of local edge write to smart edge collection in AQL."
      Fix return value of local edge write to smart edge collection in AQL.
      Fix writing of edges in AQL to smart edge collections.
      Changes necessary for AQL INSERT for smart edge collections.
      ...

commit 6563b98850722c1ed45db7737576ca7e73b9a437
Merge: f0b59f1 1103c97
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 13:05:24 2016 +0200

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:
      Add proper cleanup
      clang format
      Do threaded resolving in curl...because otherwise we will have timeouts (klingt komisch, is aber so)
      error buffer
      bool fail
      Add errordetails
      Boolfail :S

    Conflicts:
    	arangod/Agency/Agent.cpp
    	arangod/Cluster/ClusterInfo.cpp
    	lib/SimpleHttpClient/Communicator.cpp
    	lib/SimpleHttpClient/Communicator.h

commit 1103c97b8ad3a398ee1df53cd2226ee45d4a4c73
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 12:53:01 2016 +0200

    Add proper cleanup

commit 9fdc5858bc32e2d7a34271e8ee08c4e931127451
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 12:51:52 2016 +0200

    clang format

commit 19769f13bb6faad02a23a5750f9fb295d47fb847
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 12:00:45 2016 +0200

    Do threaded resolving in curl...because otherwise we will have timeouts
    (klingt komisch, is aber so)

commit 04c49f64240fcbec1b44143f295c8c4fdcb03b54
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Oct 10 09:21:05 2016 +0000

    fix curls CMake

commit 715f41f172406dacafa809e5ca1c075c10fab7cf
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 10:52:38 2016 +0200

    error buffer

commit 0fd78ec9d1789000959b0770afc384bd5f740c13
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 10:41:55 2016 +0200

    bool fail

commit 7d71bd590c101f9d1161eacfed24053bada5c3bc
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Mon Oct 10 10:32:54 2016 +0200

    Add errordetails

commit 25bab33fb50edbd2a159e601e9e4ceddf3ff3fee
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Fri Oct 7 18:30:25 2016 +0200

    Boolfail :S

commit f0b59f1ff2e374e54e50af14c2ab129d6b053a19
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Oct 7 11:43:32 2016 +0000

    release strand at the end

commit b3512b4d5a0284e5907a51656666b5e0482d3298
Merge: 7bbe0c6 d08fe7f
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Fri Oct 7 16:08:17 2016 +0200

    Merge branch 'devel' into curl-communicator

commit f1ee42104c4a3b46e69c1a66c5c3290f1c0b13b7
Merge: 7a79485 7bbe0c6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Oct 7 13:57:05 2016 +0000

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:
      fixed windows compile errors

commit 7a794855d7174414514a7003d53e68f0e9e0dc6e
Merge: 2917f1b d08fe7f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Oct 7 13:56:43 2016 +0000

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

    * 'devel' of github.com:arangodb/arangodb:
      add option to disable processor specific optimisations
      fix AQL tests in cluster
      don't write undefined into the errors file if no GDB output is there
      Modified the internal constructor of general graph to use a single json object instead of several input parameters.
      Improve collection handling in AQL (still far from good).
      Modernized general-graph module. It now uses ES6 class syntax.
      Testing.js now starts in enterprise mode if possible.

commit 2917f1b49f8d8b50046ac5c00ce51fe158d7e121
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Oct 7 12:51:22 2016 +0000

    fix asio shutdown

commit b472335448ba0ac1c00e270d498506c49272add1
Merge: a6e4d12 ecc3b56
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Oct 7 14:10:30 2016 +0200

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

commit a6e4d128d05ee03df7510509467cba3f81dda89e
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Oct 7 10:42:27 2016 +0000

    added clearHandlers

commit 7bbe0c68b64fcc81ec17474f67bc4cafe4c61e50
Author: Mark <mark@arangodb.com>
Date:   Fri Oct 7 10:47:43 2016 +0200

    fixed windows compile errors

commit 4f41c5dffa2191ddcd677aa774c36de3d7d9dde3
Author: Wilfried Goesgens <willi@arangodb.com>
Date:   Thu Oct 6 18:19:16 2016 +0200

    output exit signal

commit 8152513d152c5d7912d9f62e423bb1a0075bad64
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 15:22:32 2016 +0000

    added clearHandlers

commit 5ce884b3c3abcae562dd26df97a99b30d9745b7c
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 14:26:24 2016 +0000

    added reset for asio handler

commit 4be942d98c8ff6a051344ad01685682e985d2210
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 15:55:53 2016 +0200

    added reset

commit 2d18a0175cef55b9f41097a5a31b1ec85574f2fe
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Oct 6 15:55:19 2016 +0200

    removed warning

commit 0d6e033dd83938fff6c3013c9e965cfb58d53722
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 6 10:11:34 2016 +0200

    fix typo

commit 02a7726fbcd012a22c62a8bee09f4dfa96583bc3
Merge: f9a2ae5 794b0e0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 6 09:57:17 2016 +0200

    Merge branch 'boost_asio_mops_schleife' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'boost_asio_mops_schleife' of github.com:arangodb/arangodb:
      need to call cancel before erase

commit f9a2ae5fa17517089b5ca4f2d37d92a73243dbbf
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Oct 6 09:54:55 2016 +0200

    try to fix shutdown by consuming all work by calling run_one in a loop

commit 94b679a3a0f2daa1fe4588809356672e2035fed2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Oct 5 07:50:39 2016 +0200

    fix leak

commit 794b0e00d5b66d8d57486b007f666b5ee5027648
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Oct 4 16:06:26 2016 +0200

    need to call cancel before erase

commit c7a3107d69aed7052b3cea42b4b8deed37ac19e2
Merge: c5b3840 21298c3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 15:49:53 2016 +0200

    Merge branch 'curl-communicator' of github.com:arangodb/arangodb into boost_asio_mops_schleife

    * 'curl-communicator' of github.com:arangodb/arangodb:
      Revert "making it build partly out of source"

commit c5b3840b23a7e0ed77b53f333cba964c8cdc7a5d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 15:24:19 2016 +0200

    add call to curl multi cleanup

commit e57aad9cfab3466bba69f1fce9dd567a57b5cdbd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 15:14:51 2016 +0200

    fix call curl global cleanup

commit f80f50a809dfef03079393c4472fce863e0524a0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 14:10:48 2016 +0200

    add suppressins file for asan

commit 21298c36026d0d63282a2c17b37b082f4bab7101
Author: U-WIN-O80T0OH79D8\jenkins <jan@uhdejc.com>
Date:   Tue Oct 4 12:33:10 2016 +0200

    Revert "making it build partly out of source"

    This reverts commit 82eea7a19e722ae5d89efb38140aaadcbd53d398.

commit f3b21b211df92a0d96d1476b74333d41a9060c7d
Merge: 3a5993d 595fc9b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 12:09:17 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (27 commits)
      moveShard with distributeShardsLike
      moveShard with distributeShardsLike
      moveShard with distributeShardsLike
      linux fixes
      more authentication events, fixed changePassword
      arangodb::aql::Collection::shardIds for smart edge colls.
      Fix a typo.
      Edge indexes have now ID 1.
      grunt build
      fixed typo
      gv fixes
      grunt build
      ui - move aql result into graph viewer
      added different path for different editions
      Do not wait for synchronous replication to settle when creating a database.
      distributeShardsLike now stores CID
      Fix error handling for ClusterInfo::getCollection.
      distributeShardsLike now stores CID
      Fix enterprise version for non-smart and single server graph traversals.
      shards view [ci skip]
      ...

    Conflicts:
    	arangod/RestHandler/RestAuthHandler.h
    	arangod/RestServer/arangod.cpp

commit 3a5993d9e94cdfc635b038df923984d1802e7383
Merge: df57ad9 3ac64be
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 11:44:46 2016 +0200

    Merge remote-tracking branch 'origin/curl-communicator' into boost_asio_mops_schleife

    * origin/curl-communicator:
      Add CURL_STATICLIB globally
      Finally set variables correctly
      Disable tests
      Remove debug
      Do not use MS scale timeout
      Add curl build dir
      Fix include path for curl..no idea why there is no CURL_INCLUDE_DIRS style variable...
      curl static against openssl
      Add curl
      making it build partly out of source
      Curl on windows
      Make the crc message status (so it doesn't pop up as red in the cmake ui)

commit df57ad959b79da789ead2058fe8440e97cd09d74
Merge: b3653e9 b4e5123
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 11:22:45 2016 +0200

    Merge branch 'boost_asio' into boost_asio_mops_schleife

    * boost_asio:
      replace our ssl init calls with boost::asio::ssl calls
      fix ssl in cluster

commit b4e5123798e62954c683af073b4db3191a395a61
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 11:07:40 2016 +0200

    replace our ssl init calls with boost::asio::ssl calls

commit 3ac64be8a4b0e95162401b87b3cac903897be082
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Tue Oct 4 10:22:06 2016 +0200

    Add CURL_STATICLIB globally

commit e93940cb0c1905d8157070adc8cce13c0b11bd5c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Oct 4 09:51:44 2016 +0200

    fix ssl in cluster

commit 833722cdd151edac81b4834a0b838961b87aca99
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 18:44:24 2016 +0200

    Finally set variables correctly

commit 663822cc23cee0001eb7faf5419719eac77849da
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 18:02:17 2016 +0200

    Disable tests

commit c0d7a9a73fcf9f42de7c13b87af02d7db326d586
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 17:12:55 2016 +0200

    Remove debug

commit 28367243f8c3b79fcf99f16017e9360b2e2f9ac9
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 17:12:09 2016 +0200

    Do not use MS scale timeout

commit ceaa2682baf3bb0a028cdb5211a0c334d5db23b3
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 16:39:04 2016 +0200

    Add curl build dir

commit b3653e93a890745b32db11f45506b723d67fc99d
Merge: e000dab 11a9d3b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 16:25:47 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (23 commits)
      local cluster start update
      aql editor now handles queries running in the background
      slightly higher timeout for notifications
      oops useless assignement
      arangod/Cluster/ClusterInfo.cpp
      gv save settings bugfix
      Add #2038 to changelog
      Handle multiple request body models
      agency bug resolved
      color optimization query profiling
      Fixed Smart graph injection of collections.
      fix compile warning
      grunt build
      semistandard
      ui - cacheable explain
      improved query ui
      fixed long waits on dropping shardless collections
      lintify
      Faster creation of smart edge collections.
      Make AQL aware of smart traversals for enterprise.
      ...

    Conflicts:
    	arangod/Agency/Agent.cpp

commit 624eec008c842ff0f48a1b259de54097618353c3
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 16:12:38 2016 +0200

    Fix include path for curl..no idea why there is no CURL_INCLUDE_DIRS
    style variable...

commit e8a6173b74490fda4c57ab18708c929ed4f5a22c
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 16:03:28 2016 +0200

    curl static against openssl

commit 522177b71132c6277fd4c08630bbfae3a509fdf8
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 15:20:42 2016 +0200

    Add curl

commit 82eea7a19e722ae5d89efb38140aaadcbd53d398
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 15:19:14 2016 +0200

    making it build partly out of source

commit e000dab111721d8cb9548b26d9e2dc9015a4fbf4
Merge: e08ada2 b3ae63b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 10:59:19 2016 +0200

    Merge remote-tracking branch 'origin/curl-communicator' into boost_asio_mops_schleife

    * origin/curl-communicator:
      Remove request unittest
      Implement cURL based inter server communication

    Conflicts:
    	arangod/Cluster/ClusterComm.cpp

commit 25b01518a5fb2ba2d047b082ac6596b44e13008c
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 10:58:30 2016 +0200

    Curl on windows

commit e08ada250ca283d59328c7577f1d3e9affa55aeb
Merge: 8c4ad1d 16d1d21
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 10:19:35 2016 +0200

    Merge remote-tracking branch 'origin/devel' into boost_asio_mops_schleife

    * origin/devel:
      ui slow connection bugfix, cleanup
      Updated the general-graph module to ignore SmartGraphs which are enterprise only.
      Fix output of _id attribute for new documents in smart edge collections.
      Fix virtual cloning of LogicalCollections and derived types.
      Describe current format of document _key
      Docs: adds links to AQL traversal for anonymous graphs
      small ui shard fix
      Silence a compiler warning in enterprise mode.
      Remove isSmart attribute in community edition for Agency.
      Improve an if statement.
      grunt build
      modified cluster nodes ui
      ui logos
      added functionality to see the movement status of a shard
      Adding Smart Edge Collection drops to v8-vocbase
      Add SmartVertexCollection.

commit 8c4ad1d63a68c7cfb99cf61cc22148b774b5b0dc
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 29 10:06:19 2016 +0200

    add comment about potential issue

commit 31317b300da44e3f7e19d8fd5a781d3ef5440702
Author: Andreas Streichardt <andreas.streichardt@gmail.com>
Date:   Thu Sep 29 09:46:26 2016 +0200

    Make the crc message status (so it doesn't pop up as red in the cmake ui)

commit b3ae63bd7974f762fb2499416402186199811818
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed Sep 28 15:59:27 2016 +0200

    Remove request unittest

commit f5bc6efc263d9159c6c2134309c7a8e11d50789d
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed Sep 28 15:58:55 2016 +0200

    Implement cURL based inter server communication

commit c5760194cde05ca73426ef4672ba97fe41ac0083
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 15:30:32 2016 +0200

    fix ssl server test (bad weak ptr)

commit 136100991320261b15c0277941992086bfa07c57
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 15:04:50 2016 +0200

    better output

commit 495a3b65fc360c4dd8a1277f129d81bbba57493c
Merge: 635bc9f 8a5bc21
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 14:27:44 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (63 commits)
      elderly cmake compatibility
      spec files rather like 0/1 than fales/true
      Forward isSmart to Agency.
      Restrict _from_ replacement (etc) to the beginning of the string.
      enterprise id lookup
      calculate systemd unit directory in cmake instead of leaning on specfile finding it in some rpm magic
      cluster ui fix
      Fix hanging dbservers in graph tests.
      We don't need go anymore.
      fix sortedness documentation (additional clarification)
      Fix branch choice.
      fix creation of run directories - these shouldn't be in the client package
      updated CHANGELOG
      issue #2079
      Added some smart info into logical collection and make sure that virtual collections are created via load plan
      make relative temporary paths absolute during the system startup. This fixes #1896
      follow redirect for dumpagency
      New depth first search simulators.
      fixed test, typo, optimization
      version info
      ...

    Conflicts:
    	CHANGELOG
    	Installation/Jenkins/build.sh
    	arangod/Agency/RestAgencyHandler.cpp
    	arangod/RestHandler/RestReplicationHandler.cpp

commit 635bc9fae42b7b16fffabebe3303f92e240bbf5f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 14:19:25 2016 +0200

    fix request statistics

commit 9462a446f73f6e82ff870131938f73d3eae3bd25
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 14:15:01 2016 +0200

    silence boost warnings

commit 836289100b64a5f3ef8173446f08eaba60752770
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Wed Sep 28 10:16:34 2016 +0200

    better log messages

commit 2dbb8d2438f895c380612f0a2bf097928b43191d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 14:51:39 2016 +0200

    clean up of KeepAliveTimeout

commit 6c97d8f21dfd4b5e41fa507465875833ca75554d
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 12:25:16 2016 +0000

    removed TaskData & chunks

commit 71bd6d83eb7cac58de1a4473af4d4e9e262ab50f
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 11:54:32 2016 +0000

    fixed name

commit 821eb554305073325a4b68864cba065705f0fac3
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 11:54:20 2016 +0000

    added missing state transition

commit 119171859612b864a290cde321ba1f80ba51eb62
Author: Frank Celler <frank@arangodb.com>
Date:   Tue Sep 27 13:43:17 2016 +0200

    added WAIT_FOR

commit 41e6d3108d64467583a79d3d9dd2096f0dded26b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 12:45:12 2016 +0200

    print more info about connection in communication.debug mode

commit 22c83f8b695d745e4531896b4b5815bba1b10eba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 11:14:17 2016 +0200

    fix handling of timeout. add new event after resetting

commit 66c8247e1ce3fb4a69c5375c0f61b2b57f20c217
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 27 09:43:33 2016 +0200

    keep alive timeout is now able to take values less than a second

commit 19b6cf554de78d8fec16cd370243ccc59aa345bc
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 26 16:48:02 2016 +0200

    add keepalive timeout

commit f03757998cae93b3ddc31eded83ea69cebc09039
Author: Mark <mark@arangodb.com>
Date:   Mon Sep 26 14:30:24 2016 +0200

    fixed windows compile errors

commit f4dec34e77f02995bdaba0a73c88aadccad37524
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 26 11:24:15 2016 +0200

    add option for maximal VPackChunkSize to the server

commit a2fccca23411368fa819785223949fefcdc962c8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 26 09:47:38 2016 +0200

    initialize connection info - server/client address/port

commit 5df04763c03e227965065946b8f170654e36c59e
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 11:02:18 2016 +0000

    cppcheck fixes

commit 2a47e4e99bad63c92f1834c738cf30f0e465a1b4
Merge: 278ba49 1bdf414
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 10:47:12 2016 +0000

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

commit 278ba49a87762365ea37fc3fb5040259a1e3df75
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 10:46:45 2016 +0000

    free vocbase on cancel

commit e3b36c8418a816076449be3dea29f865b4952229
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 25 10:28:22 2016 +0000

    check if handle have been installed

commit 92aac95b39c9fc7b3d712b4770e3b3c420626ef9
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 16:21:50 2016 +0000

    fixed batching

commit 92d1335cf2a6bd296c23aa8165718fd4d283af6d
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 14:04:47 2016 +0000

    fixed leak of ListenTask

commit 5d4fb6fd1250e0a30fbe2326d11087ba3ae13b1c
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 11:34:47 2016 +0000

    fixed shutdown

commit c6fb584266818eef765aa8b6727858ab2100859a
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 11:15:05 2016 +0000

    handle shutdown

commit 7dcc50214e3e51ef58d3823ec70534354e1a98eb
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 11:14:54 2016 +0000

    handle aborts

commit 35dd9da84a69dda4103cc82be47d740550d49069
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Sep 24 10:57:57 2016 +0000

    cppcheck fixes

commit 2f9f7d87005e48904711a9b4a2863ddb98834f79
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 23 20:57:41 2016 +0000

    added cancel

commit b4696026ec9cee01f196a7096a86d29cdf8ce202
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 21:30:10 2016 +0200

    convert _scheduler in SchedulerFeature to unique_ptr

commit 0475c6dd7bdd3c842860e85ad26a607df675d600
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 17:34:07 2016 +0200

    implement synRun

commit a2b365613b5779dd59004b8cfcca04ef145c3ad3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 16:35:34 2016 +0200

    fix error caused by RestHandler not beeing created as shared_ptr

commit 8f19bbb03efa2d2bc6106b8b456040ce7cbb0c68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 16:32:38 2016 +0200

    fix some cppcheck errors

commit 7694392f73f920df4c033d98025112189d19aa00
Merge: eea0fd7 35e14fd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 14:54:59 2016 +0200

    Merge remote-tracking branch 'origin/devel' into boost_asio

    * origin/devel: (43 commits)
      cleanup
      speed up tests
      add setUpAll, tearDownAll
      modified collection info view
      rechecking dbservers before sharding operations
      updated CHANGELOG
      issue #2072
      adjusted progress indicator delay
      nodes view
      fixed wrong navi route
      updated CHANGELOG for #2071
      updated CHANGELOG
      issue #2071
      fixed compile error
      updated CHANGELOG
      issue #2070
      Some refactoring in Transaction. Also enterprisified document
      FailedServer jobs can report when last FailedLeader has been processed
      Fixed optimization of ANY in Traversals. It was included in the traverser who actually cannot handle it.
      FailedServer jobs can report when last FailedLeader has been processed
      ...

    Conflicts:
    	CHANGELOG

commit eea0fd7c42fc55cd4a1233f458c990186ad6cfc2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 14:31:00 2016 +0200

    improve error handling and reporting in SocketTask

commit 505d55d1a1feff6c93388c5c401273d4199438a7
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 23 11:56:48 2016 +0000

    removed duplicate store

commit 14669814e0eaab9a4c78c8f4396dc88181f6a4fa
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 23 11:34:31 2016 +0200

    missing self for callback

commit 8ad4ee25ef7aaa4cc9cf01d6fe3f56d805e3e9c2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Fri Sep 23 11:10:31 2016 +0200

    do error handling with error codes instead of exceptions for asio

commit c1d7375c1b0ab0fd3f7f3c682baa2946c05fc4ec
Merge: 9be5942 0e073aa
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 23:03:07 2016 +0200

    Merge remote-tracking branch 'origin/FMH' into boost_asio_merge_frank

    tests broken!

    * origin/FMH:
      added move
      WIP
      WIP
      added shared_from_this
      added shared_from_this
      WIP
      WIP

    Conflicts:
    	arangod/GeneralServer/GeneralCommTask.cpp
    	arangod/GeneralServer/RestHandler.cpp
    	arangod/GeneralServer/RestStatus.cpp
    	arangod/GeneralServer/RestStatus.h
    	arangod/RestHandler/RestBatchHandler.cpp
    	arangod/Scheduler/Scheduler.h

commit 0e073aaee9508129da6b1c83661e08050e172bff
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Sep 22 16:00:28 2016 +0000

    added move

commit 9be5942d18c5dfd66c41c5520b7cdf54025e7ed0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 16:10:31 2016 +0200

    change default chunk size

commit e17d2e4828b1abc4837db0fe7c5ef88d31ddf063
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 15:58:23 2016 +0200

    multichunk sending is now working

commit 3144b72f7883b5b0f3d1df8f4acf0ec996a70e4f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 15:40:43 2016 +0200

    try send multiple chunks

commit f7f1ff11fb47eac7e289b78b9bf4dd0adea0285a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 14:55:41 2016 +0200

    git commit prepare sending of smaller chunks

commit 50088a7006bc7ac94e4706a50382831214a5c0a6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 14:54:03 2016 +0200

    change cmake for boost

commit 29b00dcd8354144fad5048add5621d657b5f54b1
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 13:12:50 2016 +0200

    fix linking issues on windows caused by auto-linking feature of boost

commit 05da308660cbf67d84a62cdbd11c71e02d8cad7b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 13:12:13 2016 +0200

    remove forward declaration that prevents build on windows

commit 521ce1aebf055fedd9ad42bd63d91d65e4f34f42
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 11:53:11 2016 +0200

    disable autolinking code for linux

commit b67dc616340319591370957149827d2a0e4ad995
Merge: 2ac2440 467a949
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 11:25:56 2016 +0200

    Merge branch 'boost_asio' of github.com:arangodb/arangodb into boost_asio

    * 'boost_asio' of github.com:arangodb/arangodb:
      work on sending in small chunks

commit 2ac244015b6556d52b99906612ff3feaad3d60ab
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 11:25:15 2016 +0200

    update boost in cmake

commit 467a949263a21d1b0af886d01fa471f568c21343
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 22 10:59:37 2016 +0200

    work on sending in small chunks

commit 4d0816808b701af217db9c4faccd3ef780efb79c
Author: Frank Celler <frank@arangodb.com>
Date:   Wed Sep 21 15:42:06 2016 +0200

    WIP

commit 8c7d3dbca6a34080df1d807e0ec35b57b0acc172
Author: Frank Celler <frank@arangodb.com>
Date:   Wed Sep 21 15:39:54 2016 +0200

    WIP

commit 6d5b19939ae2fbeb157d3773d415b6cf980f3fd5
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Sep 19 17:25:15 2016 +0200

    added shared_from_this

commit b297b3a702de303212edfc3545602b5b4fb987f9
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Sep 19 17:25:06 2016 +0200

    added shared_from_this

commit 5fb39bf9e9ce03c291dadfd48f84f94a12f488d3
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 16:47:18 2016 +0200

    fix windows errors

commit b3f71399e12cc5e59e1bbdb4ca87b7d588fb7da9
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 16:36:55 2016 +0200

    add TaskData.h to GeneralServer.cpp and GeneralListenTask.cpp

commit da99cb2e3151f454ef346ded57c2d4865125ab7b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 16:11:49 2016 +0200

    replace magic number with boost::asio::error::would_block

commit a10aa87742153aab5a5aca53815ff44a2abc98f0
Author: Frank Celler <frank@arangodb.com>
Date:   Mon Sep 19 16:11:24 2016 +0200

    WIP

commit 368d62245efad52178acf279ff4f54eb8b03e8e5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:35:18 2016 +0200

    add boost to arangod_v8

commit 2ef495a1d1aed97b6eb1c106107a90a27e1891ba
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:25:09 2016 +0200

    remove .gitignore

commit 6005aed8b24a40e4fcc6f0569407cd10c8a973c0
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:18:21 2016 +0200

    fix more windows errors

commit e322da8eb08254c661781cea442cd6e403069ecd
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 15:00:48 2016 +0200

    force boost system to be static

commit 6082736132272f600de5f9d76805dde373bc742b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:43:53 2016 +0200

    another fix for windows

commit a36f6930fca35662e21b762bb323c2dc36a05e5a
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:39:02 2016 +0200

    fix add namespace to Socket

commit 38eeda76ad0a145176c5b05ae75d4640a3514cc4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:30:38 2016 +0200

    fix namespace / include

commit 26513ae75a22911d5b4e8584f5e8ae9314469999
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:19:18 2016 +0200

    try to get boost working on windows

commit 00b6416a6452fef0d8e43424ea4e1735c3b0e614
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:06:05 2016 +0200

    replace #warning with #pragma message - windows

commit bf455d30047ebd37a037fc24522bc502854cbbe8
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 14:03:38 2016 +0200

    improve cmake for boost

commit 6c491e5e784c0c33cf282b5d64026b61d60711a6
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 13:39:46 2016 +0200

    apply fix for windows

commit a9f9f429d8eba25b8f7215399e41dd5524bfd76b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 13:33:33 2016 +0200

    replace FAILED with FAIL so windows has no problem

commit 3cbac4115ef183ae38676584abef41b914d2592e
Merge: c614242 19f667c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 13:09:14 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb:
      fixed incompatible replication API responses
      updated CHANGELOG
      added experimental AQL functions `JSON_STRINGIFY` and `JSON_PARSE`
      added experimental support for incoming gzip-compressed requests
      fixed issue #2060
      Added a hash and equals comparator for velocypack that only takes _id into account.
      vs warnings in agency
      Made the Base Traverser Engine pure virtual

    Conflicts:
    	CHANGELOG
    	arangod/GeneralServer/HttpCommTask.cpp
    	arangod/RestHandler/RestReplicationHandler.cpp

commit c614242c4beb2ed12ccb29fcc6fa1db6a4d9090f
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 10:49:19 2016 +0200

    try to fix RestReplicationHandler

commit 74b5fc33477107be62a5d86c9c04563cc4d7cac5
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 09:12:14 2016 +0200

    remove CMakeFiles form .gitignore so git clean will work again

commit c330b1bff7acb6022b06e2499fa3a065fb820b82
Merge: d400b7f 5772054
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 09:10:39 2016 +0200

    Merge branch 'boost_asio' into boost_asio_devil

    * boost_asio:
      renamed Task2 to Task, EventLoop2 to EventLoop
      WIP
      remove https und vpps commtasks
      WIP

commit d400b7fde3c6a7b6d1c2e2cad600a3fb32b65533
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 08:49:38 2016 +0200

    Revert "remove useless file"

    This file sets indent to 2 spaces for almost all editors,
    this way we do not need modelines or change the default
    editor configuration on systems.

    This reverts commit e0503f7092.

commit 40dcd9ec34e3c741ffdb97d4101e53c49d0ac163
Merge: d5526cf ebb67be
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 19 08:40:00 2016 +0200

    Merge remote-tracking branch 'origin' into boost_asio_devil

    * origin:
      Remove outdated information about suppress-shape-information which was removed with ArangoDB 3.0, as reported by Tomek on Stackoverflow.
      remove useless file
      updated CHANGELOG
      examples about stacked escaping
      Fix generated MD5sum file
      make methods private
      speed up collection.any()
      speed up skiplist index
      fixed ssl_server test
      examples about stacked escaping
      more diagnostics

commit 8875f7bfc22cc4376b703060e85ac0141706aca5
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 18 22:53:16 2016 +0200

    WIP

commit 57720546a31a59668cd57e99d3dbc11ecfa41a8d
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 16 11:09:39 2016 +0200

    renamed Task2 to Task, EventLoop2 to EventLoop

commit eca7b17f6910fc7892f6a4dbe9c618d3e8f7bf05
Merge: ca473e8 8f2c13e
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 16 10:53:11 2016 +0200

    WIP

commit 8f2c13ec0e2f8a4be4b136bd263affc3054654ae
Author: Frank Celler <frank@arangodb.com>
Date:   Fri Sep 16 09:10:56 2016 +0200

    WIP

commit ca473e8a0eee4ed04994f70b3d52defc9127810c
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 16:19:26 2016 +0200

    remove https und vpps commtasks

commit d5526cf1b606daa26be628efa9fdca2fe2664d95
Merge: 5337a01 c912d96
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 16:01:39 2016 +0200

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

    * 'devel' of github.com:arangodb/arangodb: (39 commits)
      Fixed compile bug.
      TraverserOptions now support proper subclassing.
      Added a virtual base class for traverser engines.
      all lambdas in ClusterInfo might have been left with dangling references.
      all lambdas in ClusterInfo might have been left with dangling references.
      fix compile error
      Correct path to enterprise js code in testing.js.
      Finding graphs by name now resolve externals one step earlier.
      potentially fix leak
      removed unused flag
      get rid of two pointers in each transaction operation
      redirect output of gdb, so we can append it to the jenkins error mails.
      Foxx: post route example that accepts an array of objects
      implement use-local-time for slow queries as sugested in #2051
      fixed windows compiler warnings
      lookupGraphByName now has a non-enterprise implementation.
      Removed a graph optimization which increased the minDepth if a filter is defined on a higher depth. Under some circumstances this filter can be matched if the path is not long enough.
      fixed issue #2052
      reporting in inception
      fix assertion
      ...

commit 5337a0116ca20726795c59666cdfd6786f93cc82
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 15:53:12 2016 +0200

    ssl server is working again

commit fcedf60588681518b0f6d3eb05661ec0f9e201d7
Merge: 322a08a c912d96
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Sep 15 14:48:54 2016 +0200

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

commit 322a08a86eb9de101d0e37be5e3f6bdbdcb19345
Author: Frank Celler <frank@arangodb.com>
Date:   Thu Sep 15 14:47:19 2016 +0200

    WIP

commit 6f64f39744e3d34c48e69b9a742497d109f2464d
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 13:04:46 2016 +0200

    get encryption type via ConnectionInfo in SocketTask

commit abda1c4e1b8e0f05a15a47458fc6c9aaee4abeb4
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 09:52:58 2016 +0200

    add ssl support via asio - we are in a broken state now

commit a6a3215f5244a96a48fc5fe4545313018c181b68
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Thu Sep 15 09:47:36 2016 +0200

    Fix cmake so it works with boost asio

commit baccaa00dc041e01822bfef723d6d285ab2c7ff2
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 13 16:20:23 2016 +0200

    add basic changes to enable ssl

commit f7971e2f727ade913ce00958e0ad77e2e4c01613
Merge: c1c7b4e fee42ee
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Sep 13 09:52:44 2016 +0200

    Merge remote-tracking branch 'origin/devel' into boost_asio

    * origin/devel:
      Fixed ASSERTION guarding undefined behaviour on Mac. In some cases the assertion did throw.
      Remove debug output.
      simplified expression
      warning removed
      speed up looking up of revision ids
      Constructor of TraverserEngine is now protected. Preperation for SmartGraphEngine (EE Only).
      Fixed undefined behaviour on Mac. An empty vector was popped.
      semi-fix for long delays in multi-host-agency collection creation/drop
      semi-fix for long delays in multi-host-agency collection creation/drop
      Link the CONCAT_SEPARATOR function.
      Set agencySize back to 1 (temporarily).
      Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however.
      Make testing.js find enterprise tests in enterprise version.
      Add global.ARANGODB_CLIENT_VERSION to arangosh.
      Silence gitjslint.sh tool w.r.t. warnings.
      reformat
      Fix which attribute names are allowed for shardKeys.
      Typo fixes in docs
      x-compile portability.
      Silence cpack rpm build.

commit c1c7b4e61e5cecf9794e83f8b3bf5a965d460a53
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Sep 12 12:09:19 2016 +0200

    add boost_system via pure cmake!

commit c5d227eebffe311b24bc1d67c209d53eee0b0754
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Sep 11 21:24:58 2016 +0200

    WIP
2016-10-14 10:12:17 +00:00
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
jsteemann 1b11096060 remove Json/JsonHelper/TRI_json_t 2016-08-18 17:28:43 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
Jan Christoph Uhde 36736e3694 Merge remote-tracking branch 'origin/devel' into obi-rest-changes-next
* origin/devel: (47 commits)
  grunt build [ci skip]
  gv settings [ci skip]
  attempt to fix issue #1943
  Add missing documentation of the users database list and the hint that this should be used instead of the database api.
  added dev button to graphs view [ci skip]
  grunt build [ci skip]
  Remove jshint
  Mention updating license info
  Prevent World War 3
  Always use --global-style when installing npm deps
  gv - editable & createable nodes, edges [ci skip]
  Rebuild aardvark
  Make sure Show Interface check asks for HTML
  oops, @not supported here.
  Fix phrase explaining when the collections are dropped alongside the graph definition.
  fixed issue #1941
  gv [ci skip]
  added test for "fake" _key values
  fixed issue #1942
  In Farbe und in STEREREOOOUU!
  ...
2016-07-17 00:14:07 +02:00
Jan Christoph Uhde beae8a8f74 first changes for set/get payload methods ->
toVelocyPack now returns slices
2016-07-15 16:38:13 +02:00
Jan Steemann a1c2b7cc63 fixed issue #1941 2016-07-14 10:08:17 +02:00
Jan Christoph Uhde b2e29c4353 fix: createResponse -> setResponseCode; remove delete
remove delete _response in RestEdgesHandler
2016-07-07 08:54:41 +00:00
Jan Christoph Uhde 7996b2c152 fix: RestAqlHandler - use getVpackOptionsForDump 2016-07-07 08:56:22 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Michael Hackstein 832d2a94f3 Squashed commit of the following:
commit 6b5b1fc821f304ce0445220bbf781060bd2995af
Merge: c987b9f 1754e78
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 12:55:24 2016 +0200

    Merge branch 'AQL_GRAPHICATION' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit c987b9f71f75a95a45a32d5cb15ed5570b2ff938
Merge: c4437e2 274cfeb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 12:55:07 2016 +0200

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

commit 1754e78736bf3f93c32b0c7c4a5d5569f3c834d9
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 12:01:24 2016 +0200

    fixed leaks

commit 6f8be7707623c10b1365d12db61011f73ca3e36a
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 11:53:58 2016 +0200

    don't emit "expected" errors

commit c4437e29c72a54f46942c616447ddee377cce478
Merge: e567d81 f4e2ead
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 11:40:53 2016 +0200

    Merge branch 'AQL_GRAPHICATION' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit e567d810b2ff624fc4acc8c12948cd89b4592b8d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 11:40:44 2016 +0200

    Removed now unused SHORTEST_PATH code. Use the AQL Node instead.

commit f4e2eadbf03fecf7d0f0aa699caaf1198ca79443
Merge: 3d24da5 52f20f8
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 11:30:40 2016 +0200

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

commit 3d24da5b0060025ae7c133600bfae40b11c6ed70
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 11:30:25 2016 +0200

    simplify initialize()

commit 52f20f842dd966b046e428eb08429f036240e112
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 11:04:08 2016 +0200

    Removed an unused ClusterComm->drop

commit c4bc6fa53340ab9de39bb0ef2d573ca77197c580
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 11:00:36 2016 +0200

    do not show "expected" errors on shutdown

commit 50c170737311ae031addec8fb251cd5c1a2fbf5b
Merge: 7da771b 0141cdd
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 11:00:34 2016 +0200

    Merge branch 'AQL_GRAPHICATION' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 7da771bb2bc3daa6c332507e021d37f536d17080
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 10:59:55 2016 +0200

    Fixed VertexUniqueness::PATH in cluster Traverser. And Fixed global edge Uniqueness in cluster.

commit 0141cdd1ca929f14ac5d66a2fcf6da5faf7b0e7f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 10:30:16 2016 +0200

    pass by const reference, not by copying

commit 8b96da25cdbee4a8a6508470500ae19a8ddbc129
Merge: 7b79575 d87aa2b
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 09:07:30 2016 +0200

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

commit 7b79575a28871307f25284e1b9141a684ecc5b23
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 09:04:45 2016 +0200

    Attempt to improve getFilteredEdges in cluster.

commit 963e93e4f00afedeaa5fc960d629a6ea7e62f0ed
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 17:05:23 2016 +0200

    Fixed cloning of ShortestPathNode. Also fixed explainer to display Shortest Path Node.

commit 884df03a15ca936367bc79fdf339f633ae6d88a5
Merge: 3a28e21 2477077
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 16:10:10 2016 +0200

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

commit 3a28e210cc6e6097febd7fb0629723ee38dced48
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 16:09:56 2016 +0200

    Now allow to stringify the name of SHORTEST_PATH_NODE.

commit f3898a0a4bb37af46de50a740f43f4e00076c9fb
Merge: a284d2f 7574e60
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 16:03:11 2016 +0200

    Merge branch 'AQL_GRAPHICATION' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 7574e6005a3b377f23180d1a4ff1d07262576144
Author: jsteemann <jan@arangodb.com>
Date:   Mon Jun 6 16:01:35 2016 +0200

    attempt to init remote blocks in AQL queries

commit a284d2f4803371e2f43af28b36ca77c9d7722f8a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 15:37:38 2016 +0200

    Added ShortestPathNode as TypeName

commit 6a283fad9469622d1b6f5a955b17a98861ff839c
Merge: cfaf2c0 d54030e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 13:38:57 2016 +0200

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

commit cfaf2c06885aa65b5289e2b8c3866bcf791989f8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 11:33:37 2016 +0200

    Fixed Path Uniqueness of vertices in local case

commit 372298c78732dcdf936e3796287d2f7d3c10e3a8
Merge: d55fe00 442c7d0
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 11:32:29 2016 +0200

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

commit d55fe0074f78d0cd567ca1c8d8873f06aba3855f
Merge: 3179c30 9e3c9e3
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 10:50:26 2016 +0200

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

commit 3179c30b068ac384fa8d7723dac95d2ba5731949
Merge: 20bca1c 9fa9d49
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 10:50:09 2016 +0200

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

commit 20bca1c25956789f695765aab498112776296e71
Merge: 4f148ba e843719
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 09:32:41 2016 +0200

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

commit 4f148baafef979a61d8d195b6bed7cdea058ff2e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Jun 3 16:33:23 2016 +0200

    Fixed vertex uniqueness in Cluster case. Still fails in single though

commit 533be3b15c4d2899c1c287cc6f5224260210c7d2
Merge: fc3d65e a3032db
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Jun 3 13:58:50 2016 +0200

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

commit fc3d65ebf529344e8870898efb1ec965a88ee106
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Jun 3 13:33:47 2016 +0200

    Replaced callback function in PathEnumerator to get Vertices by a real struct, due to issue with virtual function.

commit cac533bbaf195eb1bad5e9428402e3aeb895551f
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Jun 2 18:06:38 2016 +0200

    Fixed Namespace issue. was okay for clang but not for g++

commit 4f046ad5d43a5654c8e9e35dc178d325588a8f4e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Jun 2 17:56:28 2016 +0200

    Fixed memmory issues for ShortestPath in cluster. Seems to be working now. Let full test run start.

commit f8ace613fefaefd5236e0fae47a98c13baff5b77
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Jun 2 15:20:46 2016 +0200

    First Implementation of ShortestPath in cluster. Seems to be working with default weight but not with attribute-based weight.

commit 49ddf78902f2c814c6dddccc1d4fef7318eeb098
Merge: 31b81f3 b469cea
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Jun 2 09:17:53 2016 +0200

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

commit 31b81f39530138204bd2f2f9bae33f81a7948cd5
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 17:50:54 2016 +0200

    Unified the shortest Path finders. The shortest path block now directly creates a finder and reuses it throughout the AQL. It does not go via V8Traverser any more. Next Step: Expander Functions for cluster ShortestPath.

commit db402142e4f664f9997853c9f77b60a5d30fa7c6
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 14:40:58 2016 +0200

    Removed _api/graph test. The _api/graph does not exist any more

commit a481570346935be11553047f40957e1cf719a9de
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 14:40:06 2016 +0200

    Fixed inconsistency in RocksDB functions.

commit 2dc6811f9b7632ab12f7a534e7bb8673cfaed526
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 14:39:37 2016 +0200

    Fixed all tests after removing blueprints module

commit e2d68832e6744b6c11d8b5ecd24f50892aafd0f0
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 11:43:38 2016 +0200

    Removed all libraries for the deprecated graph-blueprints module. They can all be replaced by general graphs now. The have been deprecated since 2.4

commit 51330ea34c117e2ed19dc3dd249f460dbb75b281
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 10:38:15 2016 +0200

    Fixed DISTANCE_TO and SHORTEST_PATH in general-graph module. It was not moved to AQL only yet.

commit c876fe736306f0bac1655e37ed6acf75976ac1ec
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 09:22:19 2016 +0200

    Removed now obsolete graph AQL JS code.

commit 18891b346dcd519486c0540bc68b05b2359caf43
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 09:20:54 2016 +0200

    Replaced GRAPH_ECCENTRICITY by a call in the general graph module and relaced all it's tests.

commit 06371d4d2fbd8e77e0caed82d595f250835a909b
Merge: d17c3c7 8dde0e8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 31 18:44:03 2016 +0200

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

commit d17c3c7d927abba24beffde6da2990e095d4b1c3
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 31 18:29:01 2016 +0200

    Removed BETWEENNESS and ABSOLUTE_BETWEENNESS from AQL and moved it to the general-graph module.

commit efa566ba99394eb2367fe7734fe09868302b5c14
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 14:11:22 2016 +0200

    Removed GRAPH_CLOSENESS from AQL and Tests. Reimplemented it in general-graph module instead

commit 0eff3d38947627414972603d95e36ed6beb7a8de
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 12:28:57 2016 +0200

    Entirely removed GRAPH_ABSOLUTE_CLOSENESS from AQL. general_graph still offers _absoluteCloseness(). Now general_graph also offers _farness() which is identical and the correct academic name for the result of this function. Also tests are adopted.

commit b3e7678343c380cceb5ae71bca3071ce855baf9e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 11:10:50 2016 +0200

    Removed ABSOLUTE_ECCENTRICITY function from AQL Executor and deleted the JS code for it

commit 904527ce53475485ff1a89f51991a6781573d97a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 10:57:13 2016 +0200

    Reimplemented ABSOLUTE_ECCENTRICITY as AQL only variant.

commit 42a5230b6fabf14ced7a51636a7342a52504a32d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 10:56:37 2016 +0200

    Reactivated bi-directional search in ShortestPath. Was deactivated by accident and algorithm is only correct if activated.

commit 9d61dfd18e1cdb900c39f9bc6d2bb7466a86c7d7
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 25 16:25:35 2016 +0200

    Entirely removed GRAPH_RADIUS from AQL. Moved tests to general-graph module _radius() function. Same for _diameter.

commit 4a8e51483e292b501d1d2ad9983513bc99312bef
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 25 14:52:53 2016 +0200

    Replaced call of _diameter with a new AQL query not using the deleted GRAPH_DIAMETER function

commit 15fc45e438515980ea39d711fcfca5edd78a5bea
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 25 13:05:39 2016 +0200

    Entirely removed GRAPH_DISTANCE_TO from AQL

commit bdaa20cff54170abdcd2f9ec4d246765151d71e5
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 25 12:55:20 2016 +0200

    Implemented all functions in the ShortestPathNode it is now clone-able and serves estimates. Also added Flags for ShortestPath and Traversal in the JSON representation.

commit ae6c922f56c4498aaaba7f76ffb37a0560ca1476
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 17:09:15 2016 +0200

    Removed debug output in test

commit dce2ea1e2f1c5244c26bb9fa3b783454aa4e8163
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 17:07:12 2016 +0200

    Removed GRAPH_DISTANCE_TO from test. It was identical to SHORTEST_PATH anyways...

commit c4b48bc9457fd7112feb96f9e619568ad79d29ec
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 17:00:12 2016 +0200

    Removed GRAPH_SHORTEST_PATH from stresstest and brute test

commit 87a0b725d1cef05473eff0a2b48c3ac52a549192
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 16:57:52 2016 +0200

    Removed SHORTEST_PATH and GRAPH_SHORTEST_PATH from Tests. Replaced them by there new IN DIRECTION SHORTEST_PATH equivalent.

commit 72c3cbf69dcf6aa4f167d77b29271e217ce0e2bc
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 16:55:50 2016 +0200

    Removed SHORTEST_PATH and GRAPH_SHORTEST_PATH from AQL Executor.

commit 6499ca12802f45f69e30e09fbbcebdcbca88deaa
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 14:17:35 2016 +0200

    Shortest Path now honors a distance attribute. Basic AQL graph tests are green yay ;). Now former general-graph tests are next.

commit 316280400585d9af5e09f4365c39fe80423d9eef
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 09:48:21 2016 +0200

    Fixed variable usage in Shortest Path. However now it does not terminate

commit 84359e3223cbf01b283b9bda2f6de8b367df236e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 09:17:46 2016 +0200

    Shortest Path now correctly rejects invalid start nodes

commit c8a831e0d6b95445ea3cd276d0c0c0ad2ceb4901
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 09:13:06 2016 +0200

    Fixed a bug with autocasting to bool where it was not expected

commit 0300e1b4aa120fc04db7da620a905ed86bedd068
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 18:08:29 2016 +0200

    First shortest-path runs are successful. First tests are getting green again. Make Tests Green Again

commit d593f3317e8578e307c2246e65d3452d78cf043e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 15:58:22 2016 +0200

    Added reading of start and target vertex in ShortestPath Block.

commit 46ce5b7a3cf6abb4a01d8e004b34ad2118573430
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 15:23:25 2016 +0200

    Fixed Constructor variable ordering

commit 23d666d929bdf84c302fe4729faeab2ab77886b8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 15:20:44 2016 +0200

    Added the required parameters and implementation to return the result in ShortestPathBlock. Tests still RED
    . Next actually compute the path

commit 015da1ccdf50ca1123d600ac4b1afb460ad2b2dc
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 13:32:42 2016 +0200

    Prepared the ShortestPathFinder to get injected the result container instead of creating it's own one. Deactivated parts of the OLD api, shall be deleted soon.

commit bd72afa565ecaea38a4979180d4aadc0edbf52d7
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 20 15:40:56 2016 +0200

    Added infrastructure for new Shortest Path Node in AQL. It is not Functional yet and will throw errors. Tests are RED

commit 15b76dc27c118f60ee58cf2154ba84ee1311f8e7
Merge: 625e305 893802e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 20 15:38:51 2016 +0200

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

commit 625e305ca163fcbe928e5353bd06f4232664a0ee
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 16:23:14 2016 +0200

    Activated the AQL syntax for new non function SHORTEST_PATH in AQL. Also adapted One test file for new Syntax. However the feature is NOT implement at this point. Some Tests are RED

commit a935e9d9f962a2bcb6fdeed5facec2486ab4dc06
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 12:49:18 2016 +0200

    Removed _paths test. It does not exist any more

commit 1c182858a4d9427b0be9ec5749b587e40f804386
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 12:47:06 2016 +0200

    Fixed AQL_GRAPH tests

commit 5cd4e79ab77123db322defc5dd2f9417bc99e80e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 11:42:47 2016 +0200

    Fixed all tests in aql-general-graph

commit a8ddd72ffa2ee29d085ea4c5002190149200a3b8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 11:39:24 2016 +0200

    Removed GRAPH_COMMON_PROPERTIES from tests and AQL.

commit 4c0be7fdd3d610a2196aec3e93338bf3851f3606
Merge: 98e270e 7ca4d39
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 11:17:59 2016 +0200

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

commit 98e270e47a1f85df47c54e4461457bdb10331696
Merge: ff177cc 1f9f46b
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 09:35:15 2016 +0200

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

commit ff177ccf47cda7778212621df7b512c8a6a859ee
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 18:04:36 2016 +0200

    Removed PATHS() from AQL and tests. It can be replaced by Path Pattern Matching.

commit e568d5966e516c1bc6be9da79b01fd740bf2c4ff
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 17:38:49 2016 +0200

    Removed GRAPH_PATHS from Tests and from AQL. It is easily replaceable by Pattern Matching.

commit 107b2890397b4076042dc9b08ea2a7c1ab7f0284
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 16:59:36 2016 +0200

    Removed GRAPH_COMMON_NEIGHBORS from aql.js

commit dd7f6b4b68099c9c861b05dd2506cbd0f8b9c22d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 16:54:39 2016 +0200

    Fixed some COMMON_NEIGHBORS transformation. Uniqueness is not guarenteed accross start vertices. It was with GRAPH_COMMON_NEIGHBORS.

commit 863a2e3b4728add2bad088c021d3bcf54ec6f569
Merge: 9a940aa 0064e25
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 15:19:40 2016 +0200

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

commit 9a940aa8d8d9c74d26b819d54d743c369dcfa350
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 11:07:12 2016 +0200

    Added a new uniqness version for vertices. Not complete yet

commit 8c3db5519ff85b13a24c326c5982102226272635
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 09:13:03 2016 +0200

    Replaced GRAPH_COMMON_NEIGHBORS with their new equivalent in AQL in the tests.

commit 7c9782900d798019965c4ab685c24d624dd53238
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 16:35:32 2016 +0200

    AQL does not export GRAPH_NEIGHBORS any more

commit e23c3f2b9993d62290da7966419b58e9d391efe2
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 16:35:06 2016 +0200

    Replaced vertexUniqueness with uniqueVertices and edgeUniqueness with uniqueEdges as proposed in the preliminary documentation document.

commit b589f6c1113f5e02016eac0a49c0b5ea9f42620e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 15:28:53 2016 +0200

    Removed GRAPH_NEIGHBORS from Tests and replaced them by their corresponding AQL equivalent. Only two of them are red because uniqueness is not correct yet.

commit 0bc36996429493e9ceadcb3ea82a126f2cfa66fa
Merge: 9d0473a 39083cb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 12:48:25 2016 +0200

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

commit 9d0473aeada534cd47e99dab3ceae4f91ed4ebbb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 12:48:13 2016 +0200

    Implemented base version of vertex Uniqueness in AQL traversal. Single Server only.

commit 980fd6aaa09666dbe55e3811fb6430d49bfd5a1a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 11:02:24 2016 +0200

    Edge Uniqueness levels also implemented in Cluster Case. Not yet tested due to errors in the agancy right now.

commit 73e3bf1da26afbdf0dffe815629003364e2469c4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 10:57:51 2016 +0200

    Implemented all levels of edgeUniqueness in local Traversal case.

commit 2aba559e8db4ab7ac4d297590723277bd9a305cd
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 10:42:54 2016 +0200

    Now the options test actually checks for correctness of result.

commit 2b36bf92f3cf8ff6d0bc80079fddfebf36c1df92
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 10:38:01 2016 +0200

    Started Adding tests for OPTIONS in AQL Traversal

commit 86874ae290da2ba39e5cd42ec5ddaab0487091b2
Merge: f182f24 f6b7bd2
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 10:37:30 2016 +0200

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

commit f182f244fdc38c6648fc5527a518ab41e73c6865
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 13 09:45:14 2016 +0200

    Typo fix

commit 15b63ef8a2c9b02af5917634319a5a461905402a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 17:29:06 2016 +0200

    AQL Traverser now reacts to option: edgeUniqueness (NONE or PATH). Test yet missing.

commit 1ebd4abd45e085679eb3ef24b6cff6d6debe4f0a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 15:34:03 2016 +0200

    Added infrastructure to insert OPTIONS into AQL Traversals. Right now they are only parsed not used.

commit 5440118412b43024beb451e47cc59e33591dbf84
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 13:29:51 2016 +0200

    Removed NEIGHBORS() from tests and replaced them by new syntax. Tests are RED.

commit 9fc6ec448d970b27cda16abc7f51217d8e2ba3de
Merge: 8084e28 07aa8b4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 11:31:43 2016 +0200

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

commit 8084e2804d4e4c537c9c7719303362b08e2fe0bc
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 11:30:09 2016 +0200

    Started Moving NEIGHBORS => AQL PPM. Test is RED.

commit afda95eb59b97f43b2b3ad891bb404d69ca5414e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 10:55:42 2016 +0200

    Removed GRAPH_EDGES from AQL.

commit 3766babe444781555f5373287aa98f45b7a32406
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 10:53:20 2016 +0200

    Removed the old Graph Datasource from Traversals. Only the newer generalGraph is available.

commit 6ace9c992d3d06c5cb9c9e24c117e821412f63f1
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 16:31:42 2016 +0200

    Removed _getConnectingEdges from Test. Is not supported any more.

commit fbd28aae6f11782e34fcfb51887c89c878705f0a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 14:55:03 2016 +0200

    Removed GRAPH_EDGES from AQL tests

commit e032683ccf79f185808bfadc154b587af39b5818
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 12:42:06 2016 +0200

    Removed EDGES function from AQL.

commit 42b2c31d1eddb6b2790d21d6aedfeb6c3892919f
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 11:10:08 2016 +0200

    Replaced EDGES() in Tests by the new corresponding usage of Path Pattern Matching

commit 110d1b497f7df4b94709bfd2149c72dbf4f28e8c
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 11:08:09 2016 +0200

    Fixed minor bugs in Cluster Path Pattern Matching. It did not react properly on Invalid user input.

commit 8f47a3a01c0928825c13ceba5f60c3e1fe5e4691
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 10 17:13:33 2016 +0200

    Removed unused AST reference in Index Lookups for Ast Conditions
2016-06-07 13:58:21 +02:00
Frank Celler 963449d5f7 WIP 2016-06-01 13:37:13 +02:00
Frank Celler af0b0900af WIP 2016-05-22 21:08:37 +02:00
Frank Celler 806fce1dec WIP 2016-05-21 21:58:42 +02:00
jsteemann f90a9fce18 handle "Connection" and "Content-Type" headers separately 2016-05-10 15:24:55 +02:00
jsteemann 9d865c7047 optimizations, bugfixes 2016-05-04 01:50:28 +02:00
jsteemann b796e4cc7d use some static strings here and there 2016-04-29 01:37:44 +02:00
Jan Steemann 7dc214160f fixed variable name 2016-04-25 17:51:34 +02:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
jsteemann 4a7c9f0f68 simplified bloated comments 2016-04-09 11:27:30 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Michael Hackstein 96df479125 Fixed error Reporting in AQLRestHandler. It did always throw OOM despite of the error. 2016-04-04 17:46:41 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Max Neunhoeffer 5bfdca8d69 Fix AQL in cluster bugs. 2016-03-21 23:30:13 +01:00
jsteemann 6d00c2d9e9 simplified 2016-03-15 12:37:40 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Michael Hackstein e60e7a3652 Aql/QueryResult now only uses VelocyPack instead of TRI_json_t. Also adapted all calling places 2016-03-08 13:08:05 +01:00
Michael Hackstein 7c3690c4db AqlQuery now is contructed from VelocyPack builders only. Also variables and Execution Plan is constructed form VelocyPack only. 2016-03-07 19:04:37 +01:00
Michael Hackstein 93861779b4 Merged fuxes for QueryStats 2016-03-07 12:59:22 +01:00
Michael Hackstein 038573b0db Removed large parts of JSON out of RestAqlHandler. There is still some JSON contained because auf Query still using JSON. Included several warnings for the specfic code pieces 2016-03-07 12:45:34 +01:00
Jan Steemann c157363f3c less dependencies 2016-03-04 17:21:09 +01:00
Jan Steemann 06da362f93 some json removal 2016-03-02 17:51:05 +01:00
jsteemann 851d19a9d6 logging simplifications 2016-02-25 00:00:18 +01:00
Frank Celler 345712c36f changed to new Thread interface 2016-02-17 22:19:37 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 25abd4f717 fixes for Visual Studio 2016-01-21 09:46:26 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
jsteemann 1b959c827d more const unification 2016-01-15 00:09:52 +01:00
jsteemann 2ae325fd4e removed some of those "using namespace" directives 2016-01-14 23:21:39 +01:00
Wilfried Goesgens 0765ef7b45 Mark internal apis in their documentation. 2016-01-13 12:51:43 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00