Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
38,228 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

13776 Commits

Author SHA1 Message Date
Jan Christoph Uhde 1b5cefddd3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fix build error
  Adding RocksDBPrimaryMockIndexIterator
 2017-03-28 15:51:05 +02:00
Jan Christoph Uhde 4b33614e12 Avoid one copy during document lookup for RocksDBEngine 2017-03-28 15:50:09 +02:00
Simon Grätzer 7fd102692f Fix build error 2017-03-28 15:16:08 +02:00
Simon Grätzer c592f911f3 Adding RocksDBPrimaryMockIndexIterator 2017-03-28 15:10:00 +02:00
Jan Christoph Uhde 965026ec6b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Fixed RocksDBAllIndexIterator
 2017-03-28 14:55:58 +02:00
Jan Christoph Uhde c6111ac8e3 silence warinings 2017-03-28 14:55:19 +02:00
Simon Grätzer aa1b443d85 Fixed RocksDBAllIndexIterator 2017-03-28 14:53:16 +02:00
Jan Christoph Uhde 31c52f60ff Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
* 'engine-api' of https://github.com/arangodb/arangodb:
  Added RocksDBPrimaryMockIndexIterator
 2017-03-28 14:52:59 +02:00
Jan Christoph Uhde 3c31ec2314 add function for looking up revisions to collection 2017-03-28 14:49:19 +02:00
Simon Grätzer 5e630d818f Added RocksDBPrimaryMockIndexIterator 2017-03-28 14:37:33 +02:00
Simon Grätzer 7a26fb22c1 Pushing commons method 2017-03-28 14:07:01 +02:00
jsteemann 40e4bba260 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 14:03:53 +02:00
Simon Grätzer f5b44d1c12 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 14:02:35 +02:00
Simon Grätzer 9e1a181393 Edge index tax changes 2017-03-28 14:02:29 +02:00
jsteemann 467307fd07 fixed issue #2400 2017-03-28 13:58:49 +02:00
jsteemann e9e0d3a46c remove unused attribute 2017-03-28 13:25:10 +02:00
jsteemann 2e178d4378 make _objectId const 2017-03-28 13:25:03 +02:00
Simon Grätzer cfef1498f4 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 12:01:48 +02:00
Simon Grätzer b2300ca207 Added EdgeIndexValue to RocksDBKey and switched lookup to StringRef 2017-03-28 12:01:40 +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
Wilfried Goesgens dac3b18040 move engine sources into their own cmake files 2017-03-28 11:38:45 +02:00
Simon Grätzer 4174183ffa Fixed exception because of hash index 2017-03-28 11:29:52 +02:00
Simon Grätzer 007ee4b081 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 10:57:25 +02:00
Simon Grätzer 38aa0cac4b Fixed feature start order 2017-03-28 10:56:33 +02:00
jsteemann cedee8ed02 fix recovery test 2017-03-28 10:46:56 +02:00
Simon Grätzer d6b7df6ba1 Edge index fixes 2017-03-28 10:13:07 +02:00
jsteemann 17c1a6db05 fix recovery test 2017-03-28 10:04:39 +02:00
jsteemann 8f5230e29c Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 09:48:50 +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
jsteemann 2c688aa0fa Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 09:40:12 +02:00
Simon Grätzer 7aa68ba532 Windows: fix namespaces 2017-03-28 09:35:15 +02:00
jsteemann c8bdacbc95 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 08:47:14 +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
Dan Larkin 80c91341e8 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-27 21:08:27 -04:00
Dan Larkin 61037c3078 Added some documentation to key/value/comparator classes. 2017-03-27 21:07:52 -04:00
Simon Grätzer fc3a950d08 Fixed compiler errors 2017-03-28 01:18:57 +02:00
Simon Grätzer 88b8e12cb6 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-28 01:16:00 +02:00
Simon Grätzer 8543cb77e3 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/RocksDBEngine/RocksDBCommon.cpp
#	arangod/RocksDBEngine/RocksDBCommon.h
 2017-03-28 01:15:50 +02:00
Dan Larkin 3a307521cd Updated comparator. 2017-03-27 19:00:21 -04:00
Simon Grätzer 1a50029592 Edge Index work 2017-03-28 00:55:59 +02:00
Dan Larkin 9590d911ea Removed some alignas directives. 2017-03-27 17:32:44 -04:00
Dan Larkin cbafcadccd Finished conversion of RocksDBEntry to RocksDBKey and RocksDBValue. 2017-03-27 16:51:30 -04:00
Simon Grätzer 41e043cf40 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/RocksDBEngine/RocksDBIndexFactory.cpp
 2017-03-27 18:30:38 +02:00
