1
0
Fork 0
Commit Graph

3357 Commits

Author SHA1 Message Date
jsteemann 02c0dcc689 properly report error locations 2017-03-23 20:18:33 +01:00
jsteemann 6cbe5e7776 fix message 2017-03-23 19:41:28 +01:00
baslr 71b22e642f Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-23 13:36:12 +01:00
baslr 8c2b951884 LDAP: additional error codes 2017-03-23 01:26:51 +01:00
Wilfried Goesgens 85f58b9a21 we may now also do 'milestone'-releases next to devel/alpha/beta/rc 2017-03-22 11:59:25 +01:00
baslr 8fa6f9c5e7 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-21 23:27:26 +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
jsteemann b8e011eee5 move attributes into engine 2017-03-21 10:31:50 +01:00
baslr f593561438 introduce LDAP errors 2017-03-20 16:14:29 +01:00
Dan Larkin a80ed16477 Added basic views support to ArangoShell. 2017-03-18 16:35:51 -04:00
jsteemann e3d8ae142e some fixes for view handling 2017-03-17 11:18:46 +01:00
Alan Plum 97e80c9d3b
Whitespace 2017-03-16 15:45:45 +01:00
Alan Plum 50e0eb16d2
Use COLOR_OUTPUT to determine whether to use color 2017-03-15 20:44:03 +01:00
Alan Plum 4920ef8b41
Implement tap/xunit reporters in Foxx 2017-03-15 20:09:31 +01:00
Alan Plum c18aa323dc
Extract util.indentation 2017-03-15 20:09:30 +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
jsteemann 3ed19e291d added "shardIds" option for AQL queries to restrict queries to specific shards 2017-03-08 15:07:10 +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
jsteemann bda65cef8b Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-07 10:33:25 +01:00
jsteemann aa870e9bce fix attribute name parser failure return code 2017-03-07 10:32:27 +01:00
jsteemann 644ef08ce0 added "bindVars" to attributes of currently running and slow queries 2017-03-07 00:19:01 +01:00
jsteemann c2d7412cb3 removed unused files 2017-03-06 17:41:30 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
2017-03-04 02:08:27 +01:00
Simon Grätzer e94cb25c92 Editing documentation and moving test 2017-03-03 23:29:23 +01:00
jsteemann 573c346fa5 attempt to fix issues reported by @ewoutp 2017-03-03 14:47:21 +01:00
jsteemann 3a39921147 fixed documentation and added tests for grants API 2017-03-03 12:33:13 +01:00
jsteemann 7051f5d87a fixed --convert false in arangoimp 2017-03-02 15:05:06 +01:00
jsteemann 14d5898fc2 test for issue #2342 2017-03-02 13:53:17 +01:00
jsteemann 7017c4747d change default string truncation length
from 80 characters to 256 characters for `print`/`printShell` functions in ArangoShell and arangod.
this will emit longer prefixes of string values before truncating them with `...`, which is helpful for debugging.
2017-03-02 09:52:43 +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
jsteemann f5c8932744 initial version of query execution plan cache, still very rough 2017-02-21 11:58:38 +01:00
Alan Plum d72f3ea511
Define Foxx's expected routing behaviour 2017-02-14 16:36:40 +01:00
jsteemann 202bfe1963 Merge branch 'suffix-decoding' of https://github.com/arangodb/arangodb into devel 2017-02-14 11:00:24 +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
Michael Hackstein d999ebfa87 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-10 12:59:06 +01:00
jsteemann 3c2edd46cd some diagnostics if tasks are not found 2017-02-10 12:27:43 +01:00
Frank Celler dc5e946c05 version number is now generated 2017-02-09 16:35:10 +01:00
jsteemann bb32f2741e added tests 2017-02-08 12:53:02 +01:00
Simon Grätzer 58ec9033f4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-02 23:15:34 +01:00
Frank Celler ca28e7c978 added support for topic logging 2017-02-02 16:00:37 +01:00
Simon Grätzer cec711bc85 Fixed test 2017-01-31 14:13: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
Frank Celler 864bd451cf wait longer for figures 2017-01-28 00:25:30 +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
Alan Plum c9b926916a
Even cleaner SyntaxError stacktraces
Don't clutter stacktraces for Node compatibility at all. Just add lineNumber/columnNumber/fileName to the object.
These are non-standard but there is precedent for these names in Mozilla.
2017-01-27 05:53:39 +01:00
Alan Plum 88ac5777d6
Clean up SyntaxError generation
Clobber stacktrace instead of wrapping in another exception with wonky message string.
This makes SyntaxError details node-compatible and parseable for generating code frames.
2017-01-27 05:34:22 +01:00
Alan Plum 3370ecbadd
Nicer error page and code frames 2017-01-27 01:57:30 +01:00
Alan Plum c268b2db91
Keep stacktraces out of error messages
They are already reported much more consistently via 'cause' so methods logging them should exploit that instead.
2017-01-27 01:57:29 +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
Andreas Streichardt 7b1c9b7833 Instanceinfo and testresult will now be written to the test rootdir 2017-01-24 14:54:10 +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
Andreas Streichardt 9ad10acdc0 add mochagrep 2017-01-19 17:58:43 +01:00
Simon Grätzer 54da6971f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-18 14:07:13 +01:00
jsteemann c9a2c028fa emit sort registers for GatherNode in explain output 2017-01-18 11:58:31 +01:00
Kaveh Vahedipour ea7e16979a agency bug in precondition and log handling fixed 2017-01-18 11:07:30 +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
Andreas Streichardt 4458f04e46 More specific error codes for the cluster 2017-01-11 17:54:45 +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
Michael Hackstein 0365363090 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-10 15:39:12 +01:00
Michael Hackstein fe7a829592 trx crud with empty arrays now short-circuit and return success with empty array. This lead to errors in cluster, band now is consistent with single-server. 2017-01-10 15:15:15 +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
jsteemann 503326852c try to fix test for MacOS 2017-01-09 10:58:58 +01:00
jsteemann ef76ab38cc fixed test 2017-01-06 15:29:01 +01:00
Wilfried Goesgens 19b8c90bcb fix examples - reset collections cache when working with the graph api
- add dummy cache flush function into the arangod db object
 - call cache flush when creating and deleting graphs
2017-01-04 14:34:26 +01:00
jsteemann b8a64ccca2 attempt to fix hanging tests 2017-01-03 15:53:52 +01:00
Simon Grätzer 431df0c5a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-21 11:56:44 +01:00
jsteemann 8e8e064429 fix jslint for crypto file 2016-12-20 08:50:44 +01:00
Simon Grätzer f1b6170e96 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-19 10:17:18 +01:00
Alan Plum e0fe78b782
Implement HOTP/TOTP 2016-12-19 02:20:53 +01:00
Alan Plum 61301a391b
Expose PKCS5_PBKDF2_HMAC to JS 2016-12-19 02:20:51 +01:00
Alan Plum 9a347f74fa
Cleanup crypto.js 2016-12-19 02:20:29 +01:00
Simon Grätzer e4951835aa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-14 10:40:03 +01:00
jsteemann 4d76ef962b added count(details = true) for sharded collections 2016-12-13 16:03:49 +01:00
jsteemann 03acaaea47 fixed issue #2217 2016-12-13 14:19:55 +01:00
Simon Grätzer 730ea4755e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	scripts/startLocalCluster.sh
2016-12-09 14:30:19 +01:00
Andreas Streichardt 82682f8d25 Wait for synchronous replication to settle 2016-12-07 18:38:15 +01:00
Alan Plum 0700cfa86a
Implement OAuth 1.0a 2016-12-06 18:30:11 +01:00
Andreas Streichardt 11bd9381d5 Add satellite collections 2016-12-06 16:40:50 +01:00
Simon Grätzer b126e1dddb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-06 14:57:09 +01:00
jsteemann 369b2c7bc6 added optional memory limit for AQL queries 2016-12-06 13:23:41 +01:00
Simon Grätzer 3142cc1505 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-05 01:19:56 +01:00
jsteemann 2aa414f731 fixed issue #2204 2016-12-02 13:59:48 +01:00
jsteemann 2521dff57c fix error message returned by arangoimp in case of some secondary unique key constaint violations 2016-12-02 13:37:17 +01:00
jsteemann dc5384609c jslint 2016-12-01 14:39:28 +01:00
Simon Grätzer 34714f8743 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-12-01 14:11:14 +01:00
Michael Hackstein 0f119172dd Added convenience function to create vertexCentric indexes. 2016-11-29 12:31:25 +01:00
Simon Grätzer bc4c441f30 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 17:03:26 +01:00
Michael Hackstein 0786eb735f Fixed passing of unique when using createHashIndex() 2016-11-25 16:08:58 +01:00
Michael Hackstein 7c96010711 Reincluded ensureGeoConstraint. Somehow got lost in my last commit. 2016-11-25 12:58:48 +01:00
Simon Grätzer 9bcf8cd407 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-25 12:30:39 +01:00
Michael Hackstein 37b124593f Unified ensureIndex on client and server libs. 2016-11-25 11:11:45 +01:00
Simon Grätzer 66951f4f8e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-23 13:17:27 +01:00
Michael Hackstein 90c646fc54 Added another smart graph error that disallows using system attributes for smart graphs 2016-11-22 17:54:12 +01:00
Simon Grätzer 0ae6d0d6fd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-17 11:56:29 +01:00
Alan Plum 89b59a522a
Add tests for Foxx path logic 2016-11-16 11:38:00 +01:00
Alan Plum ff415076d9
More convenient `@arangodb/request` 2016-11-16 11:37:59 +01:00
Simon Grätzer 42782e4e28 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-15 18:14:50 +01:00
Simon Grätzer 5b08879209 Added pregel arangosh code 2016-11-15 18:14:35 +01:00
jsteemann 77e2cf5a65
fix passing of special chars in URLs in cluster
- this sets option CURLOPT_PATH_AS_IS to keep ".." and other special components in paths
- this also changes the behavior of StringUtils::urlEncode() to always encode the "."
  character to "%2e"
2016-11-15 15:46:22 +01:00
Alan Plum 5788b2e3ca
Fix failing test 2016-11-13 15:08:40 +01:00
Alan Plum c0a3f5a8a1
Better Foxx API error handling 2016-11-12 22:33:07 +01:00
jsteemann fcacd76bca display index usage of traversals in AQL explainer output (previously missing) 2016-11-10 12:49:02 +01:00
Jan Steemann 6d6d5b9a00 test for issue #2149, issue #2159 2016-11-09 16:29:58 +01:00
Jan Steemann f0f90bc914 small fixes for traversal explain output 2016-11-08 16:08:58 +01:00
jsteemann 2a371cbf9e allow creating unique indexes on more attributes than present in shardKeys
The following combinations of shardKeys and indexKeys are allowed/not allowed:

shardKeys     indexKeys
        a             a        ok
        a             b    not ok
        a           a b        ok
      a b             a    not ok
      a b             b    not ok
      a b           a b        ok
      a b         a b c        ok
    a b c           a b    not ok
    a b c         a b c        ok
2016-10-28 13:04:12 +02:00
Alan Plum 0950520eb5
Implement inline middleware 2016-10-26 18:16:18 +02:00
Alan Plum 4770e38fa1
Don't load mocha QUnit interface
The QUnit interface interferes with the BDD and TDD interfaces resulting in weird inconsistencies.
2016-10-26 15:24:56 +02:00
Jan Steemann eead95db34 issue #2118 2016-10-25 15:50:42 +02:00
jsteemann 09e1fda1a0 fix revision id handling 2016-10-24 17:24:27 +02:00
jsteemann de9dc289c0 Squashed commit of the following:
commit f14e88b6259212b33843653292d95a607ff894a3
Author: Frank Celler <frank@arangodb.com>
Date:   Sun Oct 23 11:03:30 2016 +0200

    clang does not like reinterpret_cast

commit 96920079514965e792bf9688cb51cdad944692f4
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Oct 22 13:52:47 2016 +0000

    honor minimal

commit a460c3df878b9e8b544812f0fda471c1fe519458
Author: Frank Celler <frank@arangodb.com>
Date:   Sat Oct 22 12:23:16 2016 +0000

    added hidden options server.maximal-threads and server.minimal-threads

commit 38713a0a614550b38f4eb650ff62300732f90298
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 11:17:17 2016 +0200

    fix test

commit 532d65e0d22fc6916b36d6fda23ab95cd34c1ac2
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 11:17:03 2016 +0200

    re-added methods needed by EE

commit b7624580e7809baa0cdf9145e2102952e872346b
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:11:50 2016 +0200

    cppcheck

