1
0
Fork 0
Commit Graph

1538 Commits

Author SHA1 Message Date
Jan Christoph Uhde 5092c08e6d fix requests where nobody is available 2016-09-01 11:28:46 +02:00
Jan Christoph Uhde c98f83ede3 fix RestSimpleHandler 2016-08-31 18:52:58 +02:00
Jan Christoph Uhde 59ad47d717 make more efficient use of setPayload 2016-08-31 18:22:13 +02:00
jsteemann a04934ce50 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 09:25:09 +02:00
jsteemann 1bc8ce1060 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:28:11 +02:00
Michael Hackstein 8bced11a07 Potential assertion fix on planId 2016-08-30 16:27:54 +02:00
jsteemann 7223179b7f Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-30 16:07:44 +02:00
jsteemann 9b94287fb7 unify id handling? 2016-08-30 16:07:35 +02:00
Michael Hackstein 277953489c Fixed now false checks on planId == 0 for SingleServer case. This is not true any more 2016-08-30 15:37:26 +02:00
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
Michael Hackstein 82edb8707a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-30 10:12:36 +02:00
jsteemann 5964ffce78 fixed some tests 2016-08-30 09:36:43 +02:00
Jan Christoph Uhde 8e38600369 fix RestExportHandler 2016-08-29 21:27:05 +02:00
Jan Christoph Uhde d8be2b4079 fix: RestcursorHandler 2016-08-29 20:33:37 +02:00
Michael Hackstein 7cf7b89c6d Removed more usage of VocbaseCollectionInfo and replaced it by LogicalCollection. It's getting better now. State still not green. 2016-08-29 18:44:34 +02:00
Jan Christoph Uhde 656ceb873d add vpack version of cursor.dump() 2016-08-29 14:20:42 +02:00
Michael Hackstein e444332def Removed all references to _info in TRI_collection_t. This commit does not start. Constructor is broken. 2016-08-29 10:44:31 +02:00
jsteemann b196383b6d some preparation work for response generalization 2016-08-29 10:07:31 +02:00
jsteemann e8c8f286cb cleanup 2016-08-29 08:53:23 +02:00
Jan Christoph Uhde c31b93647a try to fix RestCursorHandler 2016-08-27 02:01:18 +02:00
Michael Hackstein b01a7ac0d5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 08:02:54 +02:00
jsteemann 396ab41736 allow dropping system collections in some rare cases 2016-08-25 12:47:06 +02:00
jsteemann 3469b63449 fixed a replication test 2016-08-25 11:29:47 +02:00
Michael Hackstein 1f3dabc8e1 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-25 11:08:39 +02:00
Michael Hackstein 2af30f056d Moved index creation to use LogicalCollection instead of TRI_collection_t. Involved changes of the constructor, all can now be created using iid and Slice. Removed specialized functions to create/find indixes in v8-voc index. Also the iteration is modified. This commit compiles but tests will fail. Merge commit. 2016-08-25 09:57:36 +02:00
Jan Christoph Uhde 0184399ba7 clean up - remove enumToEnum magic 2016-08-23 15:58:50 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde a6f5fc97de finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +02:00
Jan Christoph Uhde 4873a9be71 finish ContentType enum 2016-08-23 15:02:55 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
2016-08-19 14:35:05 +02:00
Michael Hackstein 635641d4e5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-19 13:15:48 +02:00
jsteemann f6ca78f9e7 removed JsonParser 2016-08-19 12:39:26 +02:00
Michael Hackstein 68faea4ce2 Fixed undefined behaviour in rest error creation 2016-08-19 11:15:08 +02:00
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream
* origin/obi-velocystream-frank:
  fixed ownership of handler

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
2016-08-19 09:58:27 +02:00
Jan Christoph Uhde 104b71fa6f fix bug when trying to copy member form nullptr request
response is generated by simple error so there is no request available
2016-08-19 09:07:00 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Michael Hackstein d3ba488271 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-18 12:38:07 +02:00
jsteemann 2c47d442df Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-18 11:31:06 +02:00
jsteemann 53e567f28f Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 11:30:07 +02:00
Andreas Streichardt 03b9d97e2f Implement proper cluster shutdown 2016-08-18 11:23:23 +02:00
Michael Hackstein 41d70c1df5 Fixed filename Typo 2016-08-18 10:28:27 +02:00
Andreas Streichardt 3f412debf0 Revert futile attempts to implement client resilience tests 2016-08-17 18:12:40 +02:00
Andreas Streichardt 70af1e3647 Implement proper cluster shutdown 2016-08-17 17:25:39 +02:00
Michael Hackstein 17a6da8afb Removed all references on TRI_vocbase_col_t and replaced them by LogicalCollection class. Not everything is properly moved and implemetned yet. This commit causes crashes. 2016-08-17 11:10:39 +02:00
Jan Christoph Uhde 21a9f64538 remove: _request from CommTask and contentType from setPayload() 2016-08-17 09:29:23 +02:00
Michael Hackstein 14e0411a87 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-16 10:29:26 +02:00
jsteemann 680042b062 moved compaction info into StorageEngine 2016-08-15 18:35:22 +02:00
Michael Hackstein 94ca36fdb2 Removed cluster-wide CollectionInfo and replaced it with a logical collection. The Logical collection shall be always available, in cluster and single server. 2016-08-15 09:08:24 +02:00
Jan Christoph Uhde 0e5b455159 setPayload of response now takes contType instead of request 2016-08-08 14:48:56 +02:00
jsteemann 95ac01313b privatization 2016-08-04 17:06:51 +02:00
jsteemann 9677210e57 refactoring 2016-08-02 15:00:25 +02:00
jsteemann 3664511e36 privatize vocbase methods 2016-08-02 13:49:22 +02:00
jsteemann 99aaf7de9b Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-02 08:43:34 +02:00
jsteemann d92f15aeed entirely removed TRI_document_collection_t 2016-07-29 17:48:51 +02:00
jsteemann 59ed0a902c refactoring 2016-07-29 17:07:16 +02:00
Jan Christoph Uhde af108e8fcd fix RestBatchHandler 2016-07-28 18:15:26 +02:00
Michael Hackstein 64d7f690da Removed AqlTransaction wherever possible. Added an InjectTransaction for the aql query, used by TraverserEngine. Also fixed TraverserEngine from/to velocypack functions. 2016-07-28 17:05:00 +02:00
jsteemann deca131a58 fixed undefined behavior 2016-07-28 16:35:27 +02:00
jsteemann ebaabdb076 Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
jsteemann 329b733090 moved dropCollection into TRI_vocbase_t 2016-07-28 13:14:12 +02:00
jsteemann b3bdd3a66a more refactoring 2016-07-28 11:47:20 +02:00
jsteemann b71e12f6a0 some vocbase refactoring 2016-07-28 11:06:21 +02:00
jsteemann 31407c3561 refactoring 2016-07-27 17:15:52 +02:00
Michael Hackstein 3dac8c27ed Implemented infrastructure for the TraversalEngines. We can now create and delete these engines accross several requests/threads. Right now the engines are empty. 2016-07-27 10:08:45 +02:00
jsteemann 89e0c11b44 refactoring 2016-07-26 16:25:38 +02:00
jsteemann df4daf4122 CleanupThread is now derived from Thread 2016-07-26 12:54:08 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
Jan Christoph Uhde da81c32539 remove body() method from GeneralRequest 2016-07-25 16:46:53 +02:00
jsteemann a92ac7be28 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-25 11:14:44 +02:00
Frank Celler a92add0a9f renamed RestServerFeature to GeneralServerFeature 2016-07-23 14:16:10 +02:00
jsteemann 431262cc19 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-21 16:42:47 +02:00
Jan Christoph Uhde 5edaf0043a preparations for velocystream completed 2016-07-21 09:32:00 +02:00
jsteemann 2b4c3707e3 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-20 13:22:29 +02:00
Jan Christoph Uhde 06bd01695a removed: body() from GeneralRequest 2016-07-19 09:16:07 +02:00
jsteemann 2dab54a751 removed a define 2016-07-18 17:15:41 +02:00
jsteemann f373a2c327 removed TRI_vocbase_defaults_t 2016-07-18 16:55:25 +02:00
jsteemann 807f287868 moved server id detection and pagesize detection into their own features 2016-07-18 14:37:12 +02:00
Jan Christoph Uhde 002a1e55cb add: payload/addPayload methods 2016-07-18 13:16:08 +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 a0dca93e65 complete: adding toVelocyPack() function that returns slice instead of builder 2016-07-16 21:33:03 +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 Christoph Uhde 6e9304cdc4 Merge remote-tracking branch 'origin/devel' into obi-rest-changes
* origin/devel: (43 commits)
  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!
  grunt [ci skip]
  gv [ci skip]
  Fix documentation.
  Fix fix.
  ...
