1
0
Fork 0
Commit Graph

2177 Commits

Author SHA1 Message Date
Jan Steemann 57e40aa328 properly handle --wal.sync-interval 2016-04-20 16:58:14 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann a5bbb8d084 allow using a few more bytes for indexed slice values 2016-04-19 23:34:39 +02:00
jsteemann a3b154043e removed unused typedef 2016-04-19 22:31:12 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Michael Hackstein 35bd5c44e4 Removed TRI_json_t from Vocbase traverser. Still needs Json for serialisation of varNode 2016-04-16 23:48:18 +02:00
Michael Hackstein afdadcdfe5 Transformed getFilteredDocuments on Coordinator in ClusterMethods to use only VelocyPack 2016-04-16 22:39:52 +02:00
Frank Celler 22e116b143 fixed ambiguity 2016-04-15 23:02:28 -07:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Kaveh Vahedipour 1605310908 [[{"url":"test","op":12,"ttl":6}]] broke agency 2016-04-15 16:41:33 +02:00
Kaveh Vahedipour e3dbb4f9b6 [[{url:test,op:12,ttl:6}]] broke agency 2016-04-15 16:31:00 +02:00
Kaveh Vahedipour 97a6c29ec6 [[{url:test,op:12,ttl:6}]] broke agency 2016-04-15 16:29:44 +02:00
Michael Hackstein 5645d77d22 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 15:40:04 +02:00
Max Neunhoeffer 4dfa9c57f6 FIx compilation. 2016-04-15 15:23:46 +02:00
Max Neunhoeffer 8490606317 Add a warning about shared folders. 2016-04-15 13:48:51 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Michael Hackstein 2d860fb80e Added a cpp file for AqlTransaction. Now only parts of AQL have to be rebuild on cluster changes, not complete AQL 2016-04-14 11:30:54 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Michael Hackstein b043b103e0 Optimized IN in AQL pattern Matcher properly. Also added some tests for it 2016-04-13 14:49:21 +02:00
Michael Hackstein 8760f10354 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 08:01:40 +02:00
Jan Steemann a7e2d783ee enable copy elision 2016-04-11 18:05:43 +02:00
Frank Celler 922753ef3d WIP 2016-04-11 17:44:41 +02:00
Michael Hackstein 474f70c9ad Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 16:33:08 +02:00
Jan Steemann 7c934b43e9 updated library 2016-04-11 13:27:21 +02:00
Michael Hackstein b9a51d3d59 Removed dead code in ExampleMatcher (Json Variant) 2016-04-10 14:15:04 +02:00
jsteemann 13345cb50a pacify valgrind 2016-04-08 23:40:29 +02:00
Frank Celler d24f63e8e2 added upgrade feature 2016-04-08 15:39:36 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Jan Steemann 1855b74aaa added asserts 2016-04-07 16:44:36 +02:00
Frank Celler 58b9cf7e91 WIP 2016-04-07 15:40:11 +02:00
Jan Steemann 9e9c1ab8d5 stringify SSL opts 2016-04-07 12:59:38 +02:00
Jan Steemann 545b87cb76 test fixes 2016-04-06 17:39:24 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Jan Steemann 18204c57e8 fixed replication tests 2016-04-06 09:41:31 +02:00
Jan Steemann d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Max Neunhoeffer 6dc128c22a Be tolerant in remove() with isRestore==true and no rev given. 2016-04-05 13:06:09 +02:00
Max Neunhoeffer b4137d2fc6 Make remove respect isRestore flag. 2016-04-05 10:39:23 +02:00
Max Neunhoeffer b1963d2cee Fix replication in the sense that revs are now copied over. 2016-04-05 10:27:43 +02:00
Frank Celler 5cab4cffac WIP 2016-04-04 15:23:25 +02:00
Michael Hackstein bf76988267 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-04 12:52:27 +02:00
Michael Hackstein ab46b07f98 Reimplemented Traversal in Cluster case 2016-04-04 12:52:11 +02:00
Jan Steemann ba9dce75f4 fixed some replication tests 2016-04-04 12:26:30 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler 09da78e444 WIP 2016-04-03 13:48:25 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Michael Hackstein 187b8e4770 Fixed a bug in replace/update cluster case. Where the DBserver requested shardkeys by shardname, which is not possible any more. shardKeys are only available for global collection Name. 2016-03-30 15:32:50 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann d9c5877054 test fixes 2016-03-24 19:25:25 +01:00
jsteemann 20dfe7ca9e fixed test 2016-03-24 01:50:55 +01:00
jsteemann b7c1a42f96 test fixes 2016-03-24 01:12:57 +01:00
Jan Steemann 7975913fc5 fixed tests 2016-03-23 18:50:46 +01:00
Jan Steemann 7c245bd3a3 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-23 16:36:21 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
Michael Hackstein b6245022b0 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-23 10:36:56 +01:00
Michael Hackstein 8c224bd435 Fixed Traverser Matches check 2016-03-23 10:36:51 +01:00
Max Neunhoeffer c2049b8ee1 Switch to IndexHandles. 2016-03-23 08:57:00 +01:00
Frank Celler 86fe838a68 new logger 2016-03-22 21:09:48 +01:00
Max Neunhoeffer 1990441d9c Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-22 13:33:23 +01:00
Max Neunhoeffer 07d193f74d Implement indexesForCollection for coordinator case. 2016-03-22 13:32:53 +01:00
Jan Steemann 6552b42f59 centralized _id extraction 2016-03-22 12:57:01 +01:00
Jan Steemann 4bb95321e6 removed unused code 2016-03-22 09:09:29 +01:00
jsteemann 9fcc5d043b removed superfluous includes 2016-03-21 22:58:42 +01:00
jsteemann 4694d36671 cppcheck 2016-03-21 20:56:08 +01:00
Jan Steemann ce63219435 removed DocumentAccessor 2016-03-21 15:40:44 +01:00
Jan Steemann f458acc4c7 cleanup 2016-03-21 14:35:58 +01:00
Jan Steemann b672ce0985 test fixes 2016-03-21 12:15:40 +01:00
Michael Hackstein 8e678d0fc2 Fixed single server version of Traverser 2016-03-18 15:54:52 +01:00
Michael Hackstein 25b33b9048 Fixed invalid forward declarations 2016-03-18 15:52:49 +01:00
jsteemann 5ded90ed1c fixed compare function for Custom attributes 2016-03-18 13:55:36 +01:00
jsteemann 906418778c cppcheck 2016-03-18 11:23:38 +01:00
Michael Hackstein c7b63f0ffa Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-18 08:48:39 +01:00
Max Neunhoeffer d1c5c64d6b Fix baby methods for documents in arangosh. 2016-03-18 02:05:19 +01:00
Max Neunhoeffer 37bac8881d Implement babies variant of DELETE /_api/document/<collection>. 2016-03-17 20:28:40 +01:00
Michael Hackstein 2d2cfae297 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-17 18:51:30 +01:00
Michael Hackstein 401f55ae37 Replaced OperationCursor by shared_ptrs every where and removed the slice function from it. Instead it returns a shared ptr on a OperationResult on getMore 2016-03-17 18:49:20 +01:00
jsteemann 1ee1ff23ec bugfixes 2016-03-17 18:36:40 +01:00
Max Neunhoeffer 929c50d6dd Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 09:36:47 +01:00
jsteemann c710168e5c removed unused parts 2016-03-17 01:02:35 +01:00
jsteemann 8148d73c03 removed some more Shaper 2016-03-17 00:36:34 +01:00
Max Neunhoeffer 138ed35012 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 00:29:05 +01:00
jsteemann a15e9d9550 removed files 2016-03-17 00:28:08 +01:00
jsteemann 3cd107e761 removed includes 2016-03-17 00:11:07 +01:00
Max Neunhoeffer 8c2545bf66 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 00:06:55 +01:00
Max Neunhoeffer 3f648ef2bb Fix remove behaviour. 2016-03-17 00:05:51 +01:00
jsteemann c41f18080b removed includes 2016-03-17 00:04:03 +01:00
Michael Hackstein f0b860cc72 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-16 11:13:46 +01:00
Michael Hackstein 4a2c33eafc Replaced setStartVertex(Slice) by setStartVertex(string) in Traversal and fixed all resulting compile errors. It now compiles but is not Functional yet. Have to implement reading of Documents from DB in TRX / VPack Style 2016-03-16 11:12:27 +01:00
jsteemann b2d7038b30 fixed some datafile issues 2016-03-15 23:37:39 +01:00
jsteemann 4f8265bfc8 temporary builder leaser 2016-03-15 14:08:03 +01:00
Michael Hackstein e0ddf68c4f Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-15 10:05:04 +01:00
Michael Hackstein a4edc8dd49 Merge from spdvpk 2016-03-14 23:46:57 +01:00
jsteemann 33df831f41 small optimizations for v8<->vpack 2016-03-14 22:22:35 +01:00
Max Neunhoeffer 3850ace12c Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-14 18:07:21 +01:00
jsteemann 2ade0ef3d0 fixed log output 2016-03-14 18:05:20 +01:00
Max Neunhoeffer f8f27c6cbf Polish mechanism for recovery via Transaction API. 2016-03-14 18:05:17 +01:00
jsteemann 9cb9dfd8af Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-14 17:54:54 +01:00