1
0
Fork 0
Commit Graph

7185 Commits

Author SHA1 Message Date
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 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
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
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
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
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
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
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
Michael Hackstein 35fbe9aefd Fixed include <array> did not compile under Mac Os X 2015-12-04 15:28:49 +01:00
Jan Steemann 3b7cbef240 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:50:42 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Michael Hackstein c60271d3c8 Fixed early optimizations of Cluster traversal filters, when document does not exist. Now behaves identical to single server and to execution without optimization 2015-12-04 13:30:40 +01:00
Jan Steemann 785beaa625 cppcheck 2015-12-04 12:18:15 +01:00
Michael Hackstein 9a724cd5a6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-04 11:21:28 +01:00
Michael Hackstein 9495117238 Fixed invalid traversal optimization if vertex is not existing but filter would let null pass 2015-12-04 11:21:15 +01:00
Jan Steemann 3b1df26a79 added AQL function `IS_DATESTRING` 2015-12-04 10:53:01 +01:00
jsteemann f3e35b6497 updated grammar file 2015-12-03 23:26:28 +01:00
Michael Hackstein bf83a0e6a2 Potential fix for memleak 2015-12-03 16:08:33 +01:00
Michael Hackstein 11640a15ad Fixed a comment 2015-12-03 16:05:06 +01:00
Jan Steemann d8bf728fd3 added TRAVERSAL nodes for optimization checks 2015-12-03 15:25:16 +01:00
Jan Steemann 75a888d9ac Windows fixes 2015-12-03 15:06:20 +01:00
Jan Steemann b8cd633276 Windows fixes 2015-12-03 15:00:19 +01:00
Wilfried Goesgens c9e6e066fb one more missing file. 2015-12-03 14:16:59 +01:00
Wilfried Goesgens 650a7c6d7c Add missing file to the cmake build 2015-12-03 14:04:22 +01:00
Jan Steemann 46f1e4624d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-03 13:46:23 +01:00
Jan Steemann ec3ab298e1 added test for traversal after data modification 2015-12-03 13:46:11 +01:00
Wilfried Goesgens 2377c4d628 Add new files to cmake. 2015-12-03 13:45:36 +01:00
Jan Steemann fdcc7adf03 fixed memleak for cluster databases 2015-12-03 12:18:13 +01:00
Jan Steemann 6c1717ec90 updated keywords list 2015-12-03 12:11:52 +01:00
Jan Steemann d572f3ed03 Merge branch 'aql-multi-modify' of https://github.com/arangodb/arangodb into devel 2015-12-03 11:38:30 +01:00
Michael Hackstein 86b4a7137d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-03 11:35:33 +01:00
Michael Hackstein 605e1bce55 Style fixes 2015-12-03 11:35:18 +01:00
Michael Hackstein 04f65ff8c1 Fixed a memleak in ClusterTraverser 2015-12-03 11:35:08 +01:00
jsteemann 9caaff18fb fixed leaks 2015-12-03 11:25:05 +01:00
jsteemann eb5b68089e even more unconstification 2015-12-03 11:11:10 +01:00
jsteemann 135d434a7f more unconstification 2015-12-03 11:09:35 +01:00
jsteemann 7892c98996 unconstify return types 2015-12-03 11:06:25 +01:00
Michael Hackstein e6fffda489 Merge branch 'JHMH' of github.com:arangodb/arangodb into devel 2015-12-03 10:26:56 +01:00
Michael Hackstein 8919a068ba Adapted to new API of cluster async request 2015-12-03 10:24:01 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
jsteemann 840df0bf09 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-03 10:16:59 +01:00
Max Neunhoeffer 16e181fe05 Adjust comments to reality for asyncRequest. 2015-12-03 09:23:15 +01:00
Jan Steemann c0729fbc6b allow calling AQL functions that require collection name arguments with string values 2015-12-02 18:20:21 +01:00
Michael Hackstein b2e4673c65 Added a test for early filtering of < <= => > in Traversal 2015-12-02 17:52:01 +01:00
Michael Hackstein 23e2ac5da7 Fixed status reporting for Cluster and Single Server Case for the AQL Traverser Node. 2015-12-02 17:20:09 +01:00