1
0
Fork 0
Commit Graph

1269 Commits

Author SHA1 Message Date
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
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
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 27e4b43fa6
Fixup add ArangoCollection#isArangoCollection 2016-04-18 18:00:39 +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
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
jsteemann ecd7de16cb added optimizer rule "inline-subqueries" 2016-04-15 17:21:22 +02:00
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +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
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Jan Steemann f161a98ba4 test fixes 2016-03-24 12:46:08 +01:00
Jan Steemann d763c102d6 fulltext fixes 2016-03-22 18:34:40 +01:00
Jan Steemann f0724447b6 fixed sparse index test 2016-03-21 17:08:42 +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 b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann 14a3d02ce7 simple query cleanup 2016-03-07 20:29:04 +01:00
Frank Celler 1cd53c20a1 added generateMimetypes and generateErrorfiles 2016-02-25 13:14:06 +01:00
Alan Plum 6593f3d358 Clean up stacktraces
Fixes #1564, #1565, #1744.
2016-02-15 22:56:29 +01:00
Alan Plum e228ce0cd0 @arangodb/request: res.body -> res.json 2016-02-11 16:50:07 +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
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
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
Andreas Streichardt 4ff105167a Issue #1675 . allow enabling strict mode in tests 2016-01-22 11:38:56 +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 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
Jan Steemann 7524c21f3a added derived files 2016-01-12 17:45:05 +01:00
Jan Steemann 6937dbc489 aggregate fixes 2016-01-12 17:21:18 +01:00
Jan Steemann 2044cf8038 implemented aggregations for SortedCollectBlock 2016-01-12 12:05:57 +01:00
Alan Plum c4c8418b6d Add support for mocha in built-in test runner 2016-01-11 20:00:56 +01:00
Jan Steemann b64f69cfd7 increase timeout a bit 2016-01-11 19:28:38 +01:00
Jan Steemann 8390793699 moved docu blocks into their own files 2016-01-07 16:39:19 +01:00
Jan Steemann 1e6a07426c collect refactoring 2016-01-07 14:10:32 +01:00
Jan Steemann ad1163e3bb refactoring for Aql COLLECT 2016-01-07 13:35:12 +01:00
Jan Steemann 10f97380be updated documentation 2016-01-04 19:10:41 +01:00
jsteemann c20cf66e93 add cacheability info for explain 2016-01-03 00:52:36 +01:00
Alan Plum 9ecc710491 Avoid _.clone
Lodash's clone is subtlely different from underscore's and breaks with ShapedJson.
2015-12-23 23:30:56 +01:00
Alan Plum de9ae5128a underscore -> lodash 2015-12-23 23:30:55 +01:00
Michael Hackstein ba3fe43a4e Fixed Explainer for traversal node. It did only know one direction and only hard-coded starting points 2015-12-18 16:17:01 +01:00
jsteemann fb908043ac truncate long objects 2015-12-17 22:14:52 +01:00
Wilfried Goesgens 788e59ed39 Lintify. 2015-12-16 15:05:29 +01:00
Wilfried Goesgens e93949674b while printing the cursor info check for whether its extra section contains a warning. 2015-12-16 14:06:37 +01:00
Wilfried Goesgens da57d31488 Implement de/serializing of filters in traversalnodes 2015-12-16 11:17:38 +01:00
Alan Plum c7c8ee90ae Goodbye ES2015 classes 2015-12-16 01:16:33 +01:00
Alan Plum 87c1310690 Log stacktraces in deprecation warnings 2015-12-16 01:16:33 +01:00
Alan Plum 8b66bf1143 Extend will not be removed in 2.9 2015-12-16 01:16:33 +01:00
Jan Steemann 8ed8681505 updated module name 2015-12-15 16:15:26 +01:00
Alan Plum 1eb99c527b Add @arangodb/db 2015-12-15 15:51:44 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Jan Steemann b123ffbe26 issue #1610 2015-12-15 15:41:50 +01:00
jsteemann 600c48375d added optimizer rule `sort-in-values` 2015-12-13 23:33:44 +01:00
Jan Steemann fcf978a422 do not print overly long string values 2015-12-10 17:06:25 +01:00
Alan Plum d3e2f75c33 Make require behave again
Calls to require should stay within the ArangoDB paths or Foxx service root.

