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

1898 Commits

Author SHA1 Message Date
Simon Grätzer 7176d34169 Fixed incremental synced 2017-04-24 15:40:48 +02:00
Kaveh Vahedipour ccc388a940 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:13:40 +02:00
Kaveh Vahedipour c099c6daa9 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:12:38 +02:00
Michael Hackstein 851f772dc1 Fixed some counting/reporting for AQL statistics in Traverser. 2017-04-24 10:42:40 +02:00
jsteemann c0995c7328 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 18:08:00 +02:00
jsteemann 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +02:00
Michael Hackstein 3b34d4edec Unified static-counting for Traversals on the Cache 2017-04-21 15:58:44 +02:00
Kaveh Vahedipour 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann 691dac7a73 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 12:35:07 +02:00
Kaveh Vahedipour 2dbd179656 Fix ocasionally hangling shut down on mac 2017-04-21 11:49:22 +02:00
Simon Grätzer 98df9c21a2 Fixing warnings 2017-04-20 19:07:30 +02:00
Simon Grätzer ec848b879f Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 18:50:57 +02:00
Simon Grätzer b304d35ac2 Added rocksdb background thread 2017-04-20 18:50:52 +02:00
Michael Hackstein 1619e6b3d8 First version of ShortestPath that is presumably working in Clustered Mode with MMFiles and RocksDB 2017-04-20 15:57:06 +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
jsteemann f08a118dfc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 12:33:05 +02:00
jsteemann e949b39d27 slightly improve error message 2017-04-19 11:07:40 +02:00
Michael Hackstein 2c446077dc Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-13 14:36:01 +02:00
Michael Hackstein d61203907b ClangFormat 2017-04-13 14:35:42 +02:00
Simon Grätzer 76b4c0b2c1 Fixed cluster startup 2017-04-13 14:32:55 +02:00
Michael Hackstein c2be40b4ab Moved some Edge Lookup logic around and moved the EdgeCursor to it's own class. This is still ongoing work. Expect shortest-path to fail. 2017-04-11 18:03:56 +02:00
jsteemann 0e98a32455 fix objectId handling 2017-04-06 11:19:27 +02:00
jsteemann 8d864f92d8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 13:20:59 +02:00
jsteemann 2bdda1b9f4 try to fix compile error 2017-04-05 13:18:16 +02:00
jsteemann 56e946bcaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-05 12:32:09 +02:00
Michael Hackstein 61f0bfc9d8 The traverserengine registry will now wait until an engine is freed instead of throwing a deadlock situation 2017-04-05 12:26:09 +02:00
Jan Christoph Uhde 3c4bdc106c Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 
* 'devel' of https://github.com/arangodb/arangodb:
  Cluster: expose body as V8 buffer in asyncRequest
  Cluster: expose getFoxxmaster in V8
  make rspec backtrace more compact
 2017-04-04 10:51:07 +02:00
Alan Plum bb6ffd70de
Cluster: expose body as V8 buffer in asyncRequest 2017-04-03 22:20:37 +02:00
Alan Plum a5a3542280
Cluster: expose getFoxxmaster in V8 2017-04-03 22:20:37 +02:00
jsteemann 0a00c8b4f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 17:58:34 +02:00
Wilfried Goesgens 8e9f1d0fe4 add helpfull error messages for the dead and gone dispatcher 2017-04-03 17:51:47 +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
Simon Grätzer 3eb1723dec Fixed edge index 2017-03-30 13:22:39 +02:00
Jan Christoph Uhde b83ae2ab82 refactor some code to make use of arangodb::Result 2017-03-30 09:39:21 +02:00
Simon Grätzer 7aa68ba532 Windows: fix namespaces 2017-03-28 09:35:15 +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
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 32953a4a97 Revert "Fix locking of shards in TraverserEngines." 
This reverts commit 467088b8af.
 2017-03-23 12:33:11 +01:00