2016-07-15 09:20:04 +00:00
Jan Christoph Uhde 682cf7a2f1 virtualize functions of request/response 2016-07-14 08:40:05 +02:00
Max Neunhoeffer a78fd42b67 Merge branch 'HLC' into devel 2016-07-13 12:52:33 +02:00
Jan Christoph Uhde ff49d7b0b4 Merge remote-tracking branch 'origin/devel' into obi-merge-restserver-next
* origin/devel: (105 commits)
  Fixed failure tests in SkiplistIndex
  Fixed a bug with reset of new skiplist index iterator
  whitespace removal
  micro optimization for key generator key tracking
  GraphQL! Hype! 🎉
  explicit
  remove unused variable
  explicit
  Fix VS complaints
  complaints
  complaints
  updated CHANGELOG
  fixed issue #1937
  Modified the SkiplistIndex lookup s.t. it does not build one large VPackBuilder containing all combinations of search values, but instead has an option to rewrite it in-place and just has to maintain the intervals.
  ignore revision ids
  fix destructuring of Externals in MERGE
  make it code.
  ignore primary and edge indexes during cluster restore
  grunt build [ci skip]
  semist.
  ...
2016-07-13 07:33:13 +00:00
Max Neunhoeffer 386f0fe883 Remove an unused var. 2016-07-12 16:56:51 +02:00
jsteemann 76f55d84bc remove unused variable 2016-07-12 16:56:48 +02:00
Max Neunhoeffer 2c2c50aa19 Rewrite old revision strings with new HLC time stamps. 2016-07-12 16:51:25 +02:00
Max Neunhoeffer 846e6b6127 Merge remote-tracking branch 'origin/devel' into HLC 2016-07-12 15:10:24 +02:00
Jan Steemann 233453bb42 ignore primary and edge indexes during cluster restore 2016-07-12 10:18:12 +02:00
Jan Steemann 94bd64d9ab fix complaining about null keys 2016-07-12 09:42:32 +02:00
Max Neunhoeffer 869a820275 Use babies in handler for arangorestore.
This fixes bad performance and corresponding errors due to timeouts
in the cluster case with synchronous replication in the restored
collections.
2016-07-11 23:37:38 +02:00
Jan Christoph Uhde b2e29c4353 fix: createResponse -> setResponseCode; remove delete
remove delete _response in RestEdgesHandler
2016-07-07 08:54:41 +00:00
Max Neunhoeffer 02a5e5cc8f Merge branch 'devel' into HLC 2016-07-06 11:03:41 +02:00
Jan Steemann 617a833040 handle "isSystem" somewhat smarter 2016-07-06 10:23:37 +02:00
Max Neunhoeffer 200d47a0bc Fix revision id bug. 2016-07-06 10:02:26 +02:00
Max Neunhoeffer f441fceed8 More fixes for new revision timestamps. 2016-07-06 09:15:48 +02:00
Max Neunhoeffer 41c5451168 Extract conversion _rev string <-> rid into functions.
Also fixes another place where this conversion was wrong.
2016-07-05 23:52:30 +02:00
Max Neunhoeffer ae1a9497c6 Fix extractRevision again. 2016-07-05 22:18:09 +02:00
Max Neunhoeffer bbfeafe830 Fix compilation. 2016-07-05 21:57:37 +02:00
Max Neunhoeffer bf3a6de760 Fix extractRevision for new revision format. 2016-07-05 21:55:42 +02:00
Jan Christoph Uhde 6963c70dc8 fix unittest http_server 2016-07-05 15:36:31 +02:00
Jan Christoph Uhde 5805758cee make it compile - more ugly casts 2016-07-05 09:56:50 +02:00
Jan Christoph Uhde 4aa7222d98 Merge remote-tracking branch 'origin/devel' into FHM
* origin/devel:
  Start adding a hybrid logical clock.
  Handle replicationFactor and numberOfShards in arangorestore.
  upgrade script for homebrew
  Fix namespace stuff for VC++
  Use standard GNU install dirs
