1
0
Fork 0
Commit Graph

3076 Commits

Author SHA1 Message Date
Michael Hackstein 49f8ba8f85 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-05 15:33:00 +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
jsteemann 5880daf2a5 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 13:40:25 +02:00
jsteemann 1c43920bfc preparations for revision() 2017-04-05 13:40:18 +02:00
Simon Grätzer 5822e77843 invokeOnAllElements 2017-04-05 13:38:43 +02:00
Simon Grätzer b69294641f Moving api-wal-noncluster and adding running trx 2017-04-05 11:54:30 +02:00
Michael Hackstein 417b594032 Added checks if we got a nullptr from CacheManager in TraverserCache. 2017-04-05 09:43:44 +02:00
jsteemann de769b534d split ManagedDocumentResult in .h and .cpp files 2017-04-04 15:47:05 +02:00
jsteemann 4196594130 fixed crash 2017-04-04 13:27:35 +02:00
baslr 29728125ac Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-31 15:05:24 +02:00
jsteemann a93d8ad45f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 14:05:58 +02:00
jsteemann 794cace842 initial implementation of count() 2017-03-31 14:05:44 +02:00
Michael Hackstein 952fcb607c Fixed memory leaks in traverser. 2017-03-31 13:52:07 +02:00
baslr dd00eade91 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-31 12:09:04 +02:00
jsteemann ab10a19974 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 11:33:35 +02:00
jsteemann 81dcfbbe3d pass trx into numberDocuments 2017-03-31 11:33:16 +02:00
Michael Hackstein d4ba5a1bec Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-03-31 11:01:30 +02:00
Michael Hackstein 78b920c5de Fixed undefined behaviour in TraverserCache. 2017-03-31 11:01:20 +02:00
jsteemann fdd5b3036d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-31 09:34:06 +02:00
baslr 7c3cb24a10 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-30 20:17:45 +02:00
Jan Christoph Uhde 95007fe28e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result
* 'engine-api' of https://github.com/arangodb/arangodb: (46 commits)
  Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
  fix handling of externals
  fix toArray()
  fix returning documents
  Added hash-, skip list, persistent indexes
  harmonize filtering - filter on full filename.
  mini modifications
  standardize starting of servers for replication tests
  Edge index compliant with design doc
  another fix for #2404
  Moved „removeLargeRange“ method to commons
  Added length byte to IndexValue keys.
  fixed issue #2404
  Added drop to primary index
  Added drop() to indexes
  Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
  Fixed edge index
  Expand on CORS documentation
  Let ArangoDB handle the allow-credentials header
  make the authentication tests run on directories
  ...
2017-03-30 19:46:17 +02:00
Dan Larkin 42807f17fb Added partialUpdate flag for view property modification. 2017-03-30 12:04:58 -04:00
Michael Hackstein 8a42089bed Fixed loglevel from error to debug as the situation is actually expect, just not performant. 2017-03-30 16:39:33 +02:00
jsteemann 677960785a fix returning documents 2017-03-30 16:22:30 +02:00
jsteemann 894666915d mini modifications 2017-03-30 15:50:23 +02:00
Jan Christoph Uhde b83ae2ab82 refactor some code to make use of arangodb::Result 2017-03-30 09:39:21 +02:00
baslr 0713099acc Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-29 15:13:24 +02:00
jsteemann f04f6e7cd4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 12:53:26 +02:00
Simon Grätzer 901abc6705 Fixing some windows conversion warnings 2017-03-29 11:35:37 +02:00
jsteemann 38ac3c23c8 fixed serialization bug 2017-03-29 09:17:23 +02:00
jsteemann f728fcdbb8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 02:41:00 +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
jsteemann a221d30b8f added savepoints 2017-03-28 17:55:25 +02:00
Jan Christoph Uhde 4b33614e12 Avoid one copy during document lookup for RocksDBEngine 2017-03-28 15:50:09 +02:00
baslr 3161fdc6f8 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-28 14:02:16 +02:00
Jan Christoph Uhde b5e760b1d3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  move engine sources into their own cmake files
  Fixed exception because of hash index
  Fixed feature start order
  fix recovery test
  Edge index fixes
  remove alignas
  fix recovery test
  force recovery tests to fail when not compiled with failure-tests
  implement SLEEP() in C++
  remove useless and harmful adjustment (lowering) of file descriptors limit
  Windows: fix namespaces
  fix recovery tests
  slightly adjusted index creation
  Removed some alignas directives.
  alias boost to catch
  fix arangosh test
  start splitting testing.js into handy bits.
  start splitting testing.js into handy bits.
  start splitting testing.js into handy bits.
