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

2700 Commits

Author SHA1 Message Date
Michael Hackstein 0b583d756a Duplicated static helper functions in AQLFunctions to be able to hadle VPack. Added a dummy for AqlValue->VPack. We have to clarify the data responsibilites before continuing here. 2016-01-29 13:42:15 +01:00
jsteemann c3fc7e1aa7 don't lock in destructor 
we have a global instance of the query cache and its destruction is
called during static deinitialization after main. if we use locks in
the dtor then we will use locks during static deinitialization (which
is fine in general, but prevents us from tracking the lock usage by
threads using thread-local storage)
 2016-01-29 01:12:59 +01:00
jsteemann 04d459a5db Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-29 00:51:14 +01:00
jsteemann 1ca11411fd added (still disabled) optimizer rule `inline-subqueries` 2016-01-29 00:50:37 +01:00
jsteemann df68e95e06 some useful methods 2016-01-29 00:09:55 +01:00
Michael Hackstein 651e705ebd Introduced a new EMPTY_GRAPH error which is thrown during AQL execitions whenever the graph has no edge collections. 2016-01-28 18:07:26 +01:00
Michael Hackstein 0a421a1cc0 Finished implementation for multi-direction traversals. 2016-01-28 15:43:19 +01:00
Michael Hackstein 582f1f46f0 Preparation for multi-direction traversals. As requested in #1683. Internal traverser can now work with one direction per collection. Next: AQL needs to learn this too. 2016-01-28 14:07:50 +01:00
Jan Steemann 2b57652880 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-27 19:29:13 +01:00
Jan Steemann de52abbf83 added AQL function `IS_SAME_COLLECTION` 2016-01-27 19:29:01 +01:00
Wilfried Goesgens e1a8726606 Don't optimize the traverser if there are functions on the traversal attribute side; this fixes #1684 2016-01-27 19:21:17 +01:00
Jan Steemann 37a083edca Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-27 18:53:29 +01:00
Jan Steemann 585208afcf changed directory name pattern for collections 2016-01-27 18:53:16 +01:00
Frank Celler 175e1e6b51 moved low level mutex in Mutex class 2016-01-27 15:31:02 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 3d8a52cdf4 some refactoring 2016-01-27 13:28:19 +01:00
Max Neunhoeffer 887e571a26 Merge branch 'devel' into ClustUp2 2016-01-26 18:01:42 +01:00
Jan Steemann ad31aea8b9 TRI_datafile_t 2016-01-26 17:56:10 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Charles Phillips a846405545 fix,solaris: call of overloaded 'log(size_t&)' is ambiguous 
return depCost + nrItems * log(nrItems);
                                         ^
arangod/Aql/SortNode.cpp:196:41: note: candidates are:
In file included from /opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/math.h:47:0,
                 from ./lib/Basics/Common.h:62,
                 from arangod/Aql/SortNode.h:27,
                 from arangod/Aql/SortNode.cpp:24:
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/iso/math_iso.h:221:21: note: long double std::log(long double)
  inline long double log(long double __X) { return __logl(__X); }
                     ^
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/iso/math_iso.h:189:15: note: float std::log(float)
  inline float log(float __X) { return __logf(__X); }
               ^
/opt/local/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.3/include-fixed/iso/math_iso.h:89:15: note: double std::log(double)
 extern double log __P((double));
               ^
 2016-01-25 23:29:05 -08:00