2016-07-05 08:09:08 +02:00
Jan Christoph Uhde 41ecd18fc1 Merge branch 'devel' into FHM
* devel:
  add: VPackValidator to RestVocbaseBaseHandler
  add tags to .gitignore and add .editorconfig
2016-07-05 08:06:12 +02:00
Max Neunhoeffer b7e957664f Handle replicationFactor and numberOfShards in arangorestore.
This adds an option --default-replication-factor to arangorestore and
makes it more convenient to specify the number of shards for restored
collections.
2016-07-05 00:10:20 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Jan Christoph Uhde ed789ce397 add: VPackValidator to RestVocbaseBaseHandler 2016-07-04 14:09:28 +02:00
Jan Steemann 7b62d71c63 added --skip-lines for import 2016-07-04 11:18:15 +02:00
jsteemann 0aaf58837b babify cluster import 2016-06-30 18:29:04 +02:00
Michael Hackstein 712e495fe2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-29 13:08:13 +02:00
Michael Hackstein 59dd29e760 Improved OperationCursor. It now uses unique instead of shared ptr. It was never shared anyways. Also many more places now use direct MasterPointers in favor of OperationResults. Also added a generic IndexIterator nextBabies function. 2016-06-29 13:08:07 +02:00
jsteemann 4a5b75b485 escape Unicode characters in JSON dumps 2016-06-29 12:53:08 +02:00
jsteemann 6769130f33 enable import API for cluster 2016-06-24 10:53:00 +02:00
jsteemann 8f0991e18e potential performance optimizations
simplifications

