Skip to content

fix(stdlib): error if using limit with negative offset #5544

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.

Sign up for GitHub

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

Merged
mhilton merged 1 commit into from
Jun 23, 2025
Merged

fix(stdlib): error if using limit with negative offset #5544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions stdlib/universe/limit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ func createLimitOpSpec(args flux.Arguments, a *flux.Administration) (flux.Operat
} else if ok {
spec.Offset = offset
}
if spec.Offset < 0 {
return nil, errors.Newf(codes.Invalid, "limit offset cannot be negative (%d)", spec.Offset)
}

return spec, nil
}
Expand Down
94 changes: 94 additions & 0 deletions stdlib/universe/limit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"sort"
"testing"
"time"

"github.com/google/go-cmp/cmp"
"github.com/influxdata/flux"
Expand All @@ -13,11 +14,104 @@ import (
"github.com/influxdata/flux/execute/executetest"
"github.com/influxdata/flux/execute/table"
"github.com/influxdata/flux/internal/gen"
"github.com/influxdata/flux/internal/operation"
"github.com/influxdata/flux/memory"
"github.com/influxdata/flux/querytest"
"github.com/influxdata/flux/stdlib/influxdata/influxdb"
"github.com/influxdata/flux/stdlib/universe"
"github.com/influxdata/flux/values"
)

func TestLimit_NewQuery(t *testing.T) {
tests := []querytest.NewQueryTestCase{
{
Name: "no offset",
Raw: `
from(bucket:"db") |> range(start:-1h) |> limit(n: 1)`,
Want: &operation.Spec{
Operations: []*operation.Node{
{
ID: "from0",
Spec: &influxdb.FromOpSpec{Bucket: influxdb.NameOrID{Name: "db"}},
},
{
ID: "range1",
Spec: &universe.RangeOpSpec{
Start: flux.Time{
Relative: -1 * time.Hour,
IsRelative: true,
},
Stop: flux.Time{
IsRelative: true,
},
TimeColumn: "_time",
StartColumn: "_start",
StopColumn: "_stop",
},
},
{
ID: "limit2",
Spec: &universe.LimitOpSpec{N: 1},
},
},
Edges: []operation.Edge{
{Parent: "from0", Child: "range1"},
{Parent: "range1", Child: "limit2"},
},
},
},
{
Name: "positive offset",
Raw: `
from(bucket:"db") |> range(start:-1h) |> limit(n: 1, offset: 2)`,
Want: &operation.Spec{
Operations: []*operation.Node{
{
ID: "from0",
Spec: &influxdb.FromOpSpec{Bucket: influxdb.NameOrID{Name: "db"}},
},
{
ID: "range1",
Spec: &universe.RangeOpSpec{
Start: flux.Time{
Relative: -1 * time.Hour,
IsRelative: true,
},
Stop: flux.Time{
IsRelative: true,
},
TimeColumn: "_time",
StartColumn: "_start",
StopColumn: "_stop",
},
},
{
ID: "limit2",
Spec: &universe.LimitOpSpec{N: 1, Offset: 2},
},
},
Edges: []operation.Edge{
{Parent: "from0", Child: "range1"},
{Parent: "range1", Child: "limit2"},
},
},
},
{
Name: "negative offset",
Raw: `
from(bucket:"db") |> range(start:-1h) |> limit(n: 1, offset: -1)`,
WantErr: true,
},
}
for _, tc := range tests {
tc := tc
t.Run(tc.Name, func(t *testing.T) {
t.Parallel()
querytest.NewQueryTestHelper(t, tc)
})
}
}

func TestLimit_Process(t *testing.T) {
testCases := []struct {
name string
Expand Down