commit da5e02351ec7872302840ca14f67aeda8ab3150b
Merge: e216800 d19beb6
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:04:51 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e2168009bde63971d5c7a17653c26a6f9ae23c3c
Author: jsteemann <jan@arangodb.com>
Date:   Sat Oct 22 01:04:30 2016 +0200

    fix non-deterministic inserts into edge index

commit 6b131ee1143f17f5465a8423921b7a96c382013e
Merge: 8ebf7f0 285ddb8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 12:23:53 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8ebf7f043efcda7fd31e1e78c6a0da99cc461b89
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 12:23:36 2016 +0200

    micro optimizations

commit ad32930b9e50ea52cb9821508912ddd80564193f
Merge: b40cfb4 fdb2104
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 21 09:10:31 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b40cfb44dd4861471385d30f3777b17ba2995ef1
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 16:07:40 2016 +0200

    share some context

commit 2411e59f2bcbd96889aac36e0a38ad62dca1ea65
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:48:05 2016 +0200

    remove unused functions

commit c422037e97572605cce4895c5cdb4b8ffa30f287
Merge: 9e9a2f7 88ea314
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:31:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 9e9a2f7c9428f333fa3c7674bb82853574ea2f2c
Merge: cedced5 638ce07
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:30:27 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cedced52c3dfcefdc8d5ca57924064b350e338e8
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 15:30:14 2016 +0200

    experimental improvements

commit 455cb59bc641d8137d635d1ff6a137183c455b00
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:25:36 2016 +0200

    pass argument by reference

commit b922a14d984dc82d55d54297552778342b6cea64
Merge: 8afd5d3 0883c49
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:19:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8afd5d35d562de4596af5b5acf1909f3c232ed60
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 13:19:47 2016 +0200

    micro optimizations for shortest path

commit e92edcc7f5dcb1429052d337eeb10b087f5dfac0
Merge: eb2d774 084961a
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:50:42 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit eb2d7747d81bc0105579ad2e6f19a4743bd217a8
Merge: 146d3e3 b376769
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:30:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 146d3e3b90304897459ecde3b9d9b282042a412f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 11:29:41 2016 +0200

    mini optimizations for traversal

commit a8cfa933c8f96840a4dca355a1efee2086a5cf2d
Merge: b990d0f c3de3ca
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 10:37:35 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b990d0f6914d4c483f9e521d0132937eb0aa5bc4
Merge: deea0b0 090a591
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 10:37:31 2016 +0200

    Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache

commit 090a59103feac32b848f18fafdb4f97816bf92f6
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 09:14:52 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit deea0b00b1ac35b4b23756218d2c12ab72185b09
Merge: d8537ef 4bf4c7f
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 20 09:14:40 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit d8537ef56e537356e32b82e10cd2b9833c542bb8
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 17:16:42 2016 +0200

    potential performance improvements

commit 828ac8743ce67a964bd2d622689cf3c69b7aa22e
Merge: e696a95 76ec1fd
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:38:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e696a95b50db1a8819247ef855b0dad710b4cc62
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:37:07 2016 +0200

    dont pass nullptrs

commit 5b31ff978091fa1ae80d59b6ba7bad63f0c83ef7
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 16:36:45 2016 +0200

    fixed shutdown order

commit 8698892b6e9395151dcfdca778ad9177b19b1614
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:25:21 2016 +0200

    added assertions

commit 8bcc2d4610ae0c15f6406b82568e3a15a8f6df5a
Merge: 1f0676b 92b5887
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:16:24 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1f0676b9e95dc47a2c573380c6d165f875fe6e87
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 15:15:06 2016 +0200

    potential performance fixes

commit 3eeee4a904079d33d6fd695100afc080acde1dc7
Merge: c111396 14d8d35
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 11:39:22 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c1113968db5fd9e4cefa8be0150dafc37cf1e25f
Merge: 4db8b2c cd3a5b4
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 19 09:08:28 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 4db8b2cbb75218391b6499de7a35bca480546031
Merge: 241e0ab e181457
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 17:48:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 241e0abbee7d040eeadfa2d0fd195f21a4eac0d4
Merge: ed309a9 93c5672
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 17:48:05 2016 +0200

    Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache

commit ed309a9abaf3185af7e4ed75278eb78716e18935
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:25:32 2016 +0200

    fix compile error

commit a53793c63988ac4e4ba8a074f61e8130c01aea04
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:13:32 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 93c567295186197236fd8d4a2f25109167e57c6c
Merge: ddfc6eb 1d7f929
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 16:07:10 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ddfc6ebbd475a238cfe23ed9b9860ea8ed840355
Merge: 762d01e 0d1572c
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:40:57 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 762d01ed7c58c2981c8f7ff8f0736e47d34006df
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:40:45 2016 +0200

    hold mutex for shorter period

commit 74f5e8a402ec7f94606053acf3361225d7140bee
Merge: ece92b5 6bc276e
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:30:36 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ece92b50a7f87685e7b3e9b2503ec224573b7663
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:30:17 2016 +0200

    performance optimizations

commit 979b5e29a3f707104fe70e632fc2f701fc8b731b
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 15:29:56 2016 +0200

    don't use pointers

commit 3f30c6d849d586c01020bb093d094dce91f14d13
Merge: ab3af79 0baecf1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 14:16:36 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ab3af79ca3f608df621bc98966e8d93bd848d401
Merge: 818f576 3c96c6f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 14:14:37 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 818f576580683704147f113208f2376de8eed9da
Merge: 19e1488 1c1a659
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 18 09:24:15 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 19e1488220cecfb0588f9b49b9f6cc26ea6fa93f
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:55:25 2016 +0200

    use half of RAM for target size

commit aef5156b7d131b47d7deacf30f20ad1dde79b843
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:51:28 2016 +0200

    revert boost changes

commit 294517d36f2c35757593b705ac2a5e56f3d9b9dc
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:51:20 2016 +0200

    fix compile error

commit 80b7560a041fd80e5b0199b5ae1cbe0a96d118a5
Merge: b220f79 f748bab
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:42:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b220f795b686a1b7a8c7f1eb50b32eee5ff573ae
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 17:42:16 2016 +0200

    stability fixes

commit 4751c25ef42cbc2f688dbe9761453e6a1209d959
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:42 2016 +0200

    silence boost compile warnings spam

commit f7f7cbeedc8881feb4eec45591f70b24a3d9292b
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:29 2016 +0200

    fix compile warnings

commit d1e3f35e55963666d85c5084cb01dc8330866249
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 17 10:34:14 2016 +0200

    change warning to fatal error

commit e858e5f6bbfd1ad5a32eea66fe7881d795527af4
Merge: cbe8299 0586862
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:58:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cbe8299d8b127588533d8a292e46d77f889a8845
Merge: 4859562 df391b2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:30:24 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 48595629fe43531d9fbbd5b982cb3c78b18b17f2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:30:03 2016 +0200

    move most-accessed property to the front of the struct

commit 660e3e3b94bc0b2ef5783097886939c67c6b1d27
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:29:52 2016 +0200

    don't create too many lookup contexts

commit 6c8a93b9ed4157511b04262bc429ae4df3531575
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 17:21:21 2016 +0200

    no copying of results in HashIndex

commit b91c040b70afc02b1e7a22a9b6e223bbac254f55
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:57:48 2016 +0200

    privatize methods

commit 70d8d6e50545b097e9e5c7dfdd0cc210af8ce3b8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:43:07 2016 +0200

    don't spam on shutdown

commit c3d37194513f4576a41cc41408af4bac7a5084ca
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 16:42:58 2016 +0200

    share IndexLookupContext

commit ed8362422d3bb8d8462820581ea029209fb80387
Merge: e674f2b 73f87e8
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 14:17:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e674f2bd5f419243461c5b34fa507277fabdffb3
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 14:17:22 2016 +0200

    transition static array chunks cache into an unordered set

commit ceb1dc126efa28a2cfca2f73037b6a3df57d99b2
Merge: 254e167 0a82f16
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 13:31:20 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 254e167f5195cd316dda8a79bd3103848bd09ba8
Merge: ce5ea17 f1c3c89
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ce5ea175f0dec9634577d9f8bf691aea8985b9d4
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:32 2016 +0200

    remove locks in case they are unnecessary

commit 0277c938871cee66e9ef1486efe8ab0d3be24885
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 12:42:11 2016 +0200

    fixed bad optimization

commit 2db9e3534e4b9f7cb54c7b8ce52913334535b876
Merge: e408593 8c7034e
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 10:47:57 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e40859312d25a42ee41640341ece78255ab5d0df
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 14 10:47:41 2016 +0200

    performance optimizations

commit 6c9f19b06fc428581bee193cd7a3b9ce5a7219bb
Merge: baf397b df977e6
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 11:16:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit baf397befd61cbb072c0cebc27bf72726f22d21a
Merge: 2c43c62 d229ac3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 09:41:40 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2c43c6242ea606428789b2e33295610e1b2d15f0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Oct 13 09:41:24 2016 +0200

    performance optimizations

commit 6304f67551dbdfc82579e37d5b02f1c73bdfe4e4
Merge: 8504836 bf8da24
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:30:34 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8504836efa2da621cb15e028dfae2f7608d37383
Merge: c4e27d0 48d29c9
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:30:28 2016 +0200

    Merge branch 'readcache' of https://github.com/arangodb/arangodb into readcache

commit c4e27d0ad85fcef3b5456bf9a2e43d717fa634e9
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:19:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 48d29c9abe585801c1df96fcbac73498d5f41fa7
Merge: 95aad69 ed13299
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:19:50 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 95aad698140f38e07d19b693075b008fbb0c5681
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:18:42 2016 +0200

    use relative include path

commit 7e410c86cf6e5f5e2431801728f9683daa70a8c0
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:18:26 2016 +0200

    simpler iteration over all documents in a collection

commit 49eec355dfbc4a5812245adc7199de0ae74a35c3
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:11:45 2016 +0200

    micro optimizations

commit f7e2d008f32d9526a525ddb15ac696b2af6eacae
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:10:16 2016 +0200

    move seldomly-used code into own function

commit 7fb500e0bf97fa9b1be497cbae4c0022bb101615
Author: jsteemann <jan@arangodb.com>
Date:   Wed Oct 12 17:09:56 2016 +0200

    micro optimizations

commit debf61f9563f00a34028e31ea91fdd8274b5c401
Merge: 1a1024d 053e7fc
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 12:15:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1a1024d38563f4cb08c68be0d5a891fcb2414954
Merge: 89414ef 001407d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 11 08:47:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 89414efadcfc3db01e43d2baa5ef6d12f627aa17
Merge: 221ae0d 0bfe447
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 17:12:03 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 221ae0d34e6d6316dd7079c3c025a5b890a7a273
Merge: ee038eb e75b8f5
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 16:46:09 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ee038eb2115b021de5f5301edb8c4e4337e3faad
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 16:45:49 2016 +0200

    index refactoring

commit 20739bdffca0104bceb603073f7a50023febbdf1
Merge: 9c356e4 5d65b0b
Author: jsteemann <jan@arangodb.com>
Date:   Mon Oct 10 09:11:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 9c356e462ebcf05dd37ba424d2d9b1d007d3164c
Merge: e50a934 8aa34ec
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 16:19:14 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e50a934b151e7a92d916ce8ffb0ca167bfb02e10
Merge: 00e1fff 51dd5a9
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 16:19:08 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 00e1fff3b0e7bff7afd74023aa24b2abd061fe42
Author: jsteemann <jan@arangodb.com>
Date:   Fri Oct 7 15:15:34 2016 +0200

    changed primary index to not use pointers

commit 0318f177e13a2c9d5e3f8473d8b63de505f5d80b
Merge: 6230439 3fc8677
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:28:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 6230439538c73bd3e2bf553bea6a53f91db1db28
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:28:05 2016 +0200

    remove _extraMemory

commit bf5b4f957751fa0fc6702da62ce46a008613a99d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 16:27:52 2016 +0200

    index API preparation

commit 5a2d19daa5f0c95131733eb94ea9182fa5b8f822
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:19:15 2016 +0200

    fix API

commit 4835ba6ca3ed071e477bf69cec4eec1b9b46b12a
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:19:08 2016 +0200

    removed garbage

commit a8f29ad166d50cb85bf0f95a0594d8a8baf3043b
Merge: d559c31 f790795
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 15:02:29 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit d559c316922e06c3cf5da6654afe9aeae15a8d5f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:13:58 2016 +0200

    cppcheck