small optimizations
2016-06-23 14:47:44 +02:00
Kaveh Vahedipour 1a8636c34c removing more locks from cluster-agency communication 2016-06-23 11:14:21 +02:00
jsteemann ea197fbf79 fixed assertion failure 2016-06-18 01:58:54 +02:00
Frank Celler 03079b2b67 3.0 fixes for paths 2016-06-14 16:51:48 +02:00
Max Neunhoeffer 1f926fc24b Fix synchronous replication: use shard name instead of ID.
Explanation: Different replicas of the same shard will have different
local collection IDs. Therefore we have to use the shard name
(collection name) to indentify collections in synchronous replication.
2016-06-13 13:54:32 +02:00
Frank Celler 2dce30ac21 clang-format 2016-06-12 12:19:37 +02:00
Andreas Streichardt f7301bdc7c Implement unregister on shutdown 2016-06-10 18:21:41 +02:00
Andreas Streichardt 496454df3f /_admin/shutdown will now need a DELETE request 2016-06-08 15:26:53 +02:00
Max Neunhoeffer 659a06765d Let a follower unfollow a leader. 2016-06-08 10:00:19 +02:00
jsteemann a88b1adf8e make query killable even if it did not yet start 2016-06-07 17:25:26 +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
jsteemann 325aa13795 merge with velocypack 2016-06-06 16:59:36 +02:00
Max Neunhoeffer 20ef93d76b Cleanup of error handling for asyncRequest and syncRequest.
I have added a thorough description of events to the comments
in ClusterComm.h. This should enable everybody to do proper
error handling when using ClusterComm::asyncRequest and
ClusterComm::syncRequest.
2016-06-04 23:05:48 -06:00
Jan Steemann 6412200f27 added /_api/aql-builtin 2016-06-03 12:56:18 +02:00
Jan Steemann 8b1366205a added 28 compatibility flag for dumping 2016-06-03 12:47:51 +02:00
Frank Celler 22b454800d WIP 2016-06-01 23:03:00 +02:00
Frank Celler 1e25e5d262 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Cluster/HeartbeatThread.cpp
	arangod/RestServer/RestServerFeature.cpp