Simon Grätzer a2157595e8 RocksDB: starting edge index 2017-03-27 18:22:24 +02:00
Dan Larkin 5c36a617c4 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-27 11:35:15 -04:00
Dan Larkin a7a3c82bb3 Initial conversion of RocksDBEntry to RocksDBKey. 2017-03-27 11:34:55 -04:00
jsteemann 458e3a3608 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-27 16:36:53 +02:00
jsteemann 3a2462532d move engine-specific includes out of standard file 2017-03-27 16:36:34 +02:00
Michael Hackstein 53742d8790 Removed dead code 2017-03-27 14:40:56 +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 922a8af392 turn off all MMFiles features in case RocksDB engine is selected 2017-03-27 14:22:00 +02:00
jsteemann cdf1c1d894 primary index 2017-03-27 12:37:23 +02:00
jsteemann b03f823db0 added lookupKey 2017-03-27 12:00:36 +02:00
Jan Christoph Uhde 87e1a0f7c2 try to build insert / remove for index 2017-03-27 11:53:13 +02:00
Jan Christoph Uhde 91b868a01d add some code for creating the fake rocksdb index 2017-03-27 11:32:26 +02:00
jsteemann 0d38d2c287 finalize insert() 2017-03-27 11:30:30 +02:00
jsteemann 9276d82578 remove debug log messages 2017-03-27 11:20:43 +02:00
jsteemann dab48de61b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-27 11:16:05 +02:00
jsteemann 00499c6a7a stub for collection::insert() 2017-03-27 11:15:42 +02:00
jsteemann 7a764b95a9 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-27 11:02:02 +02:00
jsteemann 78d586e670 fix typo 2017-03-27 11:01:56 +02:00
Frank Celler 3487097180 added ulimit example 2017-03-27 11:01:17 +02:00
jsteemann 6ca2b237d1 add method to augment index creation data 2017-03-27 11:01:09 +02:00
Jan Christoph Uhde d4c2bba930 create mock primary mock index for rocksdb 2017-03-27 09:26:17 +02:00
Jan Christoph Uhde f4e164ef78 fix compile errors 2017-03-27 08:57:51 +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
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
Dan Larkin 1d22d25c3f Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-24 13:19:43 -04:00
Dan Larkin fcb3c2f91e Added method to convert RocksDB Status to ArangoDB Result. 2017-03-24 13:19:34 -04: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
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
jsteemann 757794029f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-24 15:25:19 +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 2aa2fd65a4 more startup 2017-03-24 14:20:51 +01:00
jsteemann a34a10f719 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-24 12:27:09 +01:00
jsteemann 328346719a increase max wait time 2017-03-24 12:09:50 +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
jsteemann dd86a50ca5 fix misleading init messages 2017-03-24 09:49:57 +01:00
jsteemann 2eeccd5f09 small simplifications for error handling 2017-03-23 21:18:53 +01:00
jsteemann 02c0dcc689 properly report error locations 2017-03-23 20:18:33 +01:00
jsteemann b87cc95038 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-23 19:42:10 +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
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
jsteemann 8458597c13 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-23 15:24:14 +01:00
jsteemann f17ff29518 added stubs for indexes 2017-03-23 15:24:00 +01:00
jsteemann 2405ebee25 added diagnostic output 2017-03-23 14:16:26 +01:00
jsteemann 45da5ffe9c more diagnostic output for "not implemented" 2017-03-23 14:10:00 +01:00
Max Neunhoeffer 0dc4274b6a Increase timeout in AQL query instantiation from 30s to 90s. 2017-03-23 13:37:15 +01:00
jsteemann 0ef305c1be Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-23 13:04:18 +01:00
Max Neunhoeffer 29338899fd Finally port TraverserEngine locking bug fix manually. 2017-03-23 12:44:51 +01:00
jsteemann 4086c65e45 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-23 12:36:58 +01:00
jsteemann 90d81af098 fix compile error 2017-03-23 12:33:47 +01:00
Max Neunhoeffer b07f302ce5 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-03-23 12:33:31 +01:00
Max Neunhoeffer 32953a4a97 Revert "Fix locking of shards in TraverserEngines." 
This reverts commit 467088b8af.
 2017-03-23 12:33:11 +01:00