commit 89f525278e87d0ae926367f5c2fdb08faba4932f
Merge: 6ba81c2 21beb09
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:05:19 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 6ba81c27e6cfa425c2a59569a371707abd2aa8f3
Author: jsteemann <jan@arangodb.com>
Date:   Tue Oct 4 09:04:59 2016 +0200

    enable disabling _rev checks for pre-release 3.1 data

commit 21b701c1792d8eeaa0321ce494fafe9102c1ba9a
Merge: 1bddd76 11a9d3b
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:24:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1bddd7645fb3761eb2946b21f08f5189dadadf11
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:24:00 2016 +0200

    free unused cache memory more eagerly

commit 0136e2f0514c9fc2b35a5d21b72a3ebb64c0aaaf
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 16:23:52 2016 +0200

    renamed variable

commit 9c276a069a24f5d4544b7147efe57679c039eebf
Merge: 7c70abb 93cb87e
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:37:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 7c70abb2ce45858aaa77e08785bf635e699428f0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:37:34 2016 +0200

    platform-specific target size for revisions cache

commit 817561b1c220a4bf82b5a554efd1b70980eaa406
Merge: cb4b9e7 750b562
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 15:30:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cb4b9e75ffac7f33041562c57e2a062ffc8f7aa0
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:58:53 2016 +0200

    fixed crash

commit c5dbd81bd6405bb4247d57fa6afdf39f48f0922c
Merge: 8dad7b3 ca102fc
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:55:07 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8dad7b3de027a29acab9c97ec00a21baf8fb36d9
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 13:54:51 2016 +0200

    fix garbage collection

commit 8cac202eb8f2d05a42fc64922096e7e814de23a3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:32:55 2016 +0200

    API cleanup

commit 728429981af90b9a0207646acd9b4e32fa78f7d3
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:22:47 2016 +0200

    make option hidden

commit c3fd3621d4f929c860a19ee99b523c71e5510b48
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:20:53 2016 +0200

    remove OtherEngine

commit dd069158ed9be8aca4d9221d38e16771f424081e
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 29 08:18:40 2016 +0200

    preparation for results aggregation

commit 983980afd2bdbc3602676b305dea3f816b12bd78
Merge: c46fd98 8a5bc21
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 15:23:16 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c46fd98516ba5674e0a3abad544c2b5cae7e340e
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 15:23:02 2016 +0200

    use own hash tables

commit 1e11621149dfd8d98cc78adcae9181778454abf1
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:15:37 2016 +0200

    fix another crash

commit 0bd000c880afa78d45b215adff7dcf055ee9eb8e
Merge: 7e5da3d 69e453a
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:12:54 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 7e5da3d08667823af80d75e0eaf7af41d8cebd4a
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 11:12:40 2016 +0200

    fix crash

commit d2c9ae228de019380091fdccafb50960d1ae17ac
Merge: a2571d5 2d4bcaf
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:47:49 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit a2571d581cd3e52941846c4ce8f488b9220af0ea
Merge: d02b002 1f0ecf9
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:04:53 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit d02b0026fa8cbcec0539985ba9f5fc5ca2eb1592
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 28 10:04:31 2016 +0200

    garbage collection

commit 04794a8b5cfea93f9d0e620119941753052609de
Merge: c38c2b7 454e0bf
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 17:38:06 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c38c2b74955b33046ecb1d459a98c76b7f908aa4
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 17:37:55 2016 +0200

    fix shutdown

commit 3d0f7d3daedd9332222648f8e096dd84d9eba142
Merge: 2bbe5a0 54a0d45
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 16:38:05 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2bbe5a02aa2d9010056ec09bb526024fce9ed108
Merge: 8442ea6 0ea2ca2
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 16:35:29 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8442ea63e5bc84705b844066e11dd4c334b0d796
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 27 15:00:35 2016 +0200

    read caching

commit 0cb85c8d9fb7092ad5365de69cc51b989ab84449
Merge: 5baa73d 44edc6c
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 12:52:39 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 5baa73d63eb9dd4a6b5168da636bd8b89958883a
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 12:43:39 2016 +0200

    preparation for read cache

commit 55445bfb85374fd1b88ebfc29151ac60e10d1d81
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 26 08:50:42 2016 +0200

    refactoring

commit f1cf513a8c1359a9e4e8f18b8a6af0c5440bc091
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 16:19:58 2016 +0200

    refactoring

commit 2ab07bb6efda66b22cff2b02b64e7d17157ea56f
Merge: aa8327c 1bdf414
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:51:11 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit aa8327c151b7ae06046ad5ce95aed3d3e5c45a10
Merge: c55fd03 35e14fd
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:14:00 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c55fd031c612aee1479e361d51d92212a4e74d19
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:12:36 2016 +0200

    fix replication

commit 51164b4e70f6a6a16f841f369ecde1e906abb102
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 15:12:30 2016 +0200

    refactoring

commit 548c7f60dd14d834f796f7dde6d90feb9ba1be8e
Merge: 6be89c3 9b951ff
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 12:21:22 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 6be89c3013e5fb1eddf83befcdaf5d5ff935e9f1
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 12:20:52 2016 +0200

    allow storing arbitrary data elements in AssocUnique/AssocMulti

commit 73e5b06a050db6c3994abeba14675fe93e0c5b3b
Merge: ab5bb48 d9d0926
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 23 10:22:01 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ab5bb486bcb2e4eb8fb7267a68a7939c85e64f5b
Merge: 345963c a94db7d
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 20:50:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 345963cb6931fc7ce1f2714735f4bfbc60ca50e1
Merge: db3a071 d6a3b81
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 16:42:20 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit db3a07134341156c1489399e33368858059094df
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 16:30:52 2016 +0200

    removed last occurrences of master pointers

commit 29222e71415120a9c7163cbc420414b93acad988
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:14:20 2016 +0200

    pass Transaction in API so we can make sure a transaction is ongoing

commit 78ba63060d1675eec6d35abe056d22c2cb6b91fb
Merge: 906dc42 560da96
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:00:52 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 906dc428ddf8ef079f7fa3664cb89df3fbf07c21
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 13:00:23 2016 +0200

    pass initialCount to physical

commit 46971f72b09dd2dbbd8e20fad7be138298ec0180
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:39:05 2016 +0200

    privatization

commit 7ec3508bb0be4b56de9fec42e1417000efe20ad7
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:37:17 2016 +0200

    move master pointer management into engine

commit 667fbef8ce5ec426e3a16a5ef377ff0e42b42444
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 22 00:18:50 2016 +0200

    index cleanup

commit 8fc5c764044438f2fc854f48c517a811e31f2df1
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 22:45:32 2016 +0200

    constexpressified basic VPackSlices

commit ae8bc45a3fb34cf8f9a39548e22039d505619038
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 21:51:55 2016 +0200

    renaming

commit ba1b68c468e20a3d5282a937efd8a2e063c1abac
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 21:38:05 2016 +0200

    move last master pointers into engine

commit 179741cd1711954f91d8ec53fad7221977c4bfc3
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 20:50:41 2016 +0200

    remove includes

commit ea4e5ac9d0c0479ccc34e91f7fdc08e605005681
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 18:06:54 2016 +0200

    removed TRI_doc_mptr_t

commit 40c7ce768898f0e4f09b133dedc335a65d1b0a21
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 16:43:44 2016 +0200

    removed more TRI_doc_mptr_t

commit 3450bcc042d4caf8499af3c5454e37b1eeaf8a28
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 16:43:23 2016 +0200

    removed more TRI_doc_mptr_t

commit 64e17c8744330d2835c39523c7b15f9b79c429ef
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 13:56:08 2016 +0200

    cleanup

commit 38feed51f15bdefa95e18dab0b694eccfe1d6a3b
Merge: dbbdeb4 ec15c72
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 11:03:08 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit dbbdeb44f17f804fa798e2ee4d677543fec1b05b
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 21 11:02:45 2016 +0200

    make geo and fulltext index more robust given different platforms

commit c4e90fcf6a44390ecacacd6dbca3e5cf43179484
Merge: 86603e0 049471d
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:38:56 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 86603e04710170108d8ef4c023fa68f9366e628e
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:38:37 2016 +0200

    removed unused struct

commit 86b1b2568aefaba5ab7f621cb27b0ae5841b4da5
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 17:22:12 2016 +0200

    less TRI_doc_mptr_t

commit 30c3077002f23970e689ac422371b4e8054797db
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 16:49:09 2016 +0200

    less TRI_doc_mptr_t

commit ddb8ea6e958464f12a20a5d9e29772074dab22db
Merge: 14b9b5e d4d5e15
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:50:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 14b9b5e22030c98459b5b547cb0417a0be7970a2
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:49:44 2016 +0200

    remove mptr from method

commit cc0ed4046fcef91571f0b9b612fb290d2c19791f
Merge: 8b2b849 6fa99b6
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:27:30 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8b2b849e8c256559fc579da74863b2005356481c
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 15:26:57 2016 +0200

    create separate mptrs on update/replace, and dont mess up the existing ones

commit 88b885e2aa36b33feb3983a4c822c593fcfbf165
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 13:11:38 2016 +0200

    cleanup

commit 851e62ef0697c60590da7f26524dd824192e6a78
Merge: 05f2fcf f510773
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 12:53:19 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 05f2fcf5ea52baf45aa8fff4624d9fe08fd9b4c7
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 12:53:11 2016 +0200

    a bit more cleanup

commit 4928db648984811c58cb3e33be672f9c46c79320
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 10:42:49 2016 +0200

    remove occurrences of TRI_doc_mptr_t

commit 8c1f0cbec38a4c62c1d481d291a7b913273f5271
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 20 09:13:17 2016 +0200

    partly move master pointers into engine

commit f80bf0c097f9439a8f3b3db8bac27d63086f4de9
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 15:43:26 2016 +0200

    refactoring

commit 407ddd508aa6016e99bf311df13c8aa0f8ae94c3
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 15:34:46 2016 +0200

    refactoring

commit a40c87ead0b6ad3cdccdc826ad178b25f5ea466e
Merge: df3ceea e245e15
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 19 09:11:48 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit df3ceea699ab4f41501bb79eb206fa54bd502383
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 11:21:48 2016 +0200

    cleanup

commit e5ff73bf80c064a4c92372ea80c3a2351973df1c
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 10:37:17 2016 +0200

    cleanup

commit 44f42b25f09a2110b60d042635f8213242483f8f
Merge: 2bf7e33 fad7efe
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 16 10:00:38 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2bf7e3373b0ad7e2a2fed7ccf883be05a51e4a22
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 17:21:51 2016 +0200

    unify index iterators a bit

commit e83455dece1bd014a126e9a5554f9a7c1fe4de3f
Merge: c83eab8 c912d96
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 14:07:52 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c83eab87106ca6f5123a4a4747a730deb71069eb
Merge: fb4c5c3 b9b7d8d
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 13:59:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit fb4c5c3108af5ae8bd5bdd70748687e24b983b37
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 13:58:58 2016 +0200

    bugfixes

commit 7643365abca94aca5d138bd46341d086c1f0fb14
Merge: dabddf7 7e866a8
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:37:19 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit dabddf728932cc00abc6052370cab9d081eb1025
Merge: 1662199 abb16ee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:34:00 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 1662199d843256c0002c59c85b5f013306098cee
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 10:17:25 2016 +0200

    cleanup

commit 3ce9cf9de45f324af07112b2ac0c79ef22805cb1
Merge: e5d9703 135edf1
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 09:29:38 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit e5d970356041123b92a6ee20e4e800175e04f548
Merge: cd2def8 542f4bb
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:44:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit cd2def8762859d1cafbe066936a22a5ef27ae508
Merge: 9baaf4b a9cb076
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:20:43 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 9baaf4b32d6356d3defdfd8a4b1c0cf3f7ebfacf
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 15 08:20:24 2016 +0200

    intermediate commit. not working yet

commit 0ec0a7ce2598f4fb7a55880611947e12112e14b3
Merge: 66c6bbe 1a2a3ba
Author: jsteemann <jan@arangodb.com>
Date:   Wed Sep 14 09:43:27 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 66c6bbe68fd20cfd9c2b8c00b2220294f29124ef
Merge: f5aadb1 b5ccbd1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 17:02:46 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit f5aadb1b82a85334b3a26b6fd6b9f00bebfa65f1
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 17:02:08 2016 +0200

    some index refactoring

commit 23e5db5bdb2a192cb4e7fe9b4572fb1e272c4a11
Merge: 25355ed 84fbc98
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 12:52:30 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 25355edc43111717de0d80101e56f44c99d84a56
Author: jsteemann <jan@arangodb.com>
Date:   Tue Sep 13 12:52:19 2016 +0200

    removed dead code

