Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add blob interfaces #40

Merged
merged 1 commit into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go/common/constant/constant.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const KReadBatchSize = 1024
const KManifestTempFileSuffix = ".manifest.tmp"
const KManifestFileSuffix = ".manifest"
const KManifestDir = "versions"
const KBlobDir = "blobs"
const KParquetDataFileSuffix = ".parquet"
const KParquetDataDir = "data"
const KOffsetFieldName = "__offset"
9 changes: 9 additions & 0 deletions go/common/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,20 @@ func GetManifestTmpFilePath(path string, version int64) string {
return path
}

func GetBlobFilePath(path string) string {
blobId := uuid.New()
return filepath.Join(GetBlobDir(path), blobId.String())
}

func GetManifestDir(path string) string {
path = filepath.Join(path, constant.KManifestDir)
return path
}

func GetBlobDir(path string) string {
return filepath.Join(path, constant.KBlobDir)
}

func ParseVersionFromFileName(path string) int64 {
pos := strings.Index(path, constant.KManifestFileSuffix)
if pos == -1 || !strings.HasSuffix(path, constant.KManifestFileSuffix) {
Expand Down
25 changes: 25 additions & 0 deletions go/file/blob/blob.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package blob

import "github.com/milvus-io/milvus-storage-format/proto/manifest_proto"

type Blob struct {
Name string
Size int64
File string
}

func (b Blob) ToProtobuf() *manifest_proto.Blob {
blob := &manifest_proto.Blob{}
blob.Name = b.Name
blob.Size = b.Size
blob.File = b.File
return blob
}

func FromProtobuf(blob *manifest_proto.Blob) Blob {
return Blob{
Name: blob.Name,
Size: blob.Size,
File: blob.File,
}
}
9 changes: 8 additions & 1 deletion go/proto/manifest.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";
import "schema.proto";
package manifest_proto;
option go_package = "github.com/milvus-io/milvus-storage-format/proto/manifest_proto;manifest_proto";
option go_package = "github.com/milvus-io/milvus-storage-format/proto/manifest_proto";

message Options { string uri = 1; }

Expand All @@ -12,9 +12,16 @@ message Manifest {
repeated Fragment scalar_fragments = 4;
repeated Fragment vector_fragments = 5;
repeated Fragment delete_fragments = 6;
repeated Blob blobs = 7;
}

message Fragment {
int64 id = 1;
repeated string files = 2;
}

message Blob {
string name = 1;
int64 size = 2;
string file = 3;
}
127 changes: 109 additions & 18 deletions go/proto/manifest_proto/manifest.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 4 additions & 10 deletions go/proto/schema.proto
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";

package schema_proto;
option go_package = "github.com/milvus-io/milvus-storage-format/proto/schema_proto;schema_proto";
option go_package = "github.com/milvus-io/milvus-storage-format/proto/schema_proto";

enum LogicType {
NA = 0;
Expand Down Expand Up @@ -53,23 +53,17 @@ enum Endianness {
Big = 1;
}

message FixedSizeBinaryType {
int32 byte_width = 1;
}
message FixedSizeBinaryType { int32 byte_width = 1; }

message FixedSizeListType {
int32 list_size = 1;
}
message FixedSizeListType { int32 list_size = 1; }

message DictionaryType {
DataType index_type = 1;
DataType value_type = 2;
bool ordered = 3;
}

message MapType {
bool keys_sorted = 1;
}
message MapType { bool keys_sorted = 1; }

message DataType {
oneof type_related_values {
Expand Down
Loading
Loading