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

2549 Commits

Author SHA1 Message Date
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
Max Neunhoeffer 27cf790fef Merge branch 'devel' into ClustUp1 2015-12-14 16:46:30 +01:00
Jan Steemann 5a4165fd54 removed debug output 2015-12-14 14:34:57 +01:00
Max Neunhoeffer 525e54d5a0 Merge branch 'devel' into ClustUp1 2015-12-14 11:26:10 +01:00
Jan Steemann 90ff8508ac set `extremeVerbosity` to false 2015-12-14 10:03:52 +01:00
Jan Steemann 23367b098b make test output verbose more configurable 2015-12-11 17:54:40 +01:00
Max Neunhoeffer 95b311f802 Merge branch 'devel' into ClustUp1 2015-12-11 13:33:33 +01:00
jsteemann 18e47457a6 fixes 2015-12-11 13:29:18 +01:00
Max Neunhoeffer 7a91accb71 Merge branch 'devel' into ClustUp1 2015-12-09 15:19:11 +01:00
Wilfried Goesgens 181db60b49 break if server is dead. 2015-12-09 13:43:04 +01:00
Alan Plum d3e2f75c33 Make require behave again 
Calls to require should stay within the ArangoDB paths or Foxx service root.

The require cache for Foxx services should be service specific.

Reloading a service's controllers should clear the service's require cache.

See #1577.
 2015-12-09 13:33:41 +01:00
Max Neunhoeffer 3f78b86492 Merge branch 'devel' into ClustUp1 2015-12-09 09:04:00 +01:00
jsteemann f13ffb4dff jslint 2015-12-09 00:21:55 +01:00
Max Neunhoeffer ec4e37b2f9 Merge branch 'devel' into ClustUp1 2015-12-08 20:13:17 +01:00
Jan Steemann 4cd2621d06 adjusted AQL function return values 2015-12-08 19:45:32 +01:00
Alan Plum 6b4fbdc5a7 Make the Foxx console behave as documented 2015-12-08 18:42:13 +01:00
Max Neunhoeffer 4e523a19ed Merge branch 'devel' into ClustUp1 2015-12-08 17:02:14 +01:00
Max Neunhoeffer 257c6c897d Fix bugs and tests. 2015-12-08 12:48:11 +01:00
Jan Steemann a3f42b5072 renamed test method 2015-12-08 11:49:45 +01:00
Jan Steemann bbe8d5bb1f reduced wait period 2015-12-07 17:10:07 +01:00
Wilfried Goesgens ad8948057e Add timestamp to the output of testing.js before it starts rspec tests 2015-12-07 16:34:16 +01:00
Jan Steemann 1daeb7ad28 deadlock tests for drivers 2015-12-07 15:01:35 +01:00
Max Neunhoeffer a8a9f1832b Merge branch 'devel' into ClustUp1 2015-12-04 23:06:11 +01:00
Jan Steemann a53da38fcd fixed some cluster queries 2015-12-04 17:07:36 +01:00
Max Neunhoeffer 60df924ac1 Change data structures for collections in Agency. 
Snapshot, compiles, untested, needs new VelocyPack.
 2015-12-04 15:08:47 +01:00
Max Neunhoeffer a926c7570a Cleanup ClusterInfo library w.r.t. Current/Collections. 2015-12-04 15:08:47 +01:00
Wilfried Goesgens de86282978 add -, we do so in all other cases. 2015-12-04 14:24:10 +01:00
Wilfried Goesgens 08942dc729 Numeric functions seem to behave different in valgrind; therefore add a way to skip these tests. 2015-12-04 14:23:03 +01:00
Jan Steemann 3b1df26a79 added AQL function `IS_DATESTRING` 2015-12-04 10:53:01 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
Jan Steemann 61a8e4c686 issue #1593: add POW() AQL function 2015-12-02 15:41:30 +01:00
Wilfried Goesgens 4b861dd44a Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-12-01 16:37:06 +01:00
Wilfried Goesgens 60819f9e80 Fix spelling for starting valgrind db servers 2015-12-01 16:36:23 +01:00
Michael Hackstein e9a36a3fbf Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-30 14:17:44 +01:00
Jan Steemann e0392653f7 fixed error message 2015-11-30 13:45:31 +01:00
Wilfried Goesgens 55b8fb0c6f Fix links not to point to .html - .md is right, else the non-html generators won't work properly. 2015-11-27 11:51:29 +01:00
Michael Hackstein a93fcac0e8 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-27 09:29:01 +01:00
Wilfried Goesgens aae19ff291 Fix dangling anchors and add checker script to the make target. 2015-11-26 18:51:39 +01:00
Michael Hackstein 7bf37620bb Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-26 16:32:26 +01:00
Alan Plum ec49f5783b Remove FormatMiddleware 
Fixes #971.
 2015-11-25 13:19:00 +01:00
Alan Plum 7538d71333 URL parameter -> {query,path} parameter 2015-11-24 18:09:43 +01:00
Alan Plum 01aaa5f95a Adjust docs so it no longer implies IDs in ArangoDB might be numbers 
Fixes #1408.
 2015-11-24 16:18:37 +01:00
hkernbach 2d417e393d Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-24 13:24:12 +01:00
Alan Plum 3bd39234ec Treat empty string as null in optional Foxx configs 
Fixes #1495.
 2015-11-24 13:14:41 +01:00
Michael Hackstein 7a36bbb43f Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-18 13:58:47 +01:00