1
0
Fork 0
Commit Graph

7425 Commits

Author SHA1 Message Date
Michael Hackstein e40679e4b5 Integrated the new VocbaseCollectionInfo in Document-collection 2015-12-16 18:59:03 +01:00
Michael Hackstein d506300568 Integrated the new VocbaseCollectionInfo in VocShaper 2015-12-16 18:58:49 +01:00
Michael Hackstein cad674549e Integrated the new VocbaseCollectionInfo in Vocbase main 2015-12-16 18:58:34 +01:00
Michael Hackstein c2eb6553ae The web of TRI_col_info_t is increasing... 2015-12-16 18:56:54 +01:00
Michael Hackstein a1c66851da Further adoptions to the VocbaseCollectionInfo class in V8Server 2015-12-16 18:53:47 +01:00
Michael Hackstein f9f7c02772 Simple adoptions to VocbaseCollectionInfo class 2015-12-16 18:53:20 +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 573ba54da2 fixed typo 2015-12-16 12:04:27 +01:00
Jan Steemann 35eda37ab1 make_unique 2015-12-16 11:54:33 +01:00
Michael Hackstein 41d7fbb803 First draft of class implementation of TRI_col_info_t 2015-12-16 11:46:55 +01:00
Michael Hackstein 7f0792ab9b Started adapting the V8Server file to class version of TRI_col_info_t 2015-12-16 11:46:18 +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 c475822a76 Adapted V8Traverser to class version of TRI_col_info_t 2015-12-16 11:43:44 +01:00
Michael Hackstein bec87a0ef8 Adapted utils to class version of TRI_col_info_t 2015-12-16 11:43:12 +01:00
Michael Hackstein b543680cca Adapted resthandler to class version of TRI_col_info_t 2015-12-16 11:42:59 +01:00
Michael Hackstein f5bd11bda5 Adapted replication to class version of TRI_col_info_t 2015-12-16 11:42:39 +01:00
Michael Hackstein 37b4d2739b Adapted indexes to class version of TRI_col_info_t 2015-12-16 11:42:26 +01:00
Michael Hackstein ef3889363f Adapted cluster communication to class version of TRI_col_info_t 2015-12-16 11:42:02 +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 5a350b4391 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-16 10:59:18 +01:00
Max Neunhoeffer 98fa31818a Cleanup. 2015-12-16 10:59:10 +01:00
Michael Hackstein 2867ff1eb4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-16 10:52:08 +01:00
Michael Hackstein e6e66d4469 Fixed a bug in Traversal Path Uniqueness. 2015-12-16 10:51:54 +01:00
Max Neunhoeffer 1a0687a07a Fix move constructor and move assignment operator for CollectionInfo. 2015-12-16 10:41:11 +01:00
Max Neunhoeffer c376200978 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-16 10:29:50 +01:00
Max Neunhoeffer b337d9bd29 Fix shared_ptr<CONTAINER> direct-use in for bug. 2015-12-16 10:29:23 +01:00
Jan Steemann 65ede56176 make constructor explicit 2015-12-16 10:08:48 +01:00
Jan Steemann acf2dcf7b5 fixed leak 2015-12-16 10:08:21 +01:00
Richard Parker 93c59c81b1 Cursors seem to be working 2015-12-16 08:50:12 +00:00
Max Neunhoeffer 0198b4576b Merge branch 'devel' into ClustUp1 2015-12-15 20:40:52 +01:00
jsteemann 1e98af01ba set cloexec for file descriptors 2015-12-15 20:30:28 +01:00
jsteemann 8003ea7d74 fixed undefined variable warning 2015-12-15 20:12:50 +01:00
jsteemann 086fc073cf cppcheck 2015-12-15 19:35:51 +01:00
Max Neunhoeffer 754762c277 Fix improvement of memory management for ClusterComm. 2015-12-15 18:24:26 +01:00
Max Neunhoeffer 74b147bb20 Improve memory management in ClusterComm library. 2015-12-15 18:09:55 +01:00
Michael Hackstein fbbe4d08cd Implemented edges on path uniqueness on single server traversal 2015-12-15 18:04:28 +01:00
Michael Hackstein f589308bd0 Implemented unique edges on path for AQL traversal in cluster case 2015-12-15 18:04:14 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Michael Hackstein 7fbb519117 Added an internal route to request edges for a list of vertices instead of a single vertex only. This is used for out/in/edges in cluster which was working with a list of edges locally but not in cluster mode 2015-12-15 16:38:54 +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
Jan Steemann 8ed8681505 updated module name 2015-12-15 16:15:26 +01:00
Richard Parker c96599b7ce After testing 2.2 a bit 2015-12-15 15:05:22 +00:00
Jan Steemann 602e321058 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-15 15:56:13 +01:00
Jan Steemann 442b614fb5 documentation update 2015-12-15 15:54:58 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Jan Steemann b123ffbe26 issue #1610 2015-12-15 15:41:50 +01:00
jsteemann a864a7afcf set close bit for file descriptor 2015-12-15 13:45:25 +01:00
Jan Steemann f8cf665a8a delete connectionmanager on shutdown 2015-12-15 13:21:24 +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
Jan Steemann 84fae4ebcb Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-14 18:16:30 +01:00
Wilfried Goesgens f51e5efb34 Implement tests for de/serializing of TraversalNodes. 2015-12-14 18:07:04 +01:00
Jan Steemann 1b86f280de small issues 2015-12-14 17:54:46 +01:00
Jan Steemann 8e7ac689a2 issue #1606: fail gracefully on invalid index definitions 2015-12-14 16:58:05 +01:00
Max Neunhoeffer 5bf896c51f Fix if-match forwarding bug in getDocumentOnCoordinator. 2015-12-14 16:17:13 +01:00
Max Neunhoeffer 6ca9bd4e70 Improve ClusterComm pointer usage. 2015-12-14 14:27: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
Jan Steemann b40f95512f fix memleak 2015-12-14 11:02:57 +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
jsteemann 4a62f3d389 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-11 18:38:30 +01:00
Wilfried Goesgens 5ea0fe49b1 Multi -purpose- -> model 2015-12-11 18:22:23 +01:00
Jan Steemann caab98de0a use empty() 2015-12-11 17:20:12 +01:00
Jan Steemann a2940b20ca fixed leak in ExampleMatcher 2015-12-11 17:15:45 +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 de680bb8bb Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-11 09:31:03 +01:00
Michael Hackstein ba1a520e8c Fixed a bug in Vocbase collection to VPack. It did not include the collection properties properly 2015-12-11 08:35:44 +01:00
jsteemann c40bfe6557 cppcheck 2015-12-10 22:40:40 +01:00
Jan Steemann a406ced17c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-10 21:33:43 +01:00
Jan Steemann 4335af50e7 replication improvements 2015-12-10 19:07:10 +01:00
Jan Steemann 09d34087ea rename ditch type 2015-12-10 17:13:11 +01:00
Michael Hackstein 2520874c03 Preparation to remove TRI_json_t from Traversers. But has to many side effects to be removed in one pass 2015-12-10 16:43:08 +01:00
Michael Hackstein c959072733 Adaption to new vocbase-defaults format 2015-12-10 16:42:13 +01:00
Michael Hackstein 3f029d29c7 Refactoring of vocbase-defaults. It now uses VPack instead of TRI_json_t and it uses Class functions instead of global functions 2015-12-10 16:41:47 +01:00
Michael Hackstein eb417a2ef3 Removed TRI_json_t from vocbase main file 2015-12-10 15:30:36 +01:00
Michael Hackstein 1a33c10557 Removed TRI_json_t from Vocbase/auth and did some refactoring in the internals there. Bye Bye CORE_MEM_ZONE 2015-12-10 14:08:49 +01:00
Max Neunhoeffer d5eaccbfe5 Merge branch 'devel' into ClustUp1 2015-12-10 11:35:08 +01:00
Michael Hackstein 622fafa0fc Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-10 11:13:42 +01:00
Michael Hackstein e4f38929b5 Removed TRI_json_t from ApplicationEndpointServer 2015-12-10 11:11:16 +01:00
Michael Hackstein b492b154d8 Added a velocyPackFromFile to the VelocyPackHelper 2015-12-10 11:02:19 +01:00
Jan Steemann a36e4827c7 build fix 2015-12-10 10:43:59 +01:00
Michael Hackstein 1af985003d Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-10 10:26:14 +01:00
Michael Hackstein 84bfb63a73 Style fix 2015-12-10 00:13:06 +01:00
Max Neunhoeffer ea72850aeb Fix bug in client tests. 2015-12-09 23:13:26 +01:00
Jan Steemann ab3f27b3ee fix for unload handling 2015-12-09 19:24:10 +01:00
Jan Steemann fec29ac9c8 better compaction diagnostics 2015-12-09 19:02:22 +01:00
Michael Hackstein b8a9efbe33 Fixed a Illeagal memory access in BindParameters StripCollectionNames 2015-12-09 18:08:41 +01:00
Michael Hackstein 51da7ab7af Replication Applier configuration now uses a Destructor instead of TRI_Destroy. This commit is subject to inspection for memleaks 2015-12-09 16:29:14 +01:00
Max Neunhoeffer b76d7d6a0c Use new ObjectBuilder. 2015-12-09 15:45:52 +01:00
Michael Hackstein cfd1caf01c Replaced TRI_JsonReplicationApplier in RestHandler with velocpack 2015-12-09 15:25:14 +01:00
Michael Hackstein febd72e634 TRI_replication_applier_configuraiton_t is now a class no struct. Fixed headers 2015-12-09 15:24:41 +01:00
Michael Hackstein 5ef4782356 Added a toVelocyPack to replication_applier_configuration_t and wrapped all toJson functions around it 2015-12-09 15:24:08 +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
Michael Hackstein 96efb89179 Removed unused function 2015-12-09 13:56:04 +01:00
Michael Hackstein 2eb5697864 Removing more and more TRI_json_t 2015-12-09 13:55:39 +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
Michael Hackstein 0738741cd1 Further removed references to TRI_json_t in RestReplication handler. This included a new toVelocyPack function for TRI_vocbase_col_t 2015-12-09 12:35:33 +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
Michael Hackstein 44b806418f Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-09 10:28:16 +01:00
Michael Hackstein 7042542548 Fixed memleak for cluster Traverser edge data 2015-12-09 09:52:45 +01:00
Max Neunhoeffer c309c47981 Unuse std::atomic_load<shared_ptr> because gcc 4.9 does not have it. 2015-12-09 09:32:01 +01:00
Max Neunhoeffer 3f78b86492 Merge branch 'devel' into ClustUp1 2015-12-09 09:04:00 +01:00
jsteemann c99f4244c7 bugfix for cluster edges API 2015-12-09 00:26:18 +01:00
Wilfried Goesgens 4f4087a944 Fix link to the error codes 2015-12-08 23:45:36 +01:00
Max Neunhoeffer b00c253481 Merge branch 'devel' into ClustUp1 2015-12-08 23:22:38 +01:00
Max Neunhoeffer a0f6a3c9db Merge branch 'devel' into ClustUp1 2015-12-08 23:21:46 +01:00
jsteemann 18da212003 fixed edge handler response 2015-12-08 22:57:46 +01:00
Max Neunhoeffer f38d70844f Fix a corner case in index generation. 2015-12-08 21:32:06 +01:00
Max Neunhoeffer 588fddb53c Better error message instead of failed assertion. 2015-12-08 20:50:35 +01:00
Max Neunhoeffer ec4e37b2f9 Merge branch 'devel' into ClustUp1 2015-12-08 20:13:17 +01:00
Max Neunhoeffer a8bf9bd9ca Add a true argument. 2015-12-08 20:12:53 +01:00
Max Neunhoeffer 5465db463d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-08 20:11:32 +01:00
Jan Steemann 4cd2621d06 adjusted AQL function return values 2015-12-08 19:45:32 +01:00
Max Neunhoeffer c7adab9088 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-08 18:54:26 +01:00
Max Neunhoeffer 6cedb210df First try to fix deadlock problem. Tests not yet tried. 2015-12-08 18:54:05 +01:00
Jan Steemann 76d5f57af0 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-08 18:23:06 +01:00
Jan Steemann 6eb44f229e issue #1598: improved error reporting for dump/restore 2015-12-08 18:11:44 +01:00
Max Neunhoeffer 4e523a19ed Merge branch 'devel' into ClustUp1 2015-12-08 17:02:14 +01:00
Michael Hackstein 5300e7abca Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-08 16:11:45 +01:00
Jan Steemann 6ee813c65a fixed compaction 2015-12-08 16:08:25 +01:00
Michael Hackstein 02784df7f8 Updated file list function to use std::vector<std::string> instead of TRI_string_vector_t. 2015-12-08 15:10:03 +01:00
Jan Steemann ee6792dd6b fixes for traversal and multi-modify 2015-12-08 14:50:05 +01:00
Michael Hackstein 0a678263fb Fixed a bug when we start at an unknown vertex. THe cluster got into undefined states 2015-12-08 14:45:11 +01:00
Jan Steemann 14a7269278 make parameter explicit 2015-12-08 12:58:51 +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
Michael Hackstein 7d90d583f0 Further movement of RestReplicationHandler to VPack. This state is not fully working 2015-12-08 10:31:47 +01:00
Michael Hackstein 6e23d46c65 Moved struct TRI_vocbase_col_t to a class. It now has functions to dump to VelocyPack 2015-12-08 10:30:40 +01:00
Jan Steemann 517f20b9a2 flushWait 2015-12-07 18:28:37 +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 94c60502a9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-07 16:07:38 +01:00
Jan Steemann f707eddbcc added tests 2015-12-07 16:06:58 +01:00
Max Neunhoeffer 1396015f11 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-07 16:01:57 +01:00
Max Neunhoeffer 637a234660 Change a debug into an error. 2015-12-07 16:01:44 +01:00
Michael Hackstein dd21a42523 Fixed calls to index->toVelocyPack in RestReplicationHandler 2015-12-07 15:45:22 +01:00
Michael Hackstein 1e7108d9ca Optimized toVelocyPack functions in Index. Added special implementations for edge and primary indexes. All others TODO 2015-12-07 15:44:28 +01:00
Jan Steemann 1daeb7ad28 deadlock tests for drivers 2015-12-07 15:01:35 +01:00
Michael Hackstein 602c6a61c2 The Replication handler now uses the index->toVelocyPack functionality 2015-12-07 15:00:11 +01:00
Michael Hackstein 1969149ef3 Added a general toVelocyPack function for indexes 2015-12-07 14:54:38 +01:00
Max Neunhoeffer a674ff9629 Use no pretty printing in agency communication for VelocyPack. 2015-12-07 14:52:53 +01:00
Michael Hackstein 5c11280cec Started moving the RestReplication Handler from TRI_json_t to VelocyPack 2015-12-07 14:25:29 +01:00
Michael Hackstein 1c53e93865 Added some VelocyPack helper functions for Coordinators 2015-12-07 14:24:56 +01:00
Michael Hackstein b465921629 Adaption to new HttpRequest API 2015-12-07 14:24:42 +01:00
Michael Hackstein b78145f73f Added some VelocyPack helper functions for Coordinators 2015-12-07 14:24:21 +01:00
Michael Hackstein dd172d1776 Now allows to update a document with a VelocyPackSlice 2015-12-07 14:23:56 +01:00
Michael Hackstein 19343fb0da Added a helper function to init collection info from VelocyPack 2015-12-07 14:23:31 +01:00
Michael Hackstein 5dce6b512f Added a helper to build an index from VelocyPack description 2015-12-07 14:23:05 +01:00
Michael Hackstein 36c41c5e14 Added a helper function to transform VPack to shaped-json 2015-12-07 14:20:52 +01:00
Max Neunhoeffer 6141c61bf4 Merge branch 'devel' into ClustUp1 2015-12-07 13:44:13 +01:00
Max Neunhoeffer c11bdf9319 Two bug fixes. 2015-12-07 13:43:49 +01:00
Jan Steemann 9dd164eadc fix cluster upgrade 2015-12-07 11:57:46 +01:00
Jan Steemann e55199a27c fixed mismatched free/delete 2015-12-07 10:34:14 +01:00
Michael Hackstein f63535c142 Further reduced usage of TRI_json_t in RestImportHandler 2015-12-06 13:36:59 +01:00
Michael Hackstein 11dc6373d9 Reduced usage of TRI_Json_t in RestDocumentHandler and entirely removed it from RestEdgeHandler 2015-12-06 13:34:16 +01:00
Michael Hackstein 6b2f2451a6 Added wrappers to write/modify VelocyPack documents in a transaction 2015-12-06 13:32:43 +01:00
Michael Hackstein a814bc7414 Added a wrapper arround create/modify documents in cluster with JSOn for VelocyPack 2015-12-06 13:32:06 +01:00
Michael Hackstein 498c4395df Started moving ReplciationHandler to VPack 2015-12-06 12:57:58 +01:00
Michael Hackstein 72e7845166 Added a dummy dumpDocs VPack function. (Wraps around the TRI_json_t variant 2015-12-06 12:57:40 +01:00
Michael Hackstein 8317982983 Fixed imports. Moved from .h to .cpp 2015-12-06 12:56:11 +01:00
Michael Hackstein 07dae24edb Entirely removed TRI_json_t from VocbaseBaseHandler 2015-12-06 12:55:36 +01:00
Michael Hackstein 13a8f6871f Fixes in RestImport handler. It failed in some malformed input formats 2015-12-06 01:04:38 +01:00
Michael Hackstein e32b2e2d6f Largely removed references to TRI_json_t in RestImportHandler. Only needs temporary TRI_json_t's to interact with transactions 2015-12-05 13:01:55 +01:00
Max Neunhoeffer 23f7d9432c Finish createCollectionCoordinator change, not yet working. 2015-12-04 23:35:30 +01:00
Max Neunhoeffer a8a9f1832b Merge branch 'devel' into ClustUp1 2015-12-04 23:06:11 +01:00
Max Neunhoeffer fad55bda0e Another snapshot. 2015-12-04 23:05:45 +01:00
Michael Hackstein cc6283a349 Moved some references to TRI_json_t out of rest document handler 2015-12-04 18:18:15 +01:00
Michael Hackstein 4c2903ad44 Removed duplicated try {} catch in RestEdgesHandler 2015-12-04 18:17:26 +01:00
Michael Hackstein c5979d4ab3 Added a general catch block for bad_alloc for all RestHandlers 2015-12-04 18:16:56 +01:00
Jan Steemann 59e07db01a style 2015-12-04 18:04:43 +01:00
Michael Hackstein 6ebf72ee60 Removed usage of TRI_json_t in RestDocumentHandler. Could not yet eliminate it as ClusterMethods are not yet VPack compatible 2015-12-04 17:56:53 +01:00
Michael Hackstein 4bfb0c018f Removed now obsolete forward declaration of TRI_json_t 2015-12-04 17:26:25 +01:00
Michael Hackstein c9e07e3cf1 Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-04 17:22:00 +01:00
Michael Hackstein 712117e3ae Reduced usage of TRI_json_t in RestEdgeHandler. Now only builds it to pass it to the transaction 2015-12-04 17:21:51 +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 fd00792ac1 Removed TRI_json_t constructor from TraverserExpression. It is only possible to be build from VPack 2015-12-04 16:49:49 +01:00
Michael Hackstein b137e9471e The RestEdgesHandler now uses VPack instead of TRI_json_t 2015-12-04 16:45:29 +01:00
Max Neunhoeffer 10ff104236 Another snapshot. 2015-12-04 16:08:02 +01:00
Jan Steemann c0def05b1b Merge branch 'vpack' of https://github.com/arangodb/arangodb into vpack 2015-12-04 15:53:08 +01:00
Jan Steemann 1a3ea99e95 fixed after signature changes 2015-12-04 15:52:40 +01:00