Greenplum Database was originally forked from PostgreSQL 8.2. With version 5.0, we merged PostgreSQL 8.3 and learned quite a lot along the way. In particular, it is not enough to just merge the database code - the tooling around the database needs to evolve as well, and customers and users want and need an upgrade path. This all got fixed in the past months, and the 5.0 version will roll out of the door soon.
Time to start thinking about the next steps!
In order not to “disturb” the main repository with too many commits from the merge, this process was moved into a separate public repository. Anyone is welcome to clone this repository and look into merge conflicts. After all conflicts in this repository are solved, and all tests pass, it will be merged back into the main repository.
The master repository runs a Concourse CI pipeline which constantly tests every new PR and commit. This CI is public. Every time the CI goes red, development is stopped shortly and the reason for the failure is investigated.
For the merge, a separate pipeline is monitoring the merge repository. We expect this pipeline to be more read than green, nevertheless it will show the progress which is made while resolving all the conflicts.
Our plan is to have a major release of Greenplum Database once a year, this follows the PostgreSQL release cycle. We also plan to merge 3 PostgreSQL major versions before we release version 6.0 of Greenplum Database. This gives us roughly 3 months to merge one major version, plus additional time to prepare the upcoming release.
The merge of one major PostgreSQL version is again broken down into smaller steps. Each step will process roughly 2-4 months of upstream commits.
Several major features are approached in separate steps and not as part of the merge process. In particular the Windowing functions create a large number of conflicts, as Greenplum Database has it’s own implementation, which was already there when this feature was added to PostgreSQL.
Another problematic part is the replication code. The existing file-based replication in Greenplum Database will be replaced with WAL Replication (Write-Ahead Logging) from upstream, which was introduced in PostgreSQL 9.0. This feature offers more flexibility for setting up secondary segments, but also requires refactoring of management tools.
We have several means of communication:
If you want to follow the merge process, the best place is to checkout the repository and look for git merge conflicts.