commit 9dd274a1c1694c53987dc6d77526711b46ba996c
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 12 09:20:34 2016 +0200

    some refactoring

commit 049c11769dd38b7afac9cb85ef03ce617f96140f
Merge: ee75b21 a620690
Author: jsteemann <jan@arangodb.com>
Date:   Mon Sep 12 08:43:12 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit ee75b2169b533bafaac49752ca3b11b43940b928
Merge: 4f3a3ac 9539f2f
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 17:07:05 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 4f3a3ace83b301aa5e86e4b85b1b03f02f3dd0ea
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 17:06:46 2016 +0200

    refactoring

commit 190520d23d89c5435e4b5fce4ed7dd6dbdcc9d6c
Merge: eacd578 61c6e3b
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 16:34:00 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit eacd578f1d837a622a69fdf1b7d0ca03fbe7d5bb
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 16:33:47 2016 +0200

    refactoring

commit 7dbac24e00e39943130cfcc3e8a9923fda15c663
Merge: 7a62bb8 2761b7d
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 15:20:49 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 7a62bb830749a661c189d96d6931ba3993bc00ee
Merge: 8d40248 4cebbf9
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 15:09:18 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 8d40248badbf0f11abbd67a21dc356bb6c5d7ee2
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 14:45:39 2016 +0200

    renaming

commit bedbe0f5105ba682552ad8192a6753ed68fe899d
Merge: c1321a3 1fcc5b1
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 13:57:59 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c1321a37e06fbf56e66456fb8341cce46bd2ae37
Merge: 13c14b9 884b6d5
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 13:53:51 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 13c14b96ac95331171013ca2283cb5c6923d7489
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 10:29:27 2016 +0200

    renamed

commit 60b8189cf9b045493fb863bc5988e55f865a6280
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:42:03 2016 +0200

    use algorithm::transform

commit 9019c3247db8b75340721d949754a90da648d511
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:41:37 2016 +0200

    get rid of free()

commit 2c6ab07b469d86297131d420c1a14a95771017b8
Merge: c49664d 331c4e3
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:30:21 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit c49664d95b308c4b59b9ff07fe1f1d68f9742778
Merge: b42aaeb 01e445a
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 09:22:56 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit b42aaeb3dfda6fce26eab0de47b617601a7cbfb6
Merge: 964fa6a 64da7d0
Author: jsteemann <jan@arangodb.com>
Date:   Fri Sep 9 08:56:54 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 964fa6a2d656fed8bc89e4da445892df9d20046f
Merge: 24fd06e d7b4ad5
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 17:30:09 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 24fd06e5263d2b82e32f128270fc16af06839095
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 17:29:40 2016 +0200

    added initial cache

commit 6f092c2d8828b86627fbd80e67be8a5985bda88b
Merge: 2733228 df4dabc
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 15:48:33 2016 +0200

    Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache

commit 2733228be753bc5425adca5963b865f7d5168a46
Author: jsteemann <jan@arangodb.com>
Date:   Thu Sep 8 14:37:32 2016 +0200

    cleanup
2016-10-24 10:18:30 +02:00
Max Neunhoeffer 5e743a2a69 Allow to specify good keys in smart vertex collections. 2016-10-21 15:42:25 +02:00
Max Neunhoeffer 75ecf79277 Large scale inquisition of agency. 2016-10-21 10:34:46 +00:00
Michael Hackstein dbeaeda1fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-20 18:13:19 +02:00
Michael Hackstein 319481dea7 Fixed babies and errors in AQL Modification cluster blocks. 2016-10-20 18:13:11 +02:00
Alan Plum 245819ea9c
Add Foxx HTTP API 2016-10-20 15:09:36 +02:00
Alan Plum c76af3012b
Replace service doc on update 2016-10-20 15:05:23 +02:00
Alan Plum c7940bdb42
More readable names 2016-10-20 15:04:45 +02:00
Andreas Streichardt ad2327022e Merge remote-tracking branch 'origin/devel' into authentication 2016-10-17 13:51:26 +02:00
Andreas Streichardt 1318fa313b Implement cluster authentication 2016-10-17 13:35:55 +02:00
Michael Hackstein a5e51e5459 Further fixes in gharial for SmartGraph support. 2016-10-13 10:22:07 +01:00
Michael Hackstein 13dc4915f8 Added a new isEnterprise function in js internal module. Started to make gharial aware of SmartGraphs 2016-10-12 13:25:56 +02:00
Andreas Streichardt e75b8f5503 Implement cURL based inter server communication 2016-10-10 14:56:04 +02:00
Max Neunhoeffer f578ee394f Fixes in AQL write code to smart collections. 2016-10-09 11:09:00 +02:00
Michael Hackstein 6c64e61982 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-08 01:29:48 +02:00
Michael Hackstein ced62cdaf6 Some improvements in general-graph. Added a new Enterprise error 2016-10-08 01:28:53 +02:00
Max Neunhoeffer f316a9bc4c More changes for AQL writing to smart edge collections. 2016-10-08 00:48:23 +02:00
jsteemann b57913faaf next attempt to fix printing 2016-10-07 17:26:42 +02:00
jsteemann 8a62119ca3 function printing... 2016-10-07 17:14:26 +02:00
jsteemann d155b0ef77 attempt to fix ES6 class methods printing 2016-10-07 17:05:15 +02:00
jsteemann 18032835f2 print ES6 class attributes properly 2016-10-07 16:52:42 +02:00
jsteemann 2dc8deadc5 fix priting of arrow functions 2016-10-07 16:17:49 +02:00
Michael Hackstein acae6e9486 Modified the internal constructor of general graph to use a single json object instead of several input parameters. 2016-10-07 13:19:06 +02:00
Michael Hackstein 68988a47e6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-10-07 12:59:24 +02:00
Michael Hackstein 807e9cca3c Modernized general-graph module. It now uses ES6 class syntax. 2016-10-07 12:46:45 +02:00
Jan Steemann 7123aca19c issue #2091: decrease connect timeout to 5 seconds on startup 2016-10-07 09:18:51 +02:00
Frank Celler 20d27ef67c fixed upgrade from 3.0 to 3.1 2016-10-06 10:12:23 +00:00
Michael Hackstein cec7d79fc2 Added a new error code if a collection is not smart (EE only) 2016-10-05 13:00:43 +02:00
Max Neunhoeffer a5d582e04b Improve pseudo RNG. 2016-09-29 16:39:14 +02:00
Wilfried Goesgens dcbafac851 lintify 2016-09-29 11:38:35 +02:00
Michael Hackstein 939159fc9f Updated the general-graph module to ignore SmartGraphs which are enterprise only. 2016-09-29 08:46:37 +02:00
Max Neunhoeffer 9e2dc6eb36 New depth first search simulators. 2016-09-27 15:56:13 +02:00
Max Neunhoeffer da725af78b Some fixes to helpers for graphs. 2016-09-27 13:25:40 +02:00
Max Neunhoeffer 2913547320 Simulation support for BFS. 2016-09-27 10:59:39 +02:00
Max Neunhoeffer 40083d6019 Add a helpers file for graphs. 2016-09-27 00:12:17 +02:00
jsteemann 0b7d73bf3b add setUpAll, tearDownAll 2016-09-23 12:08:39 +02:00
jsteemann fad7efe8c3 more diagnostics 2016-09-16 09:35:08 +02:00
Michael Hackstein 8dd3105762 Added a smartSearch route for Traversal Engines. In Community edition this will throw ONLY_ENTERPRISE. It should never be called by our code however. 2016-09-12 13:42:08 +02:00
Michael Hackstein 4f50911c88 Fixed a bug in Traversal Explainer. Also fixed undefined behaviour when directly checking for an attribute omitting == true in early traversal filter. 2016-09-06 18:46:40 +02:00
jsteemann 5c9d015a28 fixed some explainer errors 2016-09-06 13:27:04 +02:00
jsteemann 6ad39e26d6 jslint 2016-09-06 11:12:22 +02:00
Michael Hackstein e22014a272 Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types 2016-09-06 09:33:23 +02:00
jsteemann 5e9cb5c852 removed unused error codes 2016-09-02 15:36:59 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +02:00
jsteemann 6c2bb5513e Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 16:06:22 +02:00
Frank Celler 04a82b919f added --cluster.system-replication-factor 2016-09-01 15:59:02 +02:00
jsteemann 3ac79c8132 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 15:08:42 +02:00
Wilfried Goesgens 549e7b46d7 mention that the edge is invalid, because of it doesn't obey the edge definitions. 2016-09-01 14:39:38 +02:00
jsteemann 2eaf7196e2 fixed some tests 2016-09-01 09:41:11 +02:00
jsteemann 1dab450622 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:35:10 +02:00
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
jsteemann 04f5fbbdb2 fixed issue #2018 2016-08-24 17:33:49 +02:00
jsteemann 5f06a5c025 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-23 12:13:08 +02:00
Michael Hackstein a788796280 Fixes #1995. The edgeCollectionRestriction was not properly forwarded in commonNeighbors case for new graph features. 2016-08-19 15:40:15 +02:00
Michael Hackstein 96f11c7e9f Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-19 12:26:07 +02:00
Michael Hackstein 1c1a61377b Removed create / drop system collection from Cluster test. This is forbidden now 2016-08-19 10:25:59 +02:00
Simran Brucherseifer 4b3a8baa44 FOXX -> Foxx 2016-08-18 13:30:18 +02:00
Michael Hackstein d3ba488271 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-18 12:38:07 +02:00
Andreas Streichardt 3f412debf0 Revert futile attempts to implement client resilience tests 2016-08-17 18:12:40 +02:00
Andreas Streichardt 6aad24ab49 Self managing (instances) tests 2016-08-17 17:25:39 +02:00
Michael Hackstein cd9a2e14b6 Fixed all single-server tests. Cluster state is not yet fixed. Still needs some internal cleanup 2016-08-17 14:43:57 +02:00
Wilfried Goesgens 92e1580ace Revert "Disable testcases for now, it triggers the crash on windows."
This reverts commit 5ef3742375.
2016-08-17 09:32:30 +02:00
Michael Hackstein 9c9b3a9390 Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-11 11:22:21 +02:00
Wilfried Goesgens 5ef3742375 Disable testcases for now, it triggers the crash on windows. 2016-08-09 09:25:30 +02:00
Michael Hackstein b66d9ea445 General Graph functions with edgeRestrictions now properly inject WITH <vertexCollections>. 2016-08-08 16:29:02 +02:00
Alan Plum e04d9d6571
Setter must return true on success 2016-08-05 17:54:37 +02:00
Jan Steemann e69e49f145 fix Buffer array access 2016-08-05 14:50:06 +02:00
Edi 2a758b0600 Error when job retried: Cannot convert object to primitive value 2016-08-03 12:46:40 +07:00
Jan Steemann 2aa1ae7db2 added read/write context info 2016-07-22 10:00:46 +02:00
jsteemann f3dfdb57d1 fixed issue #1954 2016-07-21 17:39:27 +02:00
Jan Steemann 23dc618311 fix a glitch in explainer output 2016-07-21 12:08:50 +02:00
Jan Steemann dc51d9dea5 issue #1944: nicer error logging in console.log() 2016-07-18 10:55:52 +02:00
jsteemann 85f02ddc27 eshint 2016-07-18 10:24:16 +02:00
jsteemann 83a9763cc9 added test for V8 segfault 2016-07-18 10:17:48 +02:00
Max Neunhoeffer a78fd42b67 Merge branch 'HLC' into devel 2016-07-13 12:52:33 +02:00
Max Neunhoeffer 49dd799ca9 Fix _countCommonProperties. 2016-07-11 15:08:52 +02:00
Max Neunhoeffer 1b1edb0bcc Ignore _rev in _commonNeighbours for general graphs. 2016-07-11 14:47:37 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Jan Steemann 9c98cb6cf3 added test for skipLines 2016-07-04 12:15:13 +02:00
Frank Celler 325ede0676 lowered timeout 2016-07-02 15:47:45 +02:00
Andreas Streichardt 6ee1f6d14a Reformat code 2016-06-30 16:57:17 +02:00
Andreas Streichardt 8a286a30d9 We are now using semistandard and eslint 2016-06-29 18:27:02 +02:00
Michael Hackstein c3084dfd0a Fixes #1831. Thank you very much for spotting this. The alias of insert was not propagated properly through the general-graph module. 2016-06-28 09:50:20 +02:00
Wilfried Goesgens 30b7244196 Give a little bit more time to wait for collections being dropped, when doing coverage. 2016-06-27 10:36:24 +02:00
Max Neunhoeffer 1cf3e23575 Automatically generated error files for JS. 2016-06-17 11:56:44 -07:00
Alan Plum 8a640eb1b5
ERROR_APPLICATION_* -> ERROR_SERVICE_* 2016-06-17 20:02:25 +02:00
Alan Plum 5721effec7
Add missing license comment
[skip ci]
2016-06-16 19:53:01 +02:00
Alan Plum b289f666db
More detailed error messages in Foxx API 2016-06-16 19:52:27 +02:00
Mark 0e00597e4b fixed compatibility graph functions, added tests 2016-06-16 15:39:05 +02:00
Mark 925f96d5c2 Graph: fixed weight/weightAttribute name 2016-06-16 09:21:25 +02:00
Max Neunhoeffer d0fe9f6d81 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-15 21:29:20 -07:00
Max Neunhoeffer fb19602436 Finally give system collections replication factor 2. 2016-06-15 21:28:36 -07:00
jsteemann 5af79e0daf jslint 2016-06-16 00:07:34 +02:00
Jan Steemann 1726c53805 fixed some import edge cases 2016-06-15 18:16:49 +02:00
Alan Plum b13c44be3a
Oops 2016-06-15 17:14:13 +02:00
Alan Plum 4b65779cc4
Add req.trustProxy, req.arangoUser, req.arangoVersion 2016-06-15 17:11:57 +02:00
Max Neunhoeffer 8239ed9ea4 Slight improvement of toArgv. 2016-06-15 16:26:13 +02:00
Mark e7516f159c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-15 16:19:05 +02:00
Mark 37e99291c0 fixed compatibility functions 2016-06-15 16:18:46 +02:00
Alan Plum e6e0f5d655
_.functions -> _.functionsIn 2016-06-15 15:09:43 +02:00
Alan Plum 2bb8957caf
Update all dependencies to latest 2016-06-15 13:47:01 +02:00
jsteemann 83466c2342 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-14 16:14:21 +02:00
jsteemann 34877186dd make user-defined AQL functions throw again 2016-06-14 16:14:02 +02:00
Max Neunhoeffer 527b9159dd Minor corrections. 2016-06-14 15:58:53 +02:00
Max Neunhoeffer 5a4750a89e New error TRI_ERROR_SHUTTING_DOWN. 2016-06-10 11:59:46 +02:00
Frank Celler fdf375a01e isStopping 2016-06-10 11:12:01 +02:00
jsteemann 3a247716e6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-08 16:55:51 +02:00
jsteemann abcc5c01e9 some fixes 2016-06-08 16:55:45 +02:00
Michael Hackstein 84695c2ef1 Fixed JSLint 2016-06-08 16:33:02 +02:00
Michael Hackstein 9c9ab164ae Fixed a bug in graph _paths if it was called without any direction. It generated an illegal query. 2016-06-08 16:06:51 +02:00
Michael Hackstein b7be6cce4a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-07 20:10:41 +02:00
Michael Hackstein d055ae176d Fixed explainer for shortest path. 2016-06-07 17:41:51 +02:00
Frank Celler f9298c2b43 3.0 2016-06-07 17:39:32 +02:00
jsteemann 6e3c05817e jslint 2016-06-07 17:33:13 +02:00
Michael Hackstein 6033a0f40b Removed obsolete unused code 2016-06-07 17:10:35 +02:00
Michael Hackstein 80e2531741 Removed OBSOLETE AQLGenerator. Use AQB instead 2016-06-07 16:59:57 +02:00
Michael Hackstein aa380c7d31 Added compatibility mode functions in general-graph. These allow to automatically bind user-defined functions that can be used to seemlessly replace 2.8 GRAPH_ functions. Just execute this bind once and replace all calls by arangodb::GRAPH_ in AQL. 2016-06-07 16:47:23 +02:00
Michael Hackstein 832d2a94f3 Squashed commit of the following:
commit 6b5b1fc821f304ce0445220bbf781060bd2995af
Merge: c987b9f 1754e78
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 12:55:24 2016 +0200

    Merge branch 'AQL_GRAPHICATION' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit c987b9f71f75a95a45a32d5cb15ed5570b2ff938
