diff --git a/README.md b/README.md index fe531f3..7af8abc 100644 --- a/README.md +++ b/README.md @@ -67,29 +67,21 @@ import "google/protobuf/timestamp.proto"; message View1 { option (protobq.materialized_view) = { - is_materialized_view: true + base_table: "example" enable_refresh: true }; google.protobuf.Timestamp timestamp = 1 [(protobq.materialized_view_field) = { - source: { - table: "example" - field: "timestamp" - } + origin_path: "timestamp" is_partitioned: true }]; - - string message = 3 [(protobq.materialized_view_field) = { - source: { - table: "example" - field: "message" - } - }]; + + string message = 2; } ``` -### 2. Apply schema +#### 2. Apply schema ```shell -protobq apply -i example/view1.proto --project-id {YOUR_PROJECT_ID} +protobq apply -i example/view1.proto --project-id {YOUR_PROJECT_ID} --dataset-id {YOUR_DATASET_ID} ``` diff --git a/cmd/protobq/main.go b/cmd/protobq/main.go index 1e70bd0..18e2fbb 100644 --- a/cmd/protobq/main.go +++ b/cmd/protobq/main.go @@ -35,9 +35,14 @@ func newCliApp() *cli.App { Usage: "google cloud project id", Required: true, }, + &cli.StringFlag{ + Name: "dataset-id", + Usage: "bigquery dataset id", + Required: true, + }, }, Action: func(c *cli.Context) error { - err := internal.Apply(context.Background(), c.String("project-id")) + err := internal.Apply(context.Background(), c.String("project-id"), c.String("dataset-id")) if err != nil { return err } @@ -59,6 +64,11 @@ func newCliApp() *cli.App { Usage: "google cloud project id", Required: true, }, + &cli.StringFlag{ + Name: "dataset-id", + Usage: "bigquery dataset id", + Required: true, + }, }, Action: func(c *cli.Context) error { // TODO: implements me diff --git a/internal/apply.go b/internal/apply.go index c388ed0..9b4d05a 100644 --- a/internal/apply.go +++ b/internal/apply.go @@ -6,7 +6,7 @@ import ( "cloud.google.com/go/bigquery" ) -func Apply(ctx context.Context, projectID string) error { +func Apply(ctx context.Context, projectID, datasetID string) error { cli, err := bigquery.NewClient(ctx, projectID) if err != nil { return err diff --git a/internal/bigquery_model.go b/internal/bigquery_model.go new file mode 100644 index 0000000..db1cf8f --- /dev/null +++ b/internal/bigquery_model.go @@ -0,0 +1,44 @@ +package internal + +type InsertDTOImpl struct { + tableName string + fields []BQField +} + +func NewInsertDTOImpl(tableName string, fields []BQField) *InsertDTOImpl { + return &InsertDTOImpl{ + tableName: tableName, + fields: fields, + } +} + +func (r InsertDTOImpl) TableName() string { + return r.tableName +} + +func (r InsertDTOImpl) Value() map[string]any { + res := make(map[string]any) + for _, f := range r.fields { + currentMap := res + for i, key := range f.Path { + if i == len(f.Path)-1 { + currentMap[key] = f.Value + } else { + if _, ok := currentMap[key]; !ok { + currentMap[key] = make(map[string]any) + } + currentMap = currentMap[key].(map[string]any) //nolint:forcetypeassert + } + } + } + return res +} + +func (r *InsertDTOImpl) AddField(f BQField) { + r.fields = append(r.fields, f) +} + +type BQField struct { + Path []string + Value any +} diff --git a/internal/bigquery_model_test.go b/internal/bigquery_model_test.go new file mode 100644 index 0000000..3277a5d --- /dev/null +++ b/internal/bigquery_model_test.go @@ -0,0 +1,59 @@ +package internal + +import ( + "reflect" + "testing" +) + +func TestInsertDTOImpl_Value(t *testing.T) { + type fields struct { + tableName string + fields []BQField + } + tests := []struct { + name string + fields fields + want map[string]any + }{ + { + fields: fields{ + fields: []BQField{ + { + Path: []string{"a", "b", "c"}, + Value: 1, + }, + { + Path: []string{"a", "d"}, + Value: 2, + }, + { + Path: []string{"a", "e", "f"}, + Value: 3, + }, + }, + }, + want: map[string]any{ + "a": map[string]any{ + "b": map[string]any{ + "c": 1, + }, + "d": 2, + "e": map[string]any{ + "f": 3, + }, + }, + }, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + r := InsertDTOImpl{ + tableName: tt.fields.tableName, + fields: tt.fields.fields, + } + if got := r.Value(); !reflect.DeepEqual(got, tt.want) { + t.Errorf("Value() = %v, want %v", got, tt.want) + } + }) + } +} diff --git a/internal/codegen.go b/internal/codegen.go index edd57d1..c4adadc 100644 --- a/internal/codegen.go +++ b/internal/codegen.go @@ -1,38 +1,41 @@ package internal import ( + "fmt" "runtime/debug" + "slices" + "strings" "github.com/averak/protobq/internal/protobuf/protobq" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" ) -//goland:noinspection GoSnakeCaseUsage var ( timeIdents = struct { - Duration protogen.GoIdent + Minute protogen.GoIdent }{ - Duration: protogen.GoImportPath("time").Ident("Duration"), - } - protoIdents = struct { - GetExtension protogen.GoIdent - }{ - GetExtension: protogen.GoImportPath("google.golang.org/protobuf/proto").Ident("GetExtension"), - } - internalIdents = struct { - MaterializedView protogen.GoIdent - E_MaterializedView protogen.GoIdent - }{ - MaterializedView: protogen.GoImportPath("github.com/averak/protobq/internal/protobuf/protobq").Ident("MaterializedView"), - E_MaterializedView: protogen.GoImportPath("github.com/averak/protobq/internal/protobuf/protobq").Ident("E_MaterializedView"), + Minute: protogen.GoImportPath("time").Ident("Minute"), } protobqIdents = struct { MaterializedView protogen.GoIdent MaterializedViewOptions protogen.GoIdent + InsertDTO protogen.GoIdent + internal struct { + NewInsertDTOImpl protogen.GoIdent + BQField protogen.GoIdent + } }{ MaterializedView: protogen.GoImportPath("github.com/averak/protobq").Ident("MaterializedView"), MaterializedViewOptions: protogen.GoImportPath("github.com/averak/protobq").Ident("MaterializedViewOptions"), + InsertDTO: protogen.GoImportPath("github.com/averak/protobq").Ident("InsertDTO"), + internal: struct { + NewInsertDTOImpl protogen.GoIdent + BQField protogen.GoIdent + }{ + NewInsertDTOImpl: protogen.GoImportPath("github.com/averak/protobq/internal").Ident("NewInsertDTOImpl"), + BQField: protogen.GoImportPath("github.com/averak/protobq/internal").Ident("BQField"), + }, } ) @@ -69,17 +72,38 @@ func (g CodeGenerator) Gen() error { if !g.isMaterializedViewSchema(msg) { continue } + ext, _ := proto.GetExtension(msg.Desc.Options(), protobq.E_MaterializedView).(*protobq.MaterializedView) gf.P("var _ ", protobqIdents.MaterializedView, " = (*", msg.GoIdent.GoName, ")(nil)") gf.P() + + gf.P("func (mv *", msg.GoIdent.GoName, ") Name() string {") + gf.P(" return \"", msg.Desc.Name(), "\"") + gf.P("}") + gf.P() + gf.P("func (mv *", msg.GoIdent.GoName, ") Options() ", protobqIdents.MaterializedViewOptions, " {") - gf.P(" ext, _ := ", protoIdents.GetExtension, "(mv.ProtoReflect().Descriptor().Options(), ", internalIdents.E_MaterializedView, ").(*", internalIdents.MaterializedView, ")") gf.P(" return ", protobqIdents.MaterializedViewOptions, "{") - gf.P(" EnableRefresh: ext.GetEnableRefresh(),") - gf.P(" RefreshInterval: ", timeIdents.Duration, "(ext.GetRefreshIntervalMinutes()) * time.Minute,") + gf.P(" EnableRefresh: ", ext.GetEnableRefresh(), ",") + gf.P(" RefreshInterval: ", ext.GetRefreshIntervalMinutes(), " * ", timeIdents.Minute, ",") gf.P(" }") gf.P("}") gf.P() + + gf.P("func (mv *", msg.GoIdent.GoName, ") InsertDTO() ", protobqIdents.InsertDTO, " {") + gf.P(" res := ", protobqIdents.internal.NewInsertDTOImpl, "(\"", ext.GetBaseTable(), "\", nil)") + for _, field := range msg.Fields { + g.generateAddField(gf, field, nil, "res", "mv") + } + gf.P(" return res") + gf.P("}") + gf.P() + + //for _, field := range msg.Fields { + //fieldExt, _ := proto.GetExtension(field.Desc.Options(), protobq.E_MaterializedViewField).(*protobq.MaterializedViewField) + //if fieldExt != nil { + // gf.P(" res[\"", field.Desc.Name(), "\"] = mv.", field.GoName) + //} } } return nil @@ -100,9 +124,31 @@ func (g CodeGenerator) isMaterializedViewSchema(msg *protogen.Message) bool { return false } - ext, ok := proto.GetExtension(opts, protobq.E_MaterializedView).(*protobq.MaterializedView) - if !ok { - return false + ext, _ := proto.GetExtension(opts, protobq.E_MaterializedView).(*protobq.MaterializedView) + return ext != nil +} + +func (g CodeGenerator) generateAddField(gf *protogen.GeneratedFile, field *protogen.Field, parentPaths []string, result string, receiver string) { + ext, _ := proto.GetExtension(field.Desc.Options(), protobq.E_MaterializedViewField).(*protobq.MaterializedViewField) + if ext == nil { + ext = &protobq.MaterializedViewField{} + } + + paths := parentPaths + if len(ext.GetOriginPath()) > 0 { + paths = append(paths, ext.GetOriginPath()...) + } else { + paths = append(paths, string(field.Desc.Name())) + } + + blacklist := []string{ + "google.protobuf.Timestamp", + } + if field.Message != nil && !slices.Contains(blacklist, string(field.Message.Desc.FullName())) { + for _, nestedField := range field.Message.Fields { + g.generateAddField(gf, nestedField, paths, result, receiver+".Get"+field.GoName+"()") + } + } else { + gf.P(result, ".AddField(", protobqIdents.internal.BQField, "{[]string{", fmt.Sprintf(`"%s"`, strings.Join(paths, `", "`)), "}, ", receiver, ".Get", field.GoName, "()})") } - return ext.GetIsMaterializedView() } diff --git a/internal/protobuf/example/example.pb.go b/internal/protobuf/example/example.pb.go index 06932ef..2907480 100644 --- a/internal/protobuf/example/example.pb.go +++ b/internal/protobuf/example/example.pb.go @@ -27,9 +27,10 @@ type View1 struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - UserId string `protobuf:"bytes,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"` - Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + ClusteredField string `protobuf:"bytes,2,opt,name=clustered_field,json=clusteredField,proto3" json:"clustered_field,omitempty"` + RepeatedField []string `protobuf:"bytes,3,rep,name=repeated_field,json=repeatedField,proto3" json:"repeated_field,omitempty"` + NestedField *View1_Nested `protobuf:"bytes,4,opt,name=nested_field,json=nestedField,proto3" json:"nested_field,omitempty"` } func (x *View1) Reset() { @@ -69,20 +70,88 @@ func (x *View1) GetTimestamp() *timestamppb.Timestamp { return nil } -func (x *View1) GetUserId() string { +func (x *View1) GetClusteredField() string { if x != nil { - return x.UserId + return x.ClusteredField } return "" } -func (x *View1) GetMessage() string { +func (x *View1) GetRepeatedField() []string { if x != nil { - return x.Message + return x.RepeatedField + } + return nil +} + +func (x *View1) GetNestedField() *View1_Nested { + if x != nil { + return x.NestedField + } + return nil +} + +type View1_Nested struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + StringField string `protobuf:"bytes,1,opt,name=string_field,json=stringField,proto3" json:"string_field,omitempty"` + Int64Field int64 `protobuf:"varint,2,opt,name=int64_field,json=int64Field,proto3" json:"int64_field,omitempty"` + BoolField bool `protobuf:"varint,3,opt,name=bool_field,json=boolField,proto3" json:"bool_field,omitempty"` +} + +func (x *View1_Nested) Reset() { + *x = View1_Nested{} + mi := &file_example_example_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *View1_Nested) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*View1_Nested) ProtoMessage() {} + +func (x *View1_Nested) ProtoReflect() protoreflect.Message { + mi := &file_example_example_proto_msgTypes[1] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use View1_Nested.ProtoReflect.Descriptor instead. +func (*View1_Nested) Descriptor() ([]byte, []int) { + return file_example_example_proto_rawDescGZIP(), []int{0, 0} +} + +func (x *View1_Nested) GetStringField() string { + if x != nil { + return x.StringField } return "" } +func (x *View1_Nested) GetInt64Field() int64 { + if x != nil { + return x.Int64Field + } + return 0 +} + +func (x *View1_Nested) GetBoolField() bool { + if x != nil { + return x.BoolField + } + return false +} + var File_example_example_proto protoreflect.FileDescriptor var file_example_example_proto_rawDesc = []byte{ @@ -91,20 +160,29 @@ var file_example_example_proto_rawDesc = []byte{ 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x15, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x71, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd4, 0x01, 0x0a, 0x05, 0x56, 0x69, 0x65, - 0x77, 0x31, 0x12, 0x56, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, + 0x62, 0x71, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe4, 0x02, 0x0a, 0x05, 0x56, 0x69, 0x65, + 0x77, 0x31, 0x12, 0x4b, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x42, 0x1c, 0x82, 0xb5, 0x18, 0x18, 0x0a, 0x14, 0x0a, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, - 0x6c, 0x65, 0x12, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x10, 0x01, 0x52, - 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x33, 0x0a, 0x07, 0x75, 0x73, - 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x1a, 0x82, 0xb5, 0x18, - 0x16, 0x0a, 0x12, 0x0a, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x07, 0x75, 0x73, - 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, - 0x32, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x18, 0x82, 0xb5, 0x18, 0x14, 0x0a, 0x12, 0x0a, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, - 0x65, 0x12, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x3a, 0x0a, 0x82, 0xb5, 0x18, 0x06, 0x08, 0x01, 0x10, 0x01, 0x18, 0x0a, 0x42, + 0x70, 0x42, 0x11, 0x82, 0xb5, 0x18, 0x0d, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, + 0x6d, 0x70, 0x10, 0x01, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, + 0x2f, 0x0a, 0x0f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x65, + 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x06, 0x82, 0xb5, 0x18, 0x02, 0x18, 0x01, + 0x52, 0x0e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, + 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x65, + 0x6c, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, + 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x38, 0x0a, 0x0c, 0x6e, 0x65, 0x73, 0x74, 0x65, + 0x64, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, + 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x56, 0x69, 0x65, 0x77, 0x31, 0x2e, 0x4e, 0x65, + 0x73, 0x74, 0x65, 0x64, 0x52, 0x0b, 0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x46, 0x69, 0x65, 0x6c, + 0x64, 0x1a, 0x6b, 0x0a, 0x06, 0x4e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x73, + 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1f, + 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x12, + 0x1d, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x3a, 0x0f, + 0x82, 0xb5, 0x18, 0x0b, 0x0a, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x10, 0x01, 0x42, 0x8c, 0x01, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x2e, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x42, 0x0c, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x76, 0x65, 0x72, @@ -129,18 +207,20 @@ func file_example_example_proto_rawDescGZIP() []byte { return file_example_example_proto_rawDescData } -var file_example_example_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_example_example_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_example_example_proto_goTypes = []any{ (*View1)(nil), // 0: example.View1 - (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp + (*View1_Nested)(nil), // 1: example.View1.Nested + (*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp } var file_example_example_proto_depIdxs = []int32{ - 1, // 0: example.View1.timestamp:type_name -> google.protobuf.Timestamp - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 2, // 0: example.View1.timestamp:type_name -> google.protobuf.Timestamp + 1, // 1: example.View1.nested_field:type_name -> example.View1.Nested + 2, // [2:2] is the sub-list for method output_type + 2, // [2:2] is the sub-list for method input_type + 2, // [2:2] is the sub-list for extension type_name + 2, // [2:2] is the sub-list for extension extendee + 0, // [0:2] is the sub-list for field type_name } func init() { file_example_example_proto_init() } @@ -154,7 +234,7 @@ func file_example_example_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_example_example_proto_rawDesc, NumEnums: 0, - NumMessages: 1, + NumMessages: 2, NumExtensions: 0, NumServices: 0, }, diff --git a/internal/protobuf/example/example.protobq.go b/internal/protobuf/example/example.protobq.go index 4680998..9713f2d 100644 --- a/internal/protobuf/example/example.protobq.go +++ b/internal/protobuf/example/example.protobq.go @@ -5,17 +5,30 @@ package example import ( protobq "github.com/averak/protobq" - protobq1 "github.com/averak/protobq/internal/protobuf/protobq" - proto "google.golang.org/protobuf/proto" + internal "github.com/averak/protobq/internal" time "time" ) var _ protobq.MaterializedView = (*View1)(nil) +func (mv *View1) Name() string { + return "View1" +} + func (mv *View1) Options() protobq.MaterializedViewOptions { - ext, _ := proto.GetExtension(mv.ProtoReflect().Descriptor().Options(), protobq1.E_MaterializedView).(*protobq1.MaterializedView) return protobq.MaterializedViewOptions{ - EnableRefresh: ext.GetEnableRefresh(), - RefreshInterval: time.Duration(ext.GetRefreshIntervalMinutes()) * time.Minute, + EnableRefresh: true, + RefreshInterval: 0 * time.Minute, } } + +func (mv *View1) InsertDTO() protobq.InsertDTO { + res := internal.NewInsertDTOImpl("example", nil) + res.AddField(internal.BQField{[]string{"timestamp"}, mv.GetTimestamp()}) + res.AddField(internal.BQField{[]string{"clustered_field"}, mv.GetClusteredField()}) + res.AddField(internal.BQField{[]string{"repeated_field"}, mv.GetRepeatedField()}) + res.AddField(internal.BQField{[]string{"nested_field", "string_field"}, mv.GetNestedField().GetStringField()}) + res.AddField(internal.BQField{[]string{"nested_field", "int64_field"}, mv.GetNestedField().GetInt64Field()}) + res.AddField(internal.BQField{[]string{"nested_field", "bool_field"}, mv.GetNestedField().GetBoolField()}) + return res +} diff --git a/internal/protobuf/protobq/protobq.pb.go b/internal/protobuf/protobq/protobq.pb.go index c6b1f18..92b616c 100644 --- a/internal/protobuf/protobq/protobq.pb.go +++ b/internal/protobuf/protobq/protobq.pb.go @@ -26,8 +26,11 @@ type MaterializedView struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - IsMaterializedView bool `protobuf:"varint,1,opt,name=is_materialized_view,json=isMaterializedView,proto3" json:"is_materialized_view,omitempty"` - EnableRefresh bool `protobuf:"varint,2,opt,name=enable_refresh,json=enableRefresh,proto3" json:"enable_refresh,omitempty"` + // マテビューが参照するベーステーブル名 + BaseTable string `protobuf:"bytes,1,opt,name=base_table,json=baseTable,proto3" json:"base_table,omitempty"` + // マテビューの自動更新の有効化フラグ。 + EnableRefresh bool `protobuf:"varint,2,opt,name=enable_refresh,json=enableRefresh,proto3" json:"enable_refresh,omitempty"` + // マテビューの自動更新間隔 [分]。 RefreshIntervalMinutes int32 `protobuf:"varint,3,opt,name=refresh_interval_minutes,json=refreshIntervalMinutes,proto3" json:"refresh_interval_minutes,omitempty"` } @@ -61,11 +64,11 @@ func (*MaterializedView) Descriptor() ([]byte, []int) { return file_protobq_protobq_proto_rawDescGZIP(), []int{0} } -func (x *MaterializedView) GetIsMaterializedView() bool { +func (x *MaterializedView) GetBaseTable() string { if x != nil { - return x.IsMaterializedView + return x.BaseTable } - return false + return "" } func (x *MaterializedView) GetEnableRefresh() bool { @@ -87,9 +90,13 @@ type MaterializedViewField struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Source *MaterializedViewField_Source `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"` - IsPartitioned bool `protobuf:"varint,2,opt,name=is_partitioned,json=isPartitioned,proto3" json:"is_partitioned,omitempty"` - IsClustered bool `protobuf:"varint,3,opt,name=is_clustered,json=isClustered,proto3" json:"is_clustered,omitempty"` + // フィールドの参照元パス。 + // デフォルト: [message_name, field_paths...] + OriginPath []string `protobuf:"bytes,1,rep,name=origin_path,json=originPath,proto3" json:"origin_path,omitempty"` + // このフィールドが、パーティション列であるかどうか。 + IsPartitioned bool `protobuf:"varint,2,opt,name=is_partitioned,json=isPartitioned,proto3" json:"is_partitioned,omitempty"` + // このフィールドが、クラスタ化列であるかどうか。 + IsClustered bool `protobuf:"varint,3,opt,name=is_clustered,json=isClustered,proto3" json:"is_clustered,omitempty"` } func (x *MaterializedViewField) Reset() { @@ -122,9 +129,9 @@ func (*MaterializedViewField) Descriptor() ([]byte, []int) { return file_protobq_protobq_proto_rawDescGZIP(), []int{1} } -func (x *MaterializedViewField) GetSource() *MaterializedViewField_Source { +func (x *MaterializedViewField) GetOriginPath() []string { if x != nil { - return x.Source + return x.OriginPath } return nil } @@ -143,59 +150,6 @@ func (x *MaterializedViewField) GetIsClustered() bool { return false } -type MaterializedViewField_Source struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Table string `protobuf:"bytes,1,opt,name=table,proto3" json:"table,omitempty"` - Field string `protobuf:"bytes,2,opt,name=field,proto3" json:"field,omitempty"` -} - -func (x *MaterializedViewField_Source) Reset() { - *x = MaterializedViewField_Source{} - mi := &file_protobq_protobq_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) -} - -func (x *MaterializedViewField_Source) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MaterializedViewField_Source) ProtoMessage() {} - -func (x *MaterializedViewField_Source) ProtoReflect() protoreflect.Message { - mi := &file_protobq_protobq_proto_msgTypes[2] - if x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MaterializedViewField_Source.ProtoReflect.Descriptor instead. -func (*MaterializedViewField_Source) Descriptor() ([]byte, []int) { - return file_protobq_protobq_proto_rawDescGZIP(), []int{1, 0} -} - -func (x *MaterializedViewField_Source) GetTable() string { - if x != nil { - return x.Table - } - return "" -} - -func (x *MaterializedViewField_Source) GetField() string { - if x != nil { - return x.Field - } - return "" -} - var file_protobq_protobq_proto_extTypes = []protoimpl.ExtensionInfo{ { ExtendedType: (*descriptorpb.MessageOptions)(nil), @@ -234,54 +188,48 @@ var file_protobq_protobq_proto_rawDesc = []byte{ 0x71, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x07, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xa5, 0x01, 0x0a, 0x10, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, - 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x12, 0x30, 0x0a, 0x14, 0x69, 0x73, 0x5f, 0x6d, 0x61, - 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x73, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, - 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x6e, 0x61, - 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x0d, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, - 0x12, 0x38, 0x0a, 0x18, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x76, 0x61, 0x6c, 0x5f, 0x6d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x16, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, - 0x76, 0x61, 0x6c, 0x4d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x73, 0x22, 0xd6, 0x01, 0x0a, 0x15, 0x4d, - 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x46, - 0x69, 0x65, 0x6c, 0x64, 0x12, 0x3d, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x2e, 0x4d, - 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x46, - 0x69, 0x65, 0x6c, 0x64, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x06, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x73, 0x50, - 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, - 0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x0b, 0x69, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x1a, 0x34, 0x0a, - 0x06, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x14, 0x0a, - 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, - 0x65, 0x6c, 0x64, 0x3a, 0x69, 0x0a, 0x11, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, - 0x7a, 0x65, 0x64, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x86, 0x03, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x2e, 0x4d, 0x61, 0x74, 0x65, - 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x52, 0x10, 0x6d, 0x61, - 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x3a, 0x77, - 0x0a, 0x17, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x76, - 0x69, 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, - 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xd0, 0x86, 0x03, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x2e, 0x4d, 0x61, 0x74, 0x65, 0x72, + 0x74, 0x6f, 0x22, 0x92, 0x01, 0x0a, 0x10, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, + 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x12, 0x1d, 0x0a, 0x0a, 0x62, 0x61, 0x73, 0x65, 0x5f, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x61, 0x73, + 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, + 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, + 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x38, 0x0a, + 0x18, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, + 0x6c, 0x5f, 0x6d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x16, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, + 0x4d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x73, 0x22, 0x82, 0x01, 0x0a, 0x15, 0x4d, 0x61, 0x74, 0x65, + 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, + 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x70, 0x61, 0x74, 0x68, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x50, 0x61, + 0x74, 0x68, 0x12, 0x25, 0x0a, 0x0e, 0x69, 0x73, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x69, 0x73, 0x50, 0x61, + 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, + 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x0b, 0x69, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x3a, 0x69, 0x0a, 0x11, + 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x76, 0x69, 0x65, + 0x77, 0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x18, 0xd0, 0x86, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x71, 0x2e, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, + 0x64, 0x56, 0x69, 0x65, 0x77, 0x52, 0x10, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, + 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x3a, 0x77, 0x0a, 0x17, 0x6d, 0x61, 0x74, 0x65, 0x72, + 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x5f, 0x66, 0x69, 0x65, + 0x6c, 0x64, 0x12, 0x1d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x18, 0xd0, 0x86, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x71, 0x2e, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, + 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x52, 0x15, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x56, 0x69, 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, - 0x52, 0x15, 0x6d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x56, 0x69, - 0x65, 0x77, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x42, 0x8c, 0x01, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x42, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x76, 0x65, 0x72, 0x61, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x71, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0xa2, 0x02, 0x03, 0x50, - 0x58, 0x58, 0xaa, 0x02, 0x07, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0xca, 0x02, 0x07, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0xe2, 0x02, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, - 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x07, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x8c, 0x01, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, + 0x42, 0x0c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x76, 0x65, + 0x72, 0x61, 0x6b, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x71, 0xa2, 0x02, 0x03, 0x50, 0x58, 0x58, 0xaa, 0x02, 0x07, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x71, 0xca, 0x02, 0x07, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0xe2, + 0x02, 0x13, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x07, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x71, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -296,25 +244,23 @@ func file_protobq_protobq_proto_rawDescGZIP() []byte { return file_protobq_protobq_proto_rawDescData } -var file_protobq_protobq_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_protobq_protobq_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_protobq_protobq_proto_goTypes = []any{ - (*MaterializedView)(nil), // 0: protobq.MaterializedView - (*MaterializedViewField)(nil), // 1: protobq.MaterializedViewField - (*MaterializedViewField_Source)(nil), // 2: protobq.MaterializedViewField.Source - (*descriptorpb.MessageOptions)(nil), // 3: google.protobuf.MessageOptions - (*descriptorpb.FieldOptions)(nil), // 4: google.protobuf.FieldOptions + (*MaterializedView)(nil), // 0: protobq.MaterializedView + (*MaterializedViewField)(nil), // 1: protobq.MaterializedViewField + (*descriptorpb.MessageOptions)(nil), // 2: google.protobuf.MessageOptions + (*descriptorpb.FieldOptions)(nil), // 3: google.protobuf.FieldOptions } var file_protobq_protobq_proto_depIdxs = []int32{ - 2, // 0: protobq.MaterializedViewField.source:type_name -> protobq.MaterializedViewField.Source - 3, // 1: protobq.materialized_view:extendee -> google.protobuf.MessageOptions - 4, // 2: protobq.materialized_view_field:extendee -> google.protobuf.FieldOptions - 0, // 3: protobq.materialized_view:type_name -> protobq.MaterializedView - 1, // 4: protobq.materialized_view_field:type_name -> protobq.MaterializedViewField - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 3, // [3:5] is the sub-list for extension type_name - 1, // [1:3] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 2, // 0: protobq.materialized_view:extendee -> google.protobuf.MessageOptions + 3, // 1: protobq.materialized_view_field:extendee -> google.protobuf.FieldOptions + 0, // 2: protobq.materialized_view:type_name -> protobq.MaterializedView + 1, // 3: protobq.materialized_view_field:type_name -> protobq.MaterializedViewField + 4, // [4:4] is the sub-list for method output_type + 4, // [4:4] is the sub-list for method input_type + 2, // [2:4] is the sub-list for extension type_name + 0, // [0:2] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name } func init() { file_protobq_protobq_proto_init() } @@ -328,7 +274,7 @@ func file_protobq_protobq_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protobq_protobq_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 2, NumExtensions: 2, NumServices: 0, }, diff --git a/schema.go b/schema.go index 62a7c63..45fddc4 100644 --- a/schema.go +++ b/schema.go @@ -1,12 +1,23 @@ package protobq -import "time" +import ( + "time" +) type MaterializedViewOptions struct { EnableRefresh bool RefreshInterval time.Duration + + // TODO: クラスタ化列、パーティション列を定義する。 } type MaterializedView interface { + Name() string Options() MaterializedViewOptions + InsertDTO() InsertDTO +} + +type InsertDTO interface { + TableName() string + Value() map[string]any } diff --git a/schema/protobuf/example/example.proto b/schema/protobuf/example/example.proto index c888568..ce095c8 100644 --- a/schema/protobuf/example/example.proto +++ b/schema/protobuf/example/example.proto @@ -6,31 +6,23 @@ import "protobq/protobq.proto"; message View1 { option (protobq.materialized_view) = { - is_materialized_view: true + base_table: "example" enable_refresh: true - refresh_interval_minutes: 10 }; google.protobuf.Timestamp timestamp = 1 [(protobq.materialized_view_field) = { - source: { - table: "example" - field: "timestamp" - } + origin_path: "timestamp" is_partitioned: true }]; - string user_id = 2 [(protobq.materialized_view_field) = { - source: { - table: "example" - field: "user_id" - } - is_clustered: true - }]; + string clustered_field = 2 [(protobq.materialized_view_field) = {is_clustered: true}]; - string message = 3 [(protobq.materialized_view_field) = { - source: { - table: "example" - field: "message" - } - }]; + repeated string repeated_field = 3; + + message Nested { + string string_field = 1; + int64 int64_field = 2; + bool bool_field = 3; + } + Nested nested_field = 4; } diff --git a/schema/protobuf/protobq/protobq.proto b/schema/protobuf/protobq/protobq.proto index ed218fd..9a99e4d 100644 --- a/schema/protobuf/protobq/protobq.proto +++ b/schema/protobuf/protobq/protobq.proto @@ -4,18 +4,25 @@ package protobq; import "google/protobuf/descriptor.proto"; message MaterializedView { - bool is_materialized_view = 1; + // マテビューが参照するベーステーブル名 + string base_table = 1; + + // マテビューの自動更新の有効化フラグ。 bool enable_refresh = 2; + + // マテビューの自動更新間隔 [分]。 int32 refresh_interval_minutes = 3; } message MaterializedViewField { - message Source { - string table = 1; - string field = 2; - } - Source source = 1; + // フィールドの参照元パス。 + // デフォルト: [message_name, field_paths...] + repeated string origin_path = 1; + + // このフィールドが、パーティション列であるかどうか。 bool is_partitioned = 2; + + // このフィールドが、クラスタ化列であるかどうか。 bool is_clustered = 3; }