Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sorting of custom field types is null safe #19960

Merged
merged 3 commits into from
Jul 22, 2024

Conversation

luk-kaminski
Copy link
Contributor

Description

Sorting of custom field types is null safe.
Fixes #19694

Motivation and Context

See #19694

How Has This Been Tested?

Manually and with new unit tests.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Refactoring (non-breaking change)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.

Copy link
Contributor

@todvora todvora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix, it looks good. Just one recommendation about the test. What about using an assertion like

Assertions.assertThat(comparator.compare(itemOne, itemTwo)).isNegative();

isNegative, isPositive and isZero assertions are nicely matching the contract of the comparator and make the test IMHO more readable.

@luk-kaminski luk-kaminski force-pushed the fix/sorting_of_custom_field_types_is_null_safe branch from 4d0c088 to 55d20a9 Compare July 22, 2024 07:46
@todvora todvora merged commit d20c795 into master Jul 22, 2024
5 checks passed
@todvora todvora deleted the fix/sorting_of_custom_field_types_is_null_safe branch July 22, 2024 12:39
@drewmiranda-gl
Copy link
Member

Is it possible this can/will be backported to 6.0?

@luk-kaminski
Copy link
Contributor Author

Is it possible this can/will be backported to 6.0?

Yes, hopefully I will do it today.

luk-kaminski added a commit that referenced this pull request Jul 23, 2024
* Sorting of custom field types is null safe

* Adding changelog

* Using human language in assertions instead of mathematical operators

(cherry picked from commit d20c795)
bernd pushed a commit that referenced this pull request Jul 23, 2024
* Sorting of custom field types is null safe

* Adding changelog

* Using human language in assertions instead of mathematical operators
janheise pushed a commit that referenced this pull request Jul 23, 2024
* Sorting of custom field types is null safe

* Adding changelog

* Using human language in assertions instead of mathematical operators

(cherry picked from commit d20c795)
thll pushed a commit that referenced this pull request Jul 25, 2024
…9971)

* Fix zstd library loading issue on noexec-mounted /tmp directories

Set the "ZstdTempFolder" system property early in the startup process.

Fixes #17837

* Add changelog entry.

* Bump material-symbols from 0.15.0 to 0.21.1 in /graylog2-web-interface (#19892)

* Bump material-symbols from 0.15.0 to 0.21.1 in /graylog2-web-interface

Bumps [material-symbols](https://github.com/marella/material-symbols/tree/HEAD/material-symbols) from 0.15.0 to 0.21.1.
- [Release notes](https://github.com/marella/material-symbols/releases)
- [Commits](https://github.com/marella/material-symbols/commits/v0.21.1/material-symbols)

---
updated-dependencies:
- dependency-name: material-symbols
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update icon names.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Linus Pahl <[email protected]>
Co-authored-by: maxiadlovskii <[email protected]>

* Sorting of custom field types is null safe (#19960)

* Sorting of custom field types is null safe

* Adding changelog

* Using human language in assertions instead of mathematical operators

* Check permission for stream column that needs it (#19956)

Co-authored-by: Laura <[email protected]>

* Add isFetching flag to useFieldTypes hook (#19978)

* Create native lib dir and revert API change

- The zstd library doesn't create its own temp dir, so we do it.
- Restore the "getPluginLoader(File, ChainingClassloader)" method to
  avoid breaking subclasses. (e.g., Forwarder)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Linus Pahl <[email protected]>
Co-authored-by: maxiadlovskii <[email protected]>
Co-authored-by: luk-kaminski <[email protected]>
Co-authored-by: Ousmane SAMBA <[email protected]>
Co-authored-by: Laura <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Configure <index set> field types page does not load
3 participants