Bloomshipper: Use model.Time in MetaRef and BlockRef
#11566
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Trivy scan found the following vulnerabilities:
|
chaudum
commented
Jan 2, 2024
| @@ -33,20 +33,28 @@ type Ref struct { | |||
| TenantID string | |||
| TableName string | |||
| MinFingerprint, MaxFingerprint uint64 | |||
| StartTimestamp, EndTimestamp int64 | |||
| StartTimestamp, EndTimestamp int64 // must be millisecond precision timestamp aka model.Time | |||
There was a problem hiding this comment.
It would make even more sense to use model.Time type.
poyzannur
reviewed
Jan 2, 2024
Comment on lines
+475
to
+476
| MinFingerprint: job.minFp, | ||
| MaxFingerprint: job.maxFp, |
There was a problem hiding this comment.
doesn't this complain? min/maxFp are model.Fingerprint
| StartTimestamp int64 | ||
| EndTimestamp int64 | ||
| TenantID string | ||
| MinFingerprint, MaxFingerprint model.Fingerprint |
There was a problem hiding this comment.
I think it's good to use model.Fingerprint here instead of uint64
If you are changing fp here, maybe change above in Ref struct too?
There was a problem hiding this comment.
Yes, we can change it in the Ref as well. I would create a separate PR for that, though.
chaudum
changed the title
model.Time in MetaRef and BlockRef
The `Ref` of `MetaRef` and `BlockRef` do have start and end timestamps, which are of type `int64`. This however, can lead to the problem that different components might use different precisions (`s`, `ms`, `ns`) for these timestamps. This PR changes the current implementation of the bloom shipper to use `ms` precision timestamps (using `model.Time`) instead of `s`, to match the behaviour that we have to encode ChunkRefs to object store keys. Signed-off-by: Christian Haudum <[email protected]>
chaudum
force-pushed
the
chaudum/use-model-timestamp-in-bloom-shipper
branch
from
0d4d250
to
844563c
Compare
rhnasc
pushed a commit
to inloco/loki
that referenced
this pull request
Apr 12, 2024
…1566) The `Ref` of `MetaRef` and `BlockRef` do have start and end timestamps, which are of type `int64`. This however, can lead to the problem that different components might use different precisions (`s`, `ms`, `ns`) for these timestamps. This PR changes the current implementation of the bloom shipper to use `ms` precision timestamps (using `model.Time`) instead of `s`, to match the behaviour that we have to encode ChunkRefs to object store keys. Signed-off-by: Christian Haudum <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
The
RefofMetaRefandBlockRefdo have start and end timestamps, which are of typeint64.This however, can lead to the problem that different components might use different precisions (
s,ms,ns) for these timestamps.This PR changes the current implementation of the bloom shipper to use
msprecision timestamps (usingmodel.Time) instead ofs, to match the behaviour that we have to encode ChunkRefs to object store keys.