1
0
Fork 0
Commit Graph

2063 Commits

Author SHA1 Message Date
Michael Hackstein 7b42fc7ae8 Unified lookup in PrimaryIndex to use identical format as HashIndex lookup does 2016-02-25 14:38:39 +01:00
Jan Steemann 2ee4dad77b TransactionContext is now the resource owner 2016-02-25 14:02:57 +01:00
Jan Steemann 3c6391279e cleanup 2016-02-25 12:24:04 +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
jsteemann cac9526926 removed dependency on regex.h 2016-02-24 23:06:46 +01:00
Jan Steemann cd6a9d4988 cleanup 2016-02-24 20:12:46 +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
Max Neunhoeffer aaaa50c6d0 Many index changes, compiles, does not run well. 2016-02-24 15:47:57 +01:00
jsteemann 24e1669f04 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-24 00:22:25 +01:00
jsteemann 6ff60602de fixed more recovery tests 2016-02-24 00:20:42 +01:00
jsteemann 8212de5c70 fixed recovery tests 2016-02-23 23:21:23 +01:00
Frank Celler 8edc06daf3 addeed log output 2016-02-23 22:32:28 +01:00
jsteemann c9974b60ab Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 22:26:44 +01:00
jsteemann b2ecc039c6 fixed looukp path 2016-02-23 22:24:10 +01:00
jsteemann ee49f4f3f7 cppcheck 2016-02-23 21:33:59 +01:00
Jan Steemann a27f1efd66 changed resolver handling 2016-02-23 20:27:13 +01:00
Jan Steemann 0e5f1fcb24 moved ditches into TransactionContext 2016-02-23 16:46:25 +01:00
Frank Celler 5b5471560c fixed wrong comparison for .tmp 2016-02-23 15:27:36 +01:00
Frank Celler 022a5f457c cleanup of TRI_ options 2016-02-23 15:27:35 +01:00
Frank Celler d53b65a2f8 cleanup of OS defines 2016-02-23 15:27:34 +01:00
Frank Celler 24649f44bd move to strings and away from regexp 2016-02-23 15:25:07 +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 5237860213 fixed wrong comparison for .tmp 2016-02-23 12:26:12 +01:00
Frank Celler 963578180a cleanup of TRI_ options 2016-02-23 12:26:10 +01:00
Frank Celler e269b97517 cleanup of OS defines 2016-02-23 12:26:10 +01:00
Frank Celler d142a5ddb4 move to strings and away from regexp 2016-02-23 12:26:09 +01:00
Jan Steemann f468cd00ad create transaction context as shared ptr 2016-02-23 12:18:39 +01:00
Michael Hackstein bf7a2dacea Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-23 11:10:51 +01:00
Michael Hackstein b8964a74c0 Silence unused Parameter warning 2016-02-23 11:09:27 +01:00
Jan Steemann 0a969caf23 removed SingleCollectionReadOnlyTransaction and SingleCollectionWriteTransaction 2016-02-23 11:05:44 +01:00
Max Neunhoeffer ff6da8ffe4 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-02-22 13:02:30 +01:00
Max Neunhoeffer 82e017fd9a Add TRI_vpack_sub_t. 2016-02-22 13:02:17 +01:00
Jan Steemann 2a627d419d removed unused method 2016-02-22 12:42:28 +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 f3ac5d1a04 more compaction 2016-02-19 18:21:04 +01:00
Max Neunhoeffer f679a50b5c Fix replace and update bug. 2016-02-19 15:09:51 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
jsteemann 62130d3239 locking-related bugfixes 2016-02-19 00:31:28 +01:00
Jan Steemann 157bbe3cf7 fixed replace() 2016-02-18 16:16:54 +01:00
Jan Steemann 9b80a8a371 return _rev in case of revision mismatch for document(), fixed update() 2016-02-18 14:42:38 +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 d6cc325c43 initial implementation of update, still broken 2016-02-17 18:06:35 +01:00
Jan Steemann dda2459f41 added document() 2016-02-17 15:59:44 +01:00
Jan Steemann bce6b4f130 remove 2016-02-17 13:41:18 +01:00
Jan Steemann a3b0bb83d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-16 15:39:02 +01:00
Jan Steemann 0c4ab9054a API cleanup 2016-02-16 15:13:30 +01:00
Jan Steemann 313f27deed renamed methods 2016-02-15 18:18:03 +01:00
Michael Hackstein 4a7bc9ad95 Removed unnecessary JSON 2016-02-15 17:48:20 +01:00
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Jan Steemann 7ff95c4ec4 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-15 09:36:02 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Jan Steemann 0089b0fcf6 updated vpack library 2016-02-12 16:33:26 +01:00
Jan Steemann 9898103bc1 initial vpack documents 2016-02-11 21:56:10 +01:00
Jan Steemann dad000b883 use std::string to avoid potential leaks 2016-02-11 10:13:49 +01:00
Max Neunhoeffer fc3f9f2b99 Merge branch 'devel' into ClustUp2 2016-02-11 09:27:28 +01:00
Jan Steemann 49767bb95a replicate transaction marker 2016-02-11 09:26:47 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Jan Steemann 23dfbeee46 optionally restrict logger-follow to a single collection 2016-02-10 16:49:22 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Jan Steemann 53ba1deb55 remove unnecessary code 2016-02-09 11:37:12 +01:00
Jan Steemann 39c3d3d2a2 wait until applier has started 2016-02-09 10:54:37 +01:00
Frank Celler 0e3ec4fa6a fixed TRI_doc_mptr_t 2016-02-08 23:38:41 +01:00
Jan Steemann 4bc33cafaf fixed leak 2016-02-08 18:06:11 +01:00
jsteemann be5d6fe756 remove obsolete functionality 2016-02-06 01:13:36 +01:00
Jan Steemann 206dddc701 fixed potential leak 2016-02-05 21:32:26 +01:00
Jan Steemann a0cb3b1832 replication changes 2016-02-05 18:06:39 +01:00
Michael Hackstein f5d93fb872 Implemented AQL EDGES as a VPack Variant. 2016-02-05 16:18:21 +01:00
Jan Steemann 071d36c203 replication cleanup 2016-02-05 13:28:38 +01:00
Jan Steemann abd382bf19 replication cleanup 2016-02-05 13:08:12 +01:00
Michael Hackstein 96b75d3733 Added a VPack Implementation for AQL Neighbors. This involved modification of Traverser and ExampleMather to understand VPack as well 2016-02-05 08:45:20 +01:00
Jan Steemann 437160f921 minor datafile statistics correction 2016-02-04 16:54:10 +01:00
Jan Steemann 6bac50d372 don't compact in one special case 2016-02-04 11:37:46 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Jan Steemann ac0446faf2 fixed potential truncation of master pointer list when rolling back update operations 2016-02-03 18:51:22 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
jsteemann d9de65acf8 remove now useless casts when invoking logger 2016-02-02 21:38:01 +01:00
Jan Steemann 5eb9687e21 turn off deadlock detection in cluster 2016-02-02 14:02:28 +01:00
Jan Steemann 22df27632a added helper method 2016-02-01 13:30:47 +01:00
jsteemann 3aed47d8e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-01 13:15:05 +01:00
Michael Hackstein 197292a230 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 13:02:49 +01:00
Max Neunhoeffer daf2afe71a Merge branch 'devel' into ClustUp2 2016-02-01 12:30:45 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Max Neunhoeffer 0be190d85d Merge branch 'devel' into ClustUp2 2016-02-01 11:43:00 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
Michael Hackstein b85d5d4a26 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 09:49:29 +01:00
Michael Hackstein 9ea8e3ea0c Started to write merge of two slices. This is not yet working for null means delete, works for all other merges. 2016-02-01 09:49:19 +01:00
jsteemann 54c796b6e8 fixed issues identified by `-fsanitize=undefined` 2016-01-31 23:30:41 +01:00
jsteemann 349a6d9754 more logging 2016-01-31 21:48:59 +01:00
jsteemann b635983d9c removed unused functions and headers 2016-01-31 19:08:39 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00
jsteemann d59595f1bf fixed leak 2016-01-31 02:22:15 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann ac634b9dab fixed compile error in non-maintainer-mode 2016-01-30 14:38:31 +01:00
jsteemann 353c9732b7 removed last LOG_xxx macros 2016-01-30 04:03:18 +01:00
jsteemann dbd5c500cb remove TRI_ENABLE_LOGGING 2016-01-30 00:46:40 +01:00
jsteemann 9482ee1cca use Logger 2016-01-30 00:08:35 +01:00
jsteemann 00a68113b5 more files using the Logger 2016-01-29 23:45:10 +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
Michael Hackstein e0f0a6f1a8 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:18:05 +01:00
Michael Hackstein 436c377cb5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:01:53 +01:00
Max Neunhoeffer 238937128a Merge branch 'devel' into ClustUp2 2016-01-29 13:59:11 +01:00
Max Neunhoeffer dcf4ed8bca Sort out FollowerInfo. 2016-01-29 13:56:37 +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 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
Jan Steemann ad31aea8b9 TRI_datafile_t 2016-01-26 17:56:10 +01:00
Jan Steemann 7069810778 removed some low-level locks 2016-01-26 16:16:18 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Michael Hackstein f9ada16a89 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-26 13:27:41 +01:00
Jan Steemann 1e77b11090 added comment 2016-01-25 17:56:48 +01:00
Jan Steemann 5dc0a429b2 removed spinlocks and TRI_WINDOWS_VISTA_LOCKS 2016-01-25 17:55:06 +01:00
Michael Hackstein 0a63cb5d48 Removed TRI_json_t from v8-query. 2016-01-25 16:58:53 +01:00
Jan Steemann 31bdc67d12 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-25 13:47:57 +01:00
Jan Steemann 47b77150f3 more trace logging 2016-01-25 13:47:21 +01:00
Michael Hackstein 5b2062b4e4 Removed legacy toJson function from Index.h. All callers now use VelocyPack directly 2016-01-25 11:42:31 +01:00
Michael Hackstein a6f58ce14d Use forward declarations for VelocyPack instead of all includes everywhere 2016-01-24 14:29:31 +01:00
jsteemann 904a85a27e less re-allocations 2016-01-23 17:26:11 +01:00
jsteemann 9ba3b68109 cppcheck 2016-01-23 16:22:39 +01:00
Jan Steemann cf560a473d fix undefined behavior 2016-01-22 15:34:36 +01:00
Jan Steemann 9beeb09f37 fix out-of-memory situations 2016-01-22 13:24:33 +01:00
jsteemann 0a12bd2732 more diagnosis 2016-01-22 00:58:36 +01:00
Jan Steemann 6b19a7b0a7 fixes ported from 2.8 2016-01-21 16:40:31 +01:00
Jan Steemann 219da94986 fix some locks 2016-01-21 13:01:31 +01:00
Jan Steemann d03a8376a4 catch exception 2016-01-21 09:55:17 +01:00
jsteemann 6f0be080fa unification of sub-thread naming 2016-01-21 00:51:51 +01:00
jsteemann 379abd64c3 removed outdated upgrading function 2016-01-21 00:29:56 +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
jsteemann 1c557d8200 class has virtual methods, so add virtual dtor, too 2016-01-20 20:14:51 +01:00
Jan Steemann 1e847fbb0a please the Visual Studio 2016-01-20 14:03:54 +01:00
Jan Steemann 1e253171e9 use TRI_DEFER 2016-01-20 14:03:34 +01:00
Jan Steemann da3d9d3966 removed unused function 2016-01-20 11:02:11 +01:00
Jan Steemann 541cc98f6b don't ftruncate 2016-01-20 10:53:08 +01:00
Jan Steemann ec17068875 warn when closing a datafile fails 2016-01-20 09:44:45 +01:00
Jan Steemann c8f16f8833 switched to std::vector 2016-01-19 11:50:39 +01:00
jsteemann 41b18ade20 fixed stats 2016-01-18 21:18:46 +01:00
Jan Steemann 82c98dc11f debugging 2016-01-18 18:33:48 +01:00
Jan Steemann 5daa529404 compaction fix attempt II 2016-01-18 18:24:25 +01:00
Jan Steemann 87667edc6a fixed grammar 2016-01-18 09:40:12 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Michael Hackstein 212b3752b1 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-15 10:58:20 +01:00
jsteemann 44e9a0d8bc remove deletion-count as reason for compaction 2016-01-14 22:54:45 +01:00
Jan Steemann f1b0114e89 fixed leak 2016-01-14 17:56:57 +01:00
Michael Hackstein c3d4a5338a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-01-14 17:44:59 +01:00
Jan Steemann 5582ae0515 fixed misleading error message 2016-01-14 17:35:07 +01:00
Jan Steemann d2c349b8b5 statistics fix 2016-01-14 11:10:01 +01:00
Michael Hackstein 2029d185be Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-13 17:20:32 +01:00
Jan Steemann 8404d0eac1 better OOM handling in ThreadPool constructor 2016-01-13 16:19:53 +01:00
Michael Hackstein 9f24c7ad2f Removed TRI_json_t from VocBase/document-collection. YaY 2016-01-13 15:55:46 +01:00
Michael Hackstein 98fdb95932 Modified OpenIndexIterator to use VelocyPack instead of TRI_json_t 2016-01-13 11:29:18 +01:00
Michael Hackstein 09ffbabf06 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-13 10:51:41 +01:00
Michael Hackstein 848f807499 Entirely removed TRI_json_t from server.cpp 2016-01-13 10:47:55 +01:00
Michael Hackstein 69f4f974d3 Vocbase server now stores VPack instead of TRI_json_t 2016-01-13 10:25:52 +01:00
Jan Steemann bb3703cf9e fix recovery 2016-01-12 20:47:02 +01:00
Jan Steemann a119837c3e fixed journalSize handling for collections 2016-01-12 19:41:39 +01:00
Jan Steemann 6ac3b964ff fixed collection creation 2016-01-12 19:25:13 +01:00
Michael Hackstein f968c6f924 Removed some references to TRI_json_t in VocBase/server 2016-01-12 15:56:32 +01:00
Michael Hackstein b45ac55d58 Clang-format fixes 2016-01-12 15:16:04 +01:00
Michael Hackstein 96d58b8a67 Replaced toJson with toVelocyPack in KeyGenerator. 2016-01-12 15:13:34 +01:00
Michael Hackstein af1c96cf01 KeyGenerators are now generated from VPack instead of TRI_json_t 2016-01-12 14:25:57 +01:00
Max Neunhoeffer 9eb056b971 Fix a memory leak. 2016-01-11 10:51:56 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
Jan Steemann d0f730a614 fix some compaction issues 2016-01-08 14:52:42 +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 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 9a1d7959e9 merged string-buffer.h and StringBuffer.h 2016-01-06 13:24:09 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Jan Steemann edb4d2dc4c fix some VS compile errors 2016-01-05 14:10:10 +01:00
Frank Celler 6fbe632d08 fixed comparison 2016-01-05 12:36:53 +01:00
jsteemann e5db136f99 internal function signature cleanup 2016-01-05 01:12:11 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Max Neunhoeffer 79b5175212 Add followerInfos in ClusterInfo. 2015-12-28 14:31:16 +01:00
Jan Steemann 2e10c89cc2 fix invalid reads on shutdown 2015-12-23 16:49:13 +01:00
Max Neunhoeffer 169d6b74e2 Adjust TODOs. 2015-12-23 15:07:01 +01:00
Max Neunhoeffer c7f00bfeda Continue work on TODOs. 2015-12-23 14:40:04 +01:00
Max Neunhoeffer 3996d2e6a2 Merge branch 'devel' into vpack 2015-12-23 08:35:59 +01:00
jsteemann 3d6582ed52 micro optimizations 2015-12-22 21:58:20 +01:00
Max Neunhoeffer 225c8cd843 Work on TODOs. 2015-12-22 16:50:09 +01:00
Jan Steemann 80c7645146 one more try 2015-12-22 13:10:43 +01:00
Jan Steemann e2e483e06a potential fix 2015-12-22 12:34:48 +01:00
Jan Steemann dac697d24b removed some leftover iostream includes 2015-12-21 18:20:43 +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 b37c8fb5a2 Fix js/common/tests/shell-collection.js in cluster. 2015-12-21 11:05:02 +01:00
Jan Steemann ba52741a55 adapted compaction status messages 2015-12-21 10:28:52 +01:00