Max Neunhoeffer 467088b8af Fix locking of shards in TraverserEngines. 2017-03-23 12:23:40 +01:00
Max Neunhoeffer 09cc428e00 Increase standard intra cluster timeout from 90 to 120s. 2017-03-23 10:09:12 +01:00
jsteemann d9d9eaac60 fixed two cluster tests 2017-03-22 14:03:27 +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
Simon Grätzer 1c5c616875 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-15 14:12:18 +01:00
Michael Hackstein 5eecac958f Removed accidently commited log output 2017-03-14 09:13:45 +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
Michael Hackstein 83663c47b2 Deleted CollectionResult. It is identical to arangodb::Result introduced later. 2017-03-10 17:18:12 +02:00
jsteemann 645889949c move engine-specific V8 functions into storage engine 2017-03-09 12:59:44 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
Michael Hackstein e6ab0afb50 Moved indexBuckets from Logical => MMFiles collection. 2017-03-07 14:07:32 +01:00
jsteemann aa8160fc3d try to fix non-enterprise compile error 2017-03-06 18:09:43 +01:00
Michael Hackstein 31df7eb527 Fixed error in recovery for duplicate collection name 2017-03-06 17:34:54 +01:00
Simon Grätzer 080048b080 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-01 15:05:25 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-03-01 14:52:35 +01:00
Michael Hackstein 050e470543 Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-03-01 11:11:58 +01:00
jsteemann 657cb87dd6 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-28 18:02:37 +01:00
Michael Hackstein 86c34d1b88 ClusterInfo now uses the general toVPack function of LogicalCollection instead of building everything locally. 2017-02-28 17:05:30 +01:00
jsteemann cf5d20ddee Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-28 17:02:42 +01:00
jsteemann b6a265068a fix velocypack-over-HTTP responses 2017-02-28 17:01:59 +01:00
Michael Hackstein cac32a4d1d Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-28 14:59:13 +01:00
Michael Hackstein df4eadac75 Replaced several specialized toVelocyPack functions of LogicalCollection by toVelocyPackIgnore(). Fixed distributeLike bug that occured through this. 2017-02-28 14:54:32 +01:00
jsteemann e37e94adbe Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 14:38:35 +01:00
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
Michael Hackstein ae14ae99a5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-27 13:01:12 +01:00
Michael Hackstein a884ee2bfb Intermediate commit. Moved many toVPack functions of LogicalCollection to a unified vpack + ignore-keys alternative. This commit is used to run all tests everywhere. May be red 2017-02-27 13:01:07 +01:00
jsteemann 94ce6a65f8 renamed methods 2017-02-27 11:22:44 +01:00
jsteemann d0df1952e8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-24 17:51:59 +01:00
Michael Hackstein de31c68539 Moved isVolatile into MMfiles collection. 2017-02-23 14:56:54 +01:00
Michael Hackstein aa442fc4ac Removed a velocypack-aliases include from voc-type.h 2017-02-23 13:07:32 +01:00
Kaveh Vahedipour 4cc830b0df merge from 3.1 2017-02-20 20:05:52 +01:00
Jan Christoph Uhde 071137adf6 move doCompact into PhysicalColletion 2017-02-20 10:53:11 +01:00
Jan Christoph Uhde 2d5e74f7f6 move journaize() to PhysicalCollection 
MMFilesCollection ctor might be buggy
 2017-02-17 20:06:47 +01:00
