1
0
Fork 0
Commit Graph

2172 Commits

Author SHA1 Message Date
Michael Hackstein cc542af656 Reactivated continuous neighbors searches after performance improvements. 2016-04-21 17:15:10 +02:00
Max Neunhoeffer fa99e47129 Fix a bug in traverser. 2016-04-21 14:30:14 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Michael Hackstein 490905d188 Replaced an unordered set by a vector. The uniqueness is guaranteed by other mechanisms anyways. Further improved computationtime of Neighbors 2016-04-21 13:52:12 +02:00
Michael Hackstein 68691c6799 All Neighbors implementations now use the fastest variant. 2016-04-21 13:33:28 +02:00
Michael Hackstein fe41af2257 Fixed a bug in Neighbors matchVertex. It aborted too early some times 2016-04-21 10:49:25 +02:00
Max Neunhoeffer f7bf3bdb40 Fix a cppcheck warning. 2016-04-20 22:38:19 +02:00
Max Neunhoeffer 646165f827 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 22:38:11 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections
Excluded Aardvark, the graph viewer in particular
2016-04-20 22:09:00 +02:00
Max Neunhoeffer 905a412952 Fix a typo. 2016-04-20 17:23:36 +02:00
Michael Hackstein c1ad6dd5dd Added the improvement for OutboundNeighbors to Inbound and Any neighbors as well. For Any-Neighbors the effect is not too significant. 2016-04-20 16:49:34 +02:00
Michael Hackstein ae80b86599 Added a function to request babies from an IndexIterator (next n elements). Used this function in OperationCursor to get a list of mptrs. The only Index supporting it right now is EdgeIndex. It is only used in OutboundNeighbors at this point. 2016-04-20 15:13:42 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Michael Hackstein 98995d8805 Improved Neighbors function, if there is no vertex example given. It will recognize earlier that there is nothing to check and will not fetch the real document. 2016-04-20 12:53:06 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Jan Steemann 240cb95f0c fixed crash 2016-04-19 15:54:10 +02:00
Michael Hackstein 7e6fd1561e Reverted usage of externals in Graph Functions. Commit was to early. Still warting for transparent handling of externals in VelocyPack 2016-04-19 14:42:17 +02:00
Michael Hackstein be118b1b80 Former JsonCursor now uses QueryResult and contains the TRX context for continuuos reads 2016-04-19 14:32:23 +02:00
Michael Hackstein cf737639ba V8Traverser now uses externals in Slices instead of direct documents 2016-04-19 12:30:50 +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 2dd798cd48 WIP 2016-04-15 22:09:55 -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
Frank Celler 8254bd4bd6 WIP 2016-04-14 21:32:12 -07: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
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
Frank Celler dc3e8e6bdb WIP 2016-04-12 20:27:46 +02:00
Jan Steemann 51bfb8fe57 remove TRI_json_t 2016-04-12 16:37:36 +02:00
Frank Celler 922753ef3d WIP 2016-04-11 17:44:41 +02:00
Frank Celler 3d2cc31306 WIP 2016-04-11 00:05:37 +02:00
Frank Celler 1b7c47c6bc added --console 2016-04-10 13:47:53 +02:00
Jan Steemann f725b01036 fix non-deterministic behavior 2016-04-08 16:42:22 +02:00
Frank Celler d24f63e8e2 added upgrade feature 2016-04-08 15:39:36 +02:00
Jan Steemann f2e2dbb435 pacify valgrind
added assertion

