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

7148 Commits

Author SHA1 Message Date
Willi Goesgens daeb46893f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-12 21:40:35 +01:00
Willi Goesgens 115f226385 Optimizer: Enable removing of filternodes if the index can handle the filter condition. 2014-12-12 21:39:35 +01:00
Jan Steemann 8f6193faa2 added optional COUNT clause for AQL COLLECT 2014-12-12 17:18:04 +01:00
Heiko Kernbach c181bc7d9f issue: #1168 2014-12-12 11:05:26 +01:00
Heiko Kernbach e855e0faeb issue: #1161 fixed 2014-12-12 10:52:08 +01:00
Alan Plum 7cf115f321 Merge pull request #1176 from stackmagic/foxx-repo-any 
repository.any()
 2014-12-11 13:17:08 +01:00
Jan Steemann 9b15228676 fixed broken documentation 2014-12-11 12:30:41 +01:00
Patrick Huber 3692c23474 fixes from feedback 2014-12-10 22:05:06 +01:00
Lucas Dohmen a3a566bc87 Fix bug in the user app's storage 2014-12-10 15:14:43 +01:00
Patrick Huber d0eb69fc73 expose the any() method from the collection on the repository too 2014-12-10 14:19:06 +01:00
James 7ab57d64ec Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 22:05:57 +00:00
Jan Steemann 22928c1bb5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
 2014-12-09 22:45:55 +01:00
James 3ce7164fb6 finally working again, and more tests 2014-12-09 20:15:38 +00:00
Jan Steemann 959631c4d9 issue #1173: AQL Editor "Save current query" resets user password 
Conflicts:
	CHANGELOG
 2014-12-09 20:52:51 +01:00
Jan Steemann a86cf09f7f issue #1173: AQL Editor "Save current query" resets user password 
Conflicts:
	CHANGELOG
 2014-12-09 20:50:18 +01:00
Jan Steemann 5c9e52ea20 pass query parameters 2014-12-09 17:16:03 +01:00
Jan Steemann 1fdf74e09e jslint 2014-12-09 16:44:31 +01:00
Max Neunhoeffer 17f9c83540 Fix issue #1147, must encode dispatcher ID for etcd. 2014-12-09 16:32:37 +01:00
Max Neunhoeffer be421d926f Add new test for use-index-range rule and no rule explosion. 2014-12-09 15:40:22 +01:00
Jan Steemann a617dcffc5 added tests 2014-12-09 14:50:28 +01:00
James afb960f60e fixed another bug and added a test for it. 2014-12-09 11:19:34 +00:00
James a4dcf1b9d3 Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 10:23:07 +00:00
James 8871612eb8 adding tests for last 2014-12-09 10:22:15 +00:00
Jan Steemann 797b6dbf75 added index tests 2014-12-09 11:01:58 +01:00
James 46fe461ca1 fixed bug and added test for it. 2014-12-09 09:40:40 +00:00
Jan Steemann 399e93c3ff issue #1155: allow bind parameter for sort order 
SORT what @order is now allowed
 2014-12-08 13:05:40 +01:00
Jan Steemann cd17c393ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	arangod/Aql/grammar.cpp
 2014-12-08 12:37:13 +01:00