jsteemann 089ff78d2d moved collection lock state into its own struct 2017-02-16 10:27:14 +01:00
jsteemann 0909ffe69b moved helper functions into their own file 2017-02-14 13:44:54 +01:00
jsteemann 80be198a39 moved helper classes into their own file 2017-02-14 12:35:34 +01:00
jsteemann 5ebeb5f144 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 16:29:40 +01:00
Kaveh Vahedipour a49fe5ad21 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-13 16:00:43 +01:00
Kaveh Vahedipour 6a5d61c2f1 avoidServers correctly in again 2017-02-13 16:00:30 +01:00
jsteemann 1ce4d4a97e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 15:29:59 +01:00
jsteemann 92f61416ca Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 15:25:17 +01:00
Andreas Streichardt e3d8f19368 Fix unused variables 2017-02-13 15:22:58 +01:00
jsteemann 7e690a0c61 renaming 2017-02-13 15:18:40 +01:00
Michael Hackstein e0bdc5c122 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 14:58:54 +01:00
jsteemann 5d5d8b0a93 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 14:36:39 +01:00
Andreas Streichardt 1bb8f97773 Fix secondaries 2017-02-13 14:00:19 +01:00
jsteemann eb73dbf960 renaming 2017-02-13 13:30:57 +01:00
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
Michael Hackstein c10fbf8b13 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 10:40:59 +01:00
Michael Hackstein 3add00025a Fixed a possible throw in destructor. 2017-02-13 10:40:42 +01:00
Kaveh Vahedipour 51fe9fae6c when registering callbacks fail, we should have some' to go on 2017-02-13 09:00:56 +01:00
Frank Celler 392e8233eb fixed compile error on Mac 2017-02-12 18:32:12 +01:00
jsteemann 1e78acad49 fix size_t vs uint64_t confusion 2017-02-10 23:43:47 +01:00
Jan Christoph Uhde 16a9ddd78d fix ServerState.cpp 2017-02-10 20:52:26 +01:00
Andreas Streichardt 39436dac89 Finally remove lock methods 2017-02-10 19:47:31 +01:00
Andreas Streichardt 488b71cf54 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-10 19:40:51 +01:00
Andreas Streichardt fe07f3515f Fixup registering with agency 2017-02-10 19:35:11 +01:00
Kaveh Vahedipour 7fbf9fb621 AgencyCallBacks registry and unregistry are more talkative than bool 2017-02-10 17:31:26 +01:00
Kaveh Vahedipour 76e5dec3d7 agent with less traffic 2017-02-10 17:03:15 +01:00
Simon Grätzer edab268572 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Aql/FunctionDefinitions.cpp
#	arangod/Aql/Functions.h
#	arangod/Utils/ExplicitTransaction.h
 2017-02-10 15:21:24 +01:00
jsteemann 0850e8293a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-10 09:34:55 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
Max Neunhoeffer fd3f3a88e7 Destroy all traverser engines when AQL is shut down. 2017-02-10 09:12:15 +01:00
Max Neunhoeffer 226fd54db2 Fix shutdown bug around ClusterComm and ClusterCommThread. 2017-02-09 12:37:49 +01:00
Max Neunhoeffer 7f291fe369 Reactivate TRI_ASSERT(false) if ClusterComm is used after destruction. 2017-02-09 11:58:25 +01:00
Max Neunhoeffer 141927e084 Implement timeout in TraverserEngineRegistry. 2017-02-09 11:54:38 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +01:00
Jan Christoph Uhde 9d7462b8ec disable temporarily assert in clustercom until AQLFeature is ready @max 2017-02-08 13:25:34 +01:00
Max Neunhoeffer bc9cb47b5d Add assertion for nullptr in ClusterComm::instance() 2017-02-08 11:07:12 +01:00
Max Neunhoeffer bde48d524d Change undocumented behaviour in case of invalid rev in JS document ops. 
An invalid rev should lead to a 1200 ("conflict") error rather than a
1239 ("illegal document revision") error. This is more intuitive and
in line with the corresponding change in the HTTP API. No tests needed
adjustment.
 2017-02-08 10:59:04 +01:00
jsteemann 01d3ad67b1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-08 00:59:16 +01:00
Max Neunhoeffer 883c11ea45 Handle the case that ClusterComm is already shut down gracefully. 
This touches every single place where ClusterComm is being used.
 2017-02-07 15:31:40 +01:00
