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

15254 Commits

Author SHA1 Message Date
Max Neunhoeffer ccbcade0eb Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 15:47:39 +02:00
Max Neunhoeffer 7fee115990 Add a proper hash function for AqlValue objects. 2014-08-05 15:47:20 +02:00
James 5b044a3092 removing old code. 2014-08-05 15:46:51 +02:00
James a1222d394d Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 15:38:11 +02:00
James 86989711ce adding a method for toJson to AqlValue. 2014-08-05 15:36:15 +02:00
Max Neunhoeffer 758b7de263 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 15:26:40 +02:00
Max Neunhoeffer cab02853ef Fix two bugs with new ShapedJson register values. 2014-08-05 15:26:21 +02:00
Jan Steemann fe4d83e80b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	Documentation/Books/Users/Aql/README.mdpp
	Documentation/Books/Users/AqlExtending/README.mdpp
 2014-08-05 15:09:28 +02:00
Jan Steemann ae04cb95d9 fixed compile errors 2014-08-05 15:04:42 +02:00
Thomas Schmidts 5d6c8a8971 changed width of summary block 2014-08-05 14:55:19 +02:00
James 1d912648cd removing previous use of queryResult.json in JS_ExecuteAql. 2014-08-05 14:43:51 +02:00
James fbc6ae2267 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 14:37:29 +02:00
James 6772762c60 preparing json return value for queryResult. 2014-08-05 14:37:08 +02:00
Max Neunhoeffer 5cbbd8a4c4 Fix barrier and documentCollection access in Expressions. 
Still does not link.
 2014-08-05 14:33:54 +02:00
Jan Steemann 7924c89a69 fix compile error 2014-08-05 13:56:26 +02:00
Jan Steemann 2003524a3d Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-05 13:52:17 +02:00
Jan Steemann d896089210 added helper method 2014-08-05 13:52:03 +02:00
Max Neunhoeffer 8d1ce3baf2 Copy document collection in slice and splice for AqlItemBlocks 2014-08-05 13:50:56 +02:00
Thomas Schmidts baf6635627 Added missing methods to fs module. fix #978 2014-08-05 13:37:40 +02:00
Max Neunhoeffer 135cce3250 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 13:24:22 +02:00
Jan Steemann 196441b9b4 improved v8 object generation 2014-08-05 13:23:37 +02:00
Max Neunhoeffer 96d8dcc054 Major cleanup, not yet working. 2014-08-05 12:29:36 +02:00
Max Neunhoeffer 4f466f2a09 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 11:05:57 +02:00
Max Neunhoeffer a9dac96bf3 Store AqlValue objects in AqlItemBlocks. 2014-08-05 11:05:24 +02:00
Jan Steemann 932aac9d06 added method signature 2014-08-05 10:58:58 +02:00
Jan Steemann 4a2d943d45 added helper methods 2014-08-05 10:56:37 +02:00
Jan Steemann 57f5590646 fixed scoping 2014-08-05 10:44:27 +02:00
Thomas Schmidts bf8ea5de4b Moved subsection troubleshooting from collections to arangodb shell 2014-08-05 10:32:45 +02:00
Jan Steemann 129ba6a5ad Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-05 10:23:44 +02:00
Jan Steemann 23d02a3602 added collect plan node generation 2014-08-05 10:23:33 +02:00
Jan Steemann c7e2ccee51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-08-05 10:13:03 +02:00
Jan Steemann 3a4cf3eac5 added derived file 2014-08-05 10:12:32 +02:00
James e4fb7bc3a7 Fixed some further language bugs in the doc. 2014-08-05 09:21:19 +02:00
Jan Steemann 0e8949f8b3 unify function behavior in shell and server 2014-08-05 09:07:28 +02:00
Jan Steemann 6e09cd1736 gcc 2014-08-05 09:07:11 +02:00
Max Neunhoeffer ed438f3dab Add .gdb_history to .gitignore. 2014-08-04 18:45:06 +02:00
Max Neunhoeffer 6e9b345634 Fix a memory leak. 2014-08-04 18:40:34 +02:00
Jan Steemann b2b9c7c03f use constants 2014-08-04 17:38:08 +02:00
Jan Steemann f6384b006d Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Types.h
 2014-08-04 17:31:00 +02:00
Jan Steemann 7fd236aa4f fixed enumeratecollection block 2014-08-04 17:27:51 +02:00
Willi Goesgens f72f9da348 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-04 16:53:26 +02:00
Willi Goesgens f8be000e1d Fix typos and simplify & clarify some phrases in the documentation. 2014-08-04 16:53:00 +02:00
Willi Goesgens b3ae8450ae Fix typos and simplify & clarify some phrases in the documentation. 2014-08-04 16:51:02 +02:00
Max Neunhoeffer fabfeae14d Add LimitNode. Implement skip generically. 2014-08-04 16:34:37 +02:00
James 6dee76e389 more bugs in documentation language resolved. 2014-08-04 15:36:53 +02:00
Max Neunhoeffer 8b640be8ac Add Filter node. 2014-08-04 15:11:51 +02:00
Max Neunhoeffer 87af84d4b1 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Types.h
 2014-08-04 12:53:39 +02:00
Max Neunhoeffer 901129394e More comments, more generic functionality. 2014-08-04 12:51:53 +02:00
Jan Steemann 2487474e96 master pointers 2014-08-04 11:58:42 +02:00
Jan Steemann 9587cda5b0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-04 11:46:41 +02:00