Jan Steemann 3dc247e18b fixed segfault 2016-01-25 14:20:06 +01:00
Jan Steemann 7800085a9b unified behavior of `RANGE` function 2016-01-25 14:19:49 +01:00
Michael Hackstein a6f58ce14d Use forward declarations for VelocyPack instead of all includes everywhere 2016-01-24 14:29:31 +01:00
Michael Hackstein d37cea7644 Replaced TRI_json_t in HashIndex by VelocyPack 2016-01-24 11:17:51 +01:00
Michael Hackstein e39a43ef43 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-24 10:38:48 +01:00
Frank Celler 764a95ea2a switch to testing.js, moved testing.js to client 2016-01-23 21:07:42 +01:00
jsteemann 9ba3b68109 cppcheck 2016-01-23 16:22:39 +01:00
Michael Hackstein b31cc0ba15 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-22 13:36:47 +01:00
Jan Steemann 9beeb09f37 fix out-of-memory situations 2016-01-22 13:24:33 +01:00
Michael Hackstein 7ef829ae63 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-22 13:16:39 +01:00
Jan Steemann 6b19a7b0a7 fixes ported from 2.8 2016-01-21 16:40:31 +01:00
Michael Hackstein 191c2dc3a9 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-21 16:29:38 +01:00
Jan Steemann 25abd4f717 fixes for Visual Studio 2016-01-21 09:46:26 +01:00
Michael Hackstein bc40bcfdfc Added a wraper function for AstNodes to export VPack instead of TRI_json_t 2016-01-21 07:52:49 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
jsteemann ef67a496e6 more checks & asserts, C API cleanup 2016-01-20 22:08:11 +01:00
Michael Hackstein 1178d42004 Removed TRI_json_t from Index Constructors and replaced it by VelocyPack. SingleServerTests pass. Some clister tests fail 2016-01-20 16:19:24 +01:00
Frank Celler ff11db7b78 added threadNumber to identify a thread 2016-01-19 13:57:30 +01:00
jsteemann 29cec1e86c removed outdated TODO comment 2016-01-18 22:06:43 +01:00
Wilfried Goesgens c34d74933b Replace namespace in grammer.y too. 2016-01-18 17:19:38 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
jsteemann 03c4a4fb23 renamed optimizer rule for collect optimization 2016-01-17 00:07:13 +01:00
jsteemann 2b8cf7da62 speed up LENGTH() aggregation a bit 2016-01-16 23:53:11 +01:00
jsteemann 10d84ae525 simplification of COLLECT variants 2016-01-16 22:46:05 +01:00
jsteemann 4abf96e1db removed special case for COLLECT INTO var = expr 2016-01-16 20:20:44 +01:00
Jan Steemann 7b4bf30c38 fixed differing behavior in NEIGHBORS() implementations 2016-01-15 10:22:23 +01:00
jsteemann 1b959c827d more const unification 2016-01-15 00:09:52 +01:00
jsteemann 4a1c10d46c cppcheck 2016-01-14 23:45:59 +01:00
jsteemann 2ae325fd4e removed some of those "using namespace" directives 2016-01-14 23:21:39 +01:00
Jan Steemann c577b8616e allow killing of Collect operations 2016-01-13 13:47:46 +01:00
Wilfried Goesgens 0765ef7b45 Mark internal apis in their documentation. 2016-01-13 12:51:43 +01:00
Jan Steemann 985c51cf72 fixed undefined behavior 2016-01-13 11:17:08 +01:00
jsteemann 59a8cd13dc more aggregate functions 2016-01-13 01:36:50 +01:00
Jan Steemann fd7a03980e renamed 2016-01-12 19:25:05 +01:00
Jan Steemann a08be0f0ff removed included iostream header 2016-01-12 18:30:57 +01:00
Jan Steemann 7524c21f3a added derived files 2016-01-12 17:45:05 +01:00
Jan Steemann 6937dbc489 aggregate fixes 2016-01-12 17:21:18 +01:00
Jan Steemann a3bd1c57c9 added derived files 2016-01-12 13:28:20 +01:00
Jan Steemann 2044cf8038 implemented aggregations for SortedCollectBlock 2016-01-12 12:05:57 +01:00
Jan Steemann 88d49eaef1 fixed segfault 2016-01-12 10:49:43 +01:00
jsteemann e4992ff37a fixed leak 2016-01-12 00:08:58 +01:00
jsteemann 9a2d9924b9 some bugfixes for aggregators 2016-01-11 23:53:03 +01:00
Jan Steemann 9ee2646b53 aggregators ready for hash-collect 2016-01-11 19:24:53 +01:00
Max Neunhoeffer b0283077db Merge branch 'devel' into ClustUp2 2016-01-11 11:41:36 +01:00
Max Neunhoeffer dd364a9d20 Fix merge. 2016-01-11 11:38:10 +01:00
Max Neunhoeffer e7eae3a73a Merge branch 'devel' into ClustUp2 2016-01-11 11:01:45 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
Jan Steemann 3c69cbd40a proper nesting 2016-01-08 18:14:07 +01:00
jsteemann 64c5b21074 cppcheck 2016-01-08 01:17:44 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
Jan Steemann 1e6a07426c collect refactoring 2016-01-07 14:10:32 +01:00
Jan Steemann ad1163e3bb refactoring for Aql COLLECT 2016-01-07 13:35:12 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann bdc51bca80 fix potential crash 2016-01-06 12:14:15 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Frank Celler 6fbe632d08 fixed comparison 2016-01-05 12:36:53 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Jan Steemann c7f44b5f63 reserved AQL keyword `NONE` 2016-01-04 19:34:37 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
jsteemann c20cf66e93 add cacheability info for explain 2016-01-03 00:52:36 +01:00
Max Neunhoeffer fa17c1ac22 Add reporting about query state. Needed for synchronous replication. 2015-12-30 16:52:47 +01:00
Jan Steemann f1ed7cdf46 fixed memleaks that occurred during failure testing only 2015-12-23 20:59:04 +01:00
Jan Steemann 6bc0f491a2 fixed Visual Studio warning 2015-12-23 15:33:02 +01:00
Max Neunhoeffer 394057fbda Merge branch 'devel' into vpack 2015-12-23 15:09:20 +01:00
Max Neunhoeffer 44334d90eb Remove a TODO. 2015-12-23 15:07:35 +01:00
Max Neunhoeffer 169d6b74e2 Adjust TODOs. 2015-12-23 15:07:01 +01:00
Max Neunhoeffer b10fafa501 Remove unused code. 2015-12-23 15:06:41 +01:00
Max Neunhoeffer c7f00bfeda Continue work on TODOs. 2015-12-23 14:40:04 +01:00
Jan Steemann e62ccf7a46 added Ditches for traversal 2015-12-23 11:43:24 +01:00
Max Neunhoeffer 3996d2e6a2 Merge branch 'devel' into vpack 2015-12-23 08:35:59 +01:00
jsteemann 50947dfae3 apply "sort-in-values" optimization for certain subqueries too 2015-12-23 00:44:47 +01:00
jsteemann 3d6582ed52 micro optimizations 2015-12-22 21:58:20 +01:00
jsteemann 3bcc5cd193 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 20:34:55 +01:00
jsteemann 75e815896d allow cancelation of traversal queries 2015-12-22 20:26:00 +01:00
Jan Steemann 5aebcbd91d Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 18:05:35 +01:00
Jan Steemann 6e3878ec94 changed behavior of [*] operator, added COLLECTION_COUNT internal function 2015-12-22 18:03:59 +01:00
Max Neunhoeffer 225c8cd843 Work on TODOs. 2015-12-22 16:50:09 +01:00
Max Neunhoeffer 5f3a1fbdb2 Merge branch 'devel' into vpack 2015-12-22 14:18:34 +01:00
Jan Steemann dac697d24b removed some leftover iostream includes 2015-12-21 18:20:43 +01:00
Max Neunhoeffer 61dd94bc27 Merge branch 'devel' into vpack 2015-12-21 16:06:45 +01:00
Max Neunhoeffer ade47c06dc Fix isSorted bug in cluster. 2015-12-21 16:06:04 +01:00
Max Neunhoeffer 61fe51072c Merge branch 'devel' into vpack 2015-12-21 15:22:46 +01:00
Max Neunhoeffer e8e6dc8597 More VPackObjectBuilder usages. 2015-12-21 15:22:19 +01:00
Max Neunhoeffer 8ce0a484e1 Fix graph traversal tests, behaviour and documentation. 2015-12-21 15:20:56 +01:00
Max Neunhoeffer 9d303b69d7 Merge branch 'devel' into vpack 2015-12-21 09:47:42 +01:00
jsteemann a41f65b0ca optimizer simplifications 2015-12-21 01:43:16 +01:00
jsteemann 50818d9c80 simplifications 2015-12-18 23:54:14 +01:00
jsteemann 19782a45a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-18 23:33:44 +01:00
Jan Steemann 36eac6ffd0 fixed index selection in some queries 2015-12-18 20:16:09 +01:00
Michael Hackstein 642a6261f2 Added a proper selectivity estimate for traversal nodes. 2015-12-18 18:02:13 +01:00
Michael Hackstein c00d0cbc4d Improved stability of AQL Traverser. Also added checks for illegal edge cases 2015-12-18 16:17:09 +01:00
Jan Steemann 8053911c39 tests for issue #1583 2015-12-18 12:15:52 +01:00
Jan Steemann 1faaaa0632 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 14:41:24 +01:00
Wilfried Goesgens e908be8cd4 fix style 2015-12-17 13:39:05 +01:00
Jan Steemann ad45a4b254 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 12:31:14 +01:00
Jan Steemann b76c61adb1 \0 fix 2015-12-17 12:28:16 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
jsteemann ead2ee47e7 issue #1409: fix NUL-byte handling 2015-12-17 10:54:24 +01:00
Michael Hackstein 82eea28fea Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-16 19:03:15 +01:00
Wilfried Goesgens 1914fefc48 remove unused code path 2015-12-16 17:31:04 +01:00
Wilfried Goesgens 9d1f861736 Fix memory management of traverser expression. 2015-12-16 17:07:17 +01:00
Jan Steemann 8e18d6463f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-16 11:44:56 +01:00
Michael Hackstein 5e4efc7267 Updated AQL to class verison of TRI_col_info_t 2015-12-16 11:38:33 +01:00
Jan Steemann a694b7ef48 make_unique 2015-12-16 11:36:35 +01:00
Wilfried Goesgens da57d31488 Implement de/serializing of filters in traversalnodes 2015-12-16 11:17:38 +01:00
Max Neunhoeffer b337d9bd29 Fix shared_ptr<CONTAINER> direct-use in for bug. 2015-12-16 10:29:23 +01:00
Max Neunhoeffer 0198b4576b Merge branch 'devel' into ClustUp1 2015-12-15 20:40:52 +01:00
jsteemann 8003ea7d74 fixed undefined variable warning 2015-12-15 20:12:50 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Michael Hackstein 5e332fa4b5 Adapted CXX function AQL EDGES to work with documents / Arrays as well. Similar to the old JS version 2015-12-15 16:38:45 +01:00
Michael Hackstein cd7b249e07 Fixed Cxx implementation of EDGES to be able to handle Edges 2015-12-15 16:38:03 +01:00
Jan Steemann ad8381ad6a Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-15 16:37:33 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Jan Steemann 223c44d572 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-15 12:02:47 +01:00
Max Neunhoeffer 8a69ca5367 Merge branch 'devel' into ClustUp1 2015-12-15 09:23:51 +01:00
Wilfried Goesgens f51e5efb34 Implement tests for de/serializing of TraversalNodes. 2015-12-14 18:07:04 +01:00
Max Neunhoeffer 525e54d5a0 Merge branch 'devel' into ClustUp1 2015-12-14 11:26:10 +01:00
Max Neunhoeffer 7641feeb88 Fix ClusterComm library w.r.t. pointers. 2015-12-14 11:22:30 +01:00
jsteemann db746389f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-14 00:12:36 +01:00
jsteemann 51c267cd2a dont optimize in certain cases when its useless 2015-12-14 00:12:14 +01:00
jsteemann fd29ccdbc5 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-13 23:37:22 +01:00
jsteemann 600c48375d added optimizer rule `sort-in-values` 2015-12-13 23:33:44 +01:00
Max Neunhoeffer af4d729284 The ClusterComm C++11 revolution. 2015-12-11 23:26:10 +01:00
Jan Steemann 43eff8f0e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-11 16:33:35 +01:00
Jan Steemann 5ae891ac20 fix for issue #1603 2015-12-11 16:24:33 +01:00
Jan Steemann 2bdbb13e2c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-11 14:13:36 +01:00
Max Neunhoeffer 95b311f802 Merge branch 'devel' into ClustUp1 2015-12-11 13:33:33 +01:00
jsteemann 18e47457a6 fixes 2015-12-11 13:29:18 +01:00
Max Neunhoeffer c11ec07564 Merge branch 'devel' into ClustUp1 2015-12-11 13:28:07 +01:00
Wilfried Goesgens 8c1d6efaaf Improve error message 2015-12-11 13:02:23 +01:00
Michael Hackstein 1af985003d Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-10 10:26:14 +01:00
Max Neunhoeffer ea72850aeb Fix bug in client tests. 2015-12-09 23:13:26 +01:00
Michael Hackstein b8a9efbe33 Fixed a Illeagal memory access in BindParameters StripCollectionNames 2015-12-09 18:08:41 +01:00
Max Neunhoeffer 7a91accb71 Merge branch 'devel' into ClustUp1 2015-12-09 15:19:11 +01:00
Jan Steemann 98a5badb08 cppcheck 2015-12-09 14:49:44 +01:00
Max Neunhoeffer 7931be71a0 Merge branch 'devel' into ClustUp1 2015-12-09 12:45:07 +01:00
Michael Hackstein f6e24e41e7 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-09 12:41:57 +01:00
Jan Steemann 37c032c694 fixed invalid read 2015-12-09 12:05:38 +01:00
Michael Hackstein 757577de42 Updated VPack addObject to openObject 2015-12-09 11:28:54 +01:00
Michael Hackstein acadb089ee Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-09 10:29:13 +01:00
Max Neunhoeffer ec4e37b2f9 Merge branch 'devel' into ClustUp1 2015-12-08 20:13:17 +01:00
Jan Steemann 4cd2621d06 adjusted AQL function return values 2015-12-08 19:45:32 +01:00
Jan Steemann 76d5f57af0 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-08 18:23:06 +01:00
Max Neunhoeffer 4e523a19ed Merge branch 'devel' into ClustUp1 2015-12-08 17:02:14 +01:00
Jan Steemann ee6792dd6b fixes for traversal and multi-modify 2015-12-08 14:50:05 +01:00
Max Neunhoeffer 257c6c897d Fix bugs and tests. 2015-12-08 12:48:11 +01:00
Jan Steemann a3f42b5072 renamed test method 2015-12-08 11:49:45 +01:00
Jan Steemann 04f3abae2a Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-07 16:51:21 +01:00
Jan Steemann dd87d775b5 added comment 2015-12-07 16:26:54 +01:00
Jan Steemann f707eddbcc added tests 2015-12-07 16:06:58 +01:00
Max Neunhoeffer a8a9f1832b Merge branch 'devel' into ClustUp1 2015-12-04 23:06:11 +01:00
Jan Steemann 6fd4e9b1be Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 17:08:53 +01:00
Jan Steemann a53da38fcd fixed some cluster queries 2015-12-04 17:07:36 +01:00
Michael Hackstein 35fbe9aefd Fixed include <array> did not compile under Mac Os X 2015-12-04 15:28:49 +01:00
Max Neunhoeffer 60df924ac1 Change data structures for collections in Agency. 
Snapshot, compiles, untested, needs new VelocyPack.
 2015-12-04 15:08:47 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Jan Steemann 785beaa625 cppcheck 2015-12-04 12:18:15 +01:00
