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

365 Commits

Author SHA1 Message Date
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 dd60e53ce3 added more collect special cases 2014-12-16 22:52:33 +01:00
Jan Steemann f35f8d1643 fixed ranges, added tests 2014-12-16 13:54:46 +01:00
Jan Steemann 4a60a62028 indentation 2014-12-16 00:30:55 +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
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +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 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
Jan Steemann 8f6193faa2 added optional COUNT clause for AQL COLLECT 2014-12-12 17:18:04 +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
James 4fdd97c9a7 fixed another bug 2014-12-09 14:19:52 +00: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
Jan Steemann 6ddaf08ccb fixed potential memleak 2014-12-09 09:47:28 +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
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 62411fa64a another memleak plugged 2014-12-06 19:24:47 +00:00
James aaacbcf9bb Jan's other patch 2014-12-06 14:23:13 +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 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
James 8c28127be1 fixing dynamic bounds which are lists. 2014-12-03 11:44:38 +00: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 e3abbe0a17 added some comments 2014-12-02 12:35:08 +00:00
Jan Steemann 14a130bb19 manual merge 2014-12-02 12:12:30 +01: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
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
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 cb57738d1d Two comment changes. 2014-11-28 17:52:41 +01:00
Jan Steemann b5b803b124 allow lazier querying of hash index 2014-11-28 17:36:10 +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