1
0
Fork 0
Commit Graph

2887 Commits

Author SHA1 Message Date
Jan Steemann 2151ecce68 fixed crash 2016-04-21 17:27:12 +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
jsteemann accb2cb33e added operator LIKE 2016-04-20 23:05:38 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann 316a1bd190 starting support for Externals 2016-04-19 22:31:40 +02:00
Jan Steemann bc7d45aada fixed crash 2016-04-19 16:38:50 +02:00
Jan Steemann 2254df14f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 15:38:37 +02:00
Jan Steemann 2533affb02 fixed crash 2016-04-19 15:38:30 +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
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Kaveh Vahedipour d97d23b8df naming and FMH merge perp 2016-04-19 07:59:51 +00: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
Simran Brucherseifer 097dcb0984 Minor corrections 2016-04-18 19:01:56 +02:00
Jan Steemann a3ad9ba3a3 fixed issue #1805 2016-04-18 15:09:42 +02:00
Michael Hackstein 4cf47bf9c4 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-18 12:42:00 +02:00
jsteemann a0f05f584f speed up IN lookups on ranges 2016-04-17 21:09:36 +02:00
jsteemann 30ec73e596 AQL bugfixes and tests, CHANGELOG updates 2016-04-17 20:57:13 +02:00
Frank Celler 92dc9224c2 fixed startup 2016-04-17 16:18:03 +02:00
Michael Hackstein 6f7723bc58 Entirely removed TRI_json_t from AQL/Ast. All replaced by VPack 2016-04-16 23:44:03 +02:00
Michael Hackstein 122c891fa8 Removed Ast::nodeFromJson which was obsolete and is not used anymore 2016-04-16 23:40:43 +02:00
Frank Celler f7249d2729 WIP 2016-04-15 22:47:35 -07:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -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
jsteemann bbac0b673f don't pull filters beyond modification nodes 2016-04-15 18:10:16 +02:00
jsteemann ecd7de16cb added optimizer rule "inline-subqueries" 2016-04-15 17:21:22 +02:00
Michael Hackstein e90193bec0 Fixed a nullptr access in Traversal condition finder. 2016-04-14 13:32: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
Jan Steemann 576fcab12b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-13 16:29:26 +02:00
Jan Steemann a0fde1b7b2 allow array values in attribute name bind parameters 2016-04-13 16:29:09 +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
Jan Steemann 9163236f2b renamed optimizer rule "merge-traversal-filter" into "optimize-traversals" 2016-04-12 14:51:15 +02:00
jsteemann 25c89bb7e8 make AQL RANGE() function return a real range object 2016-04-11 23:11:05 +02:00
Frank Celler 922753ef3d WIP 2016-04-11 17:44:41 +02:00
Jan Steemann 947fb8d9ad make LIKE wildcards newline-aware 2016-04-11 14:02:12 +02:00
jsteemann 4a7c9f0f68 simplified bloated comments 2016-04-09 11:27:30 +02:00
Jan Steemann 4646f5d5f0 fix wrong path 2016-04-08 13:11:03 +02:00
Jan Steemann 3a582af765 fix Windows build 2016-04-08 13:09:32 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Jan Steemann 6a00984114 fixed some comments 2016-04-07 18:21:02 +02:00
Jan Steemann 6df7221691 cleanup 2016-04-07 17:08:44 +02:00
Michael Hackstein 1b967d9535 Started fixing AQL-failures-noncluster tests. Still two are failing. Return and Sort. 2016-04-07 14:37:18 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Michael Hackstein dc58c5d769 Fixed Modify edges in cluster test. Expected old return codes 2016-04-04 18:41:28 +02:00
Michael Hackstein 96df479125 Fixed error Reporting in AQLRestHandler. It did always throw OOM despite of the error. 2016-04-04 17:46:41 +02:00
Kaveh Vahedipour 723eb01cee merging back from agency 2016-04-04 12:13:43 +00:00
Michael Hackstein ab46b07f98 Reimplemented Traversal in Cluster case 2016-04-04 12:52:11 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00