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

313 Commits

Author SHA1 Message Date
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 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
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
Max Neunhoeffer 5f217c5781 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-28 14:43:54 +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 27cff93a4e Two comment changes. 2014-11-26 16:47:32 +01:00
Jan Steemann da468b2f58 allow lazier querying of hash index 2014-11-18 14:16:36 +01:00
Jan Steemann 3696e3c7c1 fixed memleak 2014-11-13 18:04:05 +01:00
Jan Steemann f84f8efaa1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 2014-11-13 14:26:28 +01:00
Jan Steemann 32013321c5 fixed compile warning 2014-11-13 14:25:10 +01:00
Jan Steemann c167024654 fixed compile error 2014-11-13 14:14:27 +01:00
James 5fd0bd80be refactoring to avoid to calls to readIndex when fewer than DefaultBatchSize docs are requested. 2014-11-13 11:49:25 +00:00
James fb1fe3e8b1 reset the defaultbatchsize to 1000 2014-11-13 11:21:07 +00:00
James 6822f80129 updating the skipSome for index range block 2014-11-13 11:19:11 +00:00
James 49352cb8c2 removing redundant code, and updated comments. 2014-11-13 11:08:14 +00:00
James aba5567b0e cleaning up 2014-11-13 10:51:04 +00:00
Jan Steemann bb86006926 initialize variable 2014-11-13 10:36:35 +01:00
James a5006b7617 hash indexes working. 2014-11-13 08:37:52 +00:00
James f797afe0d5 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 2014-11-13 08:04:25 +00:00
Jan Steemann 7cd1eb5474 more warnings 2014-11-12 14:52:54 +01:00
James f55b252f1b snapshot working on IndexRangeBlock and hash indexes 2014-11-11 12:25:59 +00:00
James 1466813313 cleaning up 2014-11-11 11:32:48 +00:00
James d6e1971fd3 lazy index working for skiplists 2014-11-11 11:29:46 +00:00
Jan Steemann 738636db2d whitespace 2014-11-08 21:26:54 +01:00
Jan Steemann e120bdec8c do not allocate too much space for hash index elements 2014-11-08 21:15:44 +01:00
Jan Steemann 7695223744 use emplace_back 2014-11-08 21:13:41 +01:00
James 84e6881a44 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 
Conflicts:
	arangod/Aql/ExecutionNode.h
 2014-11-08 09:53:30 +00:00
Jan Steemann b0de1bb226 leaner and meaner error messages 2014-11-07 10:53:00 +01:00
James 6822594bff changed to number of blocks pulled by default by CalculationBlock and ExecutionBlock 2014-11-06 12:51:32 +00:00
James c54b92c6e7 getting tests to work 2014-11-06 12:24:28 +00:00
James c063b85d29 working except for 1 test. 2014-11-06 11:42:31 +00:00
James 47810e76e1 quick hack 2014-11-06 10:10:40 +00:00
Willi Goesgens f920a0f8d4 By Kasper: Fix possible uninitializen variable access. 2014-11-04 10:42:51 +01:00
Jan Steemann e2cfa056c0 pass query warnings around in cluster 2014-11-01 16:36:58 +01:00
Jan Steemann 025d73ae03 re-added support for fullCount 2014-11-01 15:20:05 +01:00
Jan Steemann 51d3871195 removed debug output 2014-11-01 02:25:17 +01:00
Willi Goesgens 10bf137692 Move free logic into its own function, so we can call in in both places. 2014-10-31 11:28:27 +01:00
Max Neunhoeffer 425d50bdc1 Fix RemoteBlock initializeCursor forwarding by HTTP. 2014-10-29 16:17:15 +01:00
Max Neunhoeffer ecb7317461 Remove enterSubQueryFirst. 2014-10-29 11:37:06 +01:00
Max Neunhoeffer 59c1935466 Get rid of some TODOs and FIXMEs. 2014-10-29 11:25:30 +01:00
Max Neunhoeffer 18990d9b95 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-29 08:57:34 +01:00