The require cache for Foxx services should be service specific.

Reloading a service's controllers should clear the service's require cache.

See #1577.
2015-12-09 13:33:41 +01:00
Jan Steemann e4fca5e6b3 issue #1600: updated documentation for register() function 2015-12-09 13:12:45 +01:00
Wilfried Goesgens fcf3c392c9 Add geo locations to the city navigator. 2015-12-08 18:15:18 +01:00
Jan Steemann ee6792dd6b fixes for traversal and multi-modify 2015-12-08 14:50:05 +01:00
Jan Steemann 06e43fc5cb fixed explainer output for traversals 2015-12-03 14:16:01 +01:00
Jan Steemann d572f3ed03 Merge branch 'aql-multi-modify' of https://github.com/arangodb/arangodb into devel 2015-12-03 11:38:30 +01:00
Michael Hackstein 2459e2a326 Removed unnecessary tests 2015-12-03 10:19:43 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
jsteemann 9fa0f6d3a7 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-02 16:38:50 +01:00
Jan Steemann 7c3034681b fix for cluster explainer in arangosh 2015-12-02 13:31:13 +01:00
Jan Steemann 1462779281 try to fix cluster access from arangosh 2015-12-02 13:29:42 +01:00
Michael Hackstein 8a76d4be9e Fixed AQL explainer for Traverser 2015-12-02 11:35:39 +01:00
Wilfried Goesgens 4b861dd44a Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-12-01 16:37:06 +01:00
Frank Celler dd2ba7a0be added OS to version check to catch new packages 2015-12-01 12:57:40 +01:00
hkernbach 6d25ac57e9 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-01 11:25:58 +01:00
Jan Steemann 459d15bb2c added cluster execution site info in explain output for AQL queries 2015-12-01 10:30:13 +01:00
jsteemann 49af794f5d Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-01 01:56:46 +01:00
hkernbach ac8542fe07 Merge branch 'JHMH' of github.com:arangodb/arangodb into JHMH 2015-11-27 14:58:00 +01:00
hkernbach 7dd817417f jslint 2015-11-27 14:57:51 +01:00
Michael Hackstein a93fcac0e8 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-27 09:29:01 +01:00
Wilfried Goesgens aae19ff291 Fix dangling anchors and add checker script to the make target. 2015-11-26 18:51:39 +01:00
Michael Hackstein 7bf37620bb Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-26 16:32:26 +01:00
Alan Plum 1a23993f99 Make sure constructor is called in legacy-extended classes
This is a horrible workaround for the lack of a spread operator in the V8 version we are currently using.
The super keyword has no way to pass a dynamic number of arguments without using the spread operator
but someone might reasonably want to use additional arguments in a regular subclass that is then
legacy-extended with a constructor property. This should at least protect against the majority of such
cases even if it creates a silly function signature.

See #1592.
2015-11-25 18:19:54 +01:00
Wilfried Goesgens de76c096c9 Adjust explainer to new simple expressions; linting. 2015-11-25 16:50:23 +01:00
hkernbach da06ce12e9 typo 2015-11-24 16:09:00 +01:00
hkernbach a58157f6b4 example graphs now checking if dependencies exist 2015-11-24 15:34:13 +01:00
Alan Plum 5d3b0b0619 Set returnBodyOnError: true by default in org/arangodb/request
Fixes #1437.
2015-11-24 15:00:11 +01:00
hkernbach 2d417e393d Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-24 13:24:12 +01:00
hkernbach 922782c13f removed unnecessary parameter in explainer function 2015-11-20 15:20:26 +01:00
jsteemann cb62c657e0 initial commit 2015-11-18 17:46:19 +01:00
Wilfried Goesgens 58dbbda09c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-18 17:31:00 +01:00
Jan Steemann 23a1782bd8 use options 2015-11-18 17:30:46 +01:00
Wilfried Goesgens 0b69da93bc Add Traversal example 2015-11-18 15:52:23 +01:00
Wilfried Goesgens 0f2686db5d Add the world graph to the script. 2015-11-18 15:36:35 +01:00
Michael Hackstein 7a36bbb43f Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-18 13:58:47 +01:00
Michael Hackstein a656182145 Fixed example graph and aql traversal test. 2015-11-18 10:15:44 +01:00
hkernbach bb814f1c5d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-11-17 13:10:53 +01:00
hkernbach f21cb27dca aql explainer support for bind params 2015-11-17 13:10:47 +01:00
Jan Steemann f9ba16f8d4 fixed explainer indentation 2015-11-17 11:31:06 +01:00
Wilfried Goesgens 2d5d2d881e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-11 11:05:06 +01:00
Frank Celler 1e8a7d20bc return graph 2015-11-09 10:22:22 +01:00
Wilfried Goesgens d51b5cdc9b Finalize the explain feature 2015-11-06 13:41:44 +01:00
Wilfried Goesgens 951165ab1e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH
Conflicts:
	arangod/Aql/grammar.cpp
	arangod/Aql/grammar.h
	js/common/modules/org/arangodb/graph-examples/example-graph.js