Merge: c4437e2 274cfeb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 12:55:07 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 1754e78736bf3f93c32b0c7c4a5d5569f3c834d9
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 12:01:24 2016 +0200

    fixed leaks

commit 6f8be7707623c10b1365d12db61011f73ca3e36a
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 11:53:58 2016 +0200

    don't emit "expected" errors

commit c4437e29c72a54f46942c616447ddee377cce478
Merge: e567d81 f4e2ead
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 11:40:53 2016 +0200

    Merge branch 'AQL_GRAPHICATION' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit e567d810b2ff624fc4acc8c12948cd89b4592b8d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 11:40:44 2016 +0200

    Removed now unused SHORTEST_PATH code. Use the AQL Node instead.

commit f4e2eadbf03fecf7d0f0aa699caaf1198ca79443
Merge: 3d24da5 52f20f8
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 11:30:40 2016 +0200

    Merge branch 'AQL_GRAPHICATION' of https://github.com/arangodb/arangodb into AQL_GRAPHICATION

commit 3d24da5b0060025ae7c133600bfae40b11c6ed70
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 11:30:25 2016 +0200

    simplify initialize()

commit 52f20f842dd966b046e428eb08429f036240e112
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 11:04:08 2016 +0200

    Removed an unused ClusterComm->drop

commit c4bc6fa53340ab9de39bb0ef2d573ca77197c580
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 11:00:36 2016 +0200

    do not show "expected" errors on shutdown

commit 50c170737311ae031addec8fb251cd5c1a2fbf5b
Merge: 7da771b 0141cdd
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 11:00:34 2016 +0200

    Merge branch 'AQL_GRAPHICATION' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 7da771bb2bc3daa6c332507e021d37f536d17080
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 10:59:55 2016 +0200

    Fixed VertexUniqueness::PATH in cluster Traverser. And Fixed global edge Uniqueness in cluster.

commit 0141cdd1ca929f14ac5d66a2fcf6da5faf7b0e7f
Author: jsteemann <jan@arangodb.com>
Date:   Tue Jun 7 10:30:16 2016 +0200

    pass by const reference, not by copying

commit 8b96da25cdbee4a8a6508470500ae19a8ddbc129
Merge: 7b79575 d87aa2b
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 09:07:30 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 7b79575a28871307f25284e1b9141a684ecc5b23
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue Jun 7 09:04:45 2016 +0200

    Attempt to improve getFilteredEdges in cluster.

commit 963e93e4f00afedeaa5fc960d629a6ea7e62f0ed
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 17:05:23 2016 +0200

    Fixed cloning of ShortestPathNode. Also fixed explainer to display Shortest Path Node.

commit 884df03a15ca936367bc79fdf339f633ae6d88a5
Merge: 3a28e21 2477077
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 16:10:10 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 3a28e210cc6e6097febd7fb0629723ee38dced48
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 16:09:56 2016 +0200

    Now allow to stringify the name of SHORTEST_PATH_NODE.

commit f3898a0a4bb37af46de50a740f43f4e00076c9fb
Merge: a284d2f 7574e60
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 16:03:11 2016 +0200

    Merge branch 'AQL_GRAPHICATION' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 7574e6005a3b377f23180d1a4ff1d07262576144
Author: jsteemann <jan@arangodb.com>
Date:   Mon Jun 6 16:01:35 2016 +0200

    attempt to init remote blocks in AQL queries

commit a284d2f4803371e2f43af28b36ca77c9d7722f8a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 15:37:38 2016 +0200

    Added ShortestPathNode as TypeName

commit 6a283fad9469622d1b6f5a955b17a98861ff839c
Merge: cfaf2c0 d54030e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 13:38:57 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit cfaf2c06885aa65b5289e2b8c3866bcf791989f8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 11:33:37 2016 +0200

    Fixed Path Uniqueness of vertices in local case

commit 372298c78732dcdf936e3796287d2f7d3c10e3a8
Merge: d55fe00 442c7d0
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 11:32:29 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit d55fe0074f78d0cd567ca1c8d8873f06aba3855f
Merge: 3179c30 9e3c9e3
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 10:50:26 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 3179c30b068ac384fa8d7723dac95d2ba5731949
Merge: 20bca1c 9fa9d49
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 10:50:09 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 20bca1c25956789f695765aab498112776296e71
Merge: 4f148ba e843719
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon Jun 6 09:32:41 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 4f148baafef979a61d8d195b6bed7cdea058ff2e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Jun 3 16:33:23 2016 +0200

    Fixed vertex uniqueness in Cluster case. Still fails in single though

commit 533be3b15c4d2899c1c287cc6f5224260210c7d2
Merge: fc3d65e a3032db
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Jun 3 13:58:50 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit fc3d65ebf529344e8870898efb1ec965a88ee106
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri Jun 3 13:33:47 2016 +0200

    Replaced callback function in PathEnumerator to get Vertices by a real struct, due to issue with virtual function.

commit cac533bbaf195eb1bad5e9428402e3aeb895551f
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Jun 2 18:06:38 2016 +0200

    Fixed Namespace issue. was okay for clang but not for g++

commit 4f046ad5d43a5654c8e9e35dc178d325588a8f4e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Jun 2 17:56:28 2016 +0200

    Fixed memmory issues for ShortestPath in cluster. Seems to be working now. Let full test run start.

commit f8ace613fefaefd5236e0fae47a98c13baff5b77
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Jun 2 15:20:46 2016 +0200

    First Implementation of ShortestPath in cluster. Seems to be working with default weight but not with attribute-based weight.

commit 49ddf78902f2c814c6dddccc1d4fef7318eeb098
Merge: 31b81f3 b469cea
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu Jun 2 09:17:53 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 31b81f39530138204bd2f2f9bae33f81a7948cd5
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 17:50:54 2016 +0200

    Unified the shortest Path finders. The shortest path block now directly creates a finder and reuses it throughout the AQL. It does not go via V8Traverser any more. Next Step: Expander Functions for cluster ShortestPath.

commit db402142e4f664f9997853c9f77b60a5d30fa7c6
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 14:40:58 2016 +0200

    Removed _api/graph test. The _api/graph does not exist any more

commit a481570346935be11553047f40957e1cf719a9de
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 14:40:06 2016 +0200

    Fixed inconsistency in RocksDB functions.

commit 2dc6811f9b7632ab12f7a534e7bb8673cfaed526
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 14:39:37 2016 +0200

    Fixed all tests after removing blueprints module

commit e2d68832e6744b6c11d8b5ecd24f50892aafd0f0
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 11:43:38 2016 +0200

    Removed all libraries for the deprecated graph-blueprints module. They can all be replaced by general graphs now. The have been deprecated since 2.4

commit 51330ea34c117e2ed19dc3dd249f460dbb75b281
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 10:38:15 2016 +0200

    Fixed DISTANCE_TO and SHORTEST_PATH in general-graph module. It was not moved to AQL only yet.

commit c876fe736306f0bac1655e37ed6acf75976ac1ec
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 09:22:19 2016 +0200

    Removed now obsolete graph AQL JS code.

commit 18891b346dcd519486c0540bc68b05b2359caf43
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed Jun 1 09:20:54 2016 +0200

    Replaced GRAPH_ECCENTRICITY by a call in the general graph module and relaced all it's tests.

commit 06371d4d2fbd8e77e0caed82d595f250835a909b
Merge: d17c3c7 8dde0e8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 31 18:44:03 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit d17c3c7d927abba24beffde6da2990e095d4b1c3
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 31 18:29:01 2016 +0200

    Removed BETWEENNESS and ABSOLUTE_BETWEENNESS from AQL and moved it to the general-graph module.

commit efa566ba99394eb2367fe7734fe09868302b5c14
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 14:11:22 2016 +0200

    Removed GRAPH_CLOSENESS from AQL and Tests. Reimplemented it in general-graph module instead

commit 0eff3d38947627414972603d95e36ed6beb7a8de
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 12:28:57 2016 +0200

    Entirely removed GRAPH_ABSOLUTE_CLOSENESS from AQL. general_graph still offers _absoluteCloseness(). Now general_graph also offers _farness() which is identical and the correct academic name for the result of this function. Also tests are adopted.

commit b3e7678343c380cceb5ae71bca3071ce855baf9e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 11:10:50 2016 +0200

    Removed ABSOLUTE_ECCENTRICITY function from AQL Executor and deleted the JS code for it

commit 904527ce53475485ff1a89f51991a6781573d97a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 10:57:13 2016 +0200

    Reimplemented ABSOLUTE_ECCENTRICITY as AQL only variant.

commit 42a5230b6fabf14ced7a51636a7342a52504a32d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 27 10:56:37 2016 +0200

    Reactivated bi-directional search in ShortestPath. Was deactivated by accident and algorithm is only correct if activated.

