From c348e61bdbd1ee7ee1f2cfbfa5f3d53fb6cf0d24 Mon Sep 17 00:00:00 2001
From: congqixia <congqi.xia@zilliz.com>
Date: Fri, 7 Mar 2025 17:06:02 +0800
Subject: [PATCH] fix: [GoSDK] move metaheader to client in case of race
 (#40443)

See failure run in #40352

This PR:
- move metaheader map to client struct from config
- set default value for field schema

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
---
 client/entity/field.go               |  3 +++
 client/milvusclient/client.go        | 22 ++++++++++++++++++++--
 client/milvusclient/client_config.go | 24 ------------------------
 client/milvusclient/interceptors.go  |  2 +-
 4 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/client/entity/field.go b/client/entity/field.go
index 37cd8c93e9..ff744bd4f9 100644
--- a/client/entity/field.go
+++ b/client/entity/field.go
@@ -221,6 +221,7 @@ func (f *Field) ProtoMessage() *schemapb.FieldSchema {
 		IsClusteringKey: f.IsClusteringKey,
 		ElementType:     schemapb.DataType(f.ElementType),
 		Nullable:        f.Nullable,
+		DefaultValue:    f.DefaultValue,
 	}
 }
 
@@ -419,6 +420,8 @@ func (f *Field) ReadProto(p *schemapb.FieldSchema) *Field {
 	f.IsPartitionKey = p.GetIsPartitionKey()
 	f.IsClusteringKey = p.GetIsClusteringKey()
 	f.ElementType = FieldType(p.GetElementType())
+	f.DefaultValue = p.GetDefaultValue()
+	f.Nullable = p.GetNullable()
 
 	return f
 }
diff --git a/client/milvusclient/client.go b/client/milvusclient/client.go
index 82df7c3482..216d5ad801 100644
--- a/client/milvusclient/client.go
+++ b/client/milvusclient/client.go
@@ -37,6 +37,7 @@ import (
 	"github.com/milvus-io/milvus-proto/go-api/v2/milvuspb"
 	"github.com/milvus-io/milvus/client/v2/common"
 	"github.com/milvus-io/milvus/client/v2/entity"
+	"github.com/milvus-io/milvus/pkg/v2/util/crypto"
 	"github.com/milvus-io/milvus/pkg/v2/util/merr"
 )
 
@@ -48,7 +49,9 @@ type Client struct {
 	// mutable status
 	stateMut   sync.RWMutex
 	currentDB  string
-	identifier string
+	identifier string // Identifier for this connection
+
+	metadataHeaders map[string]string
 
 	collCache *CollectionCache
 }
@@ -67,7 +70,7 @@ func New(ctx context.Context, config *ClientConfig) (*Client, error) {
 	addr := c.config.getParsedAddress()
 
 	// parse authentication parameters
-	c.config.parseAuthentication()
+	c.parseAuthentication()
 	// Parse grpc options
 	options := c.dialOptions()
 
@@ -117,6 +120,21 @@ func (c *Client) dialOptions() []grpc.DialOption {
 	return options
 }
 
+// parseAuthentication prepares authentication headers for grpc inteceptors based on the provided username, password or API key.
+func (c *Client) parseAuthentication() {
+	cfg := c.config
+	c.metadataHeaders = make(map[string]string)
+	if cfg.Username != "" || cfg.Password != "" {
+		value := crypto.Base64Encode(fmt.Sprintf("%s:%s", cfg.Username, cfg.Password))
+		c.metadataHeaders[authorizationHeader] = value
+	}
+	// API overwrites username & passwd
+	if cfg.APIKey != "" {
+		value := crypto.Base64Encode(cfg.APIKey)
+		c.metadataHeaders[authorizationHeader] = value
+	}
+}
+
 func (c *Client) Close(ctx context.Context) error {
 	if c.conn == nil {
 		return nil
diff --git a/client/milvusclient/client_config.go b/client/milvusclient/client_config.go
index 2a14ccf480..58903d7458 100644
--- a/client/milvusclient/client_config.go
+++ b/client/milvusclient/client_config.go
@@ -13,8 +13,6 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/backoff"
 	"google.golang.org/grpc/keepalive"
-
-	"github.com/milvus-io/milvus/pkg/v2/util/crypto"
 )
 
 const (
@@ -64,9 +62,6 @@ type ClientConfig struct {
 
 	DisableConn bool
 
-	metadataHeaders map[string]string
-
-	identifier    string // Identifier for this connection
 	ServerVersion string // ServerVersion
 	parsedAddress *url.URL
 	flags         uint64 // internal flags
@@ -117,29 +112,10 @@ func (c *ClientConfig) useDatabase(dbName string) {
 	c.DBName = dbName
 }
 
-// useDatabase change the inner db name.
-func (c *ClientConfig) setIdentifier(identifier string) {
-	c.identifier = identifier
-}
-
 func (c *ClientConfig) setServerInfo(serverInfo string) {
 	c.ServerVersion = serverInfo
 }
 
-// parseAuthentication prepares authentication headers for grpc inteceptors based on the provided username, password or API key.
-func (c *ClientConfig) parseAuthentication() {
-	c.metadataHeaders = make(map[string]string)
-	if c.Username != "" || c.Password != "" {
-		value := crypto.Base64Encode(fmt.Sprintf("%s:%s", c.Username, c.Password))
-		c.metadataHeaders[authorizationHeader] = value
-	}
-	// API overwrites username & passwd
-	if c.APIKey != "" {
-		value := crypto.Base64Encode(c.APIKey)
-		c.metadataHeaders[authorizationHeader] = value
-	}
-}
-
 func (c *ClientConfig) getRetryOnRateLimitInterceptor() grpc.UnaryClientInterceptor {
 	if c.RetryRateLimit == nil {
 		c.RetryRateLimit = c.defaultRetryRateLimitOption()
diff --git a/client/milvusclient/interceptors.go b/client/milvusclient/interceptors.go
index 81217929c1..14f4ea609d 100644
--- a/client/milvusclient/interceptors.go
+++ b/client/milvusclient/interceptors.go
@@ -48,7 +48,7 @@ func (c *Client) MetadataUnaryInterceptor() grpc.UnaryClientInterceptor {
 }
 
 func (c *Client) metadata(ctx context.Context) context.Context {
-	for k, v := range c.config.metadataHeaders {
+	for k, v := range c.metadataHeaders {
 		ctx = metadata.AppendToOutgoingContext(ctx, k, v)
 	}
 	return ctx