1
0
Fork 0
Commit Graph

8213 Commits

Author SHA1 Message Date
jsteemann 630c8f44aa use correct includes 2016-03-04 02:30:47 +01:00
jsteemann 053648b36c simplifications 2016-03-04 02:25:18 +01:00
jsteemann cf1427adff smaller datafile markers 2016-03-04 02:25:03 +01:00
jsteemann c2c509ef58 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 21:27:13 +01:00
jsteemann f1474f4c0a fixed logic error 2016-03-03 21:19:51 +01:00
Jan Steemann 4e0328d46f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 17:59:27 +01:00
Jan Steemann 337fc4bca4 remove std::mutex 2016-03-03 17:47:46 +01:00
Jan Steemann 16588e33d3 less json 2016-03-03 17:30:15 +01:00
Jan Steemann 3cadcd5340 less json 2016-03-03 15:40:00 +01:00
Jan Steemann 57634adaa8 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 14:23:45 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Max Neunhoeffer d545702efa Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 13:24:33 +01:00
Michael Hackstein 65cf9efefe Replaced another TRI_associative with a std::vector for Auth. Also replace TRI_vocbase_auth_cache_t by a proper CXX class VocbaseAuthCache. 2016-03-03 11:35:30 +01:00
Max Neunhoeffer d2d785ec41 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 09:04:54 +01:00
jsteemann 60ac50e5c6 cppcheck 2016-03-02 22:09:32 +01:00
Jan Steemann a09d517d9e fixed warning 2016-03-02 17:55:02 +01:00
Jan Steemann fa759ec787 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 17:51:12 +01:00
Jan Steemann 06da362f93 some json removal 2016-03-02 17:51:05 +01:00
Wilfried Goesgens 1b207c885e Add libev error handler. 2016-03-02 17:48:54 +01:00
Jan Steemann 4c03f4bf8d simplification 2016-03-02 15:50:52 +01:00
Michael Hackstein fc06d7eaa0 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-02 15:46:46 +01:00
Michael Hackstein d95c4954a4 Removed shape from ExampleMatcher. Also TRI_json_t variant is non functional anymore. It is DEPRECATED and will be removed very very soon 2016-03-02 15:46:32 +01:00
Jan Steemann 1ca358bde8 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 15:21:37 +01:00
Jan Steemann 7a087730d1 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 14:58:21 +01:00
Jan Steemann ba40edac87 less json 2016-03-02 14:58:13 +01:00
Jan Steemann 90bf212f54 fixed shutdown issues 2016-03-02 14:56:30 +01:00
Michael Hackstein 56f0e927cf unshapified VocBase/auth. Also replaced TRI_AssociativeList with an unordered_map. 2016-03-02 13:12:04 +01:00
Jan Steemann 1f6b0abaa5 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 12:42:30 +01:00
Michael Hackstein d2febf9a58 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-02 12:39:52 +01:00
Michael Hackstein 5153750abe Added a function to invoke a callback on all elements in a collection within a transaction. 2016-03-02 12:39:37 +01:00
Jan Steemann 66ee7e600d less json 2016-03-02 11:58:28 +01:00
Jan Steemann b209accf29 removed json 2016-03-02 11:34:31 +01:00
Max Neunhoeffer 9da16d66a0 Fix bugs in Transaction replace method for babies. 2016-03-02 11:32:49 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Max Neunhoeffer 738e595df3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-02 10:59:39 +01:00
Jan Steemann 91ca37facb Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 10:54:29 +01:00
Jan Steemann e6e864cd7a removed unused functions 2016-03-02 10:53:59 +01:00
Max Neunhoeffer 9a1acd1833 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-02 10:53:57 +01:00
Max Neunhoeffer 0f883dc0c8 Adjust replace to new TRI_V8ToVPack. 2016-03-02 10:53:06 +01:00
Michael Hackstein 4e5f24a869 Removed unnacessary imports of shape 2016-03-02 10:45:00 +01:00
Max Neunhoeffer a374cabfb9 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-01 18:16:42 +01:00
Max Neunhoeffer 848860de45 Fix some bugs in replace. 2016-03-01 18:16:26 +01:00
Jan Steemann 285de1998b velocypack 2016-03-01 17:54:57 +01:00
Max Neunhoeffer 1398eea35a Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-01 17:50:39 +01:00
Max Neunhoeffer 2cfa417858 First go at babies variant of replace. RestHandler case missing. 2016-03-01 17:50:13 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Jan Steemann 747349db19 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 17:03:58 +01:00
Jan Steemann 026cb57138 collection export now using vpack 2016-03-01 17:03:44 +01:00
Michael Hackstein 65abe721f3 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-01 16:39:04 +01:00
Michael Hackstein 7e30dab62f CollectionScanner and EnumerateCollectionBlocks now use VPack instead of Shapes and mptrs. 2016-03-01 16:38:55 +01:00
Michael Hackstein 922a96fee0 Added a reset function to OperationCursor. ALso added a switch to getMore to define that all documents are referenced as Externals instead of inplace 2016-03-01 16:37:21 +01:00
Michael Hackstein 03dbc4a745 Added a dummy to insert External VPackSlice references in AqlItemBlock. 2016-03-01 16:36:02 +01:00
Jan Steemann 298c96f2cc store information about datafile in upper bit 2016-03-01 16:29:09 +01:00
Jan Steemann 3fa4623dd1 made some methods private 2016-03-01 15:53:10 +01:00
Jan Steemann 0cb0c0142f remove _rid from master pointer 2016-03-01 15:06:54 +01:00
Michael Hackstein 6e7f9ef49c Transaction OperationCursor now implements a skip method. 2016-03-01 14:37:40 +01:00
Jan Steemann acf308f3dc fixed test 2016-03-01 14:32:19 +01:00
Jan Steemann d67384db5f Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 14:08:02 +01:00
Jan Steemann 0fcaf41477 cleanup 2016-03-01 14:07:47 +01:00
Michael Hackstein f1d0875c4e Removed obsolete functions and skiplist key element. 2016-03-01 13:53:45 +01:00
Michael Hackstein a424876d00 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-01 13:39:57 +01:00
Michael Hackstein fa8b4ae0e3 Removed Velocypack from FulltextIndex. And replaced TRI_string_vector_t with std::vector<std::string> 2016-03-01 13:35:47 +01:00
Jan Steemann 15350cf4b8 renamed and removed 2016-03-01 12:34:03 +01:00
Jan Steemann 102066b4ee removed methods 2016-03-01 11:50:16 +01:00
Jan Steemann 21e5e68ae5 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 11:14:55 +01:00
Jan Steemann 6c152649d4 added allKeys() method 2016-03-01 11:14:40 +01:00
Max Neunhoeffer ad97830d7f Add babies to insert document API (V8 & HTTP & Transaction). 2016-03-01 10:14:24 +01:00
jsteemann 945b6b28a3 removed old deletion marker type 2016-03-01 00:27:19 +01:00
jsteemann 1595566af6 removed a few marker types 2016-02-29 23:55:38 +01:00
jsteemann adae2e7c67 fixed saving 2016-02-29 23:31:21 +01:00
Michael Hackstein 2a9d071627 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-29 18:46:43 +01:00
Michael Hackstein a48c1819bc Added an Implementation for AQL condition Iterator in HashIndex 2016-02-29 18:46:38 +01:00
Jan Steemann 4140c3fa93 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 18:33:29 +01:00
Jan Steemann eae225f4c8 changed marker storage 2016-02-29 18:33:16 +01:00
Michael Hackstein ae7da462d0 Removed Import of *shape* in Indexes 2016-02-29 18:10:02 +01:00
Michael Hackstein 11102d4799 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-29 18:00:36 +01:00
Michael Hackstein b29b84687b Removed shape* include 2016-02-29 18:00:31 +01:00
Michael Hackstein cb40281543 Unshapified the GeoIndex 2016-02-29 17:58:26 +01:00
Jan Steemann d122ace96a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 17:44:37 +01:00
Jan Steemann 254f6b49b9 write prologue markers for document & remove markers 2016-02-29 17:08:38 +01:00
Michael Hackstein 7e086c901c Fixed n assignment where it should be an comparison 2016-02-29 17:07:07 +01:00
Jan Steemann 2e5a41c8c8 order barriers while accessing edges 2016-02-29 16:27:24 +01:00
Michael Hackstein 6ff12b98db Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-02-29 15:32:29 +01:00
Michael Hackstein 09933bea41 Used the new MultiIndex iterator for AQL=>Skiplist iterator, if there is an IN used 2016-02-29 15:32:23 +01:00
Michael Hackstein 73b97bd489 Added implementation of a multi-index-iterator Iterator. This can be used as a wrapper around IN-Expanded index lookups and might be used in IndexNode as well. 2016-02-29 15:27:51 +01:00
Michael Hackstein 16750ea55b Replaced OperationCursor by forward declaration 2016-02-29 15:26:52 +01:00
Jan Steemann 18c6fb35e1 removed warning 2016-02-29 15:23:25 +01:00
Jan Steemann 33512768a6 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 14:31:02 +01:00
Michael Hackstein 4f7e03af58 Removed unnecessary reference to Index.h. Decreases build time when Indexes are changed 2016-02-29 14:25:35 +01:00
Jan Steemann 10af07dfcf Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 14:24:55 +01:00
Jan Steemann f4f7bcb044 recovery 2016-02-29 14:24:46 +01:00
Michael Hackstein e590f51d0f Added implementation for AQL Node => Skiplist Iterator function. Does not yet support IN statment, we need a multi Iterator for this. 2016-02-29 14:19:11 +01:00
Michael Hackstein b76c189990 Removed TRI_index_operator and all it's references. They are obsolete because of new VelocyPack index iterator on Skiplist index 2016-02-29 11:42:18 +01:00
Michael Hackstein cd8d49ead0 Replaced the old Skiplist Iterator with a new Implementation using VelocyPack instead of TRI_INDEX_OPERATOR 2016-02-29 11:32:43 +01:00
Michael Hackstein b478af2f3f Temporarily disabled lookup by skiplist index function. Has to be replimented using AQL instead. 2016-02-29 11:31:48 +01:00
Michael Hackstein 75a5035ab3 Fixed value type of keyLength. Some compilers are not relaxed enough to compile this 2016-02-29 11:31:17 +01:00
Jan Steemann 91864619dc removed unused method 2016-02-29 11:18:20 +01:00
jsteemann 545b0ed6a2 cleanup 2016-02-27 02:44:51 +01:00
jsteemann f0aeab0d12 cleanup 2016-02-27 01:10:42 +01:00
jsteemann 87ed4f6588 removed unused define 2016-02-26 23:42:49 +01:00