Skip to content

Commit bd5a065

Browse files
authored
chore: Two small fixes for new engine (#19241)
1 parent 6298e44 commit bd5a065

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

pkg/dataobj/metastore/object.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,8 @@ func (m *ObjectMetastore) listObjects(ctx context.Context, path string, start, e
693693
if err != nil {
694694
return nil, err
695695
}
696+
defer objectReader.Close()
697+
696698
n, err := buf.ReadFrom(objectReader)
697699
if err != nil {
698700
return nil, fmt.Errorf("reading metastore object: %w", err)

pkg/engine/engine.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ func New(opts logql.EngineOpts, cfg metastore.Config, bucket objstore.Bucket, li
4848
if opts.BatchSize <= 0 {
4949
panic(fmt.Sprintf("invalid batch size for query engine. must be greater than 0, got %d", opts.BatchSize))
5050
}
51+
if opts.RangeConfig.IsZero() {
52+
opts.RangeConfig = rangeio.DefaultConfig
53+
}
5154

5255
return &QueryEngine{
5356
logger: logger,

pkg/util/rangeio/rangeio.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@ func (cfg *Config) RegisterFlags(prefix string, fs *flag.FlagSet) {
106106
fs.IntVar(&cfg.MinRangeSize, prefix+"min-range-size", DefaultConfig.MinRangeSize, "Experimental: minimum size of a byte range")
107107
}
108108

109+
func (cfg *Config) IsZero() bool {
110+
var zero Config
111+
return cfg == nil || *cfg == zero
112+
}
113+
109114
// effectiveParallelism returns the effective parallelism limit.
110115
func (cfg *Config) effectiveParallelism() int {
111116
if cfg.MaxParallelism <= 0 {

0 commit comments

Comments
 (0)