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

5286 Commits

Author SHA1 Message Date
Jan Steemann d358b80080 ES6 2014-12-20 04:02:24 +01:00
Jan Steemann 19d2d6668f added random iteration for collections 2014-12-19 18:01:13 +01:00
Jan Steemann a82ac45190 fixed tests on ARM 2014-12-19 17:59:36 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +01:00
Jan Steemann d92057dd03 the great rename: array => object, list => array 2014-12-18 22:33:23 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Jan Steemann 0c38d60732 less replacements in flex output 2014-12-17 17:26:37 +01:00
Jan Steemann a56ad5df36 fixed unintentionally broken tests 2014-12-17 14:44:18 +01:00
Willi Goesgens a6481cd1a7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-17 14:32:35 +01:00
Willi Goesgens 807643f000 the context-cope exits the context for us - we don't need to do this anymore by ourselves. 2014-12-17 14:32:03 +01:00
Jan Steemann 2ab3aa998d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-17 14:21:37 +01:00
Jan Steemann db1ddb880b wait for sync thread outside of lock 2014-12-17 14:21:24 +01:00
Willi Goesgens fb3ec155a8 Re-Instanciate the context-scope guard were needed. 2014-12-17 13:59:56 +01:00
Jan Steemann dd60e53ce3 added more collect special cases 2014-12-16 22:52:33 +01:00
Jan Steemann 89402bdc79 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-16 13:54:59 +01:00
Jan Steemann f35f8d1643 fixed ranges, added tests 2014-12-16 13:54:46 +01:00
Max Neunhoeffer 45cecf44f9 Initialise a few variables to please gcc. 2014-12-16 10:48:07 +01:00
Max Neunhoeffer bf915da2e3 Use an unordered_map for JSBarriers. 2014-12-16 09:57:44 +01:00
Jan Steemann 4e5cde8443 Revert "release version 2.3.0" 
This reverts commit 35d4368ad6f3f4ef8f37a2f43ed18c6c9ae5ccc6.

Conflicts:
	CHANGELOG
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/explain.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/tasks.json
	js/apps/system/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/version.json
 2014-12-16 01:30:21 +01:00
Jan Steemann 4a60a62028 indentation 2014-12-16 00:30:55 +01:00
Jan Steemann 1a57d587e0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-16 00:25:42 +01:00
Jan Steemann 1c65c042a4 added tests, fixed exception 2014-12-16 00:20:40 +01:00
Jan Steemann bcdeabd3ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2014-12-15 21:53:51 +01:00
Jan Steemann ac9836421d removed todo 2014-12-15 21:48:49 +01:00
Jan Steemann 2e77d31d11 removed TODO 2014-12-15 21:47:01 +01:00
Jan Steemann a90ee78ae1 fixed segfault 2014-12-15 20:48:10 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Jan Steemann 04bcf3f362 issue #1184: use error codes more consistently 2014-12-15 16:22:18 +01:00
Jan Steemann 4b12897026 issue #1184: return error codes more consistently 2014-12-15 16:18:49 +01:00
Jan Steemann 5ce6489e7f Merge pull request #1186 from yojimbo87/devel 
Improve edge API docs.
 2014-12-15 09:33:48 +01:00
James f5763be5f4 final clean up 2014-12-13 19:09:18 +00:00
James 17ed7fbef4 sorting works, tests updated 2014-12-13 17:47:59 +00:00
James 0dee54ee6f more bugfixes more tests 2014-12-13 16:05:20 +00:00
James a7635abe41 fixed some bugs added some tests 2014-12-13 14:51:46 +00:00
Jan Steemann 1e83716c1d removed debug output 2014-12-13 12:48:09 +01:00
Jan Steemann 44a5db257d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-12 23:02:42 +01:00
Jan Steemann f4d7a57c19 changed `COLLECT...INTO x COUNT` to `COLLECT...WITH COUNT INTO x` 
allow executing subqueries without double brackets

jslint
 2014-12-12 23:02:24 +01:00
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
Tomas Bosak 32bc422ad5 Improve edge API docs. 
- create edge operation with 202 result is returned when waitForSync was
set to false
- add missing If-None-Match header parameter description to read head
operation
- add information about _key attribute in result for replace, update and
delete operations
 2014-12-12 17:33:30 +01:00
Jan Steemann 8f6193faa2 added optional COUNT clause for AQL COLLECT 2014-12-12 17:18:04 +01:00
Tomas Bosak 953d5efa7a Add 'mergeObjects' description to edge API docs. 
Description of 'mergeObjects' parameter was missing in edge update
(PATCH) operation.
 2014-12-10 23:24:32 +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
