Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
28,771 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

259 Commits

Author SHA1 Message Date
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann bc7d45aada fixed crash 2016-04-19 16:38:50 +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
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
Jan Steemann a3ad9ba3a3 fixed issue #1805 2016-04-18 15:09:42 +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
jsteemann 4a7c9f0f68 simplified bloated comments 2016-04-09 11:27: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 af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann 45cc15fe45 fixes 2016-03-22 10:51:42 +01:00
Max Neunhoeffer 5bfdca8d69 Fix AQL in cluster bugs. 2016-03-21 23:30:13 +01:00
jsteemann 87d3d4935b fixed query cache 2016-03-18 20:22:14 +01:00
jsteemann 62fd9435d9 fixed some tests 2016-03-17 22:57:11 +01:00
jsteemann 0720ccdecb harmonized 2016-03-16 18:49:42 +01:00
jsteemann a61c6b8ffa fixed query options 2016-03-16 17:53:39 +01:00
Jan Steemann 8b281b0538 repaired explain 2016-03-11 16:38:01 +01:00
Jan Steemann 7b68bd2656 remove printing 2016-03-11 13:03:52 +01:00
Jan Steemann da691ed39c fixed memory issues 2016-03-11 12:44:38 +01:00
Jan Steemann b55b5d7386 AqlValue refactoring 2016-03-09 17:50:20 +01:00
Michael Hackstein 42e3d94bf6 Removed unused obsolete Code and Imports 2016-03-08 13:29:09 +01:00
Michael Hackstein e60e7a3652 Aql/QueryResult now only uses VelocyPack instead of TRI_json_t. Also adapted all calling places 2016-03-08 13:08:05 +01:00
Jan Steemann 0552cd54c3 query cache using vpack 2016-03-08 09:38:24 +01:00
Michael Hackstein 7c3690c4db AqlQuery now is contructed from VelocyPack builders only. Also variables and Execution Plan is constructed form VelocyPack only. 2016-03-07 19:04:37 +01:00
Michael Hackstein 9278556205 Added an implementation for warnignsToVelocyPack in query 2016-03-07 13:07:07 +01:00
Michael Hackstein a01a1605b1 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-07 12:46:27 +01:00
Michael Hackstein 038573b0db Removed large parts of JSON out of RestAqlHandler. There is still some JSON contained because auf Query still using JSON. Included several warnings for the specfic code pieces 2016-03-07 12:45:34 +01:00
Jan Steemann 6f6f7e23ba executionstats use vpack 2016-03-07 11:20:04 +01:00
Jan Steemann def9d86868 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 10:51:24 +01:00
Jan Steemann c6fa638b67 fixed issue #1765, issue #1770 2016-03-07 10:49:18 +01:00
Jan Steemann 06da362f93 some json removal 2016-03-02 17:51:05 +01:00
Jan Steemann 15350cf4b8 renamed and removed 2016-03-01 12:34:03 +01:00
Jan Steemann eb202f528c pass vocbase in TransactionContext 2016-02-23 13:03:30 +01:00
Jan Steemann f468cd00ad create transaction context as shared ptr 2016-02-23 12:18:39 +01:00
Frank Celler a5e804ab70 added cancel 2016-02-17 22:19:52 +01:00
Frank Celler 345712c36f changed to new Thread interface 2016-02-17 22:19:37 +01:00
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Jan Steemann 0d4d5f5f93 fixed stringification of query states 2016-02-08 17:06:28 +01:00
Jan Steemann b7941f3142 added assertions 2016-02-08 09:57:11 +01:00
Michael Hackstein 6eeb686287 Added dummy to collect a shared VPackBuilder from a query object. Has to be properly implemented as soon as VelocyPack is the default AqlValue format 2016-02-03 10:40:51 +01:00
jsteemann 349a6d9754 more logging 2016-01-31 21:48:59 +01:00
jsteemann b635983d9c removed unused functions and headers 2016-01-31 19:08:39 +01:00
Jan Steemann cd4cbae6ce ported fixes to devel 2016-01-29 19:05:27 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Michael Hackstein a6f58ce14d Use forward declarations for VelocyPack instead of all includes everywhere 2016-01-24 14:29:31 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
jsteemann ef67a496e6 more checks & asserts, C API cleanup 2016-01-20 22:08:11 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00