1
0
Fork 0
Commit Graph

1041 Commits

Author SHA1 Message Date
Michael Hackstein ff4cf5e0b2 Fixed merge bug. Last commit didn't build 2016-03-10 11:10:13 +01:00
Michael Hackstein 23f845de05 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 10:46:30 +01:00
Michael Hackstein 4c4c117059 Partially Adopted Traverser to new transaction API. This is still work in Progress. It compiles but it will not work yet. 2016-03-10 10:42:20 +01:00
jsteemann cf3b00adc2 removed unused functionality 2016-03-09 23:14:29 +01:00
jsteemann d756f6a176 removed TRI_transaction_collection_t from public APIs 2016-03-09 01:51:17 +01:00
Michael Hackstein 42e3d94bf6 Removed unused obsolete Code and Imports 2016-03-08 13:29:09 +01:00
Michael Hackstein e60e7a3652 Aql/QueryResult now only uses VelocyPack instead of TRI_json_t. Also adapted all calling places 2016-03-08 13:08:05 +01:00
Michael Hackstein 7c3690c4db AqlQuery now is contructed from VelocyPack builders only. Also variables and Execution Plan is constructed form VelocyPack only. 2016-03-07 19:04:37 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann ad4a9542ea removed file 2016-03-04 18:32:54 +01:00
Jan Steemann c157363f3c less dependencies 2016-03-04 17:21:09 +01:00
Jan Steemann 06da362f93 some json removal 2016-03-02 17:51:05 +01:00
Jan Steemann 18c6fb35e1 removed warning 2016-02-29 15:23:25 +01:00
Jan Steemann f4f7bcb044 recovery 2016-02-29 14:24:46 +01:00
Jan Steemann ebf2d1520b removed TRI_doc_mptr_copy_t 2016-02-26 11:46:33 +01:00
Jan Steemann a27f1efd66 changed resolver handling 2016-02-23 20:27:13 +01:00
Jan Steemann f468cd00ad create transaction context as shared ptr 2016-02-23 12:18:39 +01:00
Max Neunhoeffer 393ac7e753 Rename getCollectionId -> getCollectionIdLocal. 2016-02-19 23:26:17 +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
Jan Steemann 313f27deed renamed methods 2016-02-15 18:18:03 +01:00
Jan Steemann 9898103bc1 initial vpack documents 2016-02-11 21:56:10 +01:00
Jan Steemann 699b2435ca fix unnecessary increase of reference counter 2016-02-04 15:07:23 +01:00
Jan Steemann 5eb9687e21 turn off deadlock detection in cluster 2016-02-02 14:02:28 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann 4e94803ad7 honor results of clang-test, clang-tidy and clang-modernize 2016-01-31 15:56:18 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
Jan Steemann cd4cbae6ce ported fixes to devel 2016-01-29 19:05:27 +01:00
Max Neunhoeffer 238937128a Merge branch 'devel' into ClustUp2 2016-01-29 13:59:11 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Max Neunhoeffer 887e571a26 Merge branch 'devel' into ClustUp2 2016-01-26 18:01:42 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Jan Steemann f5d2839bf0 removed reference to unused variable 2016-01-25 18:17:50 +01:00
Michael Hackstein bc1b69af70 Fixed error where a nullptr was dereferenced without any checks 2016-01-25 16:00:17 +01:00
Jan Steemann 3dc247e18b fixed segfault 2016-01-25 14:20:06 +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 191c2dc3a9 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-21 16:29:38 +01:00
Jan Steemann 219da94986 fix some locks 2016-01-21 13:01:31 +01:00
Michael Hackstein 287aadb22c Fixed a bug when creating a new database with users. 2016-01-21 11:00:17 +01:00
Michael Hackstein 0605338d5e Fixed a non closed VPackBuilder 2016-01-21 09:36:24 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
Michael Hackstein 3c6ac9f38f Removed all TRI_json_t inputs to AgencyComm and replaced them by VPack. This commit stil has an error s.t. indexes cannot be dropped in Cluster. WIP. 2016-01-20 12:53:55 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Michael Hackstein f3806171f5 Reduced occurences of TRI_json_t in Cluster Code 2016-01-15 15:32:47 +01:00
jsteemann f66eb007cd some const unification 2016-01-15 00:03:03 +01:00
Max Neunhoeffer b0283077db Merge branch 'devel' into ClustUp2 2016-01-11 11:41:36 +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
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00