From 371f96066474a87620055dcfc60a980bd16c4a2e Mon Sep 17 00:00:00 2001 From: Devan Date: Mon, 6 Jan 2025 15:57:20 -0600 Subject: [PATCH] feat: Fix a merge conflict where a var was renamed from fs -> fss --- tsdb/engine/tsm1/compact_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tsdb/engine/tsm1/compact_test.go b/tsdb/engine/tsm1/compact_test.go index cf00144fe1..9e9f8ae3b2 100644 --- a/tsdb/engine/tsm1/compact_test.go +++ b/tsdb/engine/tsm1/compact_test.go @@ -14,8 +14,8 @@ import ( "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxdb/tsdb/engine/tsm1" - "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "go.uber.org/zap" ) @@ -3256,7 +3256,7 @@ func TestDefaultPlanner_Plan_SkipPlanningAfterFull(t *testing.T) { err := ffs.SetBlockCounts([]int{tsdb.DefaultMaxPointsPerBlock, tsdb.DefaultMaxPointsPerBlock, tsdb.DefaultMaxPointsPerBlock, tsdb.DefaultMaxPointsPerBlock}) require.NoError(t, err, "SetBlockCounts") - + cp := tsm1.NewDefaultPlanner(ffs, time.Nanosecond) plan, pLen := cp.Plan(time.Now().Add(-time.Second)) @@ -3441,7 +3441,7 @@ func TestDefaultPlanner_Plan_NotFullOverMaxsize(t *testing.T) { bcs = append(bcs, 100) } - err := fs.SetBlockCounts(bcs) + err := ffs.SetBlockCounts(bcs) require.NoError(t, err, "SetBlockCounts") cp := tsm1.NewDefaultPlanner(