From 39ea8484c17435cda5d1dbb7464c784c504202bd Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 11 Dec 2018 07:17:10 -0800 Subject: [PATCH] adjust proto API --- weed/filesys/dir.go | 1 - weed/filesys/dir_rename.go | 1 - weed/pb/filer.proto | 2 +- weed/pb/filer_pb/filer.pb.go | 163 +++++++++--------- weed/replication/sink/filersink/filer_sink.go | 1 - weed/s3api/filer_util.go | 1 - 6 files changed, 79 insertions(+), 90 deletions(-) diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go index 44f4f48cc..1302c079d 100644 --- a/weed/filesys/dir.go +++ b/weed/filesys/dir.go @@ -277,7 +277,6 @@ func (dir *Dir) Remove(ctx context.Context, req *fuse.RemoveRequest) error { request := &filer_pb.DeleteEntryRequest{ Directory: dir.Path, Name: req.Name, - IsDirectory: req.Dir, IsDeleteData: true, } diff --git a/weed/filesys/dir_rename.go b/weed/filesys/dir_rename.go index 7ba515202..8b891752b 100644 --- a/weed/filesys/dir_rename.go +++ b/weed/filesys/dir_rename.go @@ -84,7 +84,6 @@ func moveEntry(ctx context.Context, client filer_pb.SeaweedFilerClient, oldParen request := &filer_pb.DeleteEntryRequest{ Directory: oldParent, Name: entry.Name, - IsDirectory: entry.IsDirectory, IsDeleteData: false, } diff --git a/weed/pb/filer.proto b/weed/pb/filer.proto index 124eabcd2..bb33eb48e 100644 --- a/weed/pb/filer.proto +++ b/weed/pb/filer.proto @@ -117,7 +117,7 @@ message UpdateEntryResponse { message DeleteEntryRequest { string directory = 1; string name = 2; - bool is_directory = 3; + // bool is_directory = 3; bool is_delete_data = 4; bool is_recursive = 5; } diff --git a/weed/pb/filer_pb/filer.pb.go b/weed/pb/filer_pb/filer.pb.go index 10528fe17..527555f36 100644 --- a/weed/pb/filer_pb/filer.pb.go +++ b/weed/pb/filer_pb/filer.pb.go @@ -465,11 +465,11 @@ func (*UpdateEntryResponse) ProtoMessage() {} func (*UpdateEntryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } type DeleteEntryRequest struct { - Directory string `protobuf:"bytes,1,opt,name=directory" json:"directory,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` - IsDirectory bool `protobuf:"varint,3,opt,name=is_directory,json=isDirectory" json:"is_directory,omitempty"` - IsDeleteData bool `protobuf:"varint,4,opt,name=is_delete_data,json=isDeleteData" json:"is_delete_data,omitempty"` - IsRecursive bool `protobuf:"varint,5,opt,name=is_recursive,json=isRecursive" json:"is_recursive,omitempty"` + Directory string `protobuf:"bytes,1,opt,name=directory" json:"directory,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"` + // bool is_directory = 3; + IsDeleteData bool `protobuf:"varint,4,opt,name=is_delete_data,json=isDeleteData" json:"is_delete_data,omitempty"` + IsRecursive bool `protobuf:"varint,5,opt,name=is_recursive,json=isRecursive" json:"is_recursive,omitempty"` } func (m *DeleteEntryRequest) Reset() { *m = DeleteEntryRequest{} } @@ -491,13 +491,6 @@ func (m *DeleteEntryRequest) GetName() string { return "" } -func (m *DeleteEntryRequest) GetIsDirectory() bool { - if m != nil { - return m.IsDirectory - } - return false -} - func (m *DeleteEntryRequest) GetIsDeleteData() bool { if m != nil { return m.IsDeleteData @@ -1158,85 +1151,85 @@ var _SeaweedFiler_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("filer.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1272 bytes of a gzipped FileDescriptorProto + // 1267 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x57, 0xcd, 0x6f, 0xdc, 0x44, - 0x14, 0xaf, 0xf7, 0x2b, 0xeb, 0xb7, 0xbb, 0x21, 0x99, 0x0d, 0xd4, 0xda, 0x7c, 0xb0, 0x35, 0x2d, - 0x4a, 0x45, 0xb4, 0xaa, 0x02, 0x87, 0x96, 0x0a, 0x89, 0x36, 0x1f, 0x52, 0xa4, 0xb4, 0x45, 0x4e, - 0x83, 0x84, 0x38, 0x58, 0x8e, 0x3d, 0xbb, 0x8c, 0xe2, 0xb5, 0x8d, 0x67, 0x9c, 0xb4, 0xfc, 0x1d, - 0x5c, 0x39, 0x70, 0xe2, 0xce, 0x1f, 0xc0, 0x85, 0x03, 0x7f, 0x13, 0x37, 0x34, 0x1f, 0xf6, 0x8e, - 0xd7, 0x4e, 0x0a, 0x42, 0xbd, 0xcd, 0xfc, 0xde, 0x9b, 0xf7, 0x35, 0xbf, 0x79, 0xcf, 0x86, 0xde, - 0x94, 0x84, 0x38, 0x9d, 0x24, 0x69, 0xcc, 0x62, 0xd4, 0x15, 0x1b, 0x37, 0xb9, 0xb0, 0x5f, 0xc1, - 0xe6, 0x69, 0x1c, 0x5f, 0x66, 0xc9, 0x21, 0x49, 0xb1, 0xcf, 0xe2, 0xf4, 0xed, 0x51, 0xc4, 0xd2, - 0xb7, 0x0e, 0xfe, 0x31, 0xc3, 0x94, 0xa1, 0x2d, 0x30, 0x83, 0x5c, 0x60, 0x19, 0x63, 0x63, 0xd7, + 0x14, 0x8f, 0xf7, 0x2b, 0xeb, 0xb7, 0xbb, 0x25, 0x99, 0x0d, 0xd4, 0xda, 0x7c, 0xb0, 0x35, 0x14, + 0xa5, 0x22, 0x5a, 0x55, 0x81, 0x43, 0x4b, 0x85, 0x44, 0x9b, 0x0f, 0x29, 0x52, 0xda, 0x22, 0xa7, + 0x41, 0x42, 0x1c, 0x2c, 0xc7, 0x9e, 0x5d, 0x46, 0xf1, 0xda, 0xc6, 0x33, 0x4e, 0x5a, 0xfe, 0x09, + 0x2e, 0x5c, 0x39, 0x70, 0xe2, 0xbf, 0xe0, 0xc2, 0x81, 0xbf, 0x89, 0x1b, 0x9a, 0x0f, 0x7b, 0xc7, + 0x6b, 0x27, 0x05, 0x55, 0xbd, 0xcd, 0xfc, 0xde, 0x9b, 0xf7, 0x35, 0xbf, 0x79, 0xcf, 0x86, 0xde, + 0x94, 0x84, 0x38, 0x9d, 0x24, 0x69, 0xcc, 0x62, 0xd4, 0x15, 0x1b, 0x37, 0xb9, 0xb0, 0x5f, 0xc2, + 0xe6, 0x69, 0x1c, 0x5f, 0x66, 0xc9, 0x21, 0x49, 0xb1, 0xcf, 0xe2, 0xf4, 0xcd, 0x51, 0xc4, 0xd2, + 0x37, 0x0e, 0xfe, 0x29, 0xc3, 0x94, 0xa1, 0x2d, 0x30, 0x83, 0x5c, 0x60, 0x19, 0x63, 0x63, 0xd7, 0x74, 0x16, 0x00, 0x42, 0xd0, 0x8a, 0xbc, 0x39, 0xb6, 0x1a, 0x42, 0x20, 0xd6, 0xf6, 0x11, 0x6c, - 0xd5, 0x1b, 0xa4, 0x49, 0x1c, 0x51, 0x8c, 0x1e, 0x40, 0x1b, 0x73, 0x40, 0x58, 0xeb, 0xed, 0x7f, - 0x30, 0xc9, 0x43, 0x99, 0x48, 0x3d, 0x29, 0xb5, 0xff, 0x30, 0x00, 0x9d, 0x12, 0xca, 0x38, 0x48, - 0x30, 0xfd, 0x77, 0xf1, 0x7c, 0x04, 0x9d, 0x24, 0xc5, 0x53, 0xf2, 0x46, 0x45, 0xa4, 0x76, 0x68, - 0x0f, 0xd6, 0x29, 0xf3, 0x52, 0x76, 0x9c, 0xc6, 0xf3, 0x63, 0x12, 0xe2, 0x97, 0x3c, 0xe8, 0xa6, + 0xd5, 0x1b, 0xa4, 0x49, 0x1c, 0x51, 0x8c, 0xee, 0x43, 0x1b, 0x73, 0x40, 0x58, 0xeb, 0xed, 0x7f, + 0x30, 0xc9, 0x43, 0x99, 0x48, 0x3d, 0x29, 0xb5, 0xff, 0x34, 0x00, 0x9d, 0x12, 0xca, 0x38, 0x48, + 0x30, 0xfd, 0x6f, 0xf1, 0x7c, 0x04, 0x9d, 0x24, 0xc5, 0x53, 0xf2, 0x5a, 0x45, 0xa4, 0x76, 0x68, + 0x0f, 0xd6, 0x29, 0xf3, 0x52, 0x76, 0x9c, 0xc6, 0xf3, 0x63, 0x12, 0xe2, 0x17, 0x3c, 0xe8, 0xa6, 0x50, 0xa9, 0x0a, 0xd0, 0x04, 0x10, 0x89, 0xfc, 0x30, 0xa3, 0xe4, 0x0a, 0x9f, 0xe5, 0x52, 0xab, 0x35, 0x36, 0x76, 0xbb, 0x4e, 0x8d, 0x04, 0x6d, 0x40, 0x3b, 0x24, 0x73, 0xc2, 0xac, 0xf6, 0xd8, - 0xd8, 0x1d, 0x38, 0x72, 0x63, 0x7f, 0x0d, 0xc3, 0x52, 0xfc, 0x2a, 0xfd, 0x87, 0xb0, 0x82, 0x25, - 0x64, 0x19, 0xe3, 0x66, 0x5d, 0x01, 0x72, 0xb9, 0xfd, 0x4b, 0x03, 0xda, 0x02, 0x2a, 0xea, 0x6c, + 0xd8, 0x1d, 0x38, 0x72, 0x63, 0x7f, 0x03, 0xc3, 0x52, 0xfc, 0x2a, 0xfd, 0x07, 0xb0, 0x8a, 0x25, + 0x64, 0x19, 0xe3, 0x66, 0x5d, 0x01, 0x72, 0xb9, 0xfd, 0x5b, 0x03, 0xda, 0x02, 0x2a, 0xea, 0x6c, 0x2c, 0xea, 0x8c, 0xee, 0x41, 0x9f, 0x50, 0x77, 0x51, 0x8c, 0x86, 0x88, 0xaf, 0x47, 0x68, 0x51, - 0x77, 0xf4, 0x19, 0x74, 0xfc, 0x1f, 0xb2, 0xe8, 0x92, 0x5a, 0x4d, 0xe1, 0x6a, 0xb8, 0x70, 0xc5, - 0x93, 0x3d, 0xe0, 0x32, 0x47, 0xa9, 0xa0, 0xc7, 0x00, 0x1e, 0x63, 0x29, 0xb9, 0xc8, 0x18, 0xa6, - 0x22, 0xdb, 0xde, 0xbe, 0xa5, 0x1d, 0xc8, 0x28, 0x7e, 0x56, 0xc8, 0x1d, 0x4d, 0x17, 0x3d, 0x81, - 0x2e, 0x7e, 0xc3, 0x70, 0x14, 0xe0, 0xc0, 0x6a, 0x0b, 0x47, 0xdb, 0x4b, 0x39, 0x4d, 0x8e, 0x94, - 0x5c, 0x66, 0x58, 0xa8, 0x8f, 0x9e, 0xc2, 0xa0, 0x24, 0x42, 0x6b, 0xd0, 0xbc, 0xc4, 0xf9, 0xcd, - 0xf2, 0x25, 0xaf, 0xee, 0x95, 0x17, 0x66, 0x92, 0x64, 0x7d, 0x47, 0x6e, 0xbe, 0x6c, 0x3c, 0x36, - 0xec, 0x9f, 0x0d, 0x58, 0x3f, 0xba, 0xc2, 0x11, 0x7b, 0x19, 0x33, 0x32, 0x25, 0xbe, 0xc7, 0x48, + 0x77, 0xf4, 0x39, 0x74, 0xfc, 0x1f, 0xb3, 0xe8, 0x92, 0x5a, 0x4d, 0xe1, 0x6a, 0xb8, 0x70, 0xc5, + 0x93, 0x3d, 0xe0, 0x32, 0x47, 0xa9, 0xa0, 0x47, 0x00, 0x1e, 0x63, 0x29, 0xb9, 0xc8, 0x18, 0xa6, + 0x22, 0xdb, 0xde, 0xbe, 0xa5, 0x1d, 0xc8, 0x28, 0x7e, 0x5a, 0xc8, 0x1d, 0x4d, 0x17, 0x3d, 0x86, + 0x2e, 0x7e, 0xcd, 0x70, 0x14, 0xe0, 0xc0, 0x6a, 0x0b, 0x47, 0xdb, 0x4b, 0x39, 0x4d, 0x8e, 0x94, + 0x5c, 0x66, 0x58, 0xa8, 0x8f, 0x9e, 0xc0, 0xa0, 0x24, 0x42, 0x6b, 0xd0, 0xbc, 0xc4, 0xf9, 0xcd, + 0xf2, 0x25, 0xaf, 0xee, 0x95, 0x17, 0x66, 0x92, 0x64, 0x7d, 0x47, 0x6e, 0xbe, 0x6a, 0x3c, 0x32, + 0xec, 0x5f, 0x0d, 0x58, 0x3f, 0xba, 0xc2, 0x11, 0x7b, 0x11, 0x33, 0x32, 0x25, 0xbe, 0xc7, 0x48, 0x1c, 0xa1, 0x3d, 0x30, 0xe3, 0x30, 0x70, 0x6f, 0xe5, 0x58, 0x37, 0x0e, 0x95, 0xbf, 0x3d, 0x30, 0x23, 0x7c, 0xad, 0xb4, 0x1b, 0x37, 0x68, 0x47, 0xf8, 0x5a, 0x6a, 0x7f, 0x02, 0x83, 0x00, 0x87, - 0x98, 0x61, 0xb7, 0xa8, 0x2b, 0x2f, 0x7a, 0x5f, 0x82, 0xa2, 0x9e, 0xd4, 0xfe, 0xd5, 0x00, 0xb3, - 0x28, 0x2f, 0xba, 0x0b, 0x2b, 0xdc, 0x9c, 0x4b, 0x02, 0x95, 0x54, 0x87, 0x6f, 0x4f, 0x02, 0xce, - 0xd5, 0x78, 0x3a, 0xa5, 0x98, 0x09, 0xb7, 0x4d, 0x47, 0xed, 0xf8, 0x5d, 0x53, 0xf2, 0x93, 0xa4, + 0x98, 0x61, 0xb7, 0xa8, 0x2b, 0x2f, 0x7a, 0x5f, 0x82, 0xa2, 0x9e, 0xd4, 0xfe, 0xdd, 0x00, 0xb3, + 0x28, 0x2f, 0xba, 0x0b, 0xab, 0xdc, 0x9c, 0x4b, 0x02, 0x95, 0x54, 0x87, 0x6f, 0x4f, 0x02, 0xce, + 0xd5, 0x78, 0x3a, 0xa5, 0x98, 0x09, 0xb7, 0x4d, 0x47, 0xed, 0xf8, 0x5d, 0x53, 0xf2, 0xb3, 0xa4, 0x67, 0xcb, 0x11, 0x6b, 0x5e, 0x83, 0x39, 0x23, 0x73, 0x2c, 0xae, 0xa5, 0xe9, 0xc8, 0x0d, 0x1a, - 0x42, 0x1b, 0xbb, 0xcc, 0x9b, 0x09, 0xde, 0x99, 0x4e, 0x0b, 0xbf, 0xf6, 0x66, 0xe8, 0x3e, 0xac, - 0xd2, 0x38, 0x4b, 0x7d, 0xec, 0xe6, 0x6e, 0x3b, 0x42, 0xda, 0x97, 0xe8, 0xb1, 0x70, 0x6e, 0xff, - 0xd5, 0x80, 0xd5, 0xf2, 0x8d, 0xa2, 0x4d, 0x30, 0xc5, 0x09, 0xe1, 0xdc, 0x10, 0xce, 0x45, 0x97, - 0x38, 0x2b, 0x05, 0xd0, 0xd0, 0x03, 0xc8, 0x8f, 0xcc, 0xe3, 0x40, 0xc6, 0x3b, 0x90, 0x47, 0x5e, - 0xc4, 0x01, 0xe6, 0x37, 0x99, 0x91, 0x40, 0x44, 0x3c, 0x70, 0xf8, 0x92, 0x23, 0x33, 0x12, 0xa8, - 0x57, 0xc2, 0x97, 0xbc, 0x06, 0x7e, 0x2a, 0xec, 0x76, 0x64, 0x0d, 0xe4, 0x8e, 0xd7, 0x60, 0xce, - 0xd1, 0x15, 0x99, 0x18, 0x5f, 0xa3, 0x31, 0xf4, 0x52, 0x9c, 0x84, 0xea, 0x9a, 0xad, 0xae, 0x10, - 0xe9, 0x10, 0xda, 0x01, 0xf0, 0xe3, 0x30, 0xc4, 0xbe, 0x50, 0x30, 0x85, 0x82, 0x86, 0xf0, 0xab, - 0x60, 0x2c, 0x74, 0x29, 0xf6, 0x2d, 0x18, 0x1b, 0xbb, 0x6d, 0xa7, 0xc3, 0x58, 0x78, 0x86, 0x7d, - 0x9e, 0x47, 0x46, 0x71, 0xea, 0x8a, 0x37, 0xd6, 0x13, 0xe7, 0xba, 0x1c, 0x10, 0xdd, 0x60, 0x1b, - 0x60, 0x96, 0xc6, 0x59, 0x22, 0xa5, 0xfd, 0x71, 0x93, 0xb7, 0x1c, 0x81, 0x70, 0xb1, 0xfd, 0x1d, - 0xa0, 0x83, 0x14, 0x7b, 0x0c, 0xff, 0x87, 0xb6, 0x59, 0xb4, 0xc0, 0xc6, 0xad, 0x2d, 0xf0, 0x43, - 0x18, 0x96, 0x4c, 0xcb, 0x0e, 0xc2, 0x3d, 0x9e, 0x27, 0xc1, 0xfb, 0xf2, 0x58, 0x32, 0xad, 0x3c, - 0xfe, 0x6e, 0x00, 0x3a, 0x14, 0x14, 0xff, 0x7f, 0xb3, 0xa1, 0xd2, 0xb3, 0x9a, 0xd5, 0x9e, 0x75, - 0x1f, 0x56, 0xb9, 0x8a, 0x7c, 0x65, 0x81, 0xc7, 0x3c, 0xd5, 0x78, 0xfb, 0x84, 0xca, 0x10, 0x0e, - 0x3d, 0xe6, 0x29, 0x43, 0x29, 0xf6, 0xb3, 0x94, 0xf7, 0x62, 0xc1, 0x29, 0x61, 0xc8, 0xc9, 0x21, - 0x9e, 0x4b, 0x29, 0x66, 0x95, 0xcb, 0x6f, 0x06, 0x0c, 0x9f, 0x51, 0x4a, 0x66, 0xd1, 0xb7, 0x71, - 0x98, 0xcd, 0x71, 0x9e, 0xcc, 0x06, 0xb4, 0xfd, 0x38, 0x8b, 0x98, 0x48, 0xa4, 0xed, 0xc8, 0xcd, - 0x12, 0xa5, 0x1a, 0x15, 0x4a, 0x2d, 0x91, 0xb2, 0x59, 0x25, 0xa5, 0x46, 0xba, 0x56, 0x89, 0x74, - 0x1f, 0x43, 0x8f, 0xa7, 0xe7, 0xfa, 0x38, 0x62, 0x38, 0x55, 0x6f, 0x18, 0x38, 0x74, 0x20, 0x10, - 0xfb, 0x0a, 0x36, 0xca, 0x81, 0xaa, 0x09, 0x72, 0x63, 0x47, 0xe1, 0x2f, 0x2e, 0x0d, 0x55, 0x94, - 0x7c, 0xc9, 0xb9, 0x9b, 0x64, 0x17, 0x21, 0xf1, 0x5d, 0x2e, 0x90, 0xd1, 0x99, 0x12, 0x39, 0x4f, - 0xc3, 0x45, 0xce, 0x2d, 0x2d, 0x67, 0xfb, 0x0b, 0x18, 0xca, 0x01, 0x5e, 0x2e, 0xd0, 0x36, 0xc0, - 0x95, 0x00, 0x5c, 0x12, 0xc8, 0xd9, 0x65, 0x3a, 0xa6, 0x44, 0x4e, 0x02, 0x6a, 0x7f, 0x05, 0xe6, - 0x69, 0x2c, 0x73, 0xa6, 0xe8, 0x11, 0x98, 0x61, 0xbe, 0x51, 0x63, 0x0e, 0x2d, 0x28, 0x97, 0xeb, - 0x39, 0x0b, 0x25, 0xfb, 0x29, 0x74, 0x73, 0x38, 0xcf, 0xc3, 0xb8, 0x29, 0x8f, 0xc6, 0x52, 0x1e, - 0xf6, 0x9f, 0x06, 0x6c, 0x94, 0x43, 0x56, 0xa5, 0x3a, 0x87, 0x41, 0xe1, 0xc2, 0x9d, 0x7b, 0x89, - 0x8a, 0xe5, 0x91, 0x1e, 0x4b, 0xf5, 0x58, 0x11, 0x20, 0x7d, 0xe1, 0x25, 0x92, 0x3d, 0xfd, 0x50, - 0x83, 0x46, 0xaf, 0x61, 0xbd, 0xa2, 0x52, 0x33, 0xb9, 0x1e, 0xea, 0x93, 0xab, 0x34, 0x7d, 0x8b, - 0xd3, 0xfa, 0x38, 0x7b, 0x02, 0x77, 0x25, 0x61, 0x0f, 0x0a, 0x7e, 0xe5, 0xb5, 0x2f, 0xd3, 0xd0, - 0x58, 0xa6, 0xa1, 0x3d, 0x02, 0xab, 0x7a, 0x54, 0x11, 0x7e, 0x06, 0xeb, 0x67, 0xcc, 0x63, 0x84, - 0x32, 0xe2, 0x17, 0x9f, 0x51, 0x4b, 0xbc, 0x35, 0xde, 0xd5, 0x4c, 0xab, 0xcc, 0x5f, 0x83, 0x26, - 0x63, 0x39, 0xa7, 0xf8, 0x92, 0xdf, 0x02, 0xd2, 0x3d, 0xa9, 0x3b, 0x78, 0x0f, 0xae, 0x38, 0x1f, - 0x58, 0xcc, 0xbc, 0x50, 0x0e, 0xab, 0x96, 0x18, 0x56, 0xa6, 0x40, 0xc4, 0xb4, 0x92, 0xfd, 0x3c, - 0x90, 0xd2, 0xb6, 0x1c, 0x65, 0x1c, 0x10, 0xc2, 0x6d, 0x00, 0xf1, 0x7c, 0x24, 0xf3, 0x3b, 0xf2, - 0x2c, 0x47, 0x0e, 0x38, 0xb0, 0xff, 0x77, 0x1b, 0xfa, 0x67, 0xd8, 0xbb, 0xc6, 0x38, 0xe0, 0xb3, - 0x32, 0x45, 0xb3, 0x9c, 0x5b, 0xe5, 0xef, 0x59, 0xf4, 0x60, 0x99, 0x44, 0xb5, 0x1f, 0xd0, 0xa3, - 0x4f, 0xdf, 0xa5, 0xa6, 0xae, 0xe9, 0x0e, 0x3a, 0x85, 0x9e, 0xf6, 0xc1, 0x88, 0xb6, 0xb4, 0x83, - 0x95, 0xef, 0xe0, 0xd1, 0xf6, 0x0d, 0x52, 0xdd, 0x9a, 0x36, 0x3c, 0x74, 0x6b, 0xd5, 0x71, 0xa5, - 0x5b, 0xab, 0x9b, 0x38, 0xc2, 0x9a, 0x36, 0x18, 0x74, 0x6b, 0xd5, 0x51, 0xa4, 0x5b, 0xab, 0x9b, - 0x26, 0xc2, 0x9a, 0xd6, 0x9a, 0x75, 0x6b, 0xd5, 0x29, 0xa3, 0x5b, 0xab, 0xeb, 0xe7, 0x77, 0xd0, - 0x2b, 0xe8, 0xeb, 0x7d, 0x12, 0x69, 0x07, 0x6a, 0x1a, 0xfd, 0x68, 0xe7, 0x26, 0xb1, 0x6e, 0x50, - 0x6f, 0x0b, 0xba, 0xc1, 0x9a, 0xc6, 0xa8, 0x1b, 0xac, 0xeb, 0x26, 0xf6, 0x1d, 0xf4, 0x3d, 0xac, - 0x2d, 0x3f, 0x4f, 0x74, 0x6f, 0x39, 0xad, 0xca, 0xab, 0x1f, 0xd9, 0xb7, 0xa9, 0x14, 0xc6, 0x4f, - 0x00, 0x16, 0xaf, 0x0e, 0x6d, 0x2e, 0xce, 0x54, 0x5e, 0xfd, 0x68, 0xab, 0x5e, 0x98, 0x9b, 0x7a, - 0xbe, 0x03, 0x6b, 0x54, 0x52, 0x7f, 0x4a, 0x27, 0x7e, 0x48, 0x70, 0xc4, 0x9e, 0x83, 0x78, 0x05, - 0xdf, 0xf0, 0xbf, 0xc6, 0x8b, 0x8e, 0xf8, 0x79, 0xfc, 0xfc, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x58, 0x55, 0x30, 0x36, 0x4b, 0x0e, 0x00, 0x00, + 0x42, 0x1b, 0xbb, 0xcc, 0x9b, 0x09, 0xde, 0x99, 0x4e, 0x0b, 0xbf, 0xf2, 0x66, 0xe8, 0x53, 0xb8, + 0x43, 0xe3, 0x2c, 0xf5, 0xb1, 0x9b, 0xbb, 0xed, 0x08, 0x69, 0x5f, 0xa2, 0xc7, 0xc2, 0xb9, 0xfd, + 0x77, 0x03, 0xee, 0x94, 0x6f, 0x14, 0x6d, 0x82, 0x29, 0x4e, 0x08, 0xe7, 0x86, 0x70, 0x2e, 0xba, + 0xc4, 0x59, 0x29, 0x80, 0x86, 0x1e, 0x40, 0x7e, 0x64, 0x1e, 0x07, 0x32, 0xde, 0x81, 0x3c, 0xf2, + 0x3c, 0x0e, 0x30, 0xbf, 0xc9, 0x8c, 0x04, 0x22, 0xe2, 0x81, 0xc3, 0x97, 0x1c, 0x99, 0x91, 0x40, + 0xbd, 0x12, 0xbe, 0xe4, 0x35, 0xf0, 0x53, 0x61, 0xb7, 0x23, 0x6b, 0x20, 0x77, 0xbc, 0x06, 0x73, + 0x8e, 0xae, 0xca, 0xc4, 0xf8, 0x1a, 0x8d, 0xa1, 0x97, 0xe2, 0x24, 0x54, 0xd7, 0x6c, 0x75, 0x85, + 0x48, 0x87, 0xd0, 0x0e, 0x80, 0x1f, 0x87, 0x21, 0xf6, 0x85, 0x82, 0x29, 0x14, 0x34, 0x84, 0x5f, + 0x05, 0x63, 0xa1, 0x4b, 0xb1, 0x6f, 0xc1, 0xd8, 0xd8, 0x6d, 0x3b, 0x1d, 0xc6, 0xc2, 0x33, 0xec, + 0xf3, 0x3c, 0x32, 0x8a, 0x53, 0x57, 0xbc, 0xb1, 0x9e, 0x38, 0xd7, 0xe5, 0x80, 0xe8, 0x06, 0xdb, + 0x00, 0xb3, 0x34, 0xce, 0x12, 0x29, 0xed, 0x8f, 0x9b, 0xbc, 0xe5, 0x08, 0x84, 0x8b, 0xed, 0xef, + 0x01, 0x1d, 0xa4, 0xd8, 0x63, 0xf8, 0x7f, 0xb4, 0xcd, 0xa2, 0x05, 0x36, 0x6e, 0x6d, 0x81, 0x1f, + 0xc2, 0xb0, 0x64, 0x5a, 0x76, 0x10, 0xee, 0xf1, 0x3c, 0x09, 0xde, 0x97, 0xc7, 0x92, 0x69, 0xe5, + 0xf1, 0x17, 0x03, 0xd0, 0xa1, 0xa0, 0xf8, 0xbb, 0xcd, 0x06, 0x4e, 0x4e, 0xde, 0xb3, 0xe4, 0x13, + 0x0a, 0x3c, 0xe6, 0xa9, 0xae, 0xda, 0x27, 0x54, 0xda, 0x3f, 0xf4, 0x98, 0xa7, 0x3a, 0x5b, 0x8a, + 0xfd, 0x2c, 0xe5, 0x8d, 0x56, 0x10, 0x46, 0x74, 0x36, 0x27, 0x87, 0x78, 0xa0, 0xa5, 0x80, 0x54, + 0xa0, 0x7f, 0x18, 0x30, 0x7c, 0x4a, 0x29, 0x99, 0x45, 0xdf, 0xc5, 0x61, 0x36, 0xc7, 0x79, 0xa4, + 0x1b, 0xd0, 0xf6, 0xe3, 0x2c, 0x62, 0x22, 0xca, 0xb6, 0x23, 0x37, 0x4b, 0x7c, 0x69, 0x54, 0xf8, + 0xb2, 0xc4, 0xb8, 0x66, 0x95, 0x71, 0x1a, 0xa3, 0x5a, 0x25, 0x46, 0x7d, 0x0c, 0x3d, 0x9e, 0x9e, + 0xeb, 0xe3, 0x88, 0xe1, 0x54, 0x3d, 0x50, 0xe0, 0xd0, 0x81, 0x40, 0xec, 0x2b, 0xd8, 0x28, 0x07, + 0xaa, 0xc6, 0xc3, 0x8d, 0xed, 0x82, 0x3f, 0xa7, 0x34, 0x54, 0x51, 0xf2, 0x25, 0x27, 0x66, 0x92, + 0x5d, 0x84, 0xc4, 0x77, 0xb9, 0x40, 0x46, 0x67, 0x4a, 0xe4, 0x3c, 0x0d, 0x17, 0x39, 0xb7, 0xb4, + 0x9c, 0xed, 0x2f, 0x61, 0x28, 0xa7, 0x73, 0xb9, 0x40, 0xdb, 0x00, 0x57, 0x02, 0x70, 0x49, 0x20, + 0x07, 0x93, 0xe9, 0x98, 0x12, 0x39, 0x09, 0xa8, 0xfd, 0x35, 0x98, 0xa7, 0xb1, 0xcc, 0x99, 0xa2, + 0x87, 0x60, 0x86, 0xf9, 0x46, 0xcd, 0x30, 0xb4, 0xe0, 0x53, 0xae, 0xe7, 0x2c, 0x94, 0xec, 0x27, + 0xd0, 0xcd, 0xe1, 0x3c, 0x0f, 0xe3, 0xa6, 0x3c, 0x1a, 0x4b, 0x79, 0xd8, 0x7f, 0x19, 0xb0, 0x51, + 0x0e, 0x59, 0x95, 0xea, 0x1c, 0x06, 0x85, 0x0b, 0x77, 0xee, 0x25, 0x2a, 0x96, 0x87, 0x7a, 0x2c, + 0xd5, 0x63, 0x45, 0x80, 0xf4, 0xb9, 0x97, 0x48, 0xf6, 0xf4, 0x43, 0x0d, 0x1a, 0xbd, 0x82, 0xf5, + 0x8a, 0x4a, 0xcd, 0x58, 0x7a, 0xa0, 0x8f, 0xa5, 0xd2, 0x68, 0x2d, 0x4e, 0xeb, 0xb3, 0xea, 0x31, + 0xdc, 0x95, 0x84, 0x3d, 0x28, 0xf8, 0x95, 0xd7, 0xbe, 0x4c, 0x43, 0x63, 0x99, 0x86, 0xf6, 0x08, + 0xac, 0xea, 0x51, 0x45, 0xf8, 0x19, 0xac, 0x9f, 0x31, 0x8f, 0x11, 0xca, 0x88, 0x5f, 0x7c, 0x23, + 0x2d, 0xf1, 0xd6, 0x78, 0x5b, 0xa7, 0xac, 0x32, 0x7f, 0x0d, 0x9a, 0x8c, 0xe5, 0x9c, 0xe2, 0x4b, + 0x7e, 0x0b, 0x48, 0xf7, 0xa4, 0xee, 0xe0, 0x3d, 0xb8, 0xe2, 0x7c, 0x60, 0x31, 0xf3, 0x42, 0x39, + 0x89, 0x5a, 0x62, 0x12, 0x99, 0x02, 0x11, 0xa3, 0x48, 0x36, 0xeb, 0x40, 0x4a, 0xdb, 0x72, 0x4e, + 0x71, 0x40, 0x08, 0xb7, 0x01, 0xc4, 0xf3, 0x91, 0xcc, 0xef, 0xc8, 0xb3, 0x1c, 0x39, 0xe0, 0xc0, + 0xfe, 0x3f, 0x6d, 0xe8, 0x9f, 0x61, 0xef, 0x1a, 0xe3, 0x80, 0x0f, 0xc2, 0x14, 0xcd, 0x72, 0x6e, + 0x95, 0x3f, 0x56, 0xd1, 0xfd, 0x65, 0x12, 0xd5, 0x7e, 0x1d, 0x8f, 0x3e, 0x7b, 0x9b, 0x9a, 0xba, + 0xa6, 0x15, 0x74, 0x0a, 0x3d, 0xed, 0x6b, 0x10, 0x6d, 0x69, 0x07, 0x2b, 0x1f, 0xb9, 0xa3, 0xed, + 0x1b, 0xa4, 0xba, 0x35, 0x6d, 0x32, 0xe8, 0xd6, 0xaa, 0xb3, 0x48, 0xb7, 0x56, 0x37, 0x4e, 0x84, + 0x35, 0xad, 0xeb, 0xeb, 0xd6, 0xaa, 0x73, 0x46, 0xb7, 0x56, 0x37, 0x2a, 0x84, 0x35, 0xad, 0x35, + 0xeb, 0xd6, 0xaa, 0x23, 0x44, 0xb7, 0x56, 0xd7, 0xcf, 0x57, 0xd0, 0x4b, 0xe8, 0xeb, 0x7d, 0x12, + 0x69, 0x07, 0x6a, 0x1a, 0xfd, 0x68, 0xe7, 0x26, 0xb1, 0x6e, 0x50, 0x6f, 0x0b, 0xba, 0xc1, 0x9a, + 0xc6, 0xa8, 0x1b, 0xac, 0xeb, 0x26, 0xf6, 0x0a, 0xfa, 0x01, 0xd6, 0x96, 0x9f, 0x27, 0xba, 0xb7, + 0x9c, 0x56, 0xe5, 0xd5, 0x8f, 0xec, 0xdb, 0x54, 0x0a, 0xe3, 0x27, 0x00, 0x8b, 0x57, 0x87, 0x36, + 0x17, 0x67, 0x2a, 0xaf, 0x7e, 0xb4, 0x55, 0x2f, 0xcc, 0x4d, 0x3d, 0xdb, 0x81, 0x35, 0x2a, 0xa9, + 0x3f, 0xa5, 0x13, 0x3f, 0x24, 0x38, 0x62, 0xcf, 0x40, 0xbc, 0x82, 0x6f, 0xf9, 0x2f, 0xe1, 0x45, + 0x47, 0xfc, 0x19, 0x7e, 0xf1, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x22, 0x62, 0x04, 0x66, 0x28, + 0x0e, 0x00, 0x00, } diff --git a/weed/replication/sink/filersink/filer_sink.go b/weed/replication/sink/filersink/filer_sink.go index 60a1fa7d4..2e9cc86d1 100644 --- a/weed/replication/sink/filersink/filer_sink.go +++ b/weed/replication/sink/filersink/filer_sink.go @@ -66,7 +66,6 @@ func (fs *FilerSink) DeleteEntry(key string, isDirectory, deleteIncludeChunks bo request := &filer_pb.DeleteEntryRequest{ Directory: dir, Name: name, - IsDirectory: isDirectory, IsDeleteData: deleteIncludeChunks, } diff --git a/weed/s3api/filer_util.go b/weed/s3api/filer_util.go index 6dd93d50f..40c5a3e26 100644 --- a/weed/s3api/filer_util.go +++ b/weed/s3api/filer_util.go @@ -109,7 +109,6 @@ func (s3a *S3ApiServer) rm(parentDirectoryPath string, entryName string, isDirec request := &filer_pb.DeleteEntryRequest{ Directory: parentDirectoryPath, Name: entryName, - IsDirectory: isDirectory, IsDeleteData: isDeleteData, IsRecursive: isRecursive, }