jsteemann 8dfb97c0bd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 17:04:35 +01:00
Frank Celler e3fe51faa8 better threads working handling 2017-02-06 16:32:55 +01:00
Max Neunhoeffer 3f6ec436f8 Output a warning if Schmutz runs for longer than 30s. 2017-02-06 15:50:01 +01:00
jsteemann 6b3a4d1dc3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 15:48:54 +01:00
Max Neunhoeffer 71dae630c3 Store ClusterComm singleton in shared_ptr. 2017-02-06 15:25:18 +01:00
jsteemann ab11410911 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-06 13:05:11 +01:00
Kaveh Vahedipour c49c853b01 back ports from 3.1 2017-02-06 10:18:40 +01:00
Max Neunhoeffer 20e2128a44 Fix shardDistribution in case of leader change. 2017-02-06 09:45:00 +01:00
Simon Grätzer 9247a03058 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-05 04:08:51 +01:00
Frank Celler 37805f6bc9 safety check 2017-02-04 13:08:13 +01:00
Frank Celler 602795deea safety check 2017-02-04 13:08:08 +01:00
Simon Grätzer 63dfe865ba Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-03 21:27:08 +01:00
jsteemann 3c5edeb9b2 fix cluster AQL statistics 2017-02-03 11:47:36 +01:00
Max Neunhoeffer 72fa45cc94 Port better reporting of longish Schmutz behaviour to devel. 2017-02-03 10:47:13 +01:00
jsteemann 950c3f40ad fix cluster AQL statistics 2017-02-03 10:43:40 +01:00
Simon Grätzer 13f19fe51b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/RestServer/arangod.cpp
#	arangod/Utils/ExplicitTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-02-02 11:25:23 +01:00
jsteemann a1b3bfcc80 dont include ServerState when not needed 2017-02-02 10:16:53 +01:00
jsteemann fa917937c4 do not use namespaces in header files 2017-02-01 13:41:31 +01:00
jsteemann 2383548270 use initializer 2017-02-01 13:03:59 +01:00
jsteemann 9a8e2bc57a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-01 10:39:42 +01:00
jsteemann 126f9a21fe fix index ids 2017-02-01 10:39:21 +01:00
Max Neunhoeffer 48be25bdde Add diagnostics to see background jobs that do not run. 
If a job is only executed more than 5 seconds later than it was
scheduled, an error is logged.
 2017-02-01 09:36:33 +01:00
jsteemann 4fa2a6a1d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 14:57:17 +01:00
Max Neunhoeffer 460e27d31c Log level down to debug for Schmutz-Startung. 2017-01-31 14:39:34 +01:00
Max Neunhoeffer c4d5d982c7 Fix bugs of threads not announcing that they are busy. 2017-01-31 14:07:54 +01:00
Simon Grätzer bcc1a83ae5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-31 13:38:17 +01:00
jsteemann 8b62579789 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 10:04:56 +01:00
Max Neunhoeffer d8171651bf Fix assert. 2017-01-31 09:03:48 +01:00
Max Neunhoeffer d8d8ef9755 Add an assertion. 2017-01-31 09:03:41 +01:00
jsteemann 5cb4e3e685 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 08:51:42 +01:00
jsteemann 6598828449 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 00:33:42 +01:00
Max Neunhoeffer 9525f46b2b Some cleanup of comments for better understandability. 2017-01-30 23:22:58 +01:00
jsteemann 16c19ad927 cppcheck 2017-01-30 23:02:05 +01:00
Max Neunhoeffer cbae239aea Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-01-30 22:32:40 +01:00
Max Neunhoeffer af3c206d89 Try to solve sporadic shutdown blockage in heartbeat thread. 2017-01-30 22:32:05 +01:00
Simon Grätzer 40b3d1511c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-30 20:39:36 +01:00
jsteemann cb9bf7c2ff added obsolete parameter optionality 2017-01-30 17:06:02 +01:00
Max Neunhoeffer 61b353edc5 Fix fix of concurrently running Schmutzes. 2017-01-30 15:45:15 +01:00
Max Neunhoeffer 1aca50fd71 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-01-30 14:03:04 +01:00
Max Neunhoeffer fa296ebf40 Fix running multiple Schmutzes running concurrently. 2017-01-30 14:02:24 +01:00
jsteemann 1294cf6128 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-30 12:53:19 +01:00
jsteemann d96ce9af37 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-30 12:53:10 +01:00
Kaveh Vahedipour 6647fb1c14 no need to udate single host agencies' endpoints 2017-01-30 09:55:34 +01:00
Simon Grätzer 9829e931e3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-30 01:50:09 +01:00
Max Neunhoeffer f09ecd21b2 Logging level for background job debugging down to DEBUG. 2017-01-29 23:05:33 +01:00
Max Neunhoeffer c62c521a43 Fix closure for background jobs in HeartbeatThread one more time. 2017-01-29 00:08:12 +01:00
Max Neunhoeffer 3ac470cbb2 Fix closure for background jobs in HeartbeatThread. 2017-01-28 23:57:40 +01:00
Max Neunhoeffer 5dee45a6c1 Delete boost::asio::io_service::strand. 2017-01-28 23:45:19 +01:00
Max Neunhoeffer 429ffcd43c Count callbacks in _strand in HeartbeatThread and log. 2017-01-28 22:13:21 +01:00
Max Neunhoeffer 4e2a9be028 Merge branch 'devel' of ssh://github.com/arangodb/arangodb into devel 2017-01-28 21:27:41 +01:00
Max Neunhoeffer 8b4ed89d14 More logging on level info. 2017-01-28 21:26:34 +01:00
Kaveh Vahedipour 7954512878 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-28 20:34:32 +01:00
Kaveh Vahedipour bcfec215b8 tested restart from 3.1 database 2017-01-28 20:32:29 +01:00
Max Neunhoeffer 6993ca32c7 Add more debugging output on log level info around Schmutz script. 2017-01-28 20:28:58 +01:00
Simon Grätzer 37243315e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-28 15:30:28 +01:00
Kaveh Vahedipour f98701a598 localId overrules persisted UUID 2017-01-28 12:25:57 +01:00
Kaveh Vahedipour 60e0622793 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-28 12:05:37 +01:00
Kaveh Vahedipour daa1856aa0 localId overrules persisted UUID 2017-01-28 12:05:31 +01:00
Simon Grätzer 64343cd579 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	scripts/startLocalCluster.sh
 2017-01-27 15:58:22 +01:00
Michael Hackstein d5d316b971 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-27 09:58:02 +01:00
jsteemann 0cb7d416d0 moved transaction collections into their own files 2017-01-26 16:51:57 +01:00
jsteemann 2709504d74 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-26 15:21:08 +01:00
Kaveh Vahedipour 8509200040 MoveShard with ShortNames 2017-01-26 11:35:44 +01:00
Michael Hackstein f61a27d0e6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-26 09:50:00 +01:00
jsteemann 00b1632ece factored out AccessMode from transaction.h 2017-01-25 11:57:21 +01:00
Simon Grätzer 4c370a09fe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/Cluster/ClusterInfo.h
 2017-01-24 16:41:34 +01:00
