Re: Is it time to merge prototype/fdb-layer to master?

2020-09-10 Thread Joan Touzet
Cool. I'm certain we're overlooking something but I'm too tired to think of it today. FYI once the copy is done you can tell Infra to change the default branch for each repo on those and they will do so quickly, with no fuss. -Joan On 2020-09-10 4:13 p.m., Paul Davis wrote: I should have

Re: Is it time to merge prototype/fdb-layer to master?

2020-09-10 Thread Paul Davis
I should have noted, for each of the `apache/couchdb-$repo` repositories my plan is to do a straight up copy of master -> main with zero other changes. Once that's done we'll need to update rebar.config.script but that should be all we need there. On Thu, Sep 10, 2020 at 3:11 PM Paul Davis

Re: Is it time to merge prototype/fdb-layer to master?

2020-09-10 Thread Paul Davis
So I've gotten `make check` passing against a merge of master into the `prototype/fdb-layer` branch. I ended up finding a flaky test and a bug in a recent commit to master. I've just merged a fix for the flaky test and Bob is working on a patch for the buffered_response feature. Once those are

Re: Is it time to merge prototype/fdb-layer to master?

2020-09-09 Thread Joan Touzet
Have been asking for it for a while ;) obviously +1. Be aware that Jenkinsfile.full post-merge will probably fail because, at the very least, the FreeBSD hosts won't have fdb and can't run docker to containerise it. This will need some exploration to resolve but shouldn't be a blocker. The

Re: Is it time to merge prototype/fdb-layer to master?

2020-09-09 Thread Robert Samuel Newson
Agree that its time to get the fdb-layer work into master, that's where couchdb 4.0 should be being created. thanks for preserving the imported ebtree history. > On 9 Sep 2020, at 17:28, Paul Davis wrote: > > The merge on this turned out to be a lot more straightforward so I > think its

Re: Is it time to merge prototype/fdb-layer to master?

2020-09-09 Thread Robert Samuel Newson
Agree that its time to get the fdb-layer work into master, that's where couchdb 4.0 should be being created. thanks for preserving the imported ebtree history. > On 9 Sep 2020, at 17:28, Paul Davis wrote: > > The merge on this turned out to be a lot more straightforward so I > think its

Re: Is it time to merge prototype/fdb-layer to master?

2020-09-09 Thread Nick Vatamaniuc
Could we rename prototype/fdb-layer to main and it will be the base of 4.x? There might be a few things we could bring in from master into main like elixir test improvements, tooling, but it would be a smaller diff than bringing everything from prototype/fdb-layer into master. Then master can be

Re: Is it time to merge prototype/fdb-layer to master?

2020-09-09 Thread Paul Davis
The merge on this turned out to be a lot more straightforward so I think its probably the way to go. I've got a failing test in couch_views_active_tasks_test but it appears to be flaky rather than a merge error. I'll work though getting `make check` to complete and then send another update.