Revert default value feature (#563)

Signed-off-by: Congqi Xia <[email protected]>
milvus-io · Aug 23, 2023 · 9124e54 · 9124e54
1 parent f8f1c3f
commit 9124e54
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/client/insert.go b/client/insert.go
@@ -138,15 +138,6 @@ func (c *GrpcClient) processInsertColumns(colSchema *entity.Schema, columns ...e
 		_, has := mNameColumn[field.Name]
 		if !has &&
 			!field.AutoID && !field.IsDynamic {
-			if field.DefaultValue != nil {
-				emptyColumn, err := entity.DefaultValueColumn(field.Name, field.DataType)
-				// no err will be throw
-				if err != nil {
-					return nil, 0, fmt.Errorf("empty column fail to create, field name:%s ", field.Name)
-				}
-				mNameColumn[field.Name] = emptyColumn
-				continue
-			}
 			return nil, 0, fmt.Errorf("field %s not passed", field.Name)
 		}
 	}

diff --git a/client/insert_test.go b/client/insert_test.go
@@ -269,13 +269,14 @@ func (s *InsertSuite) TestInsertSuccess() {
 	})
 
 	s.Run("missing_field_with_default_value", func() {
+		s.T().Skip("skip for default value test")
 		defer s.resetMock()
 		s.setupHasCollection(testCollectionName)
 		s.setupHasPartition(testCollectionName, "partition_1")
 
 		s.setupDescribeCollection(testCollectionName, entity.NewSchema().
 			WithField(entity.NewField().WithIsPrimaryKey(true).WithIsAutoID(true).WithName("ID").WithDataType(entity.FieldTypeInt64)).
-			WithField(entity.NewField().WithName("default_value").WithDataType(entity.FieldTypeInt64).WithDefaultValueLong(1)).
+			WithField(entity.NewField().WithName("default_value").WithDataType(entity.FieldTypeInt64)).
 			WithField(entity.NewField().WithName("vector").WithDataType(entity.FieldTypeFloatVector).WithTypeParams(entity.TypeParamDim, "128")),
 		)
 

diff --git a/entity/schema.go b/entity/schema.go
@@ -137,7 +137,6 @@ type Field struct {
 	IndexParams    map[string]string
 	IsDynamic      bool
 	IsPartitionKey bool
-	DefaultValue   *schema.ValueField
 }
 
 // ProtoMessage generates corresponding FieldSchema
@@ -153,7 +152,6 @@ func (f *Field) ProtoMessage() *schema.FieldSchema {
 		IndexParams:    MapKvPairs(f.IndexParams),
 		IsDynamic:      f.IsDynamic,
 		IsPartitionKey: f.IsPartitionKey,
-		DefaultValue:   f.DefaultValue,
 	}
 }
 
@@ -200,6 +198,7 @@ func (f *Field) WithIsPartitionKey(isPartitionKey bool) *Field {
 	return f
 }
 
+/*
 func (f *Field) WithDefaultValueBool(defaultValue bool) *Field {
 	f.DefaultValue = &schema.ValueField{
 		Data: &schema.ValueField_BoolData{
@@ -252,7 +251,7 @@ func (f *Field) WithDefaultValueString(defaultValue string) *Field {
 		},
 	}
 	return f
-}
+}*/
 
 func (f *Field) WithTypeParams(key string, value string) *Field {
 	if f.TypeParams == nil {
@@ -290,7 +289,6 @@ func (f *Field) ReadProto(p *schema.FieldSchema) *Field {
 	f.IndexParams = KvPairsMap(p.GetIndexParams())
 	f.IsDynamic = p.GetIsDynamic()
 	f.IsPartitionKey = p.GetIsPartitionKey()
-	f.DefaultValue = p.GetDefaultValue()
 
 	return f
 }

diff --git a/entity/schema_test.go b/entity/schema_test.go
@@ -25,12 +25,13 @@ func TestFieldSchema(t *testing.T) {
 		NewField().WithName("int_field").WithDataType(FieldTypeInt64).WithIsAutoID(true).WithIsPrimaryKey(true).WithDescription("int_field desc"),
 		NewField().WithName("string_field").WithDataType(FieldTypeString).WithIsAutoID(false).WithIsPrimaryKey(true).WithIsDynamic(false).WithTypeParams("max_len", "32").WithDescription("string_field desc"),
 		NewField().WithName("partition_key").WithDataType(FieldTypeInt32).WithIsPartitionKey(true),
-		NewField().WithName("default_value_bool").WithDataType(FieldTypeBool).WithDefaultValueBool(true),
-		NewField().WithName("default_value_int").WithDataType(FieldTypeInt32).WithDefaultValueInt(1),
-		NewField().WithName("default_value_long").WithDataType(FieldTypeInt64).WithDefaultValueLong(1),
-		NewField().WithName("default_value_float").WithDataType(FieldTypeFloat).WithDefaultValueFloat(1),
-		NewField().WithName("default_value_double").WithDataType(FieldTypeDouble).WithDefaultValueDouble(1),
-		NewField().WithName("default_value_string").WithDataType(FieldTypeString).WithDefaultValueString("a"),
+		/*
+			NewField().WithName("default_value_bool").WithDataType(FieldTypeBool).WithDefaultValueBool(true),
+			NewField().WithName("default_value_int").WithDataType(FieldTypeInt32).WithDefaultValueInt(1),
+			NewField().WithName("default_value_long").WithDataType(FieldTypeInt64).WithDefaultValueLong(1),
+			NewField().WithName("default_value_float").WithDataType(FieldTypeFloat).WithDefaultValueFloat(1),
+			NewField().WithName("default_value_double").WithDataType(FieldTypeDouble).WithDefaultValueDouble(1),
+			NewField().WithName("default_value_string").WithDataType(FieldTypeString).WithDefaultValueString("a"),*/
 	}
 
 	for _, field := range fields {
@@ -41,7 +42,6 @@ func TestFieldSchema(t *testing.T) {
 		assert.Equal(t, field.AutoID, fieldSchema.GetAutoID())
 		assert.Equal(t, field.PrimaryKey, fieldSchema.GetIsPrimaryKey())
 		assert.Equal(t, field.IsPartitionKey, fieldSchema.GetIsPartitionKey())
-		assert.Equal(t, field.DefaultValue, fieldSchema.GetDefaultValue())
 		assert.Equal(t, field.IsDynamic, fieldSchema.GetIsDynamic())
 		assert.Equal(t, field.Description, fieldSchema.GetDescription())
 		assert.Equal(t, field.TypeParams, KvPairsMap(fieldSchema.GetTypeParams()))
@@ -56,7 +56,6 @@ func TestFieldSchema(t *testing.T) {
 		assert.Equal(t, field.Description, nf.Description)
 		assert.Equal(t, field.IsDynamic, nf.IsDynamic)
 		assert.Equal(t, field.IsPartitionKey, nf.IsPartitionKey)
-		assert.Equal(t, field.DefaultValue, nf.DefaultValue)
 		assert.EqualValues(t, field.TypeParams, nf.TypeParams)
 	}