added assertions
2016-04-08 15:05:08 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Jan Steemann d65662fb62 pacify cppcheck 2016-04-07 16:41:35 +02:00
Frank Celler 69316d0f61 WIP 2016-04-07 16:12:30 +02:00
Frank Celler 58b9cf7e91 WIP 2016-04-07 15:40:11 +02:00
Jan Steemann 513dc26fc1 make replication tests more deterministic 2016-04-07 13:00:30 +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 d0f368445a replication fixes 2016-04-05 18:32:09 +02:00
Frank Celler 31d477477e WIP 2016-04-04 15:52:14 +02:00
Jan Steemann d8b993f0fb fixed some issues with tests 2016-04-04 10:47:04 +02:00
Jan Steemann 9f213281b1 fixed some issues with tests 2016-04-04 10:13:13 +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 f2134fc0a0 WIP 2016-04-03 20:19:12 +02:00
Frank Celler 09da78e444 WIP 2016-04-03 13:48:25 +02:00
Frank Celler 66b2a3717d WIP 2016-04-03 00:25:36 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Frank Celler 873f226b5f added SchedulerFeature 2016-04-01 12:52:28 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler a11a7c134c maintainer mode fixes 2016-03-31 17:39:52 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Michael Hackstein 7eb4b2b730 Removed JS implementation of edges. The new CXX AQL implementation can server for CLuster as well. 2016-03-31 11:11:35 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann 13980ef299 bugfixes 2016-03-24 16:18:18 +01:00
Jan Steemann dce7c427d9 test fixes 2016-03-24 14:55:31 +01:00
Jan Steemann 2986ec2a64 removed dead code 2016-03-23 20:08:22 +01:00
Michael Hackstein 7269fd3dc9 Fixed multiple edge collections in Traverser. All aql-traverser tests seem to work 2016-03-23 16:38:29 +01:00
Michael Hackstein 2d45a6e5b2 Fixed statistics for Traversals. Also uses less lookups now 2016-03-23 16:04:53 +01:00
Michael Hackstein e71d650178 Dryed code in v8Traverser and fixed a boolen if error 2016-03-23 12:13:07 +01:00
Max Neunhoeffer 12c420913e Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-23 09:02:14 +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
Jan Steemann 16e56446b1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-22 19:01:27 +01:00
Jan Steemann e8c09f3cc1 added missing reset functionality for nested traversals 2016-03-22 18:58:08 +01:00
Jan Steemann d226175e91 test fixes 2016-03-22 15:15:43 +01:00
Michael Hackstein 51c0d6ee64 Edge queries are now more relaxed about the start vertex. They will not throw errors instead just return empty array as a value. 2016-03-22 11:37:04 +01:00
Michael Hackstein dea484fa38 Removed obsolete EdgeInfo 2016-03-22 09:16:40 +01:00
jsteemann 3dede4a71f cleanup 2016-03-21 22:30:00 +01:00
jsteemann d03170a93f removed unused functionality 2016-03-21 21:41:39 +01:00
jsteemann 4694d36671 cppcheck 2016-03-21 20:56:08 +01:00
Michael Hackstein 7d35e1d15e Disabled multi-threaded shortest-path search. SingleThread is fast enough and new trx API is not thread safe. 2016-03-21 16:21:14 +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 0f213e3049 made base class virtual 2016-03-21 13:24:01 +01:00
Jan Steemann d2195c43a7 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 13:17:42 +01:00
Jan Steemann 304243a4b0 fixes 2016-03-21 13:17:36 +01:00
Michael Hackstein e8f8e4b4da Reactivated vertexCollectionRestrictions in Neighbors 2016-03-21 13:11:43 +01:00
Michael Hackstein 7f9ae321a0 Traverser Basic options now know the transaction. Modified all implementations to use Slices in apropriate places. Fixes some, but not all tests 2016-03-21 11:28:33 +01:00
Jan Steemann 9e158aafd7 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:49 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
Michael Hackstein 7896905ad7 Fixed a multithreading bug for EdgeCollectionInfos. Threads shared the same Builder instance which is not possible. 2016-03-21 09:20:31 +01:00
jsteemann 87d3d4935b fixed query cache 2016-03-18 20:22:14 +01:00
Michael Hackstein 75fa81302a Fixed access to a nullptr. 2016-03-18 18:46:01 +01:00
Michael Hackstein 5bc2274855 Fixed invalid search values in Graph Traverser. Now some more tests are green. Still failing 2016-03-18 16:47:55 +01:00
Michael Hackstein 8e678d0fc2 Fixed single server version of Traverser 2016-03-18 15:54:52 +01:00
jsteemann 5ded90ed1c fixed compare function for Custom attributes 2016-03-18 13:55:36 +01:00
Michael Hackstein c7b63f0ffa Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-18 08:48:39 +01:00
Michael Hackstein 2d2cfae297 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-17 18:51:30 +01:00
Max Neunhoeffer 20d0e98462 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 18:50:33 +01:00
Max Neunhoeffer 827f2f4f44 Improve /_api/simple/remove-by-key.
Fix more document methods.
2016-03-17 18:49:52 +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 8d35a2b6f9 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-17 15:53:35 +01:00