1
0
Fork 0
Commit Graph

13561 Commits

Author SHA1 Message Date
baslr 3b2ccf46f4 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-30 01:55:08 +02:00
Dan Larkin 7dcb555b72 Added PATCH support to view rest handler. 2017-03-29 12:13:55 -04:00
mpv1989 e763233ca7 Foxx: Fix arangoUser not being set correctly 2017-03-29 17:33:16 +02:00
baslr 0713099acc Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 15:13:24 +02:00
jsteemann bd4a2eb6b6 make @dothebart happier 2017-03-29 15:04:54 +02:00
Wilfried Goesgens 619713c596 fix lock file error handling, improve error messages 2017-03-29 12:22:08 +02:00
Simon Grätzer 901abc6705 Fixing some windows conversion warnings 2017-03-29 11:35:37 +02:00
jsteemann e3ca787992 warn before we run out of file descriptors 2017-03-29 02:35:46 +02:00
jsteemann d4752433f0 slightly simplify logging 2017-03-29 01:16:55 +02:00
baslr 7f92c26774 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 00:29:16 +02:00
jsteemann e1aef394d8 delete useless DEV_TIMERS, fix rwlockcpp11 2017-03-28 22:38:27 +02:00
baslr 3161fdc6f8 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-28 14:02:16 +02:00
jsteemann 467307fd07 fixed issue #2400 2017-03-28 13:58:49 +02:00
jsteemann a6242fd474 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-28 09:45:57 +02:00
jsteemann 3d0beb3a23 implement SLEEP() in C++ 2017-03-28 09:45:53 +02:00
Simon Grätzer 7aa68ba532 Windows: fix namespaces 2017-03-28 09:35:15 +02:00
Dan Larkin 9590d911ea Removed some alignas directives. 2017-03-27 17:32:44 -04:00
Michael Hackstein 53742d8790 Removed dead code 2017-03-27 14:40:56 +02:00
Michael Hackstein 2facc4b2b7 Removed unused log-output 2017-03-27 14:31:10 +02:00
Michael Hackstein 544007a5c8 Squashed commit of the following:
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-03-27 14:30:06 +02:00
Frank Celler 3487097180 added ulimit example 2017-03-27 11:01:17 +02:00
Simon Grätzer 0b79c69884 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-27 08:56:20 +02:00
baslr c7487d44f4 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-24 19:45:53 +01:00
Dan Larkin 305e00fdf3 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-24 13:39:13 -04:00
Dan Larkin c2f370f99b Fixed an alignment bug in cache. 2017-03-24 13:39:05 -04:00
Michael Hackstein 3925f946c5 Revert "Squashed commit. Moved over SmartSearch Shortest Path feature"
This reverts commit f7eb96bc8d.
2017-03-24 18:23:20 +01:00
Simon Grätzer aadcad3a00 Fix various conversion warnings 2017-03-24 17:52:50 +01:00
Simon Grätzer 7007db2f44 Windows: Fix ShortestPathNode 2017-03-24 17:23:31 +01:00
Simon Grätzer 95f4265d25 Windows fix 2017-03-24 17:15:36 +01:00
Michael Hackstein f63483d78d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-24 15:32:08 +01:00
Michael Hackstein f7eb96bc8d Squashed commit. Moved over SmartSearch Shortest Path feature 2017-03-24 15:31:39 +01:00
Simon Grätzer ab733838a2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-24 15:14:19 +01:00
Simon Grätzer 2091dae875 Pregel: Fix concurrent creation of aggregator 2017-03-24 15:14:12 +01:00
Frank Celler 1185099501 raise limit fd as much as possible, warn if too small 2017-03-24 15:13:55 +01:00
jsteemann 328346719a increase max wait time 2017-03-24 12:09:50 +01:00
baslr fef40e3c9d merge with devel 2017-03-24 12:07:29 +01:00
Simon Grätzer fbbc118160 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-24 11:04:38 +01:00
Simon Grätzer 39b2e349dd Pregel: Coverty Scan fixes 2017-03-24 11:04:15 +01:00
Frank Celler 46b04f1317 added message id to debug output 2017-03-24 09:57:07 +01:00
baslr 494a898d04 user database permissions from ldap 2017-03-23 23:52:37 +01:00
jsteemann 8e4e463239 don't call throwing functions in dtor 2017-03-23 19:40:13 +01:00
jsteemann f1e6af1ce1 eliminate unnecessary check 2017-03-23 18:18:02 +01:00
jsteemann 30b4b2b402 prevent unlikely division by zero 2017-03-23 18:17:47 +01:00
baslr 25de0596c7 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-23 17:48:16 +01:00
Dan Larkin eaca014406 Fixed deadlock in cache shutdown. 2017-03-23 12:11:50 -04:00
Simon Grätzer b69523d736 Pregel: Fixed memory leak warning 2017-03-23 16:14:06 +01:00
Simon Grätzer 6b5a6b4c2b Pregel: Fixed memory leak warning 2017-03-23 15:54:18 +01:00
Max Neunhoeffer 0dc4274b6a Increase timeout in AQL query instantiation from 30s to 90s. 2017-03-23 13:37:15 +01:00
baslr 71b22e642f Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-23 13:36:12 +01:00
Max Neunhoeffer 29338899fd Finally port TraverserEngine locking bug fix manually. 2017-03-23 12:44:51 +01:00