fix: make sure alias is cached

Signed-off-by: xiaofanluan <[email protected]>
xiaofan-luan · Oct 30, 2024 · 2d022ce · 2d022ce
1 parent 9c4c702
commit 2d022ce
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/internal/proxy/meta_cache.go b/internal/proxy/meta_cache.go
@@ -468,14 +468,11 @@ func (m *MetaCache) update(ctx context.Context, database, collectionName string,
 		}
 	})
 
-<<<<<<< HEAD
-	collectionName = collection.Schema.GetName()
-	if database == "" {
-		log.Warn("database is empty, use default database name", zap.String("collectionName", collectionName), zap.Stack("stack"))
-=======
 	if collectionName == "" {
 		collectionName = collection.Schema.GetName()
->>>>>>> 4774463151 (fix: alias is not cached)
+	}
+	if database == "" {
+		log.Warn("database is empty, use default database name", zap.String("collectionName", collectionName), zap.Stack("stack"))
 	}
 	m.mu.Lock()
 	defer m.mu.Unlock()