2015-10-28 11:08:18 +01:00
Alan Plum 131da2ea97 Workaround for missing root props on Foxx apps
Fixes #1547.
2015-10-27 18:37:22 +01:00
Jan Steemann 3c4849e81a only drop known graphs 2015-10-23 19:03:11 +02:00
Wilfried Goesgens e9928de21b start to fix graph implementation for explain() 2015-10-22 13:05:13 +02:00
Jan Steemann 0d2197e77f changed documentation for index creation methods 2015-10-21 14:59:45 +02:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Jan Steemann d6cad3bac6 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-19 18:55:36 +02:00
Wilfried Goesgens 30be20224e Fix fluent AQL interface for fromVertices with arrays: need to use 'ArrayVariable [ * RETURN MERGE(CURRENT, other)]' instead of MERGE(ArrayVariable, other) 2015-10-19 16:40:39 +02:00
Jan Steemann 0ffb11c25e do not use sparse indexes for sorting 2015-10-14 12:03:52 +02:00
Jan Steemann fcdd95d7cd fixes 2015-10-13 16:26:43 +02:00
jsteemann 29b3741156 reworked cost calculations 2015-10-12 22:23:03 +02:00
Jan Steemann 1f4c775a02 print names of files with failing tests 2015-10-12 17:57:27 +02:00
Jan Steemann ffa777979c make IN values unique and sort em 2015-10-12 15:34:41 +02:00
Jan Steemann 6a4e9658c5 fixes for explainer and condition 2015-10-08 16:22:52 +02:00
Jan Steemann 0d80a17002 generalize condition handling 2015-10-08 15:10:28 +02:00
Jan Steemann a1de2bfcc1 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
Conflicts:
	CHANGELOG
2015-10-07 10:18:21 +02:00
Alan Plum 7332f3803e Make org/arangodb/deprecated work in arangosh without db 2015-10-06 11:37:42 +02:00
Jan Steemann 1c990b7324 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions
Conflicts:
	arangod/Aql/ExecutionNode.cpp
2015-10-05 10:32:36 +02:00
Jan Steemann 7d4c379598 small modifications, temporarily disabled interchange-adjacent-enumerations 2015-10-02 19:53:35 +02:00
Wilfried Goesgens 232d0601cb fix running of arangosh tests with the proper parametrization. 2015-10-02 15:47:01 +02:00
Wilfried Goesgens a968707134 Fix foxx-manager test for running in arangosh 2015-10-02 15:39:49 +02:00
Wilfried Goesgens 353c01f04f don't output the result json when running from an interactive shell. 2015-10-02 14:47:57 +02:00
Jan Steemann 9205739f6a added IndexNode 2015-09-30 14:10:04 +02:00
Jan Steemann a430cb9f6c allow installing Foxx apps in /_open/ 2015-09-24 15:54:09 +02:00
CoDEmanX 7b95679040 Minor documentation fixes 2015-09-21 19:37:32 +02:00
Michael Hackstein 1a7f414c16 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-09-18 12:21:39 +02:00
Frank Celler c4d1fff729 new traversal 2015-09-18 10:40:28 +02:00
Frank Celler 2e2600311a added aliases 2015-09-16 16:05:18 +02:00
Frank Celler b7bc8526d5 added engine match to available in FoxxManager 2015-09-14 16:52:05 +02:00
Willi Goesgens 3c2b745c2b wrap long lines. 2015-09-11 15:57:02 +02:00