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.

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

fix(window): sliding delay time #3424

Merged
merged 1 commit into from
Dec 5, 2024
Merged

fix(window): sliding delay time #3424

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
6 changes: 4 additions & 2 deletions internal/topo/node/window_op.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ func (o *WindowOperator) execProcessingWindow(ctx api.StreamContext, inputs []*x
if o.isMatchCondition(ctx, d) {
if o.window.Delay > 0 {
go func(ts time.Time) {
after := time.After(o.window.Delay * time.Millisecond)
after := timex.After(o.window.Delay)
select {
case <-after:
delayCh <- ts
Expand All @@ -358,7 +358,7 @@ func (o *WindowOperator) execProcessingWindow(ctx api.StreamContext, inputs []*x
}
} else {
// clear inputs if condition not matched
inputs = o.gcInputs(inputs, d.Timestamp, ctx)
inputs = o.gcInputs(inputs, d.Timestamp.Add(o.window.Delay), ctx)
}
case ast.SESSION_WINDOW:
if timeoutTicker != nil {
Expand Down Expand Up @@ -602,12 +602,14 @@ func (o *WindowOperator) handleInputs(ctx api.StreamContext, inputs []*xsql.Tupl
if nextleft < 0 {
return inputs[:0], inputs, content
}
ctx.GetLogger().Debugf("discard before %d", nextleft)
return inputs[nextleft:], inputs[:nextleft], content
}

func (o *WindowOperator) gcInputs(inputs []*xsql.Tuple, triggerTime time.Time, ctx api.StreamContext) []*xsql.Tuple {
var discard []*xsql.Tuple
inputs, discard, _ = o.handleInputs(ctx, inputs, triggerTime)
ctx.GetLogger().Debugf("after scan %v", inputs)
o.handleTraceDiscardTuple(ctx, discard)
return inputs
}
Expand Down
25 changes: 25 additions & 0 deletions internal/topo/topotest/window_rule_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,31 @@ func TestWindow(t *testing.T) {
"source_demo_0_records_out_total": int64(5),
},
},
{
Name: `TestSlidingDelay`,
Sql: `SELECT size,color FROM demo GROUP BY SlidingWindow(ss, 5, 1) Over (when size = 2)`,
R: [][]map[string]interface{}{
{
{
"size": 3,
"color": "red",
},
{
"size": 6,
"color": "blue",
},
{
"size": 2,
"color": "blue",
},
{
"size": 4,
"color": "yellow",
},
},
},
M: map[string]interface{}{},
},
}
HandleStream(true, streamList, t)
options := []*def.RuleOption{
Expand Down
Loading