Skip to content

Commit 6a1cc9f

Browse files
committed
fix: remove panics
1 parent 91f532d commit 6a1cc9f

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

storage/reads/array_cursor.go

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func newMultiShardArrayCursors(ctx context.Context, start, end int64, asc bool)
104104
return m
105105
}
106106

107-
func (m *multiShardArrayCursors) createCursor(row SeriesRow) (cursors.Cursor, error) {
107+
func (m *multiShardArrayCursors) createCursor(row SeriesRow) cursors.Cursor {
108108
m.req.Name = row.Name
109109
m.req.Tags = row.SeriesTags
110110
m.req.Field = row.Field
@@ -123,29 +123,26 @@ func (m *multiShardArrayCursors) createCursor(row SeriesRow) (cursors.Cursor, er
123123
}
124124

125125
if cur == nil || err != nil {
126-
return nil, nil
126+
return nil
127127
}
128128

129129
switch c := cur.(type) {
130130
case cursors.IntegerArrayCursor:
131131
m.cursors.i.reset(c, row.Query, cond)
132-
return &m.cursors.i, nil
132+
return &m.cursors.i
133133
case cursors.FloatArrayCursor:
134134
m.cursors.f.reset(c, row.Query, cond)
135-
return &m.cursors.f, nil
135+
return &m.cursors.f
136136
case cursors.UnsignedArrayCursor:
137137
m.cursors.u.reset(c, row.Query, cond)
138-
return &m.cursors.u, nil
138+
return &m.cursors.u
139139
case cursors.StringArrayCursor:
140140
m.cursors.s.reset(c, row.Query, cond)
141-
return &m.cursors.s, nil
141+
return &m.cursors.s
142142
case cursors.BooleanArrayCursor:
143143
m.cursors.b.reset(c, row.Query, cond)
144-
return &m.cursors.b, nil
144+
return &m.cursors.b
145145
default:
146-
return nil, &errors2.Error{
147-
Code: errors2.EInvalid,
148-
Msg: fmt.Sprintf("unsupported cursor type while creating cursor: %s", arrayCursorType(cur)),
149-
}
146+
return nil
150147
}
151148
}

0 commit comments

Comments
 (0)