jsteemann 603a0ae8ee Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-24 12:46:57 +01:00
Max Neunhoeffer dc3c380904 Fix bug found by static analysis. 2017-01-24 12:30:32 +01:00
Max Neunhoeffer f62042ef3a Clean up code without changing behaviour. 2017-01-24 12:11:57 +01:00
jsteemann e3bcb90916 remove revisions cache 2017-01-24 10:48:07 +01:00
Simon Grätzer e4593743b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-24 00:38:07 +01:00
Andreas Streichardt b56621a01b First current tests 2017-01-23 15:29:25 +01:00
Simon Grätzer 0907e901f2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-21 15:33:44 +01:00
Kaveh Vahedipour fc2d36ccb1 Dealing with 412 in ClusterInfo 2017-01-20 18:58:07 +01:00
Simon Grätzer d71ebf7c1d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-20 14:42:19 +01:00
Kaveh Vahedipour 6c56f9f05c available for use: avoidServers 2017-01-20 11:58:32 +01:00
Kaveh Vahedipour 40c6e2b48c unobserve should not create entries in agency, if empty before 2017-01-20 08:06:27 +01:00
Max Neunhoeffer 427c8e4553 Merge branch 'devel' into schmutz-ng 2017-01-19 14:53:46 +01:00
Kaveh Vahedipour 67cd7deaaa ClusterInfo enjoys clientIds 2017-01-19 14:51:29 +01:00
Max Neunhoeffer 5d8350abc6 Make followerList::add and ::remove idempotent. 2017-01-19 14:19:36 +01:00
Simon Grätzer e857d9744c Enabling async on shortest path 2017-01-19 12:38:47 +01:00
Max Neunhoeffer 370cb09d89 Merge branch 'devel' into schmutz-ng 2017-01-19 10:32:43 +01:00
Andreas Streichardt a9ccdf86c1 Several movement fixes 2017-01-18 17:48:01 +01:00
Simon Grätzer 1d66c418b6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
 2017-01-16 17:56:44 +01:00
Kaveh Vahedipour 819603b910 coordinator should not die in maintainer mode if bogus database entries are found in agency 2017-01-16 16:31:06 +01:00
Michael Hackstein 41f0ac974b Moved creation of Cluster collection from V8Server to ClusterMethods. Also introduced a static class wrapper for Methods. 2017-01-16 12:40:05 +01:00
Max Neunhoeffer f35e3a7aaf Merge branch 'devel' into schmutz-ng 2017-01-16 09:54:09 +01:00
Andreas Streichardt 191f399ce2 Move AgencyCallback stuff to cluster so it is (hopefully) clear that this 
is being used within the cluster and not within the agency.
 2017-01-13 18:08:27 +01:00
Simon Grätzer 27dcb11af3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-13 15:00:59 +01:00
Mark bfceb038fa fixed windows compile error 2017-01-12 17:03:01 +01:00
Max Neunhoeffer fe9116f7fb More Schmutz-NG. 
Does not trigger sync repl yet.
 2017-01-12 16:33:57 +01:00
Andreas Streichardt 81ef303948 Add info about requested startup role 
currently it is hard to grasp what startup options exactly are required
to start up arango. for example you can say --agency.size 3 but the
agency will only start if agency.activate is set...same is true for
coordinator,primary mode. So simply output the role during startup
 2017-01-12 15:33:13 +01:00
Andreas Streichardt 4458f04e46 More specific error codes for the cluster 2017-01-11 17:54:45 +01:00
Kaveh Vahedipour fe48bcb982 fixed for short names in frontend shard view 2017-01-11 16:31:19 +01:00
Simon Grätzer c64f61f3ec Fixing Heartbeat Thread 2017-01-11 14:46:31 +01:00
Simon Grätzer 9c9d0a6a20 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 16:30:32 +01:00
Kaveh Vahedipour f699117133 more information from ClusterInfo's dropCollectionCoordinator 2017-01-10 16:19:10 +01:00
Simon Grätzer 790ba7d0f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 13:49:43 +01:00
Kaveh Vahedipour 150ff8a1e3 waitFor will report more paranoid 2017-01-10 10:38:18 +01:00
Simon Grätzer 1bcfe4ed04 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 10:05:59 +01:00
Simon Grätzer b0e1dc43ef Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-10 09:20:15 +01:00
Kaveh Vahedipour 60bb992b4d agency dump in createCollectionCoordinator 2017-01-10 09:18:50 +01:00
Kaveh Vahedipour 75052e94f4 collection creation should not fail if 412 collection exists. just move on? 2017-01-10 08:36:39 +01:00
Kaveh Vahedipour dc9d8413c0 searching for broken collection creation in clusterinfo 2017-01-10 08:26:25 +01:00
Simon Grätzer 01ac5a51a3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-09 21:12:24 +01:00
Andreas Streichardt ff7df7d135 Fixx errormessages 2017-01-09 17:37:06 +01:00
Simon Grätzer 20d32d05b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/VocBase/LogicalCollection.cpp
 2017-01-09 13:34:37 +01:00