jsteemann e5543f5ea2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-23 12:25:50 +01:00
Max Neunhoeffer 467088b8af Fix locking of shards in TraverserEngines. 2017-03-23 12:23:40 +01:00
jsteemann e37ac1c4f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-23 12:18:36 +01:00
jsteemann ed40426f09 increase default timeout from 30 to 900 seconds 2017-03-23 12:18:24 +01:00
Max Neunhoeffer 66a8ea1538 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-03-23 12:15:40 +01:00
jsteemann 6bb9863108 fixed issue #2392 2017-03-23 12:10:11 +01:00
Max Neunhoeffer 64a18f78e0 Fix SortedCollectBlock skipping issue. Resolves #1482. 2017-03-23 12:08:54 +01:00
jsteemann 55c38befbf enum databases, views and collections at startup 2017-03-23 11:52:22 +01:00
Max Neunhoeffer 09cc428e00 Increase standard intra cluster timeout from 90 to 120s. 2017-03-23 10:09:12 +01:00
jsteemann 806c33eb1c cleanup 2017-03-23 09:01:21 +01:00
jsteemann 564598cb51 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-23 08:40:15 +01:00
Jan Christoph Uhde 59eafed99d Add code that checks during startup if _system database exists 2017-03-22 18:28:35 +01:00
Jan Christoph Uhde 1cb1d37d01 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 17:59:10 +01:00
Jan Christoph Uhde 7c7268b269 Try to load existing databases 2017-03-22 17:58:38 +01:00
Simon Grätzer bac7081983 Pregel: Reduced logspam 2017-03-22 17:55:43 +01:00
jsteemann 2824472ddc removed obsolete APIs 2017-03-22 14:54:16 +01:00
Jan Christoph Uhde ea405c8ddb resolve conflicts after merge 2017-03-22 14:50:50 +01:00
jsteemann a94acc5504 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 14:48:34 +01:00
jsteemann 324e89957f Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 14:48:29 +01:00
Jan Christoph Uhde 85e438ee00 Merge remote-tracking branch 'origin/devel' into engine-api 2017-03-22 14:47:42 +01:00
jsteemann e270ddb262 fixed failing test 2017-03-22 14:46:10 +01:00
Jan Christoph Uhde 0deac5fe62 Add functon to create slices from RocksDBEntryTypes 2017-03-22 14:45:54 +01:00
jsteemann f341d416da Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 14:21:43 +01:00
jsteemann 3db380dc6d do not throw in destructor 2017-03-22 14:20:01 +01:00
jsteemann d9d9eaac60 fixed two cluster tests 2017-03-22 14:03:27 +01:00
Jan Christoph Uhde d93d154053 Move RocksDBEntryType to separate file 2017-03-22 13:38:03 +01:00
Jan Christoph Uhde 66423f97dc delete on shutdown 2017-03-22 13:07:27 +01:00
jsteemann 71bf18dd12 renaming 2017-03-22 13:01:40 +01:00
Jan Christoph Uhde e7202945dc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-22 12:26:10 +01:00
Jan Christoph Uhde d34f75548f enable engine selection 2017-03-22 12:14:39 +01:00
jsteemann 8e51e3ba50 fix slow queries 2017-03-22 11:20:07 +01:00
jsteemann fbb14ceffc added db._engine() 2017-03-22 11:19:31 +01:00
jsteemann 358e18d5af fix wrong assertions 2017-03-22 09:45:02 +01:00
Frank Celler a25932293b added assert and only compact if no request is in flight 2017-03-22 08:52:37 +01:00
jsteemann 7659519606 finalize class 2017-03-22 08:36:41 +01:00
jsteemann 9960843fef fix logic error 2017-03-22 08:36:33 +01:00
jsteemann 058e6002d3 try to fix shutdown races 2017-03-22 08:31:49 +01:00
Dan Larkin 3eda7ce79f Added RocksDBComparator. 2017-03-21 19:07:19 -04:00
Dan Larkin 1e2b0552fb Added RocksDBEntry helper class to manage key/value conversions and access. 2017-03-21 18:06:36 -04:00
Frank Celler e997b791a8 fixed lost HTTP requests 2017-03-21 22:51:49 +01:00
Dan Larkin 6cedc0ba53 Merge branch 'views' into devel 2017-03-21 11:40:42 -04:00
Dan Larkin 85132e0eaf Finished adding view support to ArangoShell. 2017-03-21 11:40:14 -04:00
Jan Christoph Uhde 58c1f3f70f Work on RocksDBEngine and enable engine selection 2017-03-21 16:02:40 +01:00
Jan Christoph Uhde d7ba5e8c0f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-21 15:29:43 +01:00
Jan Christoph Uhde f21f88c0d4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  Pregel: fixed catch test
  unify case in error messages
  move collection keys into engine
 2017-03-21 15:28:31 +01:00
