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

991 Commits

Author SHA1 Message Date
jsteemann ea46d40bcd remove unused variable 2016-04-29 15:16:24 +02:00
Alan Plum fb2a9818e6
Session storages need both forClient and fromClient 2016-04-29 15:04:03 +02:00
Alan Plum 80dbea94a4
Make gharial behave better on errors again 2016-04-29 15:04:02 +02:00
jsteemann 3bb0f5fbe1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 14:52:30 +02:00
jsteemann ceb138d888 translate more errors 2016-04-29 14:30:11 +02:00
Alan Plum c829737568
Don't use _users in aardvark directly 2016-04-29 12:58:51 +02:00
Kaveh Vahedipour 4c3d906bd8 UserVersion, HB interval integers 2016-04-29 11:19:40 +02:00
Kaveh Vahedipour 7733e16392 UserVersion is a number 2016-04-29 10:45:27 +02:00
Kaveh Vahedipour ee2115ceeb remaining verbose output 2016-04-28 16:28:59 +02:00
Kaveh Vahedipour e81e3e51e0 javascript side of jsonified agency 2016-04-28 15:15:55 +02:00
Kaveh Vahedipour 6329d90155 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-27 17:27:52 +02:00
Kaveh Vahedipour bb834bb4a1 cluster startup ok. execept of corrdinator. 2016-04-27 17:27:06 +02:00
Kaveh Vahedipour 049cc8602e careful with loops :( 2016-04-27 16:53:09 +02:00
jsteemann 285da023e5 ShapedJson removal 2016-04-27 00:45:15 +02:00
Kaveh Vahedipour d4fc6a1062 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-25 18:37:32 +02:00
Kaveh Vahedipour 0530603763 dirty yet 2016-04-25 18:37:28 +02:00
Alan Plum 7b9085b009
Clear+recreate internal sessions to refresh them 2016-04-25 14:22:10 +02:00
jsteemann 58198a834e re-added options for foxx queues 2016-04-24 15:27:08 +02:00
Alan Plum 7653fe5eb8
Re-createSid on every access 
There's no other way to prevent the internal sid from timing out apparently.
 2016-04-21 15:14:01 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +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
Alan Plum e7e457b560
ES6ify 2016-04-20 18:34:46 +02:00
Alan Plum a3d5c64532
Object.extend is not a function 2016-04-20 18:13:04 +02:00
Alan Plum 0529471cdc
Allow passing an error to res.throw as reason 2016-04-20 18:11:49 +02:00
Max Neunhoeffer 13fdd67d38 Better timeouts in synchronisation in heartbeat thread. 2016-04-20 17:24:38 +02:00
Alan Plum 96aa1d9129
Add req.json 2016-04-20 17:18:51 +02:00
Alan Plum 7065d29975
Don't add default bodies 2016-04-20 17:18:51 +02:00
Alan Plum 2b0c1f6f9a
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 0fff3e661f
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 249dddcdf4
Optionally auto-update collection sessions 2016-04-20 15:23:02 +02:00
Alan Plum e7c0a49cfb
Don't use session.userData in system, always update lastAccess 2016-04-20 15:23:01 +02:00
Alan Plum 50ae4804f6
Spacing 2016-04-20 15:23:00 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Alan Plum 8b7a98f2e8
global.aqlQuery -> arangodb.aql 2016-04-20 13:05:27 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Alan Plum 494d5d5855
Foxx.getExports -> legacy 2016-04-19 18:16:18 +02:00
Alan Plum 17854b57a8
Formatting 2016-04-19 18:16:18 +02:00
Alan Plum 7b76519bbe
Allow res.throw(status, args) 2016-04-19 18:16:18 +02:00
Alan Plum 8a114a58d3
queues.js -> queues/index.js 2016-04-19 18:16:18 +02:00
Alan Plum 4c3319de25
Extract session storage.save 
Also fix transports
 2016-04-19 15:06:55 +02:00
Kaveh Vahedipour 87bc35068b FHM merge from devel 2016-04-19 09:59:33 +00:00
Alan Plum ffcbd0a69e
Fix require tests 2016-04-19 09:29:24 +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
Alan Plum 051a153252
@arangodb/foxx -> @arangodb/foxx/legacy 2016-04-18 18:01:08 +02:00
Alan Plum c39eca49e4
Add require.aliases 2016-04-18 18:01:06 +02:00
Alan Plum 9f25f44a87
Don't check the Foxx store unless you actually need it 2016-04-18 18:01:06 +02:00
Alan Plum 02ee7c5489
Fix Foxx session transports error message 2016-04-18 18:01:04 +02:00
Alan Plum 4b509adf15
Nicer warnings/errors 2016-04-18 18:01:04 +02:00
Alan Plum 39754d700f
Unbreaky aardvark 2016-04-18 18:01:01 +02:00
Alan Plum 2382e6a6a7
Foxx services should survive even if API docs are broken 2016-04-18 18:01:00 +02:00
Alan Plum 96d0f5f4ab
QueryParam and friends should allow omitting schemas 2016-04-18 18:00:59 +02:00
Alan Plum 8224153c72
Prettier JSON responses in dev mode 2016-04-18 18:00:58 +02:00
Alan Plum 7bef673ef8
Fix empty descriptions in swagger 2016-04-18 18:00:58 +02:00
Alan Plum 46822f2335
Split body parsing and validation, add error cause 2016-04-18 18:00:56 +02:00
Alan Plum 7364c428e7
Add SyntheticRequest#database 2016-04-18 18:00:55 +02:00
Alan Plum aaaa3ca8f8
Add SyntheticResponse#throw 2016-04-18 18:00:54 +02:00
Alan Plum 106f14cffb
Nicer route error logging logic 2016-04-18 18:00:54 +02:00
Alan Plum b475e3cc09
Allow passing swagger object to swagger handler 2016-04-18 18:00:53 +02:00
Alan Plum b82f29fb42
Disable removed system services 2016-04-18 18:00:50 +02:00
Alan Plum 3fdd0a90e2
Better handle wrapped errors in Foxx 2016-04-18 18:00:49 +02:00
Alan Plum 30d6200a60
Allow passing strings as status code in some cases 2016-04-18 18:00:48 +02:00
Alan Plum 64d2b38025
Add _system sessions storage 2016-04-18 18:00:47 +02:00
Alan Plum 9e021cbc57
Fix transport.set call in sessions middleware 2016-04-18 18:00:46 +02:00
Alan Plum 5a3e42e289
Service#thumbnail should use path instead of base64 2016-04-18 18:00:46 +02:00
Alan Plum edbe1e966c
Add createSwaggerHandler to context 2016-04-18 18:00:45 +02:00
Alan Plum f13a827158
Fix new swagger 2016-04-18 18:00:45 +02:00
Alan Plum f6a0e4619d
Allow clearing removed sessions in transport 2016-04-18 18:00:45 +02:00
Alan Plum fbd2f3203a
Only serialize session if it is set 2016-04-18 18:00:44 +02:00
Alan Plum 5d69166a89
Fix cookie session transport signing 2016-04-18 18:00:44 +02:00
Alan Plum ef88a9d6eb
Consistency with args 2016-04-18 18:00:43 +02:00
Alan Plum 2dcadc06ea
Request path should be relative to service mount 2016-04-18 18:00:43 +02:00
Alan Plum a53e211452
Nested routers should allow sloppy paths too 2016-04-18 18:00:42 +02:00
Alan Plum 6473209430
Fix hasOwnProperty call 2016-04-18 18:00:42 +02:00
Alan Plum 40d66f932d
Allow defaultDocument but no default 2016-04-18 18:00:42 +02:00
Alan Plum f7f841c7c9
If auth config is a string, it's a method 2016-04-18 18:00:42 +02:00
Alan Plum 438b50e652
Extend Foxx session storage a bit 2016-04-18 18:00:41 +02:00
Alan Plum 989f87f732
Allow adding extra fields to error response from exception 2016-04-18 18:00:41 +02:00
Alan Plum 1430e24c3d
Linting 2016-04-18 18:00:41 +02:00
Alan Plum 4c42cc3e2f
Add FOTF swagger 2016-04-18 18:00:40 +02:00
Alan Plum 898f9bdcac
Move swagger into Foxx legacy 2016-04-18 18:00:40 +02:00
Alan Plum 80f7ffe876
Move OAuth2 into Foxx 2016-04-18 18:00:40 +02:00
Alan Plum 6c0cdeb4f1
Move simple-auth into Foxx 2016-04-18 18:00:40 +02:00
Alan Plum bb6b05b724
Make header transport API consistent with cookie 2016-04-18 18:00:39 +02:00
Alan Plum 5dfdd74c74
Add session collectionStorage 2016-04-18 18:00:39 +02:00
Alan Plum cae8a6607b
Add ServerRequest#params 2016-04-18 18:00:39 +02:00
Alan Plum 71ea230d4f
Fix defaultDocument in Foxx legacy 
Opt-out values (i.e. empty strings) are now handled correctly again.
 2016-04-18 18:00:38 +02:00
Alan Plum 9cf8d347ad
More SyntheticResponse tests 2016-04-18 18:00:38 +02:00
Alan Plum 21a1720d86
Add SyntheticResponse tests 2016-04-18 18:00:37 +02:00
Alan Plum 18ff55b7dd
Add SyntheticRequest tests 2016-04-18 18:00:37 +02:00
Alan Plum 2993b73c25
More SyntheticRequest tests 2016-04-18 18:00:37 +02:00
Alan Plum 15388552f9
Formatting 2016-04-18 18:00:36 +02:00
Alan Plum ee90edfe45
Fix SyntheticRequest 2016-04-18 18:00:36 +02:00
Alan Plum 83bd3f4ace
Allow manual mime types in manifest 
Fixes #1702.
 2016-04-18 18:00:36 +02:00
Alan Plum 926f02ace5
Use mime-types 2016-04-18 18:00:35 +02:00
Alan Plum 5a6fa4a253
Generator should support edge collections 
Fixes #1718.
 2016-04-18 18:00:35 +02:00
Alan Plum ab0db4e414
Actually don't add 200 response by default 2016-04-18 18:00:35 +02:00
Alan Plum 72f65bd8e3
Response description -> reason 2016-04-18 18:00:34 +02:00
Alan Plum 5b4b3852ad
Better default 200 response 2016-04-18 18:00:34 +02:00
Alan Plum dcc2101d09
Yak shave 2016-04-18 18:00:34 +02:00
Alan Plum 22a8b5ec65
Add util.inline 2016-04-18 18:00:34 +02:00
Alan Plum b01a3da328
Fix swagger responses 2016-04-18 18:00:33 +02:00
Alan Plum 6bc2a10867
Fixup generator 2016-04-18 18:00:33 +02:00
Alan Plum a31bf33892
Basic swagger tests 2016-04-18 18:00:33 +02:00
Alan Plum a71fc92c6f
Add default body/response descriptions 2016-04-18 18:00:33 +02:00
Alan Plum 248e8e747e
Response descriptions are mandatory in Swagger 2016-04-18 18:00:32 +02:00
Alan Plum d7f514693b
Implement name reversal 2016-04-18 18:00:32 +02:00
Alan Plum bd4bc8eb96
SyntheticRequest: add baseUrl and makeAbsolute 2016-04-18 18:00:31 +02:00
Alan Plum 31526a8227
Clean up templates 2016-04-18 18:00:31 +02:00
Alan Plum b8d082941a
Fix legacy swagger 2016-04-18 18:00:31 +02:00
Alan Plum 4f2dc536ee
Tightening 
Convert some lets to consts and eliminate the redundancy in Router.
 2016-04-18 18:00:31 +02:00
Alan Plum 1f347b3145
Update license headers 2016-04-18 18:00:30 +02:00
Alan Plum 2ff1371e19
Port Foxx service generator to FOTF 2016-04-18 18:00:30 +02:00
Alan Plum d971780ba8
Make routing actually work 2016-04-18 18:00:30 +02:00
Alan Plum d2d62a97bc
Make FOTF swagger docs visible to Foxx Swagger 2016-04-18 18:00:30 +02:00
Alan Plum 8d2cc4041d
Implement request/response body handling 2016-04-18 18:00:29 +02:00
Alan Plum 24ab288d57
Move body handling into dispatch 2016-04-18 18:00:28 +02:00
Alan Plum d23f42fafc
No response schema if no response type 2016-04-18 18:00:28 +02:00
Alan Plum 3b3bfcbd95
If status 200 is set to no response, imply 204 2016-04-18 18:00:28 +02:00
Alan Plum 1197b6fa22
Use default schema for default response 2016-04-18 18:00:28 +02:00
Alan Plum 47d9ab07f4
Nevermind response headers for now 2016-04-18 18:00:27 +02:00
Alan Plum 21428c7f4b
Use joi-to-json-schema 2016-04-18 18:00:27 +02:00
Alan Plum bf253d07b3
Add operation.responses 2016-04-18 18:00:27 +02:00
Alan Plum a00ac0d96f
Swaggerify route params 2016-04-18 18:00:26 +02:00
Alan Plum d810a335ac
Better handle response/request body docs 2016-04-18 18:00:26 +02:00
Alan Plum ff0bf1a182
Add basic swagger generator stub 2016-04-18 18:00:26 +02:00
Alan Plum 91cfcb2fc9
Add SwaggerContext#_merge 2016-04-18 18:00:25 +02:00
Alan Plum 8ab3e4a161
Add tokenize.reverse 2016-04-18 18:00:25 +02:00
Alan Plum bfe66a4ad0
SwaggerContext#response per status code 2016-04-18 18:00:25 +02:00
Alan Plum 27c203bbb2
SwaggerContext should treat missing path as empty 2016-04-18 18:00:25 +02:00
Alan Plum 244345d178
SyntheticRequest#originalUrl should encode db 2016-04-18 18:00:25 +02:00
Alan Plum 314d19d20d
Extract router tree 2016-04-18 18:00:24 +02:00
Alan Plum 2633b0109b
Extract dispatch from router 2016-04-18 18:00:24 +02:00
Alan Plum 95dea0cd14
Yakshaving 2016-04-18 18:00:24 +02:00
Alan Plum 572952864c
Expose service context in request obj 2016-04-18 18:00:24 +02:00
Alan Plum 0156051c37
Basic implementation of SyntheticResponse 2016-04-18 18:00:23 +02:00
Alan Plum 9e3833eadd
Basic implementation of SyntheticRequest 
Fixes #1191.
 2016-04-18 18:00:23 +02:00
Alan Plum 5ba054210b
Fix router.resolve (req.method => req.requestType) 2016-04-18 18:00:23 +02:00
Alan Plum 34a1835532
Fix legacy mode applicationContext injection 2016-04-18 18:00:23 +02:00
Alan Plum aa4b41763e
Yakshaving 
Naming things is hard.
 2016-04-18 18:00:22 +02:00
Alan Plum 12e27cac00
Implement queryParam & body validation 2016-04-18 18:00:22 +02:00
Alan Plum 4b0fd593ce
Implement rudimentary route handling 2016-04-18 18:00:22 +02:00
Alan Plum 6637a0cd16
Make more route context attributes private 2016-04-18 18:00:21 +02:00
Alan Plum 8230d73406
More versatile route lookup 2016-04-18 18:00:21 +02:00
Alan Plum 6e6a9a3918
Add more tests & fix middleware resolution 2016-04-18 18:00:21 +02:00
Alan Plum 6ea15298bd
Partially implement routing for Foxx 2016-04-18 18:00:21 +02:00
Alan Plum e78e6476ab
Implement routing logic for router 2016-04-18 18:00:20 +02:00
Alan Plum 7bf1e5e502
Add router to Foxx services 
Fixes #1189.
 2016-04-18 18:00:20 +02:00
Alan Plum 8260da9d35
Implement basic router 
Fixes #1164.
Fixes #1759.
 2016-04-18 18:00:20 +02:00
Alan Plum 4495a2edc8
Implement session middleware 2016-04-18 18:00:20 +02:00
Alan Plum c934cbc9f2
Implement mounting legacy apps 2016-04-18 18:00:19 +02:00
Alan Plum bc0b5d40c4
Remove context._prefix 2016-04-18 18:00:19 +02:00
Alan Plum 5f91c5399c
Tidy up manifest props 2016-04-18 18:00:19 +02:00
Alan Plum 54fb1a73d8
foxx -> foxx/legacy 2016-04-18 18:00:19 +02:00
Alan Plum 0cfa0ed953
foxx.js -> foxx/index.js 2016-04-18 18:00:18 +02:00
Alan Plum 443ebe42f8
Enable applicationContext for legacy apps 2016-04-18 18:00:18 +02:00
Alan Plum 6a217bc9f7
Remove module.context.foxxFilename 2016-04-18 18:00:18 +02:00
Alan Plum 5161c63670
Remove magical Foxx comments 2016-04-18 18:00:18 +02:00
Alan Plum 54f27f51a2
Expose module.context.service 2016-04-18 18:00:18 +02:00
Alan Plum 4140c26d30
Use symbols for internal module props 2016-04-18 18:00:17 +02:00
Alan Plum c7688a72f8
module.requireCache -> module.require.cache 2016-04-18 18:00:17 +02:00
Alan Plum eacf570a39
applicationContext -> module.context 2016-04-18 18:00:17 +02:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
Max Neunhoeffer c9031a648f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-11 23:39:02 +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 947fb8d9ad make LIKE wildcards newline-aware 2016-04-11 14:02:12 +02:00
Max Neunhoeffer 130efabdca Export endpointToURL for others to require. 2016-04-07 16:19:26 +02:00
Frank Celler 58b9cf7e91 WIP 2016-04-07 15:40:11 +02:00
Jan Steemann a62d863238 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 17:39:34 +02:00
Andreas Streichardt bdda4952ef Fix replication still requiring planner 2016-04-06 17:34:43 +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 f45b6eeb49 jslint 2016-04-06 09:50:39 +02:00
Andreas Streichardt 3bdbded541 Fix linter errors 2016-04-05 18:45:39 +02:00
Andreas Streichardt d2d7af67fe Kickstarter and planner are dead 2016-04-05 17:45:39 +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 e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Michael Hackstein 303dacbc30 Fixed skip in Cordinator case GEO and FULLTEXT index if no limit is set 2016-04-01 16:31:12 +02:00
Kaveh Vahedipour cfcffb7a41 jslint error in agency test correctedush 2016-03-31 21:32:12 +00:00
Michael Hackstein e32df21b2c Also reverted simple geo queries to old version to make them functional again 2016-03-31 17:34:21 +02:00
Michael Hackstein fb2b7b6b0f Fixed FullText index in cluster. Newest implementation ended up in an endless Loop. Reverted to original version. 2016-03-31 16:20:20 +02:00
Alan Plum 77fc097601 Use _scanFoxx(replace:true) 2016-03-31 15:49:55 +02:00
Alan Plum 5a98ed9600 Always run _scanFoxx in a transaction 2016-03-31 15:00:37 +02:00
Frank Celler 2f2b0b9741 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-31 11:12:17 +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 119c1bd44b Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 09:31:32 +02:00
Alan Plum 7918975f77 Port fix for #1742 to 3.0 2016-03-30 16:14:18 +02:00
Jan Steemann ecf2deadb8 jslint 2016-03-24 19:35:37 +01:00
Jan Steemann 5166dc72d2 jslint 2016-03-24 19:32:31 +01:00
Jan Steemann c7daf1531d Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:23:11 +01:00
Michael Hackstein 582be9e707 Fixed usage of replace in graph-blueprints 2016-03-24 17:10:01 +01:00
Jan Steemann 881761d2d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-24 17:05:43 +01:00
Andreas Streichardt 9ba72b4412 Properly update current collection 2016-03-24 16:55:15 +01:00
Andreas Streichardt 3f9f03bb38 Remove debug 2016-03-24 14:26:12 +01:00
Jan Steemann d763c102d6 fulltext fixes 2016-03-22 18:34:40 +01:00
Jan Steemann 45cc15fe45 fixes 2016-03-22 10:51:42 +01:00
Jan Steemann 31d9c1873a fixed test 2016-03-21 18:03:49 +01:00
Jan Steemann f0724447b6 fixed sparse index test 2016-03-21 17:08:42 +01:00
jsteemann 82a1c58429 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 11:03:54 +01:00
Frank Celler def5b35a84 jslint fixes 2016-03-18 11:02:42 +01:00
jsteemann fd49f750fb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-18 10:46:03 +01:00
Andreas Streichardt 14ce41435b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-17 22:40:00 +00:00
Andreas Streichardt 90862b6081 Proper secondary => Primary failover 2016-03-17 22:39:15 +00:00
jsteemann c175d03433 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 23:14:53 +01:00
jsteemann ba9b318a7f don't issue two warnings 2016-03-17 23:13:50 +01:00
jsteemann 333bda5df1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-16 14:51:08 +01:00
Frank Celler cd1b2b6fc3 moved script 2016-03-16 13:01:41 +01:00
Frank Celler d9f9b8b65d fixed server version 2016-03-16 13:01:18 +01:00
Jan Steemann 6d6d2e9e9c do not set useless bind parameters 2016-03-11 19:42:14 +01:00
Jan Steemann 273deddaee Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 19:11:58 +01:00
Andreas Streichardt b29c437b7f Add more error info 2016-03-11 18:22:12 +01:00
Jan Steemann 14a3d02ce7 simple query cleanup 2016-03-07 20:29:04 +01:00
Jan Steemann 4d4ee7e237 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 16:25:15 +01:00
Jan Steemann ba637faea0 do not compare execution times 2016-03-07 11:33:20 +01:00
Jan Steemann e0e84b7ea1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 11:50:48 +01:00
Frank Celler 0d13d6609a renamed to _frontend 2016-03-01 11:25:07 +01:00
Jan Steemann ce31d754e4 fixed typo 2016-02-26 12:33:08 +01:00
Alan Plum 14cba16385 Linting 2016-02-15 23:29:23 +01:00
Alan Plum 6593f3d358 Clean up stacktraces 
Fixes #1564, #1565, #1744.
 2016-02-15 22:56:29 +01:00
Max Neunhoeffer 0902edc257 Fix jslint error. 2016-02-15 20:50:12 +01:00
Max Neunhoeffer 9d3446afe5 Stop WAL collection before synchronization of shard. 2016-02-15 10:29:06 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Max Neunhoeffer 8b98ae5ef5 Snapshot for merging. 2016-02-11 09:11:00 +01:00
Jan Steemann 85315ce9db added quantifiers test 2016-02-10 15:20:41 +01:00
Alan Plum a5dd99d4a7 Fix db._modules based routing 2016-02-10 14:44:21 +01:00
Jan Steemann f3107bc25f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 11:34:40 +01:00
Max Neunhoeffer 88c2657af7 Merge branch 'devel' into ClustUp2 2016-02-10 08:38:37 +01:00
Alan Plum 7dbc89d7be Actually register static Foxx model events 
Fixes #1665.
 2016-02-09 16:50:45 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
Jan Steemann 040b09f303 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-05 19:47:29 +01:00
Jan Steemann 45f416dae3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-05 18:31:17 +01:00
Andreas Streichardt a0df762a42 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-05 18:30:43 +01:00
Frank Celler 4264fae2ab fixed valgrind for testing 2016-02-05 18:22:26 +01:00
Jan Steemann 99b79acb61 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-05 18:20:32 +01:00
Jan Steemann a0cb3b1832 replication changes 2016-02-05 18:06:39 +01:00
Andreas Streichardt 111050871e Fix jslint 2016-02-05 17:23:35 +01:00
Andreas Streichardt 8075cdc30f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-05 14:25:45 +01:00
Andreas Streichardt 584c3564c6 Rework unittest cluster start logic 2016-02-05 14:25:17 +01:00
Jan Steemann abd382bf19 replication cleanup 2016-02-05 13:08:12 +01:00
Jan Steemann 94990da5f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-04 19:18:43 +01:00
Andreas Streichardt c0ed7f0429 Add peggy 2016-02-04 17:29:08 +01:00
Max Neunhoeffer fc94a38184 Add an InitDone stamp to cluster plan. 2016-02-04 15:53:42 +01:00
Andreas Streichardt adce528373 Proper initialization 
Also find a fitting spot for our role
 2016-02-04 11:29:43 +01:00
jsteemann 13335d4cf9 bugfixes 2016-02-03 01:06:27 +01:00
Jan Steemann fc909486c2 parser adjustments for array operators, not yet working 2016-02-02 18:05:39 +01:00
Max Neunhoeffer 93400bfdcc Implement followerInfo. 2016-02-01 11:38:10 +01:00
Max Neunhoeffer 238937128a Merge branch 'devel' into ClustUp2 2016-01-29 13:59:11 +01:00
Alan Plum a93979f95a Add engines field in templateEngine 2016-01-29 13:55:50 +01:00
Jan Steemann 9ce9490e96 don't throw if collection is not found 2016-01-28 13:27:14 +01:00
Jan Steemann de52abbf83 added AQL function `IS_SAME_COLLECTION` 2016-01-27 19:29:01 +01:00
Max Neunhoeffer 887e571a26 Merge branch 'devel' into ClustUp2 2016-01-26 18:01:42 +01:00
Jan Steemann 7800085a9b unified behavior of `RANGE` function 2016-01-25 14:19:49 +01:00
Jan Steemann c5d50871c2 fix for invalid input 2016-01-25 11:05:51 +01:00
Frank Celler 764a95ea2a switch to testing.js, moved testing.js to client 2016-01-23 21:07:42 +01:00
jsteemann 9ba3b68109 cppcheck 2016-01-23 16:22:39 +01:00
Wilfried Goesgens c1fcf62d37 Fix arangosh text to report proper results. 2016-01-22 15:52:43 +01:00
Wilfried Goesgens 2ebd9be2a1 Use json output of rspec, and parse it to get a proper result. 2016-01-22 15:30:41 +01:00
Wilfried Goesgens fea39708d8 align structure for ruby tests properly so that we have a result. 2016-01-22 13:55:05 +01:00
Jan Steemann 99a3cde31f jslint 2016-01-22 12:22:01 +01:00
Wilfried Goesgens ff259520c5 Fix layers for results of config-, upgrade-test and arangob. 2016-01-22 11:23:57 +01:00
Jan Steemann d0ce5310e0 fix version strings 2016-01-21 16:11:48 +01:00
Wilfried Goesgens 4257f6e3a3 More on stacktraces in windows. 2016-01-20 11:45:49 +01:00
Wilfried Goesgens dacd3c009f fix calculation of sleep state. 2016-01-19 15:58:34 +01:00
Jan Steemann a3d93e8a1d jslint 2016-01-18 18:24:48 +01:00
Wilfried Goesgens 523a3ff2da Add repetive test + sleep option 2016-01-18 16:28:12 +01:00
Jan Steemann 43e31c623d removed unused function 2016-01-15 10:28:38 +01:00
Jan Steemann 9e979db56a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-15 10:22:51 +01:00
Jan Steemann 7b4bf30c38 fixed differing behavior in NEIGHBORS() implementations 2016-01-15 10:22:23 +01:00
Wilfried Goesgens 77b6c52d01 No more one letter vars. 2016-01-15 10:20:34 +01:00
Wilfried Goesgens a5b5e7764d its o - not c 2016-01-15 09:46:43 +01:00
Jan Steemann 13a620599d fixed differing behavior in NEIGHBORS() implementations 2016-01-15 09:38:05 +01:00
jsteemann ae9147ef68 fixed invalid variable usage 2016-01-14 23:02:03 +01:00
Wilfried Goesgens f6f885d027 increase grace period for server to run tests when valgrind is in sight 2016-01-14 15:38:04 +01:00
Wilfried Goesgens 499d6b9df3 Handle situations in which the http reply object doesn't have a body (i.e. timeout...) 2016-01-14 15:36:38 +01:00
Alan Plum 4462f477e2 Fix spammy log output for realz 2016-01-13 18:53:27 +01:00
Alan Plum 90cbe39495 Better output for test authentication_parameters 2016-01-13 16:44:49 +01:00
Alan Plum 008d4826a9 Actually filter out log spam in tests again 2016-01-13 16:07:52 +01:00
Jan Steemann 150ed86c86 fixed jslint warning 2016-01-13 11:28:50 +01:00
Wilfried Goesgens e9fb81b845 Fix test: return proper result array. 2016-01-13 11:20:59 +01:00
Alan Plum b4ca221bee Fix the brokenness 
let outside strict is bad.
 2016-01-12 19:53:16 +01:00
Alan Plum b3c7cfd11e Remove jasmine completely 
This should not impact the frontend tests as they use a npm-installed copy of jasmine.
 2016-01-12 19:04:49 +01:00
Alan Plum bb14ad043d Also run mocha tests in runHere 2016-01-12 18:54:40 +01:00
Alan Plum 44faf4428d Improved mocha integration 
Mocha tests now produce pretty XML files and log output for Jenkins.
 2016-01-12 18:49:50 +01:00
Jan Steemann 6937dbc489 aggregate fixes 2016-01-12 17:21:18 +01:00
Wilfried Goesgens fd3d282fb1 Merge pull request #1653 from arangodb/mocha-tests 
Add support for mocha in built-in test runner
 2016-01-12 09:35:35 +01:00
Wilfried Goesgens a884e73404 assertQueryError: also output the query that failed with the error message. 2016-01-12 09:20:01 +01:00
Alan Plum c4c8418b6d Add support for mocha in built-in test runner 2016-01-11 20:00:56 +01:00
jsteemann debeaeec07 less garbage collection 2016-01-11 12:43:05 +01:00
Max Neunhoeffer b0283077db Merge branch 'devel' into ClustUp2 2016-01-11 11:41:36 +01:00
Max Neunhoeffer e7eae3a73a Merge branch 'devel' into ClustUp2 2016-01-11 11:01:45 +01:00
Jan Steemann 8390793699 moved docu blocks into their own files 2016-01-07 16:39:19 +01:00
Alan Plum 480194ae14 Add missing header to foxx/service 2016-01-06 18:47:13 +01:00
Alan Plum e2f3bfabd1 Fix typo in error message 2016-01-06 18:47:13 +01:00
Jan Steemann 1fc4c0d34e fixed hanging test 2016-01-05 17:58:36 +01:00
Alan Plum 1b25f98996 On Windows, posix-ify mocha test paths 2016-01-05 11:32:21 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Jan Steemann a15c18572f fixed test, added more tests 2016-01-04 19:33:18 +01:00
Jan Steemann 555a0286c2 make merging configurable in update-by-example API 2016-01-04 16:31:06 +01:00
Max Neunhoeffer d8bae80887 Snapshot, with debugging output. 2015-12-30 16:53:13 +01:00
Max Neunhoeffer ad5446bf49 Set heartbeat interval to 5s. 2015-12-29 15:49:37 +01:00
Max Neunhoeffer 8feb663890 Add synchronisation of follower shards. 2015-12-29 15:48:55 +01:00
Alan Plum 9ecc710491 Avoid _.clone 
Lodash's clone is subtlely different from underscore's and breaks with ShapedJson.
 2015-12-23 23:30:56 +01:00
Alan Plum de9ae5128a underscore -> lodash 2015-12-23 23:30:55 +01:00
Alan Plum a1b816e4f3 Update copyright headers 2015-12-23 23:30:43 +01:00
Alan Plum 840c432904 org/arangodb -> @arangodb in Foxx generator 2015-12-23 23:25:50 +01:00
Max Neunhoeffer 3996d2e6a2 Merge branch 'devel' into vpack 2015-12-23 08:35:59 +01:00
jsteemann 3d6582ed52 micro optimizations 2015-12-22 21:58:20 +01:00
Jan Steemann 5aebcbd91d Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 18:05:35 +01:00
Jan Steemann 6e3878ec94 changed behavior of [*] operator, added COLLECTION_COUNT internal function 2015-12-22 18:03:59 +01:00
Max Neunhoeffer 5f3a1fbdb2 Merge branch 'devel' into vpack 2015-12-22 14:18:34 +01:00
Alan Plum cad8c3841a Replace exportCache with app.main.loaded 2015-12-21 19:30:15 +01:00
Alan Plum ff23c28a44 Invalidate export cache when app is reloaded 2015-12-21 19:27:16 +01:00
Max Neunhoeffer b227b71c96 Remove name from collection properties for shards. 2015-12-18 15:34:37 +01:00
jsteemann b5fa1b4629 extremeVerbosity 2015-12-16 11:48:04 +01:00
Wilfried Goesgens e096903af6 Add comments howto configure the system so we can do automatic coredump analysis 2015-12-16 10:20:19 +01:00
Alan Plum b61d08efce applicationContext.foxxFilename -> applicationContext.fileName 2015-12-16 01:57:30 +01:00
Alan Plum 8b05198e17 Remove duplication 2015-12-16 01:41:20 +01:00
Alan Plum b8b0aa02f4 Remove unnecessary deprecation warnings 2015-12-16 01:16:38 +01:00
Alan Plum 318cf45def fix console.warn in Foxx 2015-12-16 01:16:38 +01:00
Alan Plum 8cd34bc586 Fix UndocumentedBody 2015-12-16 01:16:37 +01:00
Alan Plum 0c913dfbcf Make the Foxx console behave as documented 2015-12-16 01:16:37 +01:00
Alan Plum 78979e6a0c Revert unnecessary changes 2015-12-16 01:16:36 +01:00
Alan Plum ea419c671e Make activateAuthentication actually work again 2015-12-16 01:16:36 +01:00
Alan Plum 220468ec45 Add Model.toJSONSchema for 2.5 compat 2015-12-16 01:16:36 +01:00
Alan Plum ecfc00098e Lint 2015-12-16 01:16:35 +01:00
Alan Plum 64d3744594 Add jwt support back to Foxx sessions 2015-12-16 01:16:35 +01:00
Alan Plum c09b000d01 Make sessions more backwards compatible again 2015-12-16 01:16:35 +01:00
Alan Plum 06135043c1 Undeprecate Foxx.requireApp 2015-12-16 01:16:35 +01:00
Alan Plum 35b1f4e84f More undeprecation 2015-12-16 01:16:34 +01:00
Alan Plum 07209e278a Don't deprecate addInjector in 2.x 2015-12-16 01:16:34 +01:00
Alan Plum c7c8ee90ae Goodbye ES2015 classes 2015-12-16 01:16:33 +01:00
Alan Plum abbf019256 ctrl.del will not be removed in 2.9 2015-12-16 01:16:33 +01:00
Alan Plum 9c4bb1500d Linting 2015-12-16 01:16:32 +01:00
Alan Plum 0d6c70b4ee Remove ramda from npm deps 2015-12-16 00:10:19 +01:00
Alan Plum 0223b59233 Quotes 2015-12-16 00:09:41 +01:00
Max Neunhoeffer 0198b4576b Merge branch 'devel' into ClustUp1 2015-12-15 20:40:52 +01:00
Alan Plum 5947e2d9a8 fix console.warn in Foxx 2015-12-15 18:16:42 +01:00
Max Neunhoeffer 4451e491ec Merge branch 'devel' into ClustUp1 2015-12-15 17:46:34 +01:00
Michael Hackstein 5235ced456 out/in/edges on an edge collection in a cluster now works for an array of vertices as well 2015-12-15 16:39:04 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00