Jan Steemann d5ec9ca4bb jslint 2014-12-08 11:50:14 +01:00
Jan Steemann db507fe3f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-08 11:34:02 +01:00
Jan Steemann 63ceb0d1e0 added tests for mergeObjects 2014-12-08 11:33:54 +01:00
Max Neunhoeffer 10580f1401 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-08 11:30:21 +01:00
Max Neunhoeffer 32c6262586 Switch off importing test in the cluster because feature not yet implemented. 2014-12-08 11:27:19 +01:00
Jan Steemann a018ccaed7 added derived file 2014-12-08 11:23:53 +01:00
scottashton c657790bc4 cleaned up example for getConnectingEdges 2014-12-08 10:58:59 +01:00
Jan Steemann 4912cbe9fe updated AQB version 2014-12-08 10:22:20 +01:00
James 6e47660ff7 Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-06 15:41:34 +00:00
James a4c7c4edcd tests for index-or and in 2014-12-06 15:27:20 +00:00
James 8698a1da3d fixing bugs and updating tests 2014-12-06 14:02:50 +00:00
Jan Steemann 0203c8ca7c added derived files 2014-12-05 19:03:34 +01:00
Jan Steemann 8f99e59747 issue #1163: fullcount was sometimes used for wrong LIMIT node 2014-12-05 19:02:51 +01:00
Patrick Huber b8bfdaf554 remove attribute in method parameter 2014-12-05 18:12:24 +01:00
Patrick Huber 57fe367f87 typo 2014-12-05 18:12:24 +01:00
Patrick Huber 92e3f968e0 typo 2014-12-05 18:12:24 +01:00
Patrick Huber ea7553b2cc copy paste error 2014-12-05 18:12:24 +01:00
Jan Steemann eb372dea63 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-05 14:59:00 +01:00
Jan Steemann d9a945e33a include or exclude system collections from replication 2014-12-05 14:58:43 +01:00
Thomas Schmidts e799dfa8f9 Fixed #1007 spelling error fixed 2014-12-05 14:28:08 +01:00
Jan Steemann dd68db2252 fixed precedence of range operator 2014-12-05 11:00:26 +01:00
Heiko Kernbach d85586a1de fixed issue: #1083 2014-12-04 15:48:46 +01:00
Jan Steemann 90819836e5 added test for mergeObjects 2014-12-04 13:05:20 +01:00
Jan Steemann 4c43c1bdaf less plans created by optimizer 2014-12-04 12:49:34 +01:00
Jan Steemann d424e1874e Merge pull request #1156 from yojimbo87/devel 
Improve collection modifying API docs
 2014-12-04 09:46:21 +01:00
Jan Steemann 0975fb8349 jslint 2014-12-04 09:44:41 +01:00
Tomas Bosak ef9e5a33f1 Improve collection modifying API docs 
Load collection:
- state explicitly that 'count' attribute needs to be in request body
object
- add 'isSystem' attribute to result description

Unload collection:
- add 'isSystem' attribute to result description

Change collection properties:
- modify return description
- add 'isSystem', 'isVolatile', 'doCompact' and 'keyOptions' attributes
to result description

Rename collection:
- add 'isSystem' attribute to result description

Rotate collection journal:
- fix return code typo
 2014-12-03 19:45:23 +01:00
Jan Steemann e4b51f616c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 17:46:03 +01:00
Jan Steemann 7e161b88ce issue #1131: added KEEP for `COLLECT...INTO` 2014-12-03 17:44:10 +01:00
Tomas Bosak 8d4de5b22f Improve collection API docs 
- add keyOptions attribute description which is also part of the result
- add empty line before return codes header
 2014-12-03 17:20:34 +01:00
Frank Celler 3e430276d6 Merge pull request #1145 from triAGENS/positional-query-args 
Support positional arguments in Foxx queries
 2014-12-03 14:48:39 +01:00
