p93542168
/
wheat-cache
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

!17 结构体模板化 

Merge pull request !17 from bandl/feat-struct-strings
This commit is contained in:
bandl 2021-09-18 07:28:31 +00:00 committed by Gitee
parent 414cd6d9a7 4405512540
commit f910e2c503
21 changed files with 801 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
View File

@ -7,7 +7,7 @@
### 描述（做了什么，变更了什么）
### 测试用例（新增、改动、可能影响的功能）
### 影响到的模块

4
conf/public_conf.go
View File

@ -20,9 +20,9 @@ func init() {
case nil:
case viper.ConfigFileNotFoundError:
formatPath := []string{linuxPath, devPath, devPath}
log.Fatalf("The profile could not be read, read path:%v", formatPath)
log.Fatalf("the profile could not be read, read path:%v", formatPath)
default:
log.Fatalf("The resolution of the profile failed, err: %v", err)
log.Fatalf("the resolution of the profile failed, err: %v", err)
}
}

5
doc/RDB + AOF 的事务解决方案.md Normal file
View File

@ -0,0 +1,5 @@
### RDB + AOF 的事务解决方案
![事务RDB方案](https://gitee.com/timedb/img/raw/master/images/事务RDB方案.svg)

6
doc/make/make.md
View File

@ -9,3 +9,9 @@ make dcgen
```shell
make build
```
### 启动 storage 服务
```shell
make dev
```
### 根据配置生成 结构体命令

11
makefile
View File

@ -11,4 +11,13 @@ build:
.PHONY: install
install:
@make build
@make build
.PHONY: dev
dev:
@./bin/storage storage
.PHONY: gen-struct
gen-struct:
@python3 ./shell/make-struct.py
@gofmt -w $(BASE_PATH)/structure/generate/structure.gen.go

166
pkg/proto/base.pb.go Normal file
View File

@ -0,0 +1,166 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.26.0
// protoc v3.17.3
// source: base.proto
package proto
import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
timestamppb "google.golang.org/protobuf/types/known/timestamppb"
reflect "reflect"
sync "sync"
)
const (
// Verify that this generated code is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
// Verify that runtime/protoimpl is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
type BaseKey struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
Ttl int64 `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"`
Expire *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expire,proto3" json:"expire,omitempty"`
}
func (x *BaseKey) Reset() {
*x = BaseKey{}
if protoimpl.UnsafeEnabled {
mi := &file_base_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *BaseKey) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*BaseKey) ProtoMessage() {}
func (x *BaseKey) ProtoReflect() protoreflect.Message {
mi := &file_base_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use BaseKey.ProtoReflect.Descriptor instead.
func (*BaseKey) Descriptor() ([]byte, []int) {
return file_base_proto_rawDescGZIP(), []int{0}
}
func (x *BaseKey) GetKey() string {
if x != nil {
return x.Key
}
return ""
}
func (x *BaseKey) GetTtl() int64 {
if x != nil {
return x.Ttl
}
return 0
}
func (x *BaseKey) GetExpire() *timestamppb.Timestamp {
if x != nil {
return x.Expire
}
return nil
}
var File_base_proto protoreflect.FileDescriptor
var file_base_proto_rawDesc = []byte{
0x0a, 0x0a, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 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, 0x22, 0x61, 0x0a,
0x07, 0x42, 0x61, 0x73, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x74,
0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x74, 0x74, 0x6c, 0x12, 0x32, 0x0a, 0x06,
0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x18, 0x03, 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, 0x52, 0x06, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65,
0x42, 0x0b, 0x5a, 0x09, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
file_base_proto_rawDescOnce sync.Once
file_base_proto_rawDescData = file_base_proto_rawDesc
)
func file_base_proto_rawDescGZIP() []byte {
file_base_proto_rawDescOnce.Do(func() {
file_base_proto_rawDescData = protoimpl.X.CompressGZIP(file_base_proto_rawDescData)
})
return file_base_proto_rawDescData
}
var file_base_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_base_proto_goTypes = []interface{}{
(*BaseKey)(nil), // 0: BaseKey
(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
}
var file_base_proto_depIdxs = []int32{
1, // 0: BaseKey.expire: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
}
func init() { file_base_proto_init() }
func file_base_proto_init() {
if File_base_proto != nil {
return
}
if !protoimpl.UnsafeEnabled {
file_base_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*BaseKey); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_base_proto_rawDesc,
NumEnums: 0,
NumMessages: 1,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_base_proto_goTypes,
DependencyIndexes: file_base_proto_depIdxs,
MessageInfos: file_base_proto_msgTypes,
}.Build()
File_base_proto = out.File
file_base_proto_rawDesc = nil
file_base_proto_goTypes = nil
file_base_proto_depIdxs = nil
}

101
storage/proto/storage.pb.go → pkg/proto/storage.pb.go
View File

@ -29,9 +29,9 @@ type Comm struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
Operation string `protobuf:"bytes,2,opt,name=Operation,proto3" json:"Operation,omitempty"`
Option []string `protobuf:"bytes,3,rep,name=Option,proto3" json:"Option,omitempty"`
// Types that are assignable to CommOption:
// *Comm_StringComm
CommOption isComm_CommOption `protobuf_oneof:"comm_option"`
}
func (x *Comm) Reset() {
@ -66,27 +66,30 @@ func (*Comm) Descriptor() ([]byte, []int) {
return file_storage_proto_rawDescGZIP(), []int{0}
}
func (x *Comm) GetKey() string {
if x != nil {
return x.Key
}
return ""
}
func (x *Comm) GetOperation() string {
if x != nil {
return x.Operation
}
return ""
}
func (x *Comm) GetOption() []string {
if x != nil {
return x.Option
func (m *Comm) GetCommOption() isComm_CommOption {
if m != nil {
return m.CommOption
}
return nil
}
func (x *Comm) GetStringComm() *StringxComm {
if x, ok := x.GetCommOption().(*Comm_StringComm); ok {
return x.StringComm
}
return nil
}
type isComm_CommOption interface {
isComm_CommOption()
}
type Comm_StringComm struct {
StringComm *StringxComm `protobuf:"bytes,1,opt,name=string_comm,json=stringComm,proto3,oneof"`
}
func (*Comm_StringComm) isComm_CommOption() {}
type CommendRequest struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -184,24 +187,24 @@ func (x *CommendResponse) GetResult() []string {
var File_storage_proto protoreflect.FileDescriptor
var file_storage_proto_rawDesc = []byte{
0x0a, 0x0d, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
0x4e, 0x0a, 0x04, 0x43, 0x6f, 0x6d, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x4f, 0x70, 0x65,
0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4f, 0x70,
0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x4f, 0x70, 0x74, 0x69, 0x6f,
0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22,
0x33, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
0x74, 0x12, 0x21, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d,
0x65, 0x6e, 0x64, 0x73, 0x22, 0x29, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52,
0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c,
0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x32,
0x3a, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x2c, 0x0a,
0x07, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x12, 0x0f, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65,
0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e, 0x43, 0x6f, 0x6d, 0x6d,
0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x0f, 0x5a, 0x0d, 0x73,
0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x33,
0x0a, 0x0d, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
0x0d, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x46,
0x0a, 0x04, 0x43, 0x6f, 0x6d, 0x6d, 0x12, 0x2f, 0x0a, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x53, 0x74,
0x72, 0x69, 0x6e, 0x67, 0x78, 0x43, 0x6f, 0x6d, 0x6d, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x74, 0x72,
0x69, 0x6e, 0x67, 0x43, 0x6f, 0x6d, 0x6d, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x5f,
0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x33, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e,
0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x6d,
0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x43, 0x6f, 0x6d,
0x6d, 0x52, 0x08, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x29, 0x0a, 0x0f, 0x43,
0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16,
0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x32, 0x3a, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x6d, 0x53, 0x65,
0x72, 0x76, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x07, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x12,
0x0f, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
0x1a, 0x10, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
0x73, 0x65, 0x42, 0x0b, 0x5a, 0x09, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -221,16 +224,18 @@ var file_storage_proto_goTypes = []interface{}{
(*Comm)(nil), // 0: Comm
(*CommendRequest)(nil), // 1: CommendRequest
(*CommendResponse)(nil), // 2: CommendResponse
(*StringxComm)(nil), // 3: StringxComm
}
var file_storage_proto_depIdxs = []int32{
0, // 0: CommendRequest.commends:type_name -> Comm
1, // 1: CommServer.Commend:input_type -> CommendRequest
2, // 2: CommServer.Commend:output_type -> CommendResponse
2, // [2:3] is the sub-list for method output_type
1, // [1:2] 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
3, // 0: Comm.string_comm:type_name -> StringxComm
0, // 1: CommendRequest.commends:type_name -> Comm
1, // 2: CommServer.Commend:input_type -> CommendRequest
2, // 3: CommServer.Commend:output_type -> CommendResponse
3, // [3:4] is the sub-list for method output_type
2, // [2:3] 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_storage_proto_init() }
@ -238,6 +243,7 @@ func file_storage_proto_init() {
if File_storage_proto != nil {
return
}
file_stringx_proto_init()
if !protoimpl.UnsafeEnabled {
file_storage_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Comm); i {
@ -276,6 +282,9 @@ func file_storage_proto_init() {
}
}
}
file_storage_proto_msgTypes[0].OneofWrappers = []interface{}{
(*Comm_StringComm)(nil),
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{

323
pkg/proto/stringx.pb.go Normal file
View File

@ -0,0 +1,323 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.26.0
// protoc v3.17.3
// source: stringx.proto
package proto
import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
)
const (
// Verify that this generated code is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
// Verify that runtime/protoimpl is sufficiently up-to-date.
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
type StringXSet struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Key *BaseKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
}
func (x *StringXSet) Reset() {
*x = StringXSet{}
if protoimpl.UnsafeEnabled {
mi := &file_stringx_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *StringXSet) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*StringXSet) ProtoMessage() {}
func (x *StringXSet) ProtoReflect() protoreflect.Message {
mi := &file_stringx_proto_msgTypes[0]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use StringXSet.ProtoReflect.Descriptor instead.
func (*StringXSet) Descriptor() ([]byte, []int) {
return file_stringx_proto_rawDescGZIP(), []int{0}
}
func (x *StringXSet) GetKey() *BaseKey {
if x != nil {
return x.Key
}
return nil
}
func (x *StringXSet) GetValue() string {
if x != nil {
return x.Value
}
return ""
}
type StringxGet struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Key *BaseKey `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
}
func (x *StringxGet) Reset() {
*x = StringxGet{}
if protoimpl.UnsafeEnabled {
mi := &file_stringx_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *StringxGet) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*StringxGet) ProtoMessage() {}
func (x *StringxGet) ProtoReflect() protoreflect.Message {
mi := &file_stringx_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use StringxGet.ProtoReflect.Descriptor instead.
func (*StringxGet) Descriptor() ([]byte, []int) {
return file_stringx_proto_rawDescGZIP(), []int{1}
}
func (x *StringxGet) GetKey() *BaseKey {
if x != nil {
return x.Key
}
return nil
}
type StringxComm struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
// Types that are assignable to StringXComm:
// *StringxComm_Get
// *StringxComm_Set
StringXComm isStringxComm_StringXComm `protobuf_oneof:"string_x_comm"`
}
func (x *StringxComm) Reset() {
*x = StringxComm{}
if protoimpl.UnsafeEnabled {
mi := &file_stringx_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *StringxComm) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*StringxComm) ProtoMessage() {}
func (x *StringxComm) ProtoReflect() protoreflect.Message {
mi := &file_stringx_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use StringxComm.ProtoReflect.Descriptor instead.
func (*StringxComm) Descriptor() ([]byte, []int) {
return file_stringx_proto_rawDescGZIP(), []int{2}
}
func (m *StringxComm) GetStringXComm() isStringxComm_StringXComm {
if m != nil {
return m.StringXComm
}
return nil
}
func (x *StringxComm) GetGet() *StringXSet {
if x, ok := x.GetStringXComm().(*StringxComm_Get); ok {
return x.Get
}
return nil
}
func (x *StringxComm) GetSet() *StringxGet {
if x, ok := x.GetStringXComm().(*StringxComm_Set); ok {
return x.Set
}
return nil
}
type isStringxComm_StringXComm interface {
isStringxComm_StringXComm()
}
type StringxComm_Get struct {
Get *StringXSet `protobuf:"bytes,1,opt,name=get,proto3,oneof"`
}
type StringxComm_Set struct {
Set *StringxGet `protobuf:"bytes,2,opt,name=set,proto3,oneof"`
}
func (*StringxComm_Get) isStringxComm_StringXComm() {}
func (*StringxComm_Set) isStringxComm_StringXComm() {}
var File_stringx_proto protoreflect.FileDescriptor
var file_stringx_proto_rawDesc = []byte{
0x0a, 0x0d, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
0x0a, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3e, 0x0a, 0x0a, 0x53,
0x74, 0x72, 0x69, 0x6e, 0x67, 0x58, 0x53, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x03, 0x6b, 0x65, 0x79,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x4b, 0x65, 0x79,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x28, 0x0a, 0x0a, 0x53,
0x74, 0x72, 0x69, 0x6e, 0x67, 0x78, 0x47, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x03, 0x6b, 0x65, 0x79,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x4b, 0x65, 0x79,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x60, 0x0a, 0x0b, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x78,
0x43, 0x6f, 0x6d, 0x6d, 0x12, 0x1f, 0x0a, 0x03, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x58, 0x53, 0x65, 0x74, 0x48, 0x00,
0x52, 0x03, 0x67, 0x65, 0x74, 0x12, 0x1f, 0x0a, 0x03, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x78, 0x47, 0x65, 0x74, 0x48,
0x00, 0x52, 0x03, 0x73, 0x65, 0x74, 0x42, 0x0f, 0x0a, 0x0d, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
0x5f, 0x78, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x42, 0x0b, 0x5a, 0x09, 0x70, 0x6b, 0x67, 0x2f, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
file_stringx_proto_rawDescOnce sync.Once
file_stringx_proto_rawDescData = file_stringx_proto_rawDesc
)
func file_stringx_proto_rawDescGZIP() []byte {
file_stringx_proto_rawDescOnce.Do(func() {
file_stringx_proto_rawDescData = protoimpl.X.CompressGZIP(file_stringx_proto_rawDescData)
})
return file_stringx_proto_rawDescData
}
var file_stringx_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_stringx_proto_goTypes = []interface{}{
(*StringXSet)(nil), // 0: StringXSet
(*StringxGet)(nil), // 1: StringxGet
(*StringxComm)(nil), // 2: StringxComm
(*BaseKey)(nil), // 3: BaseKey
}
var file_stringx_proto_depIdxs = []int32{
3, // 0: StringXSet.key:type_name -> BaseKey
3, // 1: StringxGet.key:type_name -> BaseKey
0, // 2: StringxComm.get:type_name -> StringXSet
1, // 3: StringxComm.set:type_name -> StringxGet
4, // [4:4] is the sub-list for method output_type
4, // [4:4] is the sub-list for method input_type
4, // [4:4] is the sub-list for extension type_name
4, // [4:4] is the sub-list for extension extendee
0, // [0:4] is the sub-list for field type_name
}
func init() { file_stringx_proto_init() }
func file_stringx_proto_init() {
if File_stringx_proto != nil {
return
}
file_base_proto_init()
if !protoimpl.UnsafeEnabled {
file_stringx_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*StringXSet); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_stringx_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*StringxGet); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_stringx_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*StringxComm); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
file_stringx_proto_msgTypes[2].OneofWrappers = []interface{}{
(*StringxComm_Get)(nil),
(*StringxComm_Set)(nil),
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_stringx_proto_rawDesc,
NumEnums: 0,
NumMessages: 3,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_stringx_proto_goTypes,
DependencyIndexes: file_stringx_proto_depIdxs,
MessageInfos: file_stringx_proto_msgTypes,
}.Build()
File_stringx_proto = out.File
file_stringx_proto_rawDesc = nil
file_stringx_proto_goTypes = nil
file_stringx_proto_depIdxs = nil
}

1
pkg/structure/define/define.go
View File

@ -1 +0,0 @@
package define

10
protobuf/base.proto Normal file
View File

@ -0,0 +1,10 @@
syntax = "proto3";
option go_package = "pkg/proto";
import "google/protobuf/timestamp.proto";
message BaseKey {
string key = 1;
int64 ttl = 2;
google.protobuf.Timestamp expire = 3;
}

9
proto/storage/storage.proto → protobuf/storage.proto
View File

@ -1,11 +1,12 @@
syntax = "proto3";
option go_package = "storage/proto";
option go_package = "pkg/proto";
import "stringx.proto";
message Comm {
string key = 1;
string Operation = 2;
repeated string Option = 3;
oneof comm_option {
StringxComm string_comm = 1;
}
}
message CommendRequest {

22
protobuf/stringx.proto Normal file
View File

@ -0,0 +1,22 @@
syntax = "proto3";
import "base.proto";
option go_package = "pkg/proto";
message StringXSet {
BaseKey key = 1;
string value = 2;
}
message StringxGet {
BaseKey key = 1;
}
message StringxComm {
oneof string_x_comm {
StringXSet get = 1;
StringxGet set = 2;
}
}

72
shell/make-struct.py Normal file
View File

@ -0,0 +1,72 @@
import os
from jinja2 import Template
import yaml
sysPath = os.getcwd()
tem_text = '''// Code generated by gen-struct. DO NOT EDIT.
// make gen-struct generated
package generate
const (
DEFAULT_KEY = iota
{% for key in keys %}
{{key}}
{% endfor %}
)
const (
DEFAULT_COMM = iota
{% for key in sets %}
{{key}}
{% endfor %}
)
var CommKey = map[string]int {
{% for kmp in key_maps %}
{% for comm in kmp.val %}
"{{comm}}": {{kmp.key}},
{% endfor %}
{% endfor %}
}
'''
class KeyMap(object):
def __init__(self, key, val) -> None:
self.key = key
self.val = val
def load_conf():
conf_path = f"{sysPath}/structure/generate/tem.yaml"
with open(conf_path, 'r', encoding='utf-8') as f:
cfg = f.read()
cfg = yaml.load(cfg)
return cfg
def set_structure_template(conf: dict):
keys = conf.keys()
key_map = []
val_set = []
for k, v in conf.items():
key_map.append(KeyMap(key=k, val=v))
for val in v:
val_set.append(val.upper() + "_COMM")
template = Template(tem_text)
text = template.render(keys=keys, key_maps=key_map, sets=val_set)
temp_path = f"{sysPath}/structure/generate/structure.gen.go"
with open(temp_path, 'w', encoding='utf-8') as f:
f.write(text)
if __name__ == "__main__":
conf = load_conf()
set_structure_template(conf)

6
shell/proto.py
View File

@ -1,10 +1,10 @@
import os
sysPath = os.getcwd()
protoPath = f"{sysPath}/proto"
protoPath = f"{sysPath}/protobuf"
comm = """
protoc --proto_path={} --go_out=plugins=grpc:{} {}
protoc --proto_path={} --proto_path={} --go_out=plugins=grpc:{} {}
"""
@ -12,7 +12,7 @@ def out_proto():
# 到达 storage
for root, dirs, files in os.walk(protoPath):
for f in files:
commend = comm.format(root, sysPath, f).strip()
commend = comm.format(protoPath, root, sysPath, f).strip()
err = os.system(commend)
if err:

2
storage/server/server.go
View File

@ -14,7 +14,7 @@ func NewServer() proto.CommServerServer {
func (s *server) Commend(
ctx context.Context,
request *proto.CommendRequest,
req *proto.CommendRequest,
) (*proto.CommendResponse, error) {
return nil, nil
}

15
structure/define.go Normal file
View File

@ -0,0 +1,15 @@
package structure
const (
STRING_X = iota
LIST_X
SET_X
Z_SET_X
)
// SetComm 操作描述
type SetComm struct {
Typ int
Opt string
Params []string
}

41
structure/generate/structure.gen.go Normal file
View File

@ -0,0 +1,41 @@
// Code generated by gen-struct. DO NOT EDIT.
// make gen-struct generated
package generate
const (
DEFAULT_KEY = iota
STRING_X
)
const (
DEFAULT_COMM = iota
SET_COMM
GET_COMM
ADD_COMM
REDUCE_COMM
SETBIT_COMM
GETBIT_COMM
)
var CommKey = map[string]int{
"set": STRING_X,
"get": STRING_X,
"add": STRING_X,
"reduce": STRING_X,
"setbit": STRING_X,
"getbit": STRING_X,
}

10
structure/generate/tem.yaml Normal file
View File

@ -0,0 +1,10 @@
# 这里定义结构体的支持的命令, 以后也许会添加结构体的命令验证
STRING_X:
- set
- get
- add
- reduce
- setbit
- getbit

8
pkg/structure/define/interface.go → structure/interface.go
View File

@ -1,4 +1,4 @@
package define
package structure
type CacheValue interface {
LengthByte() int64
@ -9,14 +9,14 @@ type ParseComm func(comm string) ([]string, error)
type CacheStruct interface {
SizeByte() int64
// RollBack 事务相关
// TODO RollBack 事务相关, V2 实现
RollBack() error
// Begin 事务相关, V2 实现
Begin() error
// Comment 事务相关, V2 实现
Comment() error
ParseCommend(comm ParseComm) ([]string, error)
GetValue(opt ...string) CacheValue
SetValue(opt ...string) error
Encode() ([]byte, error)
}

1
structure/stringx/option.go Normal file
View File

@ -0,0 +1 @@
package stringx

49
structure/stringx/string.go Normal file
View File

@ -0,0 +1,49 @@
package stringx
import (
"unsafe"
"gitee.com/timedb/wheatCache/structure"
)
type StringxInt struct {
val int
}
type StringxFloat struct {
val float64
}
type Stringx struct {
ValFloat StringxFloat
ValInt StringxInt
ValString string
}
func (s *Stringx) SizeByte() int64 {
size := unsafe.Sizeof(s)
return int64(size)
}
// RollBack 事务相关, V2 实现
func (s *Stringx) RollBack() error {
panic("not implemented") // TODO: Implement
}
// Begin 事务相关, V2 实现
func (s *Stringx) Begin() error {
panic("not implemented") // TODO: Implement
}
// RollBack 事务相关, V2 实现
func (s *Stringx) Comment() error {
panic("not implemented") // TODO: Implement
}
func (s *Stringx) ParseCommend(comm structure.ParseComm) ([]string, error) {
panic("not implemented") // TODO: Implement
}
func (s *Stringx) Encode() ([]byte, error) {
panic("not implemented") // TODO: Implement
}