commit 9d61dfd18e1cdb900c39f9bc6d2bb7466a86c7d7
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 25 16:25:35 2016 +0200

    Entirely removed GRAPH_RADIUS from AQL. Moved tests to general-graph module _radius() function. Same for _diameter.

commit 4a8e51483e292b501d1d2ad9983513bc99312bef
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 25 14:52:53 2016 +0200

    Replaced call of _diameter with a new AQL query not using the deleted GRAPH_DIAMETER function

commit 15fc45e438515980ea39d711fcfca5edd78a5bea
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 25 13:05:39 2016 +0200

    Entirely removed GRAPH_DISTANCE_TO from AQL

commit bdaa20cff54170abdcd2f9ec4d246765151d71e5
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 25 12:55:20 2016 +0200

    Implemented all functions in the ShortestPathNode it is now clone-able and serves estimates. Also added Flags for ShortestPath and Traversal in the JSON representation.

commit ae6c922f56c4498aaaba7f76ffb37a0560ca1476
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 17:09:15 2016 +0200

    Removed debug output in test

commit dce2ea1e2f1c5244c26bb9fa3b783454aa4e8163
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 17:07:12 2016 +0200

    Removed GRAPH_DISTANCE_TO from test. It was identical to SHORTEST_PATH anyways...

commit c4b48bc9457fd7112feb96f9e619568ad79d29ec
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 17:00:12 2016 +0200

    Removed GRAPH_SHORTEST_PATH from stresstest and brute test

commit 87a0b725d1cef05473eff0a2b48c3ac52a549192
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 16:57:52 2016 +0200

    Removed SHORTEST_PATH and GRAPH_SHORTEST_PATH from Tests. Replaced them by there new IN DIRECTION SHORTEST_PATH equivalent.

commit 72c3cbf69dcf6aa4f167d77b29271e217ce0e2bc
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 16:55:50 2016 +0200

    Removed SHORTEST_PATH and GRAPH_SHORTEST_PATH from AQL Executor.

commit 6499ca12802f45f69e30e09fbbcebdcbca88deaa
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 14:17:35 2016 +0200

    Shortest Path now honors a distance attribute. Basic AQL graph tests are green yay ;). Now former general-graph tests are next.

commit 316280400585d9af5e09f4365c39fe80423d9eef
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 09:48:21 2016 +0200

    Fixed variable usage in Shortest Path. However now it does not terminate

commit 84359e3223cbf01b283b9bda2f6de8b367df236e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 09:17:46 2016 +0200

    Shortest Path now correctly rejects invalid start nodes

commit c8a831e0d6b95445ea3cd276d0c0c0ad2ceb4901
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 24 09:13:06 2016 +0200

    Fixed a bug with autocasting to bool where it was not expected

commit 0300e1b4aa120fc04db7da620a905ed86bedd068
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 18:08:29 2016 +0200

    First shortest-path runs are successful. First tests are getting green again. Make Tests Green Again

commit d593f3317e8578e307c2246e65d3452d78cf043e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 15:58:22 2016 +0200

    Added reading of start and target vertex in ShortestPath Block.

commit 46ce5b7a3cf6abb4a01d8e004b34ad2118573430
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 15:23:25 2016 +0200

    Fixed Constructor variable ordering

commit 23d666d929bdf84c302fe4729faeab2ab77886b8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 15:20:44 2016 +0200

    Added the required parameters and implementation to return the result in ShortestPathBlock. Tests still RED
    . Next actually compute the path

commit 015da1ccdf50ca1123d600ac4b1afb460ad2b2dc
Author: Michael Hackstein <michael@arangodb.com>
Date:   Mon May 23 13:32:42 2016 +0200

    Prepared the ShortestPathFinder to get injected the result container instead of creating it's own one. Deactivated parts of the OLD api, shall be deleted soon.

commit bd72afa565ecaea38a4979180d4aadc0edbf52d7
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 20 15:40:56 2016 +0200

    Added infrastructure for new Shortest Path Node in AQL. It is not Functional yet and will throw errors. Tests are RED

commit 15b76dc27c118f60ee58cf2154ba84ee1311f8e7
Merge: 625e305 893802e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 20 15:38:51 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 625e305ca163fcbe928e5353bd06f4232664a0ee
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 16:23:14 2016 +0200

    Activated the AQL syntax for new non function SHORTEST_PATH in AQL. Also adapted One test file for new Syntax. However the feature is NOT implement at this point. Some Tests are RED

commit a935e9d9f962a2bcb6fdeed5facec2486ab4dc06
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 12:49:18 2016 +0200

    Removed _paths test. It does not exist any more

commit 1c182858a4d9427b0be9ec5749b587e40f804386
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 12:47:06 2016 +0200

    Fixed AQL_GRAPH tests

commit 5cd4e79ab77123db322defc5dd2f9417bc99e80e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 11:42:47 2016 +0200

    Fixed all tests in aql-general-graph

commit a8ddd72ffa2ee29d085ea4c5002190149200a3b8
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 11:39:24 2016 +0200

    Removed GRAPH_COMMON_PROPERTIES from tests and AQL.

commit 4c0be7fdd3d610a2196aec3e93338bf3851f3606
Merge: 98e270e 7ca4d39
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 11:17:59 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 98e270e47a1f85df47c54e4461457bdb10331696
Merge: ff177cc 1f9f46b
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 19 09:35:15 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit ff177ccf47cda7778212621df7b512c8a6a859ee
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 18:04:36 2016 +0200

    Removed PATHS() from AQL and tests. It can be replaced by Path Pattern Matching.

commit e568d5966e516c1bc6be9da79b01fd740bf2c4ff
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 17:38:49 2016 +0200

    Removed GRAPH_PATHS from Tests and from AQL. It is easily replaceable by Pattern Matching.

commit 107b2890397b4076042dc9b08ea2a7c1ab7f0284
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 16:59:36 2016 +0200

    Removed GRAPH_COMMON_NEIGHBORS from aql.js

commit dd7f6b4b68099c9c861b05dd2506cbd0f8b9c22d
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 16:54:39 2016 +0200

    Fixed some COMMON_NEIGHBORS transformation. Uniqueness is not guarenteed accross start vertices. It was with GRAPH_COMMON_NEIGHBORS.

commit 863a2e3b4728add2bad088c021d3bcf54ec6f569
Merge: 9a940aa 0064e25
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 15:19:40 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 9a940aa8d8d9c74d26b819d54d743c369dcfa350
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 11:07:12 2016 +0200

    Added a new uniqness version for vertices. Not complete yet

commit 8c3db5519ff85b13a24c326c5982102226272635
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 18 09:13:03 2016 +0200

    Replaced GRAPH_COMMON_NEIGHBORS with their new equivalent in AQL in the tests.

commit 7c9782900d798019965c4ab685c24d624dd53238
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 16:35:32 2016 +0200

    AQL does not export GRAPH_NEIGHBORS any more

commit e23c3f2b9993d62290da7966419b58e9d391efe2
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 16:35:06 2016 +0200

    Replaced vertexUniqueness with uniqueVertices and edgeUniqueness with uniqueEdges as proposed in the preliminary documentation document.

commit b589f6c1113f5e02016eac0a49c0b5ea9f42620e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 15:28:53 2016 +0200

    Removed GRAPH_NEIGHBORS from Tests and replaced them by their corresponding AQL equivalent. Only two of them are red because uniqueness is not correct yet.

commit 0bc36996429493e9ceadcb3ea82a126f2cfa66fa
Merge: 9d0473a 39083cb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 12:48:25 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 9d0473aeada534cd47e99dab3ceae4f91ed4ebbb
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 12:48:13 2016 +0200

    Implemented base version of vertex Uniqueness in AQL traversal. Single Server only.

commit 980fd6aaa09666dbe55e3811fb6430d49bfd5a1a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 11:02:24 2016 +0200

    Edge Uniqueness levels also implemented in Cluster Case. Not yet tested due to errors in the agancy right now.

commit 73e3bf1da26afbdf0dffe815629003364e2469c4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 10:57:51 2016 +0200

    Implemented all levels of edgeUniqueness in local Traversal case.

commit 2aba559e8db4ab7ac4d297590723277bd9a305cd
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 10:42:54 2016 +0200

    Now the options test actually checks for correctness of result.

commit 2b36bf92f3cf8ff6d0bc80079fddfebf36c1df92
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 10:38:01 2016 +0200

    Started Adding tests for OPTIONS in AQL Traversal

commit 86874ae290da2ba39e5cd42ec5ddaab0487091b2
Merge: f182f24 f6b7bd2
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 17 10:37:30 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit f182f244fdc38c6648fc5527a518ab41e73c6865
Author: Michael Hackstein <michael@arangodb.com>
Date:   Fri May 13 09:45:14 2016 +0200

    Typo fix

commit 15b63ef8a2c9b02af5917634319a5a461905402a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 17:29:06 2016 +0200

    AQL Traverser now reacts to option: edgeUniqueness (NONE or PATH). Test yet missing.

commit 1ebd4abd45e085679eb3ef24b6cff6d6debe4f0a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 15:34:03 2016 +0200

    Added infrastructure to insert OPTIONS into AQL Traversals. Right now they are only parsed not used.

commit 5440118412b43024beb451e47cc59e33591dbf84
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 13:29:51 2016 +0200

    Removed NEIGHBORS() from tests and replaced them by new syntax. Tests are RED.

commit 9fc6ec448d970b27cda16abc7f51217d8e2ba3de
Merge: 8084e28 07aa8b4
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 11:31:43 2016 +0200

    Merge branch 'devel' of github.com:arangodb/arangodb into AQL_GRAPHICATION

commit 8084e2804d4e4c537c9c7719303362b08e2fe0bc
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 11:30:09 2016 +0200

    Started Moving NEIGHBORS => AQL PPM. Test is RED.

commit afda95eb59b97f43b2b3ad891bb404d69ca5414e
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 10:55:42 2016 +0200

    Removed GRAPH_EDGES from AQL.

commit 3766babe444781555f5373287aa98f45b7a32406
Author: Michael Hackstein <michael@arangodb.com>
Date:   Thu May 12 10:53:20 2016 +0200

    Removed the old Graph Datasource from Traversals. Only the newer generalGraph is available.

commit 6ace9c992d3d06c5cb9c9e24c117e821412f63f1
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 16:31:42 2016 +0200

    Removed _getConnectingEdges from Test. Is not supported any more.

commit fbd28aae6f11782e34fcfb51887c89c878705f0a
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 14:55:03 2016 +0200

    Removed GRAPH_EDGES from AQL tests

commit e032683ccf79f185808bfadc154b587af39b5818
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 12:42:06 2016 +0200

    Removed EDGES function from AQL.

commit 42b2c31d1eddb6b2790d21d6aedfeb6c3892919f
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 11:10:08 2016 +0200

    Replaced EDGES() in Tests by the new corresponding usage of Path Pattern Matching

commit 110d1b497f7df4b94709bfd2149c72dbf4f28e8c
Author: Michael Hackstein <michael@arangodb.com>
Date:   Wed May 11 11:08:09 2016 +0200

    Fixed minor bugs in Cluster Path Pattern Matching. It did not react properly on Invalid user input.

commit 8f47a3a01c0928825c13ceba5f60c3e1fe5e4691
Author: Michael Hackstein <michael@arangodb.com>
Date:   Tue May 10 17:13:33 2016 +0200

    Removed unused AST reference in Index Lookups for Ast Conditions
