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

16066 Commits

Author SHA1 Message Date
Jan Steemann 6c3544cffb Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-29 10:59:33 +02:00
Jan Steemann 8a96f907b0 refactored function argument conversion 2014-08-29 10:59:24 +02:00
James 505d1d9499 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-29 09:34:36 +02:00
James b25f9d8301 fixed bug in last. 2014-08-29 09:34:23 +02:00
Jan Steemann 2630c7107a Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-29 09:33:14 +02:00
Jan Steemann 0eac5dcf47 fixed tests 2014-08-29 09:33:09 +02:00
James 7fe3cd8c68 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-29 09:26:40 +02:00
James 58a288fe77 copying a RangeIndexNode now properly copies the range infos. 2014-08-29 09:26:11 +02:00
Jan Steemann a32fac3747 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-29 09:20:36 +02:00
Jan Steemann 43ec93109f optimizer rules are now kept in a sorted map 
rules can optionally be disabled at runtime
 2014-08-29 00:08:29 +02:00
Jan Steemann 6cd4372299 fixed several tests 2014-08-28 22:33:50 +02:00
Jan Steemann b54e791f8f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 22:23:25 +02:00
Jan Steemann a5856ad6db Merge branch 'CoDEmanX-devel' into devel 2014-08-28 22:07:14 +02:00
Jan Steemann 61d6ebd9e6 Merge branch 'devel' of https://github.com/CoDEmanX/ArangoDB into CoDEmanX-devel 
Conflicts:
	Documentation/Books/Users/Aql/Advanced.mdpp
	Documentation/Books/Users/Aql/Functions.mdpp
	Documentation/Books/Users/Aql/GraphOperations.mdpp
	Documentation/Books/Users/AqlExamples/Grouping.mdpp
 2014-08-28 22:06:27 +02:00
Jan Steemann b2c119fded further documentation fixes, provided by @CoDEmanX 2014-08-28 21:54:37 +02:00
Jan Steemann 1c7c8fdd24 issue #1007: fixed broken markup 2014-08-28 21:46:53 +02:00
CoDEmanX d8363b3c43 Fix escaping of asterisks in AQL documentation. 
Asterisks need to be escaped with backslashes, but if surrounded by square brackets, the brackets need to be escaped as well. Does not apply to parentheses it seems, but maybe other characters with special markdown meaning.
 2014-08-28 21:33:34 +02:00
Jan Steemann c9fa7dfbb3 updated documentation 2014-08-28 21:21:51 +02:00
Jan Steemann d72354da66 issue #1003: added feature to use backslash escaping for CSV data in arangoimp 2014-08-28 21:03:58 +02:00
Jan Steemann c47807e2ee Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 16:56:05 +02:00
James a14be1d3be Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-28 16:55:39 +02:00
Jan Steemann 687c56f923 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 16:55:22 +02:00
James 4b5e42c52a bugfixes and leaks fixed. 2014-08-28 16:55:18 +02:00
Jan Steemann d3624c3244 attempt to fix infinite ranges in skiplists 2014-08-28 16:54:45 +02:00
Max Neunhoeffer 16a5899e8f Add a FIXME. 2014-08-28 16:52:03 +02:00
Max Neunhoeffer c1568d94f0 Improve a comment. 2014-08-28 16:50:26 +02:00
Jan Steemann 2a104b8bcb fixed several AQL tests 2014-08-28 16:19:05 +02:00
Jan Steemann fd5e687ef0 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 15:34:17 +02:00
Jan Steemann 694d64da3c do not optimize away non-deterministic functions 2014-08-28 15:34:06 +02:00
Max Neunhoeffer 84199295ba Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-28 15:21:28 +02:00
Max Neunhoeffer af340d6dd6 Make sure varUsage is valid before instanciation. 2014-08-28 15:21:05 +02:00
James 3f646034c8 cleaning up IndexRangeBlock::readSkiplistIndex 2014-08-28 15:12:50 +02:00
James 9f6f15f85f Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-28 15:02:27 +02:00
James 9644fc87c7 fixed bug in last. 2014-08-28 15:00:53 +02:00
Max Neunhoeffer 665777c59a Make dummyRule local in the optimizer. 2014-08-28 14:49:33 +02:00
James 05dac4f52d Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Optimizer.cpp
 2014-08-28 14:41:51 +02:00
James 1deed3ebce fixed bugs useIndexRange. 2014-08-28 14:39:26 +02:00
Jan Steemann 910c029730 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 14:28:11 +02:00
Jan Steemann a2da3eb7ee removed debug output 2014-08-28 14:27:43 +02:00
Jan Steemann e686fcaa85 fixed unused variables warning 2014-08-28 14:18:14 +02:00
Jan Steemann 844955cafd disabled debug output 2014-08-28 14:10:41 +02:00
Jan Steemann 531bb921ff disabled broken rules 2014-08-28 14:04:32 +02:00
Jan Steemann 04b322d9e0 sorting 2014-08-28 14:04:24 +02:00
Jan Steemann 7ba6b17d45 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-28 13:54:37 +02:00
Jan Steemann ca814c9733 remove-redundant-sorts 2014-08-28 13:54:17 +02:00
Willi Goesgens 75d9d4ee60 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-28 13:48:44 +02:00
Willi Goesgens 0a1d5edb29 SortToRange: fix abort critereon for non-skiplist indexes 2014-08-28 13:48:03 +02:00
Max Neunhoeffer 9b49328218 Rearrange levels for optimizer rules. Use rules multiple times. 2014-08-28 13:46:46 +02:00
Max Neunhoeffer e1b557ff20 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Optimizer.cpp
 2014-08-28 13:33:33 +02:00
Max Neunhoeffer 12e15b6c2e Adjust the output level of useSortIndex rule. 2014-08-28 13:29:44 +02:00