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

15542 Commits

Author SHA1 Message Date
Willi Goesgens a5c031505b Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-13 17:12:46 +02:00
Willi Goesgens dd1845ac8a Print beautiful stacktraces for C-Asserts. 2014-08-13 17:09:27 +02:00
Jan Steemann 67b0a9de5c Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-13 16:30:08 +02:00
Jan Steemann 30b32f1f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/V8Server/v8-vocbase.cpp
	js/server/tests/ahuacatl-general-graph.js
 2014-08-13 16:29:57 +02:00
James 69ad2e3209 tweaking ExecutionEngine initialisation. 2014-08-13 16:24:31 +02:00
James 389da13d7a Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-13 16:17:26 +02:00
James 11ffc1cac0 added getSome etc methods to ExecutionEngine. 2014-08-13 16:16:42 +02:00
Jan Steemann 0a70e979f8 call `toJSON` function of objects (if present) when serializing 2014-08-13 16:05:58 +02:00
Max Neunhoeffer 34ffa100ee Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-13 16:03:46 +02:00
Max Neunhoeffer 85bff66b63 Make the SingletonBlock reset _done when initCursor is called. 2014-08-13 16:03:21 +02:00
Jan Steemann ab080d8b73 added derived files 2014-08-13 16:02:19 +02:00
Jan Steemann 8c24436b69 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-13 16:00:09 +02:00
Jan Steemann 8f9591ca1e properly stringify _from and _to attributes using CollectionNameResolver 2014-08-13 15:59:56 +02:00
Max Neunhoeffer e85fd5fd22 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-13 15:45:20 +02:00
Max Neunhoeffer 3e135323dd Change the API one more time. 2014-08-13 15:44:44 +02:00
Jan Steemann 3fd352e7d7 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-13 15:40:06 +02:00
Jan Steemann ea418088c5 fixed simple expressions 2014-08-13 15:39:56 +02:00
James 3b91313ef7 replacing getSome and skipSome methods for limit block with getOrSkipSome 
method.
 2014-08-13 15:25:04 +02:00
James 6a8b2d3254 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-13 15:06:44 +02:00
James 22b2bedc59 skipSome method for limit block now working. 2014-08-13 15:06:34 +02:00
Jan Steemann 2cbf14716e Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-13 14:22:51 +02:00
Jan Steemann 69f99324f2 added simple expressions 2014-08-13 14:22:14 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
James fafad41150 Complete merge. 2014-08-13 12:47:32 +02:00
James 19f01bab0a Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionBlock.h
 2014-08-13 10:26:33 +02:00
James fa29a2ecb0 removed deprecated skipSome method from AggregateBlock. 2014-08-13 09:41:11 +02:00
James b05ae9668c removed deprecated skipSome from FilterBlock. 2014-08-13 09:40:22 +02:00
Max Neunhoeffer 684384e313 Cleanup ExecutionBlocks w.r.t. exceptions and leakages. 
Note:
  Aggregate not completely checked.
  Left some FIXMEs.
 2014-08-13 00:27:34 +02:00
Max Neunhoeffer e2851d1b2d Adjust some indentation. 2014-08-12 22:57:56 +02:00
James eed06f6512 method for getOrSkipSome for AggregateBlock, now working. 2014-08-12 20:06:18 +02:00
Jan Steemann 52911293f7 added special compare function to take into account floating point differences 2014-08-12 19:14:13 +02:00
Jan Steemann 413ce6c50c test fixes 2014-08-12 18:53:49 +02:00
Heiko Kernbach 462bc6112c Merge 2014-08-12 18:06:36 +02:00
Heiko Kernbach 34ee4517ab added more regex validation 2014-08-12 18:06:23 +02:00
Willi Goesgens a809b58541 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-12 17:11:06 +02:00
Willi Goesgens e823314a63 Adapt #8c280e255cce88af22377bee0e3ea8669c2b6d97 and #35303ab5eb5f3d588c2c6fe276dcc3772836d89f to give us a graph in defined sequence here too. 2014-08-12 17:10:29 +02:00
Jan Steemann d06dd817b0 removed some default cases 2014-08-12 17:03:06 +02:00
James 98393aca94 removing DEBUG statements. 2014-08-12 16:59:00 +02:00
James 0c558f57b8 getOrSkipSome method for FilterBlock. 2014-08-12 16:57:12 +02:00
Jan Steemann 13849b2c77 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-12 16:54:07 +02:00
Jan Steemann 14e136f6d4 fixed enumeration over empty docvec 2014-08-12 16:53:58 +02:00
Max Neunhoeffer afaabc7964 Fix bug in skipSome of EnumerateCollectionBlock. 2014-08-12 16:49:00 +02:00
James a62cba0306 reversing changes to skipSome and getSome for EnumerateCollectionBlock. 2014-08-12 16:38:21 +02:00
Michael Hackstein 1ee7cecdd7 Enforced sorting in ahuacatl generel graph test 2014-08-12 16:38:15 +02:00
Jan Steemann 80848b62a9 make test deterministic 2014-08-12 16:28:59 +02:00
Jan Steemann 3ae6d85711 removed tests for now-unsupported functionality 2014-08-12 16:22:32 +02:00
Jan Steemann 6400912c3a some comments 2014-08-12 16:19:48 +02:00
Max Neunhoeffer cb56e2175f Fix SortBlock empty bug. 2014-08-12 16:00:31 +02:00
Frank Celler 5f3c5b4798 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/bootstrap/module-console.js
 2014-08-12 15:54:09 +02:00
Max Neunhoeffer 132b22e0bb Further bugfixes with AqlItemBlock and AqlValue allocations. 2014-08-12 15:52:27 +02:00