1
0
Fork 0
Commit Graph

3717 Commits

Author SHA1 Message Date
Max Neunhoeffer d3f492158c Port 3.1 fixes to devel, move something into try block. 2017-04-26 11:17:08 +02:00
Michael Hackstein 5beae6081b Removed double include due to hidden merge conflict. 2017-04-26 11:04:01 +02:00
jsteemann b349eaf34a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-26 10:40:14 +02:00
jsteemann b226dfdc9a add missing include files 2017-04-26 10:40:04 +02:00
Michael Hackstein e891c66c88 Fixed missing includes 2017-04-26 10:39:10 +02:00
Michael Hackstein aed90940d0 Fixed compile bugin shortest path 2017-04-26 10:32:40 +02:00
Michael Hackstein 9e1eba3bde ShortestPathBlock does not use EdgeCollectionInfo anymore. Replaced by EdgeCursors 2017-04-26 10:21:18 +02:00
Michael Hackstein 4c58817cc7 Further unnecessary friends and member variables removed 2017-04-26 10:10:05 +02:00
Michael Hackstein d3517eb491 Removed unnecessary friend declaration 2017-04-26 10:02:20 +02:00
Michael Hackstein f876eef088 Removed unused member variable in ShortestPathBlock 2017-04-26 09:52:00 +02:00
Michael Hackstein 9e49f87fe6 Removed if where if and else were identical 2017-04-25 10:10:46 +02:00
jsteemann 31c9e04ae6 fixed memleak 2017-04-22 00:28:45 +02:00
jsteemann 691dac7a73 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 12:35:07 +02:00
Michael Hackstein e3beaaa8fc Added a test + fix for a Stackoverflow issue in Traversals and ShortestPath in AQL. This occured in the case where there are a lot of starting vertices in a row that do not have any paths attached to them. Fixes: #2445 2017-04-21 11:31:30 +02:00
jsteemann 2994988210 attempt to fix broken graph stuff 2017-04-20 22:14:30 +02:00
Simon Grätzer 98df9c21a2 Fixing warnings 2017-04-20 19:07:30 +02:00
Michael Hackstein e3febed2b5 ShortestPath and TraversalNode now call GraphNode::toVelocyPack as expected, not the Base ExecuteionNode::toVelocypackGeneric by accident 2017-04-20 17:19:30 +02:00
Michael Hackstein 4f899bfd2c Integreated a ShortestPathEngine on DBServers and wired it up with ShortestPathNode and Options. The path seems to be computed correctly in clsuter now, but the vertices are not yet retrieved. 2017-04-20 13:57:14 +02:00
Michael Hackstein 0fa1980064 More unified merge of Traverser- and ShortestPath- into GraphNode. Now the ShortestPathNode creates TraverserEngines on the Cluster. Finally everything ready to wire computation together 2017-04-19 15:23:37 +02:00
Michael Hackstein e7142beca0 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-19 10:10:57 +02:00
Michael Hackstein 50ce09cd98 Added a generic GraphNode as a base-class for Traversal and ShortestPath. It should handle Graph parsing and Engine creation. 2017-04-19 10:10:47 +02:00
jsteemann d3f32799c6 fixed assertion failure 2017-04-18 14:54:29 +02:00
Dan Larkin 2e0fdbf666 Fixed some bugs. 2017-04-13 20:06:25 -04:00
Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
Michael Hackstein 177a3de0fd Squashed commit of the following:
commit ba04aa66ce874fc67644ef2c7b8ee6ef3397e13e
Merge: 8ea1ad2 c6d65ea
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Apr 13 16:51:17 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 8ea1ad2ff0325fc014479376b5258d1b3fa4f730
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Apr 3 14:18:11 2017 +0200

    Deactivated cache in single-server mode

commit 2c68eaeb841aebccccd245ef78bab919adf39a2f
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Apr 3 09:18:36 2017 +0200

    Activating document cache in cluster mode for traversals.

