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

317 Commits

Author SHA1 Message Date
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
Jan Steemann 7ef8097fe1 added mergeArrays 2014-11-28 14:07:36 +01: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
Max Neunhoeffer 27cff93a4e Two comment changes. 2014-11-26 16:47:32 +01:00
James 12eb461181 correct logic in dynamic bounds evaluation. 2014-11-25 11:55:50 +00:00
James 9df14a7200 fixed bugs in last 2014-11-23 14:33:26 +00:00
James 7e51c27b95 preventing overlap of dynamic ranges 2014-11-23 14:10:22 +00:00
James 1f69d82a8a working out bugs 2014-11-20 11:51:22 +00:00
James dd025f4a99 initial changes to IndexRangeBlock for OR and IN conditions. 2014-11-18 13:50:59 +00: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 e09fc778ba Merge branch 'aql-feature-lazy-index' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-11-13 12:19:12 +00: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