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

5172 Commits

Author SHA1 Message Date
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
Max Neunhoeffer 877b1d6df9 Fix a comment. 2014-11-28 13:33:15 +01:00
Max Neunhoeffer 0445b547be Fix a buffer overflow that did not have any effect. 2014-11-28 13:31:27 +01:00
Max Neunhoeffer a76e22f03a Only put non-toplevel vars into the INTO variable in a COLLECT. 
This restores the behaviour of 2.2.
 2014-11-28 13:05:15 +01:00
Max Neunhoeffer 676ec3694d Choose more sensible block sizes for fetch from dependency. 2014-11-28 11:43:09 +01:00
Max Neunhoeffer 4e48475a9f Fix a bug in list access for AqlValues. 2014-11-28 11:21:47 +01:00
James be95719179 fixed bug in logic of hash index use. 2014-11-28 08:24:56 +00:00
James fe356e2187 some partial fixes 2014-11-27 13:24:16 +00:00
James 8a8237a55e correct merge mistakes 2014-11-27 09:55:46 +00:00
James 40a67f47c7 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
 2014-11-27 09:25:43 +00:00
Jan Steemann 8a715d7791 fixed `remove-redundant-or` rule 
the rule was not producing correct conditions for queries such as

   FOR i IN collection FILTER i._key > 'a' && i._key > null RETURN i
 2014-11-26 21:42:22 +01:00
Jan Steemann 292eaad273 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-26 19:49:38 +01:00
Jan Steemann 45ebdf7581 enable more indexes 2014-11-26 19:49:28 +01:00
Max Neunhoeffer b2f93a048a Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-26 16:47:55 +01:00
Max Neunhoeffer 27cff93a4e Two comment changes. 2014-11-26 16:47:32 +01:00