James 8601dd4424 working again 2014-12-09 16:54:34 +00:00
James 35be017bb3 snapshot 2014-12-09 16:44:02 +00:00
Jan Steemann 6aaa5f05a4 nullptr 2014-12-09 16:27:14 +01:00
Jan Steemann 2fbc53f711 fixed potential leaks 2014-12-09 16:27:05 +01:00
James 4fdd97c9a7 fixed another bug 2014-12-09 14:19:52 +00:00
Jan Steemann d638c1c0c9 fixed choicung 2014-12-09 15:18:53 +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 1467b34c5e fixing duplicates in dynamic bounds 2014-12-09 10:19:01 +00:00
Tomas Bosak d0b041842a Update document API description. 
Include information about _key attribute which is also returned along
with _id and _rev for replace, update and delete document operations.
 2014-12-09 10:50:06 +01:00
James 46fe461ca1 fixed bug and added test for it. 2014-12-09 09:40:40 +00:00
Max Neunhoeffer 2d810c27b2 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-09 09:59:23 +01:00
Max Neunhoeffer 368530dd5a Fix number of plan cap. 2014-12-09 09:59:07 +01:00
Jan Steemann 6ddaf08ccb fixed potential memleak 2014-12-09 09:47:28 +01:00
Max Neunhoeffer 62f03aa013 Choose skiplistIndex if in doubt. 2014-12-08 16:53:05 +01:00
Max Neunhoeffer f6324dd9ec Fix a comment. 2014-12-08 16:12:40 +01:00
Max Neunhoeffer 0ccb6dd48c Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-08 15:37:37 +01:00
Max Neunhoeffer fc79c31661 More sensible plan management in useIndexRangeNode optimizer rule. 2014-12-08 15:37:01 +01: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 5d9c8ef49a removed compile warnings 2014-12-08 12:54:44 +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 23203a5437 indenting 2014-12-08 11:23:45 +01:00
Jan Steemann b4a0443da7 fixed default behavior of merge 2014-12-08 11:23:05 +01:00
Jan Steemann 12c155636a updated docs for mergeObjects 2014-12-08 11:00:31 +01:00
James dca2cc0c34 some further cleaning up 2014-12-06 20:44:56 +00:00
James b2ec5d6f1b more cleaning up 2014-12-06 20:25:14 +00:00
James 53c32616dc removing redundant files 2014-12-06 19:43:24 +00:00
James 37e059fb7a cleaning up 2014-12-06 19:40:04 +00:00
James 62411fa64a another memleak plugged 2014-12-06 19:24:47 +00:00
James ad211c83a5 memleaks 2014-12-06 19:01:16 +00:00
James 454ef10898 fixing last 2014-12-06 16:21:59 +00:00
James bf4b718019 memleaks 2014-12-06 16:18:39 +00:00
James aaacbcf9bb Jan's other patch 2014-12-06 14:23:13 +00:00
James f0bb73982c whitespace 2014-12-06 14:22:52 +00:00
James 8698a1da3d fixing bugs and updating tests 2014-12-06 14:02:50 +00:00
James caaa9435b9 cleaning up 2014-12-06 13:04:50 +00:00
James 08ffbb9638 snapshot 2014-12-06 11:09:32 +00:00
Jan Steemann 8f99e59747 issue #1163: fullcount was sometimes used for wrong LIMIT node 2014-12-05 19:02:51 +01:00
Jan Steemann c43bd64222 fixed VS compile error 2014-12-05 15:16:37 +01:00
Jan Steemann 34012395e3 fixed some compile issues 2014-12-05 15:02:08 +01:00
Jan Steemann d9a945e33a include or exclude system collections from replication 2014-12-05 14:58:43 +01:00
Jan Steemann dd68db2252 fixed precedence of range operator 2014-12-05 11:00:26 +01:00
Jan Steemann 1d140b8007 Merge pull request #1158 from yojimbo87/devel 
Fix typo and add '_key' attribute description.
 2014-12-05 09:20:30 +01:00
Jan Steemann 399176cf67 fixed cursor ttl issue 
Conflicts:
	CHANGELOG
 2014-12-05 09:18:32 +01:00