2016-06-01 16:25:13 +02:00
Frank Celler 963449d5f7 WIP 2016-06-01 13:37:13 +02:00
Andreas Streichardt 9178e560eb Implement jwt tests 2016-05-31 19:19:10 +02:00
Andreas Streichardt b5f27100b1 oops...JWT should be uppercase in header 2016-05-31 17:22:28 +02:00
Andreas Streichardt 87f09b986a Compiles 2016-05-31 14:28:15 +02:00
Andreas Streichardt 6cb00f905d Merge branch 'devel' into jwt 2016-05-30 18:49:26 +02:00
Andreas Streichardt 5b0055bfbf jwt generation works 2016-05-30 18:47:04 +02:00
Max Neunhoeffer 7943e1567c Add a cast to make Windwos happier. 2016-05-25 15:59:04 +02:00
Frank Celler 3e0930aa16 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-05-24 10:21:18 +02:00
Max Neunhoeffer 611b7f9ee0 Repair resilience for system collections.
Plus a lot of synchronous replication bugfixes.
2016-05-23 14:02:01 +02:00
Frank Celler c441700c20 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-05-22 21:45:40 +02:00
Frank Celler 30ef88df00 WIP 2016-05-22 21:21:04 +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
Max Neunhoeffer fa27587124 Add /_api/replication/holdReadLockCollection for sync. replication. 2016-05-21 01:03:14 +02:00
jsteemann 9166d0223f fix rev 2016-05-20 16:04:14 +02:00
jsteemann 2c6166822d fix rev 2016-05-20 15:59:58 +02:00
Max Neunhoeffer d810641ff3 Add a waitForSync in replication. 2016-05-19 14:04:52 +02:00
Jan Steemann 7d4599a056 removed now unneeded API-changes document 2016-05-13 16:04:48 +02:00
Frank Celler 9dbba248de added fillBody 2016-05-13 15:14:44 +02:00
jsteemann 5be32e9fe5 attempt to speed up dumper 2016-05-12 16:46:52 +02:00
Jan Steemann 8e090e642e removed "createCollection" attribute from APIs 2016-05-12 15:17:45 +02:00
jsteemann 3f1516eca7 bugfixes 2016-05-11 15:01:06 +02:00
jsteemann 98f0ad81a6 micro optimizations 2016-05-11 14:06:47 +02:00
jsteemann bfd5596359 optimizations 2016-05-11 11:50:07 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
jsteemann 30525fccee use StaticStrings 2016-05-10 17:01:34 +02:00
Max Neunhoeffer 39ecd9fd13 Rename prefix and prefixStripped in AgencyComm. 2016-05-10 16:00:07 +02:00
Max Neunhoeffer 825f010980 Rename getValues2 to getValues. 2016-05-10 15:52:54 +02:00
jsteemann f90a9fce18 handle "Connection" and "Content-Type" headers separately 2016-05-10 15:24:55 +02:00
Michael Hackstein ab13d1e3a6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 13:45:20 +02:00
Michael Hackstein 7b8d3d6df7 Insertion of documents in Cluster (babies case) now passes through the X-Arango-Error-Codes. 2016-05-09 12:45:31 +02:00
Jan Steemann 8d6bf61335 fixed restore 2016-05-09 11:55:00 +02:00
Jan Steemann 0bd61cf928 removed option `--server.default-api-compatibility` 2016-05-06 18:38:37 +02:00
Max Neunhoeffer 75f7689a9f Fix arangodump.
RestReplicationHandler::handleCommandClusterInventory was using
getValues instead of getValues2 and the etcd-fake code did not
work properly with objects as values in the agency.
2016-05-04 23:46:09 +02:00
Wilfried Goesgens 4fb12c91b1 Revalidate dispatcher pointer before accessing it and throw appropriate error message if not. 2016-05-03 16:56:50 +02:00
jsteemann db9e3d1360 optimizations 2016-05-03 00:43:39 +02:00
jsteemann b9324ea2a1 use VPackDumper 2016-05-02 17:32:53 +02:00
jsteemann 96fceb4411 use std::unordered_maps for headers 2016-05-01 20:52:47 +02:00
jsteemann 7cd90ae711 micro optimizations 2016-05-01 14:13:53 +02:00
jsteemann 1250fcf63e micro optimizations 2016-05-01 00:03:23 +02:00
jsteemann a1df0c8168 turn waitForSync off during restore 2016-04-30 16:47:29 +02:00
jsteemann e478c1ae11 faster lookup for _key attribute 2016-04-30 13:25:06 +02:00
jsteemann 3a92773685 use StaticStrings 2016-04-29 15:18:20 +02:00
Frank Celler d4f7316b46 more static strings 2016-04-29 11:14:57 +02:00
Frank Celler 1369ad3a6f towards windows service 2016-04-29 11:14:57 +02:00
Michael Hackstein 165d92fc58 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 09:15:09 +02:00
jsteemann b796e4cc7d use some static strings here and there 2016-04-29 01:37:44 +02:00
Michael Hackstein a4541a83ad Generate document in rest handler now works with externals 2016-04-28 17:32:56 +02:00
jsteemann 46fc8a25d4 micro optimizations 2016-04-28 15:41:50 +02:00
jsteemann b9ef307bf1 micro optimizations 2016-04-28 12:04:14 +02:00
Frank Celler 33c96bea86 added application/x-velocypack 2016-04-26 23:01:36 +02:00
jsteemann 46e9db4d4e wal simplifications 2016-04-25 22:31:48 +02:00
Jan Steemann b7f3ab4683 micro optimizations 2016-04-25 17:58:11 +02:00
jsteemann f660587336 fix importing of unsupported index types 2016-04-24 19:15:26 +02:00
jsteemann 5b59b6dacd use generateResult instead of home-made solution 2016-04-23 20:49:43 +02:00
jsteemann 0da9ac7cdc micro optimizations 2016-04-23 16:23:15 +02:00
Jan Steemann 104e8e8b9b remove ArangoServer.h remainders 2016-04-22 20:18:28 +02:00
Jan Steemann 38e543e0a8 cppcheck 2016-04-22 15:51:03 +02:00
Jan Steemann 7d6994862e fixed startup/shutdown with specific features 2016-04-22 14:44:42 +02:00
jsteemann ad0a3f38b0 allow accessing /_admin/log in all databases 2016-04-22 08:41:39 +02:00
Frank Celler ac3a9883b9 restored log buffer feature 2016-04-21 21:07:23 -07:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann 240cb95f0c fixed crash 2016-04-19 15:54:10 +02:00
Michael Hackstein be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +02:00
Frank Celler 75d3de2b31 fixed merge 2016-04-19 07:52:02 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Kaveh Vahedipour 313140e0e1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 15:27:31 +02:00
Michael Hackstein 94ee7b41f8 Removed unneccessary warning 2016-04-18 13:44:11 +02:00
Kaveh Vahedipour 1221326753 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-18 13:08:56 +02:00
Kaveh Vahedipour 76a0b2d41a cluster startup and supervision 2016-04-18 13:08:49 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
Michael Hackstein ca64e727a1 Entirely removed TRI_json_t and Json from ClusterMethods and RestEdgesHandler 2016-04-16 23:23:25 +02:00
Michael Hackstein 1c040696b4 Removed unnecessary TRI_json_t in RestReplicationHandler 2016-04-16 22:37:48 +02:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07: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
Michael Hackstein cd12a07a4d Fixed return codes in cluster. They are now forwarded properly from DBServer to Client 2016-04-15 17:58:06 +02:00
Jan Steemann bbfaee3bfe allow specifying collection name prefixes for `_from` and `_to` in arangoimp: 2016-04-15 16:18:23 +02:00
Michael Hackstein 0e2d31f633 Moved GET _api/document?collection=xxx to PUT _api/simple/all-keys {collection: xxx}. Adapted all tests. Also removed Transaction::allKeys which got obsolete by this commit. 2016-04-15 11:23:25 +02:00
Frank Celler 8254bd4bd6 WIP 2016-04-14 21:32:12 -07:00
Michael Hackstein 9d26149187 RestHandler now reacts to NOT_ALL_SHARDING_ATTRIBUTES_GIVEN. This could not occur before. 2016-04-14 10:23:11 +02:00
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
Jan Steemann d0296b38e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-12 18:27:53 +02:00
Jan 7cd428c367 Merge pull request #1798 from ObiWahn/devel
optional velocypack response
2016-04-12 18:27:08 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
Kaveh Vahedipour 9bd08b98c4 correct callback jsons 2016-04-12 16:01:00 +02:00
Kaveh Vahedipour b44af0ab60 new simple URI form from endpoint 2016-04-12 14:20:47 +02:00
Michael Hackstein 50535f6ad8 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 14:12:06 +02:00
Kaveh Vahedipour 0efa889f43 new simple URI form from endpoint 2016-04-12 14:10:18 +02:00
Kaveh Vahedipour 9853b9662c introducing cluster sanity checking to agency 2016-04-12 12:10:46 +02:00
Michael Hackstein 19a861e86d Modify Document now returns X-Arango-Error-Codes header in baby case. 2016-04-11 14:23:03 +02:00
Michael Hackstein 83b13bb8b3 Implemented modifyDocument in cluster with babies. 2016-04-11 10:25:03 +02:00
Jan Christoph Uhde 1977377cc6 prepare two more functions to return velocypack - please review 2016-04-11 01:19:24 +02:00
Jan Christoph Uhde 1d72053587 reviewed by jan 2016-04-10 10:42:56 +02:00
Kaveh Vahedipour c949df2dfc agency compiles after pull from devel 2016-04-08 12:40:38 +00:00
Jan Christoph Uhde c3c403532b client is now able to request velocypack 2016-04-08 13:29:27 +02:00
Jan Steemann e37029aec6 removed unused private variable 2016-04-07 18:52:32 +02:00
Jan Steemann 1855b74aaa added asserts 2016-04-07 16:44:36 +02:00
Jan Steemann 74794d16db Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:43:35 +02:00
Jan Steemann 4b0c01975b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:30:36 +02:00
Frank Celler f6c818a399 removed tolower for NC 2016-04-07 14:15:30 +02:00
Jan Steemann 513dc26fc1 make replication tests more deterministic 2016-04-07 13:00:30 +02:00
Michael Hackstein 015c5d2908 Fixed single-server babies test. Also made sure that the error header is capialized properly 2016-04-07 12:41:23 +02:00
Kaveh Vahedipour 4ae8aae1da redone the single-host and multi-host agency to function in identical way in commiting and confirmation thereof 2016-04-07 12:20:53 +02:00
Jan Steemann 545b87cb76 test fixes 2016-04-06 17:39:24 +02:00
Jan Steemann aae8ffa5e3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:46:47 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Max Neunhoeffer 836d288c85 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-04-06 10:15:20 +02:00
Max Neunhoeffer cae6b850df Fix addFollower. 2016-04-06 10:15:03 +02:00
Michael Hackstein 98b4c43315 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:30:11 +02:00
Kaveh Vahedipour f6c5feb5e4 implementing code review: rewrote url generation 2016-04-06 08:58:38 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Michael Hackstein a968446820 SingleServer INSERT babies now uses newest format. It tries to insert as much as possible. Reports each document individually. Also reports each error individually. The ordering of documents in request and response is identical. 2016-04-05 15:53:48 +02:00
Kaveh Vahedipour 8bb3b84aed implementing code review 2016-04-05 14:20:07 +02:00
Jan Steemann bd43decab4 replication fixes 2016-04-04 14:55:55 +02:00
Michael Hackstein 4339c6540d Fixed a bug with custom _id attribute in RestSimpleHandle lookupByKeys 2016-04-04 12:48:55 +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
Michael Hackstein 0f7c2af9dc Fixed undefined behaviour bug if someone tries to delete a document without key and body. 2016-04-01 17:12:22 +02:00
Kaveh Vahedipour 1dba990295 ttl overwrite 2016-04-01 15:10:20 +02:00
Kaveh Vahedipour f013604f47 ttl overwright 2016-04-01 15:01:53 +02:00
Michael Hackstein 91d394105c ClusterResolver cid by numeric name now checks if the number is actually a valid collection and it returns cid 0 instead of the given numeric number. Some apis rely on this to check if collection exists or not. 2016-04-01 14:31:13 +02:00
Kaveh Vahedipour 8ace3c10a3 Overwriting ttls 2016-04-01 14:24:30 +02:00
Michael Hackstein 4637d0ff40 Fixed api/edges in Cluster 2016-04-01 11:38:44 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 1c0492ff8a MSVC fixes 2016-03-31 14:02:02 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Kaveh Vahedipour 66d668ba13 merge back from agency 2016-03-31 11:50:05 +00:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Kaveh Vahedipour cdd76c1b89 still ttl in long 2016-03-31 11:53:08 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Kaveh Vahedipour 2ddc1cd8ec i am a teapot if value not found and only a single search string is requested 2016-03-31 11:44:02 +02:00
Kaveh Vahedipour f9cc972cff i am a teapot if value not found and only a single search string is requested 2016-03-31 11:04:10 +02:00
Frank Celler 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Kaveh Vahedipour ee97eb769b updating state to AQL 2016-03-30 13:20:19 +02:00
Michael Hackstein 9d70091713 The RestEdges handler now behaves identically to the server side edges() functions. Specifically it does not return duplicate edges any more. Also added a helper function to build an EdgeIndex Lookup from VPackArray. 2016-03-30 10:13:09 +02:00
Kaveh Vahedipour 173a6010b5 VisualStudio warnings 2016-03-29 13:01:23 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann 1915e39aea Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 15:28:57 +01:00
Kaveh Vahedipour 1bdfe53ec2 Agency write sensitive to X-ArangoDB-Agency-Mode 2016-03-24 14:14:33 +01:00
Kaveh Vahedipour a6bd03c609 Fixing VS 2015 warnings and errors 2016-03-24 10:46:00 +01:00
Kaveh Vahedipour c1a5b56061 Fixing VS 2015 warnings and errors 2016-03-24 10:38:50 +01:00
jsteemann b7c1a42f96 test fixes 2016-03-24 01:12:57 +01:00
jsteemann 1efc83babf Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 23:48:27 +01:00
jsteemann 8f4a3be165 cppcheck 2016-03-23 23:06:18 +01:00
jsteemann 3f3ac72503 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 20:55:01 +01:00
Jan Steemann f7faf536eb merge 2016-03-23 19:12:57 +01:00
Kaveh Vahedipour 80e7828a97 need to log all changes of term in agency 2016-03-23 19:05:34 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Kaveh Vahedipour 599abfb415 repaired redirection in public agency api 2016-03-23 17:19:46 +01:00
Jan Steemann d5d943b4a5 adapt to branch 2016-03-23 17:09:29 +01:00
Jan Steemann 9ac39b7ad6 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:30 +01:00
Kaveh Vahedipour d239fb8e7f merging into devel 2016-03-23 15:36:48 +01:00
Kaveh Vahedipour 7254ad4c9e Fixing issues 2016-03-23 15:16:47 +01:00
Kaveh Vahedipour 342ca3e383 merging into devel 2016-03-23 10:05:14 +01:00
Max Neunhoeffer c2049b8ee1 Switch to IndexHandles. 2016-03-23 08:57:00 +01:00
Kaveh Vahedipour 7f76eb64cb first really usable multi-host agency 2016-03-22 13:34:19 +01:00
Jan Steemann 04e7f2dced fixed test 2016-03-22 12:03:25 +01:00
Jan Steemann 9e026655a0 allow generating HTTP responses with TransactionContext 2016-03-22 12:01:02 +01:00
Jan Steemann 31c06b0845 cleanup 2016-03-22 11:48:17 +01:00
Jan Steemann 45cc15fe45 fixes 2016-03-22 10:51:42 +01:00
jsteemann d03170a93f removed unused functionality 2016-03-21 21:41:39 +01:00
jsteemann 4694d36671 cppcheck 2016-03-21 20:56:08 +01:00
Jan Steemann 3da00d24ea test fixes 2016-03-21 18:25:48 +01:00