Frank Celler 77f544a554 Merge pull request #1144 from triAGENS/less-confusing-http-naming 
Renamed mergeArrays->mergeObjects (because it's actually about objects, not arrays)
 2014-12-03 14:48:04 +01:00
Jan Steemann 4f39b9e358 optimize away `INTO` of `COLLECT` if unused 2014-12-03 13:49:03 +01:00
Jan Steemann 29cd807fe6 fixed caps 2014-12-03 12:23:17 +01:00
Jan Steemann 8af441da56 Merge pull request #1148 from triAGENS/correct-horse-battery-staple 
Dev app baseUrls should be db-relative too
 2014-12-03 11:58:38 +01:00
Alan Plum 3b5b6b2249 Merge pull request #1151 from yojimbo87/devel 
GET /_api/collection/{collection-name} returns also 'isSystem' attribute
 2014-12-03 11:55:21 +01:00
Jan Steemann ae092f467f added derived file 2014-12-03 11:53:34 +01:00
Jan Steemann 9d197d3eb2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 11:39:04 +01:00
Jan Steemann 4ef82239a3 added optimizer statistics 2014-12-03 11:38:56 +01:00
Max Neunhoeffer 9a28d9914d Add new import tests to JS testsuite, fixing the "importing" target. 2014-12-03 11:27:44 +01:00
Tomas Bosak cf94fa4399 GET /_api/collection/{collection-name} returns also 'isSystem' attribute. 2014-12-03 11:24:52 +01:00
Max Neunhoeffer 8f1dd637c6 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-03 10:56:29 +01:00
Alan Plum 7a4076da8f Also accept `false` instead of an empty array. 2014-12-03 10:56:28 +01:00
Jan Steemann 8e2c5176f4 fixed segfault 2014-12-03 10:47:35 +01:00
Max Neunhoeffer 94e8bbe605 Fix error checking in unittests. 2014-12-03 10:45:51 +01:00
Alan Plum 7b01edbb4c Fixes #1146. 2014-12-03 10:24:50 +01:00
Jan Steemann e81ac9993e fixed paragraph issue 2014-12-03 09:56:15 +01:00
Jan Steemann fa9ac4db44 fixed paragraph issue 2014-12-03 09:55:25 +01:00
Alan Plum 741bf1e4d5 Support positional arguments in Foxx queries. 2014-12-02 18:29:25 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Alan Plum fdc4c1e810 Rename Repository#modelPrototype to avoid confusion. Added Repository#modelSchema. 2014-12-02 13:37:06 +01:00
James 0646a5a98e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	CHANGELOG
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	arangod/Aql/grammar.cpp
	js/server/tests/aql-optimizer-indexes.js
 2014-12-02 10:42:04 +00:00
James fed9e98aca Merge branch 'master' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	CHANGELOG
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	js/server/tests/aql-optimizer-indexes.js
 2014-12-02 10:36:06 +00:00
Patrick Huber f1c6c6cc24 allow to supply args to the optional 'transform' function in Foxx.createQuery() 2014-12-02 08:18:49 +01:00
Frank Celler 7c8b0228da recreate password if missing 2014-12-01 15:36:47 +01:00
Willi Goesgens 1024750c07 Clarify whether the test is running via arangosh or arangod. 2014-12-01 14:21:00 +01:00
Frank Celler 9bd960fb21 release version 2.3.1 2014-11-28 20:01:19 +01:00
Michael Hackstein 3698fc590f Removed console output 2014-11-28 17:57:20 +01:00
Michael Hackstein 68924f3f92 Fixed a bug with two identically named check boxes and click events that were not correctly unbound 2014-11-28 17:57:15 +01:00
Michael Hackstein b2b8b28712 Removed unused frontend libraries ColVis and dataTables 2014-11-28 17:57:10 +01:00
Michael Hackstein 9072e234eb Replaced datatables by own implementation, less overhead easier to handle and not broken in Firefox 2014-11-28 17:57:05 +01:00
Max Neunhoeffer 9fb53e28d9 Revert "More error output if update() in foxx manager fails." 
This reverts commit 3e6822a3917eb18ad45b6a0f145c87ca686fc54c.
 2014-11-28 17:56:53 +01:00
Max Neunhoeffer d333ac5845 Cleanup cleanupDirectories list after cleanup of directories. 2014-11-28 17:56:16 +01:00
Max Neunhoeffer 18d0a1f3f6 More error output if update() in foxx manager fails. 
This is a temporary output to track down the continuous testing
problems.
 2014-11-28 17:56:01 +01:00
Jan Steemann aa37504e09 jslint 2014-11-28 17:55:01 +01:00
Jan Steemann b6e182fd0f added tests 2014-11-28 17:53:28 +01:00
Alan Plum 08c67cf80a Updated joi to 4.9.0. 2014-11-28 17:52:31 +01:00
Jan Steemann 42e7c64de6 fixed jslint warnings 2014-11-28 17:52:18 +01:00
Jan Steemann 544f7d4ab4 fix optimization of subqueries 
Conflicts:
	CHANGELOG
 2014-11-28 17:51:50 +01:00
Jan Steemann 99530f6478 fixed invalid optimization, added test cases 
Conflicts:
	CHANGELOG
 2014-11-28 17:50:17 +01:00
Alan Plum 234af094ec Expose root-relative mount URL as appContext.baseUrl. 2014-11-28 17:49:51 +01:00
Jan Steemann 48259d816c fixed tests 2014-11-28 17:48:49 +01:00
Jan Steemann 08a19c80d4 issue #1109: added *bytes* unit to API description where missing 2014-11-28 17:46:42 +01:00