1
0
Fork 0
Commit Graph

2669 Commits

Author SHA1 Message Date
Jan Steemann 254f6b49b9 write prologue markers for document & remove markers 2016-02-29 17:08:38 +01:00
jsteemann 951c608ee6 cleanup 2016-02-26 23:20:41 +01:00
jsteemann 99e7bcfe5e removed debug macros 2016-02-26 23:15:20 +01:00
jsteemann 4845b3fc93 cleanup 2016-02-26 23:07:19 +01:00
Jan Steemann bd9293802d marker changes, unfinished 2016-02-26 19:39:17 +01:00
Michael Hackstein 7174a6225f Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-26 13:32:10 +01:00
Michael Hackstein ac173ca497 The Edge Index now indexes with VPackSlice instead of TRI_edge_header_t. Some functions that were using the Edge Index are disabled and will not work. These functions have to be modified to use the new Transaction API. 2016-02-26 13:31:10 +01:00
Jan Steemann ebf2d1520b removed TRI_doc_mptr_copy_t 2016-02-26 11:46:33 +01:00
Jan Steemann 693b31d032 remove _prev and _next from mptr 2016-02-26 11:23:01 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
Jan Steemann 8f2e2de451 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 10:46:13 +01:00
jsteemann 1823ae4fd2 removed unused forwards and functions 2016-02-25 00:48:06 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann 851d19a9d6 logging simplifications 2016-02-25 00:00:18 +01:00
Frank Celler da7955e417 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-24 19:29:01 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Jan Steemann 63d1d5339f cppcheck 2016-02-24 17:55:36 +01:00
Jan Steemann 4bbccedf0d Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 17:46:40 +01:00
Jan Steemann af367a3e13 fixed range optimizations 2016-02-24 17:43:17 +01:00
jsteemann ee49f4f3f7 cppcheck 2016-02-23 21:33:59 +01:00
Frank Celler d53b65a2f8 cleanup of OS defines 2016-02-23 15:27:34 +01:00
Jan Steemann 70d44f06fa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 13:22:46 +01:00
Jan Steemann eb202f528c pass vocbase in TransactionContext 2016-02-23 13:03:30 +01:00
Frank Celler e269b97517 cleanup of OS defines 2016-02-23 12:26:10 +01:00
Jan Steemann f468cd00ad create transaction context as shared ptr 2016-02-23 12:18:39 +01:00
Michael Hackstein 538650ce61 Removed obsolete define 2016-02-23 11:10:44 +01:00
Michael Hackstein f61c16a248 Removed obsolete JSON implementations in Aql/Functions 2016-02-23 11:09:48 +01:00
Jan Steemann ea3a7f3dab removed cap constraints 2016-02-22 12:37:16 +01:00
Jan Steemann 4277f7a131 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-22 09:41:44 +01:00
Max Neunhoeffer 393ac7e753 Rename getCollectionId -> getCollectionIdLocal. 2016-02-19 23:26:17 +01:00
Jan Steemann be42d61f2a added derived file 2016-02-19 18:30:21 +01:00
Jan Steemann bc6283fc91 added WITH collections declarative 2016-02-19 18:20:46 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
Jan Steemann adde757e46 move v8 try-catch into handle scopes 2016-02-19 11:42:44 +01:00
Michael Hackstein 4d044d2732 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-18 12:56:33 +01:00
Jan Steemann d7963c651b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-18 12:55:49 +01:00
Michael Hackstein 46d8b291c9 C++ Graph module now uses new Transcation API to get the graph definition 2016-02-18 12:51:08 +01:00
Jan Steemann ba93854c59 check return value 2016-02-18 11:00:39 +01:00
Frank Celler a5e804ab70 added cancel 2016-02-17 22:19:52 +01:00
Frank Celler 345712c36f changed to new Thread interface 2016-02-17 22:19:37 +01:00
Jan Steemann a3b0bb83d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-16 15:39:02 +01:00
Michael Hackstein b93e56031b Fixed handling of Null Bytes in AqlValue for VPack. 2016-02-16 13:54:02 +01:00
Michael Hackstein 85b38d09b9 Fixed double free bug in cluster case 2016-02-16 11:34:26 +01:00
Michael Hackstein 116f8a822c Fixed typos in Attribute Names for toVelocyPack. 2016-02-16 11:15:53 +01:00
Michael Hackstein f32750e1ac Removed obsolete toJson from AQL Nodes 2016-02-16 10:29:38 +01:00
Michael Hackstein f767636f14 Added a toVelocyPack serialisation to all Aql Nodes and their dependencies. Right now in parallel to toJson. 2016-02-16 00:04:32 +01:00
Jan Steemann 313f27deed renamed methods 2016-02-15 18:18:03 +01:00
Michael Hackstein bb264d89f8 Removed VPackSlice const from std::containers. It is against the standard and compiles somehow with clang but not with g++4.9 2016-02-15 11:21:40 +01:00
Michael Hackstein 2c6c31004c Silenced parentheses warning 2016-02-15 10:53:35 +01:00