Jan Steemann 3b1df26a79 added AQL function `IS_DATESTRING` 2015-12-04 10:53:01 +01:00
jsteemann f3e35b6497 updated grammar file 2015-12-03 23:26:28 +01:00
Michael Hackstein 11640a15ad Fixed a comment 2015-12-03 16:05:06 +01:00
Jan Steemann d8bf728fd3 added TRAVERSAL nodes for optimization checks 2015-12-03 15:25:16 +01:00
Jan Steemann b8cd633276 Windows fixes 2015-12-03 15:00:19 +01:00
Jan Steemann ec3ab298e1 added test for traversal after data modification 2015-12-03 13:46:11 +01:00
Jan Steemann 6c1717ec90 updated keywords list 2015-12-03 12:11:52 +01:00
Jan Steemann d572f3ed03 Merge branch 'aql-multi-modify' of https://github.com/arangodb/arangodb into devel 2015-12-03 11:38:30 +01:00
Michael Hackstein 86b4a7137d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-03 11:35:33 +01:00
Michael Hackstein 605e1bce55 Style fixes 2015-12-03 11:35:18 +01:00
jsteemann eb5b68089e even more unconstification 2015-12-03 11:11:10 +01:00
jsteemann 135d434a7f more unconstification 2015-12-03 11:09:35 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
jsteemann 840df0bf09 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-03 10:16:59 +01:00
Jan Steemann c0729fbc6b allow calling AQL functions that require collection name arguments with string values 2015-12-02 18:20:21 +01:00
Michael Hackstein b2e4673c65 Added a test for early filtering of < <= => > in Traversal 2015-12-02 17:52:01 +01:00
jsteemann 9fa0f6d3a7 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-02 16:38:50 +01:00
Jan Steemann 3a7eca45b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-02 15:41:51 +01:00
Jan Steemann 61a8e4c686 issue #1593: add POW() AQL function 2015-12-02 15:41:30 +01:00
Max Neunhoeffer 3821a775a3 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-02 14:48:04 +01:00
Max Neunhoeffer 3556f76469 Fix ClusterComm::asyncRequest w.r.t. body shared_ptr. 2015-12-02 14:15:18 +01:00