2016-06-07 13:58:21 +02:00
jsteemann eca908359a make some system collections smaller 2016-06-06 17:16:55 +02:00
Frank Celler ab5234ec9f fixed test 2016-06-03 15:28:35 +02:00
Jan Steemann 38dbbfdf9d changed division by zero result 2016-06-03 11:50:45 +02:00
Frank Celler 8c9055f3fd Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-02 11:13:23 +02:00
jsteemann 222c57ed32 renamed "rocksdb" index to "persistent" index 2016-06-02 10:23:30 +02:00
Andreas Streichardt ba14069f93 Merge branch 'devel' into jwt 2016-06-01 12:10:12 +02:00
Andreas Streichardt 630d12713d Merge branch 'devel' into jwt 2016-06-01 10:19:53 +02:00
Andreas Streichardt 2a1c9b93f4 Fix eslint stuff 2016-06-01 09:50:32 +02:00
Kaveh Vahedipour 7b440f94dc Moving Job classes out of Supervision 2016-05-31 16:28:54 +02:00
Alan Plum d4a9b0e1f3
Indicate legacy state in app store 2016-05-31 14:46:00 +02:00
Alan Plum 5bdfcc5f88
Port 0ef698a and 1f17514 to 3.0 2016-05-31 14:45:59 +02:00
Jan Steemann 154eb49ad5 added test for deadlock detection 2016-05-31 10:19:45 +02:00
Max Neunhoeffer d6b9643a8e Temporarily use replicationFactor 1 for system collections.
This is to avoid bugs which are still in the synchronous replication.
2016-05-25 23:36:18 +02:00
Max Neunhoeffer a73c617da2 Revert "Temporarily go back to unresilient system collections."
This reverts commit bf2642c7bf.
2016-05-20 15:07:25 +02:00
Max Neunhoeffer bf2642c7bf Temporarily go back to unresilient system collections. 2016-05-20 14:24:20 +02:00
Max Neunhoeffer b24bbeeda9 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-20 12:53:54 +02:00
Max Neunhoeffer d90e31eb71 System collections now resilient. :-) 2016-05-20 12:53:39 +02:00
Jan Steemann a8e2e3021e added some tests 2016-05-20 12:15:19 +02:00
jsteemann 3b318805ec don't leak buffers 2016-05-19 18:15:08 +02:00
Max Neunhoeffer a73b348e77 Add TRI_SuspendExternalProcess and TRI_ContinueExternalProcess for Unix. 2016-05-19 14:06:57 +02:00
Andreas Streichardt aba66a50eb _listEndpoints => _endpoints() 2016-05-18 15:34:42 +02:00
Jan Steemann c6b883d41d fixed issue #1826 2016-05-18 11:40:58 +02:00
jsteemann 4f72db6451 speed up calls to user-defined functions 2016-05-13 23:08:39 +02:00
jsteemann 1faaa18f6e display "const" attribute 2016-05-13 18:51:20 +02:00
Andreas Streichardt 4d13e8fb1b _listDatabases() => _databases() 2016-05-11 15:30:47 +02:00
Alan Plum 6459b39159
Fix missing name/version in generated foxxes 2016-05-09 18:12:33 +02:00
jsteemann 4612869028 show execution location of execution nodes in ArangoShell 2016-05-09 15:58:14 +02:00
Michael Hackstein 8dd27b01f8 Added an Index and an AQL statement to the quickie test. 2016-05-09 09:39:23 +02:00
jsteemann e1f874ad4a jslint 2016-05-07 07:56:16 +02:00
Max Neunhoeffer b5c87fba33 Add a trivial quickie test and a convenience script. 2016-05-06 22:47:17 +02:00
Kaveh Vahedipour e623198d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 17:06:23 +02:00
jsteemann f2d014ff6a bugfixes 2016-05-04 16:10:04 +02:00
Alan Plum 7e2603bdcc Merge pull request #1811 from arangodb/kill-the-monkey
Remove monkeypatches
2016-05-04 11:42:24 +02:00
Kaveh Vahedipour 7ac2f7111a Merge branch 'json_agency_comm' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:48:48 +02:00
Andreas Streichardt f882db1436 Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 15:48:17 +02:00
Andreas Streichardt f5f040e21a Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 15:47:00 +02:00
Kaveh Vahedipour d2513d7579 wrong implementation of property collectionsetting through coordinator 2016-05-03 15:45:19 +02:00
Michael Hackstein be6b8908fa Fixed cluster crud tests. They did by accident not run into the untested state thus far. 2016-05-03 15:28:01 +02:00
Alan Plum 85950c9798
Remove monkeypatches.js 2016-05-03 14:55:32 +02:00
Alan Plum c1828234d6
Move shallowCopy and propertyKeys into @arangodb/util 2016-05-03 14:55:32 +02:00
Kaveh Vahedipour dab8accd5b Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 08:57:09 +02:00
Alan Plum 698dfae860
Print jshint exceptions to console 2016-05-03 00:51:49 +02:00
Alan Plum 53c7169d5b
Remove redundant test
The name and version fields are now optional.
2016-05-02 18:52:02 +02:00
Alan Plum 3bb355e3dc
Don't default to index.js 2016-05-02 18:47:37 +02:00
Alan Plum 8643f45c25
Add missing index.js files 2016-05-02 18:45:51 +02:00
Kaveh Vahedipour b791188f18 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 17:49:11 +02:00
Alan Plum 3fb6d517f7
Object#propertyKeys -> internal.propertyKeys 2016-05-02 17:34:08 +02:00
Alan Plum 571e07c613
Missed one 2016-05-02 17:23:51 +02:00
Alan Plum 4af0c67c5c
Unbreak shallowCopy 2016-05-02 17:19:01 +02:00
Kaveh Vahedipour 00ce93b8d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 16:14:37 +02:00
Kaveh Vahedipour 88ea3473b0 too much output in logs 2016-05-02 16:07:00 +02:00
Alan Plum 0c420c746c
Remove unused code 2016-05-02 15:53:58 +02:00
Alan Plum 53dc168a71
Linting 2016-05-02 14:42:10 +02:00
Alan Plum 2bd0f59d9d
Bump jshint to 2.9.2 2016-05-02 14:42:09 +02:00
Alan Plum f81c946fd7
app -> service 2016-05-02 14:42:08 +02:00
jsteemann 3bb0f5fbe1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 14:52:30 +02:00
Alan Plum c253026711
Support iterator API in query results 2016-04-29 13:30:55 +02:00
jsteemann 64ee910e38 move system attributes to the front of objects 2016-04-29 13:13:39 +02:00
jsteemann 285da023e5 ShapedJson removal 2016-04-27 00:45:15 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections
Excluded Aardvark, the graph viewer in particular
2016-04-20 22:09:00 +02:00
Alan Plum eea0a0e259
Deduplicate AQL template bindVars and support AQB 2016-04-20 16:18:19 +02:00
Alan Plum 2b0c1f6f9a
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 95b9f8db7e
Nevermind that 2016-04-20 13:45:17 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Alan Plum 8b7a98f2e8
global.aqlQuery -> arangodb.aql 2016-04-20 13:05:27 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Alan Plum 17854b57a8
Formatting 2016-04-19 18:16:18 +02:00
Jan Steemann c091031ec7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:12:06 +02:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Michael Hackstein 95662103f2 Fixed JSLint 2016-04-19 17:39:58 +02:00
Michael Hackstein 2c246c860c Fixed a bug in general-graph module. It was possible to create a graph using document collections for relations. This did lead into undefined behaviour. 2016-04-19 17:07:18 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Alan Plum ffcbd0a69e
Fix require tests 2016-04-19 09:29:24 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Alan Plum c39eca49e4
Add require.aliases 2016-04-18 18:01:06 +02:00
Alan Plum 6fc9b185eb
hasOwnProperty is now global 2016-04-18 18:00:41 +02:00
Alan Plum 27e4b43fa6
Fixup add ArangoCollection#isArangoCollection 2016-04-18 18:00:39 +02:00
Alan Plum 9cf8d347ad
More SyntheticResponse tests 2016-04-18 18:00:38 +02:00
Alan Plum 926f02ace5
Use mime-types 2016-04-18 18:00:35 +02:00
Alan Plum 22a8b5ec65
Add util.inline 2016-04-18 18:00:34 +02:00
Alan Plum ad717505fe
Add pluck to util 2016-04-18 18:00:29 +02:00
Alan Plum 95613be7c6
Mark ArangoDB result sets and errors
This makes it easier to recognize them (see joi.isJoi).
2016-04-18 18:00:29 +02:00
Alan Plum 314d19d20d
Extract router tree 2016-04-18 18:00:24 +02:00
Alan Plum 4b0fd593ce
Implement rudimentary route handling 2016-04-18 18:00:22 +02:00
Alan Plum 5161c63670
Remove magical Foxx comments 2016-04-18 18:00:18 +02:00
Alan Plum 4140c26d30
Use symbols for internal module props 2016-04-18 18:00:17 +02:00
Alan Plum c7688a72f8
module.requireCache -> module.require.cache 2016-04-18 18:00:17 +02:00
Alan Plum eacf570a39
applicationContext -> module.context 2016-04-18 18:00:17 +02:00
Alan Plum a385738601
Revert "fixed version"
This reverts commit 034eea10b3.
2016-04-18 18:00:17 +02:00
Jan Steemann 8430f1f71c added test case 2016-04-18 17:29:06 +02:00
Jan Steemann 1355618f67 added tests for indexes on "_key", "_from" and "_to" 2016-04-18 17:22:10 +02:00
Jan Steemann 0b07b77cf8 added index tests 2016-04-18 16:50:39 +02:00
Michael Hackstein 75015da169 Fixed JSLint 2016-04-18 13:43:09 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein cd12a07a4d Fixed return codes in cluster. They are now forwarded properly from DBServer to Client 2016-04-15 17:58:06 +02:00
jsteemann ecd7de16cb added optimizer rule "inline-subqueries" 2016-04-15 17:21:22 +02:00
Michael Hackstein a4f6844e27 Fixed babies test in error cases. 2016-04-15 15:53:21 +02:00
Michael Hackstein 20733a81ae Improved baby errors in cluster 2016-04-15 14:48:44 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
Michael Hackstein 1311f73775 Further fixes in cluster communication for baby case 2016-04-12 13:04:51 +02:00
Michael Hackstein 7991815376 Fixed property undefiend bug in test 2016-04-12 10:39:30 +02:00
Michael Hackstein eeb11919f9 Fixed expectation in cluster-crud test. We cannot guarantee that CHANGE_SHARDING_ATTRIBUTES is thrown, might be NOT_FOUND in some cases 2016-04-12 10:35:09 +02:00
Michael Hackstein 0bc206ff80 Further modification of document babies test 2016-04-12 08:51:16 +02:00
Michael Hackstein 474f70c9ad Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 16:33:08 +02:00
Michael Hackstein 5bc4bb51e6 Reactivated babies test in cluster 2016-04-11 16:32:25 +02:00
Michael Hackstein 0ec045d811 Removed debug output 2016-04-11 16:31:41 +02:00
Michael Hackstein 19139a7bf5 Modified document-babies tests. They are now green but correctness has to be discussed. 2016-04-11 16:29:04 +02:00
Wilfried Goesgens 81df4e6e85 migrate 1b41f5c0bb to devel. 2016-04-11 14:21:46 +02:00
Michael Hackstein 7313df2e5f Fixed babies-tests to fit the newest definition 2016-04-11 14:21:34 +02:00
Jan Steemann 947fb8d9ad make LIKE wildcards newline-aware 2016-04-11 14:02:12 +02:00
Michael Hackstein df497eb8b2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-10 14:09:25 +02:00
Michael Hackstein 68577f1a45 Fixed expectation of document-babies test. Not yet green 2016-04-10 14:09:18 +02:00
jsteemann e84a0ff0ad jslint argl 2016-04-09 01:02:59 +02:00
jsteemann f94f298862 deactivate babies tests temporarily 2016-04-08 23:50:02 +02:00
Jan Steemann 6df7221691 cleanup 2016-04-07 17:08:44 +02:00
Jan Steemann ce11474602 jslint 2016-04-07 16:40:21 +02:00
Frank Celler 58b9cf7e91 WIP 2016-04-07 15:40:11 +02:00
Jan Steemann 74794d16db Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:43:35 +02:00
Jan Steemann 83f18fa419 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 13:01:23 +02:00
Jan Steemann 513dc26fc1 make replication tests more deterministic 2016-04-07 13:00:30 +02:00
Michael Hackstein 015c5d2908 Fixed single-server babies test. Also made sure that the error header is capialized properly 2016-04-07 12:41:23 +02:00
Michael Hackstein 3e1b295d68 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-07 10:30:41 +02:00
Michael Hackstein 6847d3f4a7 Preperation to create documents on coordinator with baby awareness. 2016-04-07 10:27:01 +02:00
Jan Steemann 2a12f3d936 make tests a bit more robust? 2016-04-06 17:57:57 +02:00
Jan Steemann aae8ffa5e3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:46:47 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Michael Hackstein ff195124d2 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:51:30 +02:00
Michael Hackstein 074e949037 Fixed JSHINT 2016-04-06 09:51:19 +02:00
Jan Steemann f45b6eeb49 jslint 2016-04-06 09:50:39 +02:00
Michael Hackstein 98b4c43315 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 09:30:11 +02:00
Andreas Streichardt 3bdbded541 Fix linter errors 2016-04-05 18:45:39 +02:00
Jan Steemann 782b38e5fa Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-05 18:32:24 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +02:00
Michael Hackstein 1d43063189 Added check for error-code headers in new babies definition 2016-04-05 15:51:16 +02:00
Michael Hackstein 964535c315 Adapted document-babies-spec to newest version of babies API for insertion of documents. Test is now red 2016-04-05 14:54:58 +02:00
Andreas Streichardt 8859ee1de4 Fix line ending madness
treat csv files as binary so we can CONSISTENTLY import csv files
containing \r\n on any system
2016-04-05 11:21:24 +02:00
Michael Hackstein bdb0261d2e Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-05 10:32:06 +02:00
Michael Hackstein 64308f8ef5 General Graph now uses the new version to save edges with only one json object. instead of the (from, to, doc) used before 2016-04-05 10:31:50 +02:00
Max Neunhoeffer 765b6f6685 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-04-05 10:28:21 +02:00
Max Neunhoeffer b1963d2cee Fix replication in the sense that revs are now copied over. 2016-04-05 10:27:43 +02:00
Jan Steemann ebeb119f4d some test fixes 2016-04-04 18:20:18 +02:00
Kaveh Vahedipour 5caf02768c code beautification 2016-04-04 14:42:49 +02:00
Kaveh Vahedipour 1293c9301a agency's own endpoint is now derived from server.endpoint 2016-04-04 11:23:46 +00:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Michael Hackstein 17e7a32fa6 Made the geo index ensure test independent of Index ordering 2016-04-01 13:59:36 +02:00
Michael Hackstein a14120d239 Removed Test for new features. It cannot work in Cluster Case. Needs to be fixed later on. 2016-04-01 12:27:37 +02:00
Michael Hackstein 618c855c85 Cluster Methods now use the OperationOptions of transactions. And now reacts to these options accordingly incl returnNew/returnOld 2016-03-31 10:52:24 +02:00
Michael Hackstein 7c49288acb Disabled Document babies test in Cluster Mode. Should only be used cluster Internally 2016-03-30 17:40:03 +02:00
Michael Hackstein 237aea6b5b Removed tests for removed functions FIRST and LAST 2016-03-30 17:17:11 +02:00
Michael Hackstein 794f692865 Fixed crud test. exists with an old revision now throws Conflict. Former returned false. 2016-03-30 16:18:08 +02:00
Jan Steemann c7daf1531d Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:23:11 +01:00
Michael Hackstein ef834037df Fixed shell edges Test. The new version of edgeCollection.edge returns a unique array 2016-03-24 17:22:40 +01:00
Michael Hackstein 86513511df Fixed expected error code. was SHAPER_FAILED is now BAD_PARAMETER 2016-03-24 17:10:32 +01:00
Jan Steemann cda0646c83 removed unused error codes 2016-03-24 17:04:58 +01:00
Jan Steemann 688109bcc5 jslint 2016-03-24 15:55:13 +01:00
Jan Steemann eae423349f fixed test (well, cheating a bit) 2016-03-24 13:17:53 +01:00
Jan Steemann 007e0c6e5c fixed test 2016-03-24 13:14:59 +01:00
Jan Steemann f161a98ba4 test fixes 2016-03-24 12:46:08 +01:00
Jan Steemann ecbd17b992 fixed test 2016-03-23 19:13:03 +01:00
Jan Steemann f670a07046 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 19:01:19 +01:00
Jan Steemann 7975913fc5 fixed tests 2016-03-23 18:50:46 +01:00
Andreas Streichardt 8cdf8eebad More python fixes 2016-03-23 18:36:22 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
Jan Steemann 1a2fdb64ee removed unused test 2016-03-22 18:52:49 +01:00
Jan Steemann d763c102d6 fulltext fixes 2016-03-22 18:34:40 +01:00
Jan Steemann 2ab44cef03 fixed tests 2016-03-22 16:17:05 +01:00
Jan Steemann 7f95833505 fixed tests 2016-03-22 16:14:52 +01:00
Jan Steemann 04b436f0b5 fixed test 2016-03-22 15:18:34 +01:00
Jan Steemann d226175e91 test fixes 2016-03-22 15:15:43 +01:00
Jan Steemann 80413739d1 fixed test 2016-03-22 14:34:18 +01:00
Jan Steemann 45cc15fe45 fixes 2016-03-22 10:51:42 +01:00
Jan Steemann f0724447b6 fixed sparse index test 2016-03-21 17:08:42 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
jsteemann f12320277f bugfixes 2016-03-18 16:56:05 +01:00
Max Neunhoeffer af6f7bd0fa Fix jslint. 2016-03-18 11:12:34 +01:00
Max Neunhoeffer e9ad1ad954 Fix jslint. 2016-03-18 11:10:04 +01:00
Max Neunhoeffer bf77bd31e2 Fix jslint. 2016-03-18 11:08:52 +01:00
Max Neunhoeffer 20fb42afd5 Cleanup of tests. 2016-03-18 02:04:38 +01:00
jsteemann e0ce1cef5a make buffers somewhat usable 2016-03-17 22:47:22 +01:00
Max Neunhoeffer f44b8a6fa9 Add tests for babies DELETE HTTP /_api/document/<collection>. 2016-03-17 21:13:50 +01:00
Max Neunhoeffer 20d0e98462 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 18:50:33 +01:00
Max Neunhoeffer 827f2f4f44 Improve /_api/simple/remove-by-key.
Fix more document methods.
2016-03-17 18:49:52 +01:00
jsteemann a9cc127ffa Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 17:17:26 +01:00
Max Neunhoeffer 105fe3e406 Fix tests for documents. 2016-03-17 15:53:02 +01:00
jsteemann 6ce73b439c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 15:21:32 +01:00
Frank Celler 13603e876e safety check 2016-03-17 12:00:27 +01:00
Frank Celler 89cf60d217 added missing test 2016-03-16 23:36:48 +01:00
Frank Celler b39e20c6fc fixed endpoint 2016-03-16 23:29:56 +01:00
Frank Celler a92d280f81 added babies http test 2016-03-16 22:18:00 +01:00
Frank Celler f28f20883a cosmetics 2016-03-16 22:16:56 +01:00
Max Neunhoeffer 8b8019b28a Fix behaviour of remove. 2016-03-16 19:55:49 +01:00
Max Neunhoeffer c9b48ea24b Add babies tests for returnNew and returnOld. 2016-03-14 15:01:48 +01:00
Max Neunhoeffer 0bd5524a7f Fix new tests. 2016-03-14 14:06:56 +01:00
Max Neunhoeffer 5dd4426bf7 Add tests for returnNew and returnOld. 2016-03-14 14:05:21 +01:00
Max Neunhoeffer 8f6cd501aa Change behaviour of remove(), return data, allow returnOld. 2016-03-11 16:35:55 +01:00
Max Neunhoeffer a25df3aece Fix jslint problems. 2016-03-10 16:44:44 +01:00
Max Neunhoeffer 6e4a4d1f7b Add babies tests for document API. 2016-03-10 16:28:10 +01:00
Max Neunhoeffer df487862a8 Fix some more edge tests. 2016-03-10 13:08:02 +01:00
Jan Steemann 878865c53a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 17:57:07 +01:00
Alan Plum 075ca6a3a5 Request shouldn't set content-type header to "undefined"
Fixes #1776.
2016-03-09 13:10:41 +01:00
Jan Steemann 329b3d623f Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:24 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Max Neunhoeffer 6ca5132b89 Fix test for edge save. 2016-03-09 09:16:33 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Max Neunhoeffer 7c4d4ab36c Adjust test to (new) behaviour. 2016-03-08 18:46:15 +01:00
Max Neunhoeffer 4452578f5f Fix a test. 2016-03-08 17:46:08 +01:00
Jan Steemann 14a3d02ce7 simple query cleanup 2016-03-07 20:29:04 +01:00
Alan Plum 041ebf1542 Fix #1577 once and for all
This guarantees the module resolution doesn't break out of the ArangoDB module root (or the service's root).
2016-02-26 12:24:26 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
Frank Celler 034eea10b3 fixed version 2016-02-19 20:15:39 +01:00
Michael Hackstein 8295bae5b3 Added generated files 2016-02-16 14:07:10 +01:00
Michael Hackstein 32d0e48d61 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-16 13:56:08 +01:00
Alan Plum fb23c44e3d Fix client test 2016-02-16 01:45:57 +01:00
Frank Celler 8f1e79e5dc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-15 23:23:44 +01:00
Frank Celler 9a2ced5056 raised waitForSync 2016-02-15 23:22:50 +01:00
Alan Plum 6593f3d358 Clean up stacktraces
Fixes #1564, #1565, #1744.
2016-02-15 22:56:29 +01:00
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Alan Plum e228ce0cd0 @arangodb/request: res.body -> res.json 2016-02-11 16:50:07 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Jan Steemann 196ec2593c added parentheses for explain 2016-02-10 15:21:12 +01:00
Jan Steemann cc257b90ff print brackets in explainer 2016-02-10 13:12:46 +01:00
Jan Steemann f3107bc25f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 11:34:40 +01:00
Jan Steemann 5ba2432d78 remove sort in more cases 2016-02-10 11:23:11 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Frank Celler 546ffce3ed added replication test 2016-02-06 23:30:22 +01:00
Frank Celler 6d4b68245a added print.limitString 2016-02-06 20:20:07 +01:00
Jan Steemann 6aa28abce3 adjusted test 2016-02-05 20:46:57 +01:00
Jan Steemann 94990da5f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-04 19:18:43 +01:00
Frank Celler 7769b68d69 fixed returns 2016-02-04 16:46:29 +01:00
Frank Celler 8b6f4b8bec removed DEV_APP_PATH 2016-02-04 16:38:20 +01:00
Michael Hackstein edf7f6b9d9 Further implementation of AQL functions for VPack. UNIQUE UNIQUE_SORTED UNION UNION_DISTINCT 2016-02-04 15:23:26 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
jsteemann 13335d4cf9 bugfixes 2016-02-03 01:06:27 +01:00
jsteemann b962c5a9e8 array comparison operators 2016-02-03 00:28:03 +01:00
Jan Steemann fc909486c2 parser adjustments for array operators, not yet working 2016-02-02 18:05:39 +01:00
Jan Steemann 45d9745756 fixed display of Traversals in AQL explain 2016-02-02 11:24:51 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
Michael Hackstein 651e705ebd Introduced a new EMPTY_GRAPH error which is thrown during AQL execitions whenever the graph has no edge collections. 2016-01-28 18:07:26 +01:00
Michael Hackstein 847463f968 Fixed JSLintQ 2016-01-28 17:29:29 +01:00
Michael Hackstein ff1a3e5675 Updated AQL explainer to work with Multi Direction Traversals. Last step closes #1683 2016-01-28 17:15:53 +01:00
Frank Celler 732fb58f86 moved into sub-directories 2016-01-24 13:16:05 +01:00
Frank Celler c2a3f90fde moved tests into sub-directories 2016-01-24 12:21:04 +01:00
Frank Celler 8a7f409380 added fs.append 2016-01-24 11:34:13 +01:00
Frank Celler df0a6f4abf create out directory 2016-01-23 23:30:41 +01:00
Andreas Streichardt 4ff105167a Issue #1675 . allow enabling strict mode in tests 2016-01-22 11:38:56 +01:00
jsteemann e0f5401bed fixed test in failure mode 2016-01-21 00:20:32 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
Frank Celler 9840280637 added vm 2016-01-15 12:36:57 +01:00
Frank Celler cc91d528e2 do not check DB if connection is down 2016-01-15 12:35:00 +01:00
Jan Steemann 798a1e05cc Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-12 19:41:49 +01:00
Jan Steemann a119837c3e fixed journalSize handling for collections 2016-01-12 19:41:39 +01:00
Alan Plum b3c7cfd11e Remove jasmine completely
This should not impact the frontend tests as they use a npm-installed copy of jasmine.
2016-01-12 19:04:49 +01:00
Alan Plum 812060864b Handle pending mocha tests in output 2016-01-12 18:49:52 +01:00
Alan Plum f442465445 Implement mocha.grep
Allows using context.only and context.skip to skip tests.
2016-01-12 18:49:51 +01:00
Alan Plum 44faf4428d Improved mocha integration
Mocha tests now produce pretty XML files and log output for Jenkins.
2016-01-12 18:49:50 +01:00
Alan Plum e90c89812f shell-foxx-manager-install-spec to mocha 2016-01-12 18:49:49 +01:00
Alan Plum 0d16d03853 shell-query-timecritical-spec to mocha 2016-01-12 18:49:48 +01:00
Alan Plum 4eab5cd6c8 Disable mocha timeout and bail
The timeout only results in tests being marked as failing
AFTER the tests have run. That's worse than useless for sync-only
tests like we use.
2016-01-12 18:49:27 +01:00