fix conflict

Signed-off-by: Kosuke Morimoto <[email protected]>
vdaas · Aug 20, 2024 · 66ae195 · 66ae195
1 parent 527b2f4
commit 66ae195
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 235 deletions.
diff --git a/apis/docs/v1/docs.md b/apis/docs/v1/docs.md
@@ -1633,8 +1633,7 @@ Represent the index manager service.
 | IndexDetail           | [.payload.v1.Empty](#payload-v1-Empty) | [.payload.v1.Info.Index.Detail](#payload-v1-Info-Index-Detail)                     | Represent the RPC to get the index information for each agents. |
 | IndexStatistics       | [.payload.v1.Empty](#payload-v1-Empty) | [.payload.v1.Info.Index.Statistics](#payload-v1-Info-Index-Statistics)             | Represent the RPC to get the index statistics.                  |
 | IndexStatisticsDetail | [.payload.v1.Empty](#payload-v1-Empty) | [.payload.v1.Info.Index.StatisticsDetail](#payload-v1-Info-Index-StatisticsDetail) | Represent the RPC to get the index statistics for each agents.  |
-| IndexProperty         | [.payload.v1.Empty](#payload-v1-Empty) | [.payload.v1.Info.Index.Property](#payload-v1-Info-Index-Property)                 | Represent the RPC to get the index property.                    |
-| IndexPropertyDetail   | [.payload.v1.Empty](#payload-v1-Empty) | [.payload.v1.Info.Index.PropertyDetail](#payload-v1-Info-Index-PropertyDetail)     | Represent the RPC to get the index properties for each agents.  |
+| IndexProperty         | [.payload.v1.Empty](#payload-v1-Empty) | [.payload.v1.Info.Index.PropertyDetail](#payload-v1-Info-Index-PropertyDetail)     | Represent the RPC to get the index property.                    |
 
 <a name="v1_vald_insert-proto"></a>
 

diff --git a/apis/grpc/v1/payload/payload.pb.go b/apis/grpc/v1/payload/payload.pb.go
diff --git a/apis/grpc/v1/rpc/errdetails/error_details.pb.go b/apis/grpc/v1/rpc/errdetails/error_details.pb.go
diff --git a/apis/grpc/v1/vald/index.pb.go b/apis/grpc/v1/vald/index.pb.go
diff --git a/apis/grpc/v1/vald/index_vtproto.pb.go b/apis/grpc/v1/vald/index_vtproto.pb.go
@@ -51,9 +51,7 @@ type IndexClient interface {
 	// Represent the RPC to get the index statistics for each agents.
 	IndexStatisticsDetail(ctx context.Context, in *payload.Empty, opts ...grpc.CallOption) (*payload.Info_Index_StatisticsDetail, error)
 	// Represent the RPC to get the index property.
-	IndexProperty(ctx context.Context, in *payload.Empty, opts ...grpc.CallOption) (*payload.Info_Index_Property, error)
-	// Represent the RPC to get the index properties for each agents.
-	IndexPropertyDetail(ctx context.Context, in *payload.Empty, opts ...grpc.CallOption) (*payload.Info_Index_PropertyDetail, error)
+	IndexProperty(ctx context.Context, in *payload.Empty, opts ...grpc.CallOption) (*payload.Info_Index_PropertyDetail, error)
 }
 
 type indexClient struct {
@@ -110,20 +108,9 @@ func (c *indexClient) IndexStatisticsDetail(
 
 func (c *indexClient) IndexProperty(
 	ctx context.Context, in *payload.Empty, opts ...grpc.CallOption,
-) (*payload.Info_Index_Property, error) {
-	out := new(payload.Info_Index_Property)
-	err := c.cc.Invoke(ctx, "/vald.v1.Index/IndexProperty", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *indexClient) IndexPropertyDetail(
-	ctx context.Context, in *payload.Empty, opts ...grpc.CallOption,
 ) (*payload.Info_Index_PropertyDetail, error) {
 	out := new(payload.Info_Index_PropertyDetail)
-	err := c.cc.Invoke(ctx, "/vald.v1.Index/IndexPropertyDetail", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/vald.v1.Index/IndexProperty", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -143,9 +130,7 @@ type IndexServer interface {
 	// Represent the RPC to get the index statistics for each agents.
 	IndexStatisticsDetail(context.Context, *payload.Empty) (*payload.Info_Index_StatisticsDetail, error)
 	// Represent the RPC to get the index property.
-	IndexProperty(context.Context, *payload.Empty) (*payload.Info_Index_Property, error)
-	// Represent the RPC to get the index properties for each agents.
-	IndexPropertyDetail(context.Context, *payload.Empty) (*payload.Info_Index_PropertyDetail, error)
+	IndexProperty(context.Context, *payload.Empty) (*payload.Info_Index_PropertyDetail, error)
 	mustEmbedUnimplementedIndexServer()
 }
 
@@ -178,14 +163,8 @@ func (UnimplementedIndexServer) IndexStatisticsDetail(
 
 func (UnimplementedIndexServer) IndexProperty(
 	context.Context, *payload.Empty,
-) (*payload.Info_Index_Property, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method IndexProperty not implemented")
-}
-
-func (UnimplementedIndexServer) IndexPropertyDetail(
-	context.Context, *payload.Empty,
 ) (*payload.Info_Index_PropertyDetail, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method IndexPropertyDetail not implemented")
+	return nil, status.Errorf(codes.Unimplemented, "method IndexProperty not implemented")
 }
 func (UnimplementedIndexServer) mustEmbedUnimplementedIndexServer() {}
 
@@ -300,26 +279,6 @@ func _Index_IndexProperty_Handler(
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Index_IndexPropertyDetail_Handler(
-	srv any, ctx context.Context, dec func(any) error, interceptor grpc.UnaryServerInterceptor,
-) (any, error) {
-	in := new(payload.Empty)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(IndexServer).IndexPropertyDetail(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/vald.v1.Index/IndexPropertyDetail",
-	}
-	handler := func(ctx context.Context, req any) (any, error) {
-		return srv.(IndexServer).IndexPropertyDetail(ctx, req.(*payload.Empty))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 // Index_ServiceDesc is the grpc.ServiceDesc for Index service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -347,10 +306,6 @@ var Index_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "IndexProperty",
 			Handler:    _Index_IndexProperty_Handler,
 		},
-		{
-			MethodName: "IndexPropertyDetail",
-			Handler:    _Index_IndexPropertyDetail_Handler,
-		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "v1/vald/index.proto",

diff --git a/apis/grpc/v1/vald/vald.go b/apis/grpc/v1/vald/vald.go
@@ -140,7 +140,6 @@ const (
 	IndexStatisticsRPCName       = "IndexStatistics"
 	IndexStatisticsDetailRPCName = "IndexStatisticsDetail"
 	IndexPropertyRPCName         = "IndexProperty"
-	IndexPropertyDetailRPCName   = "IndexPropertyDetail"
 )
 
 type client struct {

diff --git a/apis/proto/v1/vald/index.proto b/apis/proto/v1/vald/index.proto
@@ -47,12 +47,7 @@ service Index {
   }
 
   // Represent the RPC to get the index property.
-  rpc IndexProperty(payload.v1.Empty) returns (payload.v1.Info.Index.Property) {
+  rpc IndexProperty(payload.v1.Empty) returns (payload.v1.Info.Index.PropertyDetail) {
     option (google.api.http).get = "/index/property";
   }
-
-  // Represent the RPC to get the index properties for each agents.
-  rpc IndexPropertyDetail(payload.v1.Empty) returns (payload.v1.Info.Index.PropertyDetail) {
-    option (google.api.http).get = "/index/property/detail";
-  }
 }
diff --git a/apis/swagger/v1/vald/index.swagger.json b/apis/swagger/v1/vald/index.swagger.json
@@ -58,27 +58,6 @@
       "get": {
         "summary": "Represent the RPC to get the index property.",
         "operationId": "Index_IndexProperty",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/IndexProperty"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "tags": ["Index"]
-      }
-    },
-    "/index/property/detail": {
-      "get": {
-        "summary": "Represent the RPC to get the index properties for each agents.",
-        "operationId": "Index_IndexPropertyDetail",
         "responses": {
           "200": {
             "description": "A successful response.",

diff --git a/internal/client/v1/client/vald/vald.go b/internal/client/v1/client/vald/vald.go
@@ -830,7 +830,7 @@ func (c *client) IndexStatisticsDetail(
 
 func (c *client) IndexProperty(
 	ctx context.Context, in *payload.Empty, opts ...grpc.CallOption,
-) (res *payload.Info_Index_Property, err error) {
+) (res *payload.Info_Index_PropertyDetail, err error) {
 	ctx, span := trace.StartSpan(grpc.WrapGRPCMethod(ctx, "internal/client/"+vald.IndexPropertyRPCName), apiName+"/"+vald.IndexPropertyRPCName)
 	defer func() {
 		if span != nil {
@@ -850,28 +850,6 @@ func (c *client) IndexProperty(
 	return res, nil
 }
 
-func (c *client) IndexPropertyDetail(
-	ctx context.Context, in *payload.Empty, opts ...grpc.CallOption,
-) (res *payload.Info_Index_PropertyDetail, err error) {
-	ctx, span := trace.StartSpan(grpc.WrapGRPCMethod(ctx, "internal/client/"+vald.IndexPropertyDetailRPCName), apiName+"/"+vald.IndexPropertyDetailRPCName)
-	defer func() {
-		if span != nil {
-			span.End()
-		}
-	}()
-	_, err = c.c.RoundRobin(ctx, func(ctx context.Context,
-		conn *grpc.ClientConn,
-		copts ...grpc.CallOption,
-	) (any, error) {
-		res, err = vald.NewValdClient(conn).IndexPropertyDetail(ctx, in, append(copts, opts...)...)
-		return nil, err
-	})
-	if err != nil {
-		return nil, err
-	}
-	return res, nil
-}
-
 func (c *client) GetTimestamp(
 	ctx context.Context, in *payload.Object_TimestampRequest, opts ...grpc.CallOption,
 ) (res *payload.Object_Timestamp, err error) {
@@ -1316,7 +1294,7 @@ func (c *singleClient) IndexStatisticsDetail(
 
 func (c *singleClient) IndexProperty(
 	ctx context.Context, in *payload.Empty, opts ...grpc.CallOption,
-) (res *payload.Info_Index_Property, err error) {
+) (res *payload.Info_Index_PropertyDetail, err error) {
 	ctx, span := trace.StartSpan(grpc.WrapGRPCMethod(ctx, "internal/singleClient/"+vald.IndexPropertyRPCName), apiName+"/"+vald.IndexPropertyRPCName)
 	defer func() {
 		if span != nil {
@@ -1326,18 +1304,6 @@ func (c *singleClient) IndexProperty(
 	return c.vc.IndexProperty(ctx, in, opts...)
 }
 
-func (c *singleClient) IndexPropertyDetail(
-	ctx context.Context, in *payload.Empty, opts ...grpc.CallOption,
-) (res *payload.Info_Index_PropertyDetail, err error) {
-	ctx, span := trace.StartSpan(grpc.WrapGRPCMethod(ctx, "internal/client/"+vald.IndexPropertyDetailRPCName), apiName+"/"+vald.IndexPropertyDetailRPCName)
-	defer func() {
-		if span != nil {
-			span.End()
-		}
-	}()
-	return c.vc.IndexPropertyDetail(ctx, in, opts...)
-}
-
 func (c *singleClient) GetTimestamp(
 	ctx context.Context, in *payload.Object_TimestampRequest, opts ...grpc.CallOption,
 ) (res *payload.Object_Timestamp, err error) {