Table of Contents
- Contribution Guidelines
- Create a design document
- Create an issue for the change
- Create a branch for your change
- Making the changes
- Creating a Pull Request (PR)
If your change is relatively minor, you can skip this step. If you are adding new major feature, we suggest that you add a design document and solicit comments from the community before submitting any code.
Here is a list of current design documents.
Create a Pinot issue for the change you would like to make. Provide information on why the change is needed and how you plan to address it. Use the conversations on the issue as a way to validate assumptions and the right way to proceed. Be sure to review sections on Backward and Forward compatibility changes and External libraries.
If you have a design document, please refer to the design documents in your Issue. You may even want to create multiple issues depending on the extent of your change.
Once you are clear about what you want to do, proceed with the next steps listed below.
$ cd pinot # # ensure you are starting from the latest code base # the following steps, ensure your fork's (origin's) master is up-to-date # $ git fetch upstream $ git checkout master $ git merge upstream/master # create a branch for your issue $ git checkout -b <your issue branch>
Make the necessary changes. If the changes you plan to make are too big, make sure you break it down into smaller tasks.
Follow the recommendations/best-practices noted here when you are making changes.
Please ensure your code is adequately documented. Some things to consider for documentation:
- Always include class level java docs. At the top class level, we are looking for information about what functionality is provided by the class, what state is maintained by the class, whether there are concurrency/thread-safety concerns and any exceptional behavior that the class might exhibit.
- Document public methods and their parameters.
- Ensure there is adequate logging for positive paths as well as exceptional paths. As a corollary to this, ensure logs are not noisy.
- Do not use System.out.println to log messages. Use the
- Use logging levels correctly: set level to
debugfor verbose logs useful for only for debugging.
- Do not log stack traces via
printStackTracemethod of the exception.
- Where possible, throw specific exceptions, preferably checked exceptions, so the callers can easily determine what the erroneous conditions that need to be handled are.
- Avoid catching broad exceptions (ie,
catch (Exception e)blocks, except for when this is in the run() method of a thread/runnable.
Current Pinot code does not strictly adhere to this, but we would like to change this over time and adopt best practices around exception handling.
If you are making any changes to state stored, either in Zookeeper or in segments, make sure you consider both backward and forward compatibility issues.
- For backward compatibility, consider cases where one component is using the new version and another is still on the old version. E.g., when the request format between broker and server is updated, consider resulting behaviors when a new broker is talking to an older server. Will it break?
- For forward compatibility, consider rollback cases. E.g., consider what happens when state persisted by new code is handled by old code. Does the old code skip over new fields?
Be cautious about pulling in external dependencies. You will need to consider multiple things when faced with a need to pull in a new library.
- What capability is the addition of the library providing you with? Can existing libraries provide this functionality (may be with a little bit of effort)?
- Is the external library maintained by an active community of contributors?
- What are the licensing terms for the library. For more information about handling licenses, see License Headers for newly added files.
- Are you adding the library to Foundational modules modules? This will affect the rest of the Pinot code base. If the new library pulls in a lot of transitive dependencies, then we might encounter unexpected issues with multiple classes in the classpath. These issues are hard to catch with tests as the order of loading the libraries at runtime matters. If you absolutely need the support, consider adding it via extension modules, see Extension modules.
Automated tests are always recommended for contributions. Make sure you write tests so that:
- You verify the correctness of your contribution. This serves as proof to you as well as the reviewers.
- You future proof your contributions against code refactors or other changes. While this may not always be possible (see Testing Guidelines), its a good goal to aim for.
Identify a list of tests for the changes you have made. Depending on the scope of changes, you may need one or more of the following tests:
Make sure your code has the necessary class or method level unit tests. It is important to write both positive case as well as negative case tests. Document your tests well and add meaningful assertions in the tests; when the assertions fail, ensure that the right messages are logged with information that allows other to debug.
Add integration tests to cover End-to-End paths without relying on mocking (see note below). You
MUSTadd integration tests for REST APIs, and must include tests that cover different error codes; i.e., 200 OK, 4xx or 5xx errors that are explicit contracts of the API.
Use Mockito to mock classes to control specific behaviors - e.g., simulate various error conditions.
DO NOT use advanced mock libraries such as PowerMock. They make bytecode level changes to allow tests for static/private members but this typically results in other tools like jacoco to fail. They also promote incorrect implementation choices that make it harder to test additional changes. When faced with a choice to use PowerMock or advanced mocking options, you might either need to refactor the code to work better with mocking or you actually need to write an integration test instead of a unit test.
Validate assumptions in tests
Make sure that adequate asserts are added in the tests to verify that the tests are passing for the right reasons.
Write reliable tests
Make sure you are writing tests that are reliable. If the tests depend on asynchronous events to be fired, do not add
sleepto your tests. Where possible, use appropriate mocking or condition based triggers.
All source code files should have license headers. To automatically add the header for any new file you plan to checkin, run in
pinot top-level folder:
If you checkin third-party code or files, please make sure you review Apache guidelines:
Once you determine the code you are pulling in adhere to the guidelines above, go ahead pull the changes in. Do not add license headers for them. Follow these instructions to ensure we are compliant with Apache Licensing process:
pinot/licensesadd a LICENSE-<newlib> file that has the license terms of the included library.
- Update the
pinot/LICENSEfile to indicate the newly added library file paths under the corresponding supported Licenses.
- Update the exclusion rules for
ratmaven plugins in the parent pom:
If attention to the licensing terms in not paid early on, they will be caught much later in the process, when we prepare to make a new release. Updating code at that time to work with the right libraries at that time might require bigger refactoring changes and delay the release process.
Run the following command to verify the code-style before posting a PR
Before you create a review request for the changes, make sure you have run the corresponding unit tests for your changes. You can run individual tests via the IDE or via maven command-line. Finally run all tests locally by running
mvn clean install -Pbin-dist.
For changes that are related to performance issues or race conditions, it is hard to write reliable tests, so we recommend running manual stress tests to validate the changes. You
MUSTnote the manual tests done in the PR description.
Push changes and create a PR for review
Commit your changes with a meaningful commit message.
$ git add <files required for the change> $ git commit -m "Meaningful oneliner for the change" $ git push origin <your issue branch> After this, create a PullRequest in `github <https://github.com/apache/incubator-pinot/pulls>`_. Include the following information in the description: * The changes that are included in the PR. * Design document, if any. * Information on any implementation choices that were made. * Evidence of sufficient testing. You ``MUST`` indicate the tests done, either manually or automated. Once the PR is created, the code base is compiled and all tests are run via ``travis``. Make sure you followup on any issues flagged by travis and address them. If you see test failures that are intermittent, ``please`` create an issue to track them. Once the ``travis`` run is clear, request reviews from atleast 2 committers on the project and be sure to gently to followup on the issue with the reviewers.
Once you receive comments on github on your changes, be sure to respond to them on github and address the concerns. If any discussions happen offline for the changes in question, make sure to capture the outcome of the discussion, so others can follow along as well.
It is possible that while your change is being reviewed, other changes were made to the master branch. Be sure to pull rebase your change on the new changes thus:
# commit your changes $ git add <updated files> $ git commit -m "Meaningful message for the udpate" # pull new changes $ git checkout master $ git merge upstream/master $ git checkout <your issue branch> $ git rebase master At this time, if rebase flags any conflicts, resolve the conflicts and follow the instructions provided by the rebase command. Run additional tests/validations for the new changes and update the PR by pushing your changes:
$ git push origin <your issue branch>
- When you have addressed all comments and have an approved PR, one of the committers can merge your PR.
- After your change is merged, check to see if any documentation needs to be updated. If so, create a PR for documentation.