Skip to content

Commit 3fa1a3c

Browse files
authored
Merge pull request weaviate#7849 from weaviate/merge-stable-v1.30-into-main
Merge stable/v1.30 into main
2 parents d459f5e + 6545b06 commit 3fa1a3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1723
-525
lines changed

adapters/handlers/rest/configure_api.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ func MakeAppState(ctx context.Context, options *swag.CommandLineOptionsGroup) *s
386386
SeparateObjectsCompactions: appState.ServerConfig.Config.Persistence.LSMSeparateObjectsCompactions,
387387
MaxSegmentSize: appState.ServerConfig.Config.Persistence.LSMMaxSegmentSize,
388388
CycleManagerRoutinesFactor: appState.ServerConfig.Config.Persistence.LSMCycleManagerRoutinesFactor,
389+
IndexRangeableInMemory: appState.ServerConfig.Config.Persistence.IndexRangeableInMemory,
389390
HNSWMaxLogSize: appState.ServerConfig.Config.Persistence.HNSWMaxLogSize,
390391
HNSWWaitForCachePrefill: appState.ServerConfig.Config.HNSWStartupWaitForVectorCache,
391392
HNSWFlatSearchConcurrency: appState.ServerConfig.Config.HNSWFlatSearchConcurrency,

adapters/repos/db/index.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -656,6 +656,7 @@ type IndexConfig struct {
656656
SegmentsCleanupIntervalSeconds int
657657
SeparateObjectsCompactions bool
658658
CycleManagerRoutinesFactor int
659+
IndexRangeableInMemory bool
659660
MaxSegmentSize int64
660661
HNSWMaxLogSize int64
661662
HNSWWaitForCachePrefill bool

adapters/repos/db/init.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ func (db *DB) init(ctx context.Context) error {
9494
SegmentsCleanupIntervalSeconds: db.config.SegmentsCleanupIntervalSeconds,
9595
SeparateObjectsCompactions: db.config.SeparateObjectsCompactions,
9696
CycleManagerRoutinesFactor: db.config.CycleManagerRoutinesFactor,
97+
IndexRangeableInMemory: db.config.IndexRangeableInMemory,
9798
MaxSegmentSize: db.config.MaxSegmentSize,
9899
HNSWMaxLogSize: db.config.HNSWMaxLogSize,
99100
HNSWWaitForCachePrefill: db.config.HNSWWaitForCachePrefill,

0 commit comments

Comments
 (0)