commit 3943ca4f8257fe54534949c46749e40c28c4d597
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Mar 31 16:10:39 2017 +0200

    Created two implementations of TraverserCache. One that takes responsibility for strings only, the other one also caches Documents.

commit 0951f906f18d3631cec412cd0b00504e6d00fc3e
Merge: 0f9970b 87fbbe8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Mar 31 14:59:16 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 0f9970b7bab478c4b591b3f4c7fb18915753df30
Merge: d546fd1 8a42089
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 30 17:09:20 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit d546fd13c6a0a3bb4622f6aefd44ea3a149cc8cb
Merge: 873bc59 bd4a2eb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 29 15:16:54 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 873bc5950028248bf209d0c53fc9eb93938e3610
Merge: 8e4457a 3487097
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Mar 27 14:00:27 2017 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 8e4457a96754bea3437e8d44c0ef9db2366ee86d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Mar 27 13:59:44 2017 +0200

    Removed old VPackSlice based getVertex API in traversers.

commit 2e0716eeeec1ec56b96571a18074539f5e27cb40
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Mar 24 09:09:02 2017 +0100

    Fixed logic error in SingleServerEdgeCursor readAll. The cursorId was not propageted properly, which cased filter-evaluations to fail

commit cea85c2ac1163ed0a989c492b8039ed4f7622325
Merge: 538f216 45a4fac
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Mar 24 08:17:31 2017 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 538f216cbefcdfb4d06fe16a42f223cecae8598b
Merge: 5f4afee 8bfcb49
Author: Simon Grätzer <simon@graetzer.org>
Date:   Thu Mar 23 16:33:44 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of https://github.com/arangodb/arangodb into devel-feature/traversal-cache

commit 5f4afee54094ea6d2a0cfec1abfb75451f228a23
Author: Simon Grätzer <simon@graetzer.org>
Date:   Thu Mar 23 16:33:38 2017 +0100

    VertexGetter StringRef methods

commit 8bfcb490d7a907ebd7dcc9e6f38a8d29baa7c7e5
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 16:32:38 2017 +0100

    Fixed AqlValues created by traverser-cache. They are now not using externals anymore which cased everything to crash

commit 614cdedb7e30e35f65f289b310c38b2585eb03e4
Merge: 773b0a5 416777b
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 12:52:19 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of github.com:arangodb/arangodb into devel-feature/traversal-cache

    This state is still red

commit 773b0a5e51f87875fa9bf1440dd002b2e1fcfd2a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 12:48:53 2017 +0100

    Added Implementation or readAll in Cluster EdgeCursor. This commit is still red.

commit 82ebbd6ec84918d43bbc64174bc251efa548a4de
Merge: e52b210 35dffc4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 11:37:31 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of github.com:arangodb/arangodb into devel-feature/traversal-cache

    This commit is not green.