Jan Christoph Uhde cb3dd9683f fix logtopic 2017-03-21 15:27:52 +01:00
jsteemann d43a4073ad unify case in error messages 2017-03-21 14:24:47 +01:00
jsteemann 63868b4378 move collection keys into engine 2017-03-21 14:23:29 +01:00
Jan Christoph Uhde 5a60a52db9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb:
  move replication-dump into engine
  try to fix shutdown races
  changelog
  ui - fixed some event issues
  moved export into engine
  move attributes into engine
 2017-03-21 14:10:43 +01:00
Jan Christoph Uhde 1c9ad06aa6 Avoid name resolution if given host is a valid address 2017-03-21 14:07:01 +01:00
jsteemann 7fb536387d move replication-dump into engine 2017-03-21 13:55:57 +01:00
jsteemann 93423ba273 try to fix shutdown races 2017-03-21 12:59:46 +01:00
jsteemann ec0e5e39a7 moved export into engine 2017-03-21 11:41:50 +01:00
Jan Christoph Uhde 68bb668f1b add more empty implementations for RocksDB Storage engine 2017-03-21 10:53:13 +01:00
jsteemann b8e011eee5 move attributes into engine 2017-03-21 10:31:50 +01:00
Jan Christoph Uhde db8202fd50 Add empty RocksDBTransactionState implemenation 2017-03-20 16:48:39 +01:00
Jan Christoph Uhde 3ef89f118a Add empty RocksDBView 2017-03-20 16:22:30 +01:00
Jan Christoph Uhde 29e10ad551 Add RocksDBIndexFactory 2017-03-20 16:03:59 +01:00
Jan Christoph Uhde 3c73363507 Add empty implementation for RocksDBCollection 2017-03-20 15:19:59 +01:00
jsteemann 6ba59eda5b index API change 2017-03-20 14:40:54 +01:00
Jan Christoph Uhde 2795eedabd add empty implementation of RocksDBEngine 2017-03-20 14:24:42 +01:00
Jan Christoph Uhde 42e9294dc0 clang format 2017-03-20 13:11:45 +01:00
Simon Grätzer 1ab8c44330 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-20 12:41:32 +01:00
jsteemann c51f27c201 make waiting for free V8 contexts abort after 90 seconds 2017-03-20 12:38:04 +01:00
Simon Grätzer 7bc01b46e0 Pregel: Changed scheduler post call 2017-03-20 12:22:16 +01:00
Jan Christoph Uhde 5bf592eca8 Add header files and empty cpp files for RocksDBEngine 2017-03-20 12:00:02 +01:00
jsteemann 29905e0e8b constify and lower default lock timeout for collections 2017-03-20 11:37:39 +01:00
jsteemann 2ea436b3e9 a bit more debug messages 2017-03-20 11:33:27 +01:00
jsteemann 9349005191 wait longer before scheduler shutdown 2017-03-20 11:05:24 +01:00
Simon Grätzer d778ab4587 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 19:54:38 +01:00
Simon Grätzer 553421196a Pregel: Migrated to boost deadline_timer 2017-03-17 19:54:33 +01:00
jsteemann 5b1409dd40 make registerViewImplementation static 2017-03-17 17:24:09 +01:00
Simon Grätzer 79c2e87bac Pregel: code reformatting 2017-03-17 16:21:25 +01:00
Simon Grätzer 782d63b79f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 16:13:53 +01:00
jsteemann 8282aa61df Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 16:03:29 +01:00
jsteemann 6528ded053 commented the interface 2017-03-17 16:03:21 +01:00
Kaveh Vahedipour 68178599e0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 15:59:31 +01:00
Simon Grätzer 31f30378cf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 15:55:07 +01:00
Simon Grätzer 162a0476c3 Pregel: Removed ThreadPool, added test for memory mapping 2017-03-17 15:55:01 +01:00
Kaveh Vahedipour a87fb6d71e restructured the leadership takeover 2017-03-17 15:44:58 +01:00
jsteemann 5d6dcb3bf1 re-added constructionguard 2017-03-17 15:44:22 +01:00
jsteemann a2a14652b2 re-added ConstructionGuard 2017-03-17 15:12:14 +01:00
jsteemann 650d1afad5 fix leaks during cleanup 2017-03-17 13:38:23 +01:00
Simon Grätzer 18989d1026 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 13:26:19 +01:00
jsteemann 1d772584b7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 12:35:00 +01:00
Frank Celler 31de362d84 switch to uint64 for hidden options --server.minimal-threads and --server.maximal-threads 2017-03-17 12:34:47 +01:00
jsteemann e3d8ae142e some fixes for view handling 2017-03-17 11:18:46 +01:00