2017-03-28 12:01:24 +02:00
Jan Christoph Uhde 96897ebe08 ManagedDocumentResult now manages data when using setManaged 2017-03-28 11:54:04 +02:00
jsteemann 8e113b76d8 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 08:47:09 +02:00
jsteemann 7bd6bd6e45 slightly adjusted index creation 2017-03-28 08:46:01 +02:00
Simon Grätzer 1a50029592 Edge Index work 2017-03-28 00:55:59 +02:00
jsteemann 3bdd833e67 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-27 14:39:04 +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
jsteemann dab48de61b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-27 11:16:05 +02:00
baslr c7487d44f4 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-24 19:45:53 +01: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
jsteemann 2c54a6ac1e added some basic transaction handling 2017-03-24 17:23:32 +01:00
Michael Hackstein f7eb96bc8d Squashed commit. Moved over SmartSearch Shortest Path feature 2017-03-24 15:31:39 +01:00
jsteemann 2aa2fd65a4 more startup 2017-03-24 14:20:51 +01:00
baslr 494a898d04 user database permissions from ldap 2017-03-23 23:52:37 +01:00
jsteemann 45da5ffe9c more diagnostic output for "not implemented" 2017-03-23 14:10:00 +01:00
baslr 71b22e642f Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-23 13:36:12 +01:00
jsteemann 55c38befbf enum databases, views and collections at startup 2017-03-23 11:52:22 +01:00
jsteemann 71bf18dd12 renaming 2017-03-22 13:01:40 +01:00
baslr 8fa6f9c5e7 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-21 23:27:26 +01:00
jsteemann 7fb536387d move replication-dump into engine 2017-03-21 13:55:57 +01:00
jsteemann b8e011eee5 move attributes into engine 2017-03-21 10:31:50 +01:00
baslr 90341c5efb Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-18 04:14:39 +01:00
baslr bc14d53ff5 ldap authwork 2017-03-18 04:14:15 +01:00
jsteemann 6528ded053 commented the interface 2017-03-17 16:03:21 +01:00
jsteemann 5d6dcb3bf1 re-added constructionguard 2017-03-17 15:44:22 +01:00
jsteemann e3d8ae142e some fixes for view handling 2017-03-17 11:18:46 +01:00
Dan Larkin 508aabeafe Updated schema, added LoggerView, and added support for implementation properties. 2017-03-16 19:45:48 -04:00
jsteemann e22586f40c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 16:45:31 +01:00
jsteemann 1932fd1975 moved files 2017-03-16 16:45:02 +01:00
jsteemann a87b8c4f25 generalize usleep argument 2017-03-16 16:27:40 +01:00
jsteemann 979f003538 added ViewTypesFeature 2017-03-16 12:50:22 +01:00
jsteemann 25a380f77c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 12:50:11 +01:00
jsteemann 0bb2711abb Merge branch 'engine-api' of https://github.com/arangodb/arangodb into views 2017-03-16 12:16:23 +01:00
baslr 8244d93594 ldapauth: upsert user into _users 2017-03-16 11:21:15 +01:00
Michael Hackstein 1ab0295f54 Replaced Traverser estimateCost by a more precise version, it now does not check hardcoded on an edge-index estimate. 2017-03-16 09:45:09 +01:00
Dan Larkin aa23074efd Added view retrieval via HTTP with tests and initial work on view factory. 2017-03-15 18:44:48 -04:00
baslr f346f00721 fix exception 2017-03-15 23:07:29 +01:00
baslr 3015b591e5 refactor code to hexHashFromData 2017-03-15 17:51:58 +01:00
baslr 721ee1632b Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-15 17:29:02 +01:00
jsteemann 7e7fe8bc21 discover views on startup 2017-03-15 14:48:10 +01:00
Simon Grätzer 1c5c616875 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-15 14:12:18 +01:00
jsteemann 49aef67cca use std::shared_ptrs for views 2017-03-15 13:07:08 +01:00
jsteemann 1a06f1e15e initial functionality for views - unstable 2017-03-14 16:35:45 +01:00
baslr b4ba426061 revalidate ldap auth 2017-03-14 14:54:06 +01:00
Michael Hackstein 1ebf562c4e Moved MMFiles out of vocbase.cpp 2017-03-14 10:29:17 +01:00
baslr 8f761516e4 make wintendo happy 2017-03-14 01:40:40 +01:00
baslr e48a019c76 ldap build on wintendo? 2017-03-13 22:44:12 +01:00
baslr 66f60a0ce3 auth also against ldap, create authInfo 2017-03-13 20:07:43 +01:00
Michael Hackstein bf6f785415 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-13 17:31:51 +01:00
Michael Hackstein 1c33e77bd8 Moved unloadCollection callback into StorageEngine. 2017-03-13 17:28:08 +01:00
baslr 440a7f661f Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-13 13:14:21 +01:00
Simon Grätzer 7b35f75b23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/GeneralServer/GeneralServerFeature.cpp
2017-03-13 12:25:28 +01:00
jsteemann 45a68f54f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-13 12:10:54 +01:00
baslr a06c159081 fix unintended newline 2017-03-13 10:26:47 +01:00
baslr 4ec57d784d merge from devel 2017-03-13 01:06:17 +01:00
baslr 05e708138b ldap auth 2017-03-13 00:49:57 +01:00
Simon Grätzer 871272d7c1 Merge from devel 2017-03-12 12:32:22 +01:00
jsteemann b662b6edbf added missing locks to authentication cache methods 2017-03-11 01:54:37 +01:00
jsteemann 8875243c66 some minor refactoring preparations 2017-03-11 01:14:55 +01:00
jsteemann 2e1c7fcea6 some minor refactoring preparations 2017-03-11 01:01:29 +01:00
Michael Hackstein 83663c47b2 Deleted CollectionResult. It is identical to arangodb::Result introduced later. 2017-03-10 17:18:12 +02:00