Tomas Bosak 259c3152cd Fix typo and add '_key' attribute description. 2014-12-04 17:57:13 +01:00
Jan Steemann 4564f13bc8 implemented LENGTH in C++ 2014-12-04 17:10:48 +01:00
Jan Steemann cc00bb8897 optimizations 2014-12-04 16:33:48 +01:00
Jan Steemann f3b3e5d932 removed duplicate entry 2014-12-04 13:36:30 +01:00
Jan Steemann 4c43c1bdaf less plans created by optimizer 2014-12-04 12:49:34 +01:00
Jan Steemann 0a27b7cf89 removed debug output 2014-12-04 11:15:45 +01:00
Jan Steemann 0cb5b70a3e turned assertions into ifs 2014-12-04 11:15:33 +01:00
Max Neunhoeffer 0aba8ffa80 Commit generated files for grammar. 2014-12-03 23:37:45 +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 6185943bc5 prevent double-free of variable bounds 2014-12-03 17:45:46 +01:00
Jan Steemann 7e161b88ce issue #1131: added KEEP for `COLLECT...INTO` 2014-12-03 17:44:10 +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
James efa0e51300 compiles 2014-12-03 11:54:40 +00:00
James 8c28127be1 fixing dynamic bounds which are lists. 2014-12-03 11:44:38 +00:00
Jan Steemann 4ef82239a3 added optimizer statistics 2014-12-03 11:38:56 +01:00
Jan Steemann 8e2c5176f4 fixed segfault 2014-12-03 10:47:35 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
James 99959d37dc more deleting 2014-12-02 13:29:15 +00:00
James e3abbe0a17 added some comments 2014-12-02 12:35:08 +00:00
James d02102450c Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-02 11:22:26 +00:00
James 52b174bb3d updating 2014-12-02 11:22:01 +00:00
Jan Steemann 14a130bb19 manual merge 2014-12-02 12:12:30 +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
James b1300fb927 same as last 2014-12-02 10:24:01 +00:00
James 8f735ca9c7 more attempts at fixing memleaks 2014-12-02 10:14:16 +00:00
James 3bab43be0a memleaks 2014-12-02 09:36:11 +00:00
James 2d9c4196ac updating comment 2014-12-02 08:05:33 +00:00
Max Neunhoeffer cfb0b21f2d Add Jan's patch for the indexRangeNode recognition. 
We change all EnumerateCollectionNodes to IndexRangeNodes if possible
and do not keep the old plans.
 2014-12-01 18:38:30 +01:00
Max Neunhoeffer 5c6d3d047d Better error handling and cleanup if instanciation runs into error. 
This concerns AQL in the cluster.
 2014-12-01 18:26:03 +01:00
Patrick Huber c9de415b1f space, typo. DatabaseMethods.mdpp references v8-vocbase.cpp but this doc block is in v8-collection.cpp... 2014-12-01 15:11:30 +01:00
Frank Celler 9bd960fb21 release version 2.3.1 2014-11-28 20:01:19 +01:00
Max Neunhoeffer 015d45fd4f Fix a bug in AQL COLLECT statement. Sorts out #1127. 
This concerned every COLLECT statement, only the first group had access
to the values of the variables before the COLLECT statement.
 2014-11-28 17:56:32 +01:00
Jan Steemann 7d5b47478a remove KEEP 2014-11-28 17:56:25 +01:00
Jan Steemann 4ae15a8931 added mergeArrays attribute 2014-11-28 17:55:52 +01:00
Max Neunhoeffer fb97638a11 Fix a comment. 2014-11-28 17:55:46 +01:00
Max Neunhoeffer 0a795499b9 Fix a buffer overflow that did not have any effect. 2014-11-28 17:55:40 +01:00
Max Neunhoeffer 5e3a41dabf Only put non-toplevel vars into the INTO variable in a COLLECT. 
This restores the behaviour of 2.2.
 2014-11-28 17:55:20 +01:00
Max Neunhoeffer 4d97f7a3ba Choose more sensible block sizes for fetch from dependency. 2014-11-28 17:55:12 +01:00
Max Neunhoeffer cfd71a5bb0 Fix a bug in list access for AqlValues. 2014-11-28 17:55:07 +01:00
Jan Steemann a1f812b28b enable more indexes 2014-11-28 17:53:08 +01:00
Max Neunhoeffer cb57738d1d Two comment changes. 2014-11-28 17:52:41 +01:00
Jan Steemann 5de76aff74 VS 2014-11-28 17:52:13 +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
Jan Steemann ffca5bdc0b removed unused function 2014-11-28 17:48:55 +01:00
Jan Steemann 0e2770996b include collection name in replication output 2014-11-28 17:48:43 +01:00
Max Neunhoeffer ff3a999348 Fix compilation of new estimation function. 2014-11-28 17:47:58 +01:00
Max Neunhoeffer d889974ad4 First version of fix for LIMIT cost estimation. 2014-11-28 17:47:50 +01:00
Jan Steemann 1f5db121db renamed function, updated documentation 
Conflicts:
	CHANGELOG
 2014-11-28 17:46:29 +01:00
Jan Steemann b5b803b124 allow lazier querying of hash index 2014-11-28 17:36:10 +01:00
Jan Steemann 06af1d3af2 added several AQL functions 2014-11-28 17:34:29 +01:00
Max Neunhoeffer 6a53d40c24 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-28 16:15:47 +01:00
Max Neunhoeffer 7664fc643c Fix a bug in AQL COLLECT statement. Sorts out #1127. 
This concerned every COLLECT statement, only the first group had access
to the values of the variables before the COLLECT statement.
 2014-11-28 16:14:44 +01:00
Jan Steemann acf070c6ac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-28 15:58:48 +01:00
Jan Steemann 200eacd592 remove KEEP 2014-11-28 15:58:26 +01:00
Max Neunhoeffer 5f217c5781 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-28 14:43:54 +01:00
Jan Steemann 7ef8097fe1 added mergeArrays 2014-11-28 14:07:36 +01:00
Jan Steemann bc8579f20b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-28 13:58:59 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00