parse index config correctly and avoid returning nil

weaviate · Apr 25, 2024 · 1b690dc · 1b690dc
1 parent cea1a65
commit 1b690dc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/usecases/schema/executor.go b/usecases/schema/executor.go
@@ -20,7 +20,6 @@ import (
 	"github.com/weaviate/weaviate/cluster/proto/api"
 	"github.com/weaviate/weaviate/entities/models"
 	"github.com/weaviate/weaviate/entities/schema"
-	schemaConfig "github.com/weaviate/weaviate/entities/schema/config"
 )
 
 type executor struct {
@@ -91,7 +90,7 @@ func (e *executor) UpdateClass(req api.UpdateClassRequest) error {
 		}
 	} else {
 		if err := e.migrator.UpdateVectorIndexConfig(ctx,
-			className, req.Class.VectorIndexConfig.(schemaConfig.VectorIndexConfig)); err != nil {
+			className, asVectorIndexConfig(req.Class)); err != nil {
 			return fmt.Errorf("vector index config update: %w", err)
 		}
 	}

diff --git a/usecases/schema/parser.go b/usecases/schema/parser.go
@@ -253,17 +253,30 @@ func validateVectorConfigsParityAndImmutables(initial, updated *models.Class) er
 }
 
 func asVectorIndexConfigs(c *models.Class) map[string]schemaConfig.VectorIndexConfig {
+	cfgs := map[string]schemaConfig.VectorIndexConfig{}
 	if c.VectorConfig == nil {
-		return nil
+		return cfgs
 	}
 
-	cfgs := map[string]schemaConfig.VectorIndexConfig{}
 	for vecName := range c.VectorConfig {
 		cfgs[vecName] = c.VectorConfig[vecName].VectorIndexConfig.(schemaConfig.VectorIndexConfig)
 	}
 	return cfgs
 }
 
+func asVectorIndexConfig(c *models.Class) schemaConfig.VectorIndexConfig {
+	var (
+		cfg schemaConfig.VectorIndexConfig
+		ok  bool
+	)
+	cfg, ok = c.VectorIndexConfig.(schemaConfig.VectorIndexConfig)
+	if !ok {
+		return nil
+	}
+
+	return cfg
+}
+
 func validateShardingConfig(current, update *models.Class, mtEnabled bool) error {
 	if mtEnabled {
 		return nil