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

version: the build tag is incorrectly added to the RocksDB version string #231

Closed
isaac-io opened this issue Nov 10, 2022 · 1 comment · Fixed by #233
Closed

version: the build tag is incorrectly added to the RocksDB version string #231

isaac-io opened this issue Nov 10, 2022 · 1 comment · Fixed by #233
Assignees
Labels
bug Something isn't working build Build related
Milestone

Comments

@isaac-io
Copy link
Contributor

The changes in #156 were accidentally applied to the GetRocksVersionAsString() function instead of GetSpeedbVersionAsString(). This replaced ROCKSDB_PATCH with SPEEDB_PATCH (causing 7.2.2 to become 7.2.0), as well as added the tag in the wrong place (Speedb version: 2.1.0 (7.2.0-*-(main+4)-(#isaac/snapshot+1)) instead of Speedb version: 2.1.0-*-(main+4)-(#isaac/snapshot+1) (7.2.2)).

To Reproduce

  1. Build db_bench on any branch containing build: add a build tag into the version for non-release builds #156
  2. Run it and see the log file

Expected behavior

The RocksDB version patch isn't replaced, and the tag is applied to the Speedb version rather than the RocksDB one.

Additional context

N/A

@isaac-io isaac-io added bug Something isn't working build Build related labels Nov 10, 2022
@isaac-io isaac-io added this to the v2.2.0 milestone Nov 10, 2022
@isaac-io isaac-io self-assigned this Nov 10, 2022
@isaac-io
Copy link
Contributor Author

@erez-speedb does this means that you'll need to make changes to the way the tag is extracted and shown in the admin site?

isaac-io added a commit that referenced this issue Nov 10, 2022
The changes in #157 were accidentally applied to the `GetRocksVersionAsString()`
function instead of the `GetSpeedbVersionAsString()` function. This replaced
the RocksDB patch number with the Speedb one, and added the build tag in
the wrong place.

Fix it by moving the logic to the intended function.
isaac-io added a commit that referenced this issue Nov 10, 2022
The changes in #157 were accidentally applied to the `GetRocksVersionAsString()`
function instead of the `GetSpeedbVersionAsString()` function. This replaced
the RocksDB patch number with the Speedb one, and added the build tag in
the wrong place.

Fix it by moving the logic to the intended function.
isaac-io added a commit that referenced this issue Nov 12, 2022
The changes in #157 were accidentally applied to the `GetRocksVersionAsString()`
function instead of the `GetSpeedbVersionAsString()` function. This replaced
the RocksDB patch number with the Speedb one, and added the build tag in
the wrong place.

Fix it by moving the logic to the intended function.
Yuval-Ariel pushed a commit that referenced this issue Nov 15, 2022
The changes in #157 were accidentally applied to the `GetRocksVersionAsString()`
function instead of the `GetSpeedbVersionAsString()` function. This replaced
the RocksDB patch number with the Speedb one, and added the build tag in
the wrong place.

Fix it by moving the logic to the intended function.
Yuval-Ariel added a commit that referenced this issue Nov 23, 2022
The change set includes:
1) A header file that contains the Major, Minor, and Patch versions of speedb
as a macro, as well as a set of functions returning info about how/when/where
this version of speedb was created.

also includes all changes done on build_version.cc.in in the following commits:
1. version: remove superfluous build property
The `speedb_build_spdb_key` property is unused and was accidentally
imported as part of #1.

2.general: replace RocksDB references in strings with Speedb (#64)
This includes references in statuses as well as tools output.

3.build: add a version build-tag for non-release builds (#156)
The build tag can be set during the build (using either the Makefile
or the CMake). If it's not provided, and we're not in a release build,
it will be calculated using the state of the git tree since the last
release tag (for example, for this PR the build tag will be calculated as
`(main+17)-(156-build-add-a-build-tag-into-the-version-for-non-release-builds+1)`.
If the git tree state can not be determined, a question mark will be
used instead.
build_version: apply the build tag to the Speedb version string (#231)

4. The changes in #157 were accidentally applied to the `GetRocksVersionAsString()`
function instead of the `GetSpeedbVersionAsString()` function. This replaced
the RocksDB patch number with the Speedb one, and added the build tag in
the wrong place.
Fix it by moving the logic to the intended function.
Yuval-Ariel pushed a commit that referenced this issue Nov 25, 2022
The changes in #157 were accidentally applied to the `GetRocksVersionAsString()`
function instead of the `GetSpeedbVersionAsString()` function. This replaced
the RocksDB patch number with the Speedb one, and added the build tag in
the wrong place.

Fix it by moving the logic to the intended function.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working build Build related
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant