lib/logstorage: skip unsafe last-N optimization when pipes may overwrite _time#1549
Open
immanuwell wants to merge 1 commit into
Open
lib/logstorage: skip unsafe last-N optimization when pipes may overwrite _time#1549immanuwell wants to merge 1 commit into
immanuwell wants to merge 1 commit into
Conversation
Contributor
There was a problem hiding this comment.
1 issue found across 6 files
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="lib/logstorage/pipe_unpack_logfmt.go">
<violation number="1" location="lib/logstorage/pipe_unpack_logfmt.go:61">
P2: `resultPrefix != ""` is not a sufficient safety guarantee: `fieldsUnpackerContext.addField` concatenates `fieldPrefix + name` directly, so a prefix like `"_"` with a field named `"time"` produces `_time`. The `canReturnLastNResults` guard should account for whether any combination of `resultPrefix` and a matched field name could resolve to `_time`.</violation>
</file>
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
| // TODO: verify that the unpacked fields do not overwrite _time with non-timestamp values. | ||
|
|
||
| return true | ||
| return pu.resultPrefix != "" || !prefixfilter.MatchFilters(pu.fieldFilters, "_time") |
Contributor
There was a problem hiding this comment.
P2: resultPrefix != "" is not a sufficient safety guarantee: fieldsUnpackerContext.addField concatenates fieldPrefix + name directly, so a prefix like "_" with a field named "time" produces _time. The canReturnLastNResults guard should account for whether any combination of resultPrefix and a matched field name could resolve to _time.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At lib/logstorage/pipe_unpack_logfmt.go, line 61:
<comment>`resultPrefix != ""` is not a sufficient safety guarantee: `fieldsUnpackerContext.addField` concatenates `fieldPrefix + name` directly, so a prefix like `"_"` with a field named `"time"` produces `_time`. The `canReturnLastNResults` guard should account for whether any combination of `resultPrefix` and a matched field name could resolve to `_time`.</comment>
<file context>
@@ -58,9 +58,7 @@ func (pu *pipeUnpackLogfmt) canLiveTail() bool {
- // TODO: verify that the unpacked fields do not overwrite _time with non-timestamp values.
-
- return true
+ return pu.resultPrefix != "" || !prefixfilter.MatchFilters(pu.fieldFilters, "_time")
}
</file context>
This file contains hidden or 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
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.
This fixes a kinda nasty last-N edge case.
If
unpack_json,unpack_logfmt,extract, orextract_regexpcan overwrite_time, a wide enough time range may hit the last-N fast path and fail withmissing _time field in the query results. A narrow range works, so it is pretty easy to miss.Fix is simple: skip that optimization for those unsafe cases. Safe cases with
result_prefixstill keep the fast path.Repro
{"_msg":"{\"_time\":\"not-a-timestamp\",\"msg\":\"bad\"}","_time":"2025-01-01T01:00:00Z"}* | unpack_json | keep _msg, _time | sort by (_time desc) limit 1on2025-01-01T01:00:00Z..2025-01-01T01:00:00.000000001Z2025-01-01T01:00:00Z..2025-01-01T01:00:03ZTests:
go test ./lib/logstoragego test ./apptest/tests -run "TestVlsingleLastnOptimization$|TestVlsingleLastnOptimizationWithUnpackedInvalidTime$" -count=1Related to #1360.