commit 416777b60a8a0c741d11e9c654745866d0dfa15d
Author: Simon Grätzer <simon@graetzer.org>
Date:   Thu Mar 23 11:25:35 2017 +0100

    Fixed errornous ClusterEdgeCursor implementation of `readAll

commit e52b21025a5f56e2cfc03e3c129da83793f19846
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Mar 23 11:01:17 2017 +0100

    Fixed API for Traversals: All functions now use StringRefs to identify vertices and edges which are presisted within the traverser-cache.

commit 35dffc439c156366b1110c6770c1565021934632
Author: Simon Grätzer <simon@graetzer.org>
Date:   Wed Mar 22 20:26:41 2017 +0100

    Fixed a few cluster issues

commit 73cf4fe41c363f6c034a1daeacee1630d7e827a5
Author: Simon Grätzer <simon@graetzer.org>
Date:   Wed Mar 22 17:26:12 2017 +0100

    Fixed EdgeCursor bug

commit 2f7329b4e9711740b423cf2963c6cf3f880c4bdf
Merge: bb9b129 8e5edf5
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 22 14:32:07 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 8e5edf5fbe93f34d3340099619baa9a56a738887
Author: Simon Grätzer <simon@graetzer.org>
Date:   Wed Mar 22 14:09:43 2017 +0100

    Fixing compile errors

commit bb9b1294c9ff91f62bc27775a4c7a69c5daca2fd
Merge: 048a4c6 8e51e3b
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 22 11:39:17 2017 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 048a4c65e11d6fd9cb25a58ee97ed756a419a067
Merge: 693607e c6b177d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 22 11:34:57 2017 +0100

    Solved merge conflicts. Build is still red.

commit c6b177dfc348df0f49f07cd67e83b873871fe6c5
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 23:04:28 2017 +0100

    Fixed off by one error, and crash

commit 5dbc9eb58f1d21e5a530806d7ad7e52058234b83
Merge: 463e352 db8c255
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 17:46:01 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of https://github.com/arangodb/arangodb into devel-feature/traversal-cache

    # Conflicts:
    #	arangod/Graph/BreadthFirstEnumerator.cpp

commit 463e3520636c19ae7a7c1d445099f336c5bde31e
Merge: 4e75f29 b8cabbe
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 17:00:17 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of https://github.com/arangodb/arangodb into devel-feature/traversal-cache

    # Conflicts:
    #	arangod/Graph/BreadthFirstEnumerator.cpp

commit 693607ea92ab3116a628c08c59a983a6fdf8b5f4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 16:26:57 2017 +0100

    Moved specialized NeighborsEnumerator into its own files.

commit db8c25587ebcdeff8b32d08cf2d97d723bf2b3fe
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 15:16:39 2017 +0100

    Replaced SingleServerBreadthFirst with using Callbacks in readAll method of EdgeCursor

commit 4e75f29de95edeea35573b128a0a13e04c9e65d2
Merge: 8716936 6de86c5
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 14:32:12 2017 +0100

    Merge branch 'devel-feature/traversal-cache' of https://github.com/arangodb/arangodb into devel-feature/traversal-cache

commit b8cabbedebb16c09c8168ec8b5a4499e98c705f4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 11:17:23 2017 +0100

    Removed _enumertedPath from BreadthFirstEnumerator. Less string copying expected now.

commit 8716936bd480f4b7c85ece6fc1a51335f1942258
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 11:05:04 2017 +0100

    Traverser: changed method definitions

commit 14af02fbc08b7e2ed6b0cbb918ff509ffaef76bf
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 10:45:13 2017 +0100

    Removed usage of _enumeratedPath in lastEdge/Vertex to AQL. Goal is to delete this struct in the class, as it does unneccessary copies

commit 06a20ab0549d97b47eda98d3428e3390619ca5ec
Author: Simon Grätzer <simon@graetzer.org>
Date:   Tue Mar 21 10:39:21 2017 +0100

    Intermediate changes

commit 3a9a5f7c7ad186c669c3986f6f89c5a26b835ee0
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 10:34:43 2017 +0100

    Logic of BreadthFirstEnumerator now points to the last path returned instead of the next path to return. This will allow to get rid of enumeratedPath in there.

commit 6de86c548220a3ad21c53fb1de691070774130ec
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Mar 21 10:17:25 2017 +0100

    Extracted BreadthFirstEnumerator out of PathEnumerator files. Only moving of code.

commit acd1d9eba5d7ea23e0d6beab831a42dc61a385a5
Merge: a99ad3c 1ab8c44
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Mar 20 13:13:16 2017 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit a99ad3c624d7ae4815776f165d65f19e43167e56
Author: Simon Grätzer <simon@graetzer.org>
Date:   Fri Mar 17 13:25:45 2017 +0100

    Added TraverserCache to SingleServerTraverser

commit e88ae1e53d99b55546329413e7b4a5edc48c4875
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 15 13:36:05 2017 +0100

    Fixed compiler Issues in TraverserCache

commit 9d89cdc0297813f24064b46a67a43cde9a3d0297
Merge: 9d41804 f18ad19
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 15 09:43:06 2017 +0100

    Merge branch 'devel' of github.com:arangodb/arangodb into devel-feature/traversal-cache

commit 9d4180480c7bc37f1f64b6e3141dae611f8d399c
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Mar 15 09:42:53 2017 +0100

    Started implementing a Traverser Cache Abstraction that is used to store already fetched documents.
2017-04-13 17:00:44 +02:00
Jan Christoph Uhde 23f0a9246f Fix Index Node 2017-04-13 09:45:30 +02:00
Michael Hackstein 5f33a95a82 Fixed AttribtueWeighted ShortestPath computation. 2017-04-12 17:27:45 +02:00
Michael Hackstein 034b38f0cc Replaced the velocypack ConstantDistance ShortestPath API by a StringRef & TraverserCache version. This should be save for RocksDB. This commit fails in ClusterMode. 2017-04-12 14:21:53 +02:00
Michael Hackstein 7469cc7bec Reenabled ShortestPath with AttributeWeight. Was accidentially disabled by options modifications. 2017-04-12 09:05:54 +02:00
Michael Hackstein 1119257d49 ShortestPathOptions now contain forward and backward lookupinfos for all edge collections in use. 2017-04-11 15:00:21 +02:00
Michael Hackstein 7e3ce102b1 The ShortestPathBlock and -Node now use a pointer to the same options instead of managing one each. 2017-04-11 14:08:21 +02:00
Michael Hackstein 212de2b0d1 Simplified AqlTraverser Setup code by moving shared logic into the TraverserOptions. 2017-04-11 13:47:06 +02:00
Michael Hackstein b09dfaa323 Removed external expander functions and moved them into the PathFinder implementations. 2017-04-11 11:41:12 +02:00
Andreas Streichardt bf2efb387e Fix unlocking of AQL queries in the cluster 2017-04-10 17:01:24 +02:00
Michael Hackstein cf7136264b Removed V8Traverser files and made ShortestPathOptions an extension of Graph::BaseOptions. Now they are ready to use LokkupInfos as well. Now starting to move logic around 2017-04-10 16:26:23 +02:00
Michael Hackstein 052c4942fc Removed superflous aql::ShortestPathOptions and replaced it by traverser::ShortestPathOptions. Api is not fixed yet. 2017-04-10 11:02:01 +02:00
jsteemann 0229ab9326 issue #2415 2017-04-09 23:19:10 +02:00
jsteemann 0b9982d237 fix crash 2017-04-06 13:22:51 +02:00
jsteemann d76f9f67ff fix crash 2017-04-06 12:49:45 +02:00
Simon Grätzer e58bdb6258 Fixing windows build 2017-04-06 11:17:42 +02:00
Simon Grätzer 6435e3b2bc Fixing windows build 2017-04-06 11:15:49 +02:00
Simon Grätzer 08167c2614 Conversion warnings 2017-04-06 10:56:50 +02:00
Simon Grätzer a90e62bc02 Conversion errors 2017-04-06 10:50:40 +02:00
Michael Hackstein daa8b2b855 Detemplateified the ShortestPath class structure. 2017-04-05 17:47:14 +02:00
Michael Hackstein fbd3e4e237 Removed VertexID from ShortestPath templates. 2017-04-05 17:01:05 +02:00
Michael Hackstein ee57f9abef Renamed ConstDistanceFinder => ConstantWeightShortestPathFinder 2017-04-05 16:29:40 +02:00
Michael Hackstein 30095556e9 Renamed DynamicDistanceFinder => AttributeWeightShortestPathFinder 2017-04-05 16:21:38 +02:00
Michael Hackstein 829fb4be54 Renamed PathFinder => ShortestPathFinder. 2017-04-05 16:17:37 +02:00
Michael Hackstein e64cadde7d Added a toAqlValue in ManagedDocumentResult that should be called from outside. This figures out if we have to copy the content into the AqlValue or if we could just point to the raw data. 2017-04-05 15:32:45 +02:00
Michael Hackstein 039c6fbd16 Moved all logic of lib/Basics/PathFinder into seperated files in arangod/Graph. Preparation to detemplatify this code as we need some arangodb interna in it for Slice mangement 2017-04-05 15:31:44 +02:00