Simon Grätzer 78135ed8b3 Lazy Loading & auto corrections 2017-01-09 12:53:47 +01:00
jsteemann 902a787ca6 added try..catch block for thread 2017-01-09 08:32:45 +01:00
Andreas Streichardt 466f932701 First steps to low level replication debugging 2017-01-06 17:19:07 +01:00
Kaveh Vahedipour c533f311cb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-06 14:47:02 +01:00
Kaveh Vahedipour a0af781630 to lock or not to lock 2017-01-06 14:46:57 +01:00
Andreas Streichardt 15fab0b7ce Do not initialize clustercomm twice in debug mode 2017-01-06 11:58:26 +01:00
Kaveh Vahedipour 4ac74301d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-06 11:10:36 +01:00
Andreas Streichardt dafb5d0724 Allow setInitialized within DEBUG_SYNC_REPL mode 2017-01-06 10:44:35 +01:00
Kaveh Vahedipour e87182d971 more verbose output on failure to create plan 2017-01-06 09:38:37 +01:00
Andreas Streichardt 06a0fc11cd Add Sync Replication debug code 2017-01-04 15:51:47 +01:00
jsteemann 0070b40fbf attempt to fix Windows build 2017-01-04 09:08:13 +01:00
Kaveh Vahedipour f66688c397 visual studio ridiculous once again 2017-01-03 17:45:57 +01:00
Andreas Streichardt 8c8a17528c Fix coordinator case 2017-01-03 16:43:54 +01:00
Andreas Streichardt 8bb3142d19 Rework setRole code 2017-01-03 16:32:43 +01:00
Kaveh Vahedipour 5b3d95298b agent restart from persistence with complete set of new endpoints 2017-01-03 15:39:52 +01:00
Kaveh Vahedipour 9d5a5537ce remove deceased agents from AgencyComm 2017-01-02 17:12:00 +01:00
Kaveh Vahedipour a2ee40d4f3 restarting agents inform rest of their new endpoints 2017-01-02 15:58:38 +01:00
Kaveh Vahedipour 4928358e04 removing trace of agency locks part 1 2016-12-30 11:21:11 +01:00
Simon Grätzer 7563fb4b80 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-29 18:09:57 +01:00
Kaveh Vahedipour 6e2394a831 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-29 15:03:33 +01:00
Kaveh Vahedipour ff701ff57c getting rid of locks in cluster.js 2016-12-29 15:03:09 +01:00
jsteemann 668c097bb4 cheaper string construction 2016-12-28 21:34:30 +01:00
Kaveh Vahedipour e9f465d13b read/write/transact interface lifted up to js 2016-12-28 15:37:05 +01:00
Simon Grätzer 9a6c7196a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-26 20:52:29 +01:00
Kaveh Vahedipour 9a778c7304 coordinators need to know all agency endpoints too through heartbeats 2016-12-23 12:08:53 +01:00
Simon Grätzer 344c3761ba Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-22 14:51:55 +01:00
Kaveh Vahedipour 95076d053a Bogus error message 2016-12-22 08:40:21 +01:00
Simon Grätzer 52a88488d6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-21 23:16:41 +01:00
Kaveh Vahedipour 8924cf7852 let's not count failed db servers in replication factor fix 2016-12-21 15:49:56 +01:00