feat(structure-tools): add structure tools

This commit is contained in:
bandl 2021-09-16 20:43:03 +08:00
parent 40dd0dd91a
commit b902c8cc1f
14 changed files with 650 additions and 15 deletions

View File

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

View File

@ -1 +0,0 @@
package structure

View File

@ -0,0 +1,8 @@
syntax = "proto3";
option go_package = "structure/proto";
message BaseKey {
string key = 1;
int64 ttl = 2;
}

View File

@ -0,0 +1,21 @@
syntax = "proto3";
import "base.proto";
option go_package = "structure/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)

View File

@ -4,7 +4,7 @@ sysPath = os.getcwd()
protoPath = f"{sysPath}/proto" protoPath = f"{sysPath}/proto"
comm = """ 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 # 到达 storage
for root, dirs, files in os.walk(protoPath): for root, dirs, files in os.walk(protoPath):
for f in files: for f in files:
commend = comm.format(root, sysPath, f).strip() commend = comm.format(protoPath, root, sysPath, f).strip()
err = os.system(commend) err = os.system(commend)
if err: if err:

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
}

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,
}

View File

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

View File

@ -17,8 +17,6 @@ type CacheStruct interface {
Comment() error Comment() error
ParseCommend(comm ParseComm) ([]string, error) ParseCommend(comm ParseComm) ([]string, error)
GetValue(opt ...string) CacheValue
SetValue(opt ...string) error
Encode() ([]byte, error) Encode() ([]byte, error)
} }

150
structure/proto/base.pb.go Normal file
View File

@ -0,0 +1,150 @@
// 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"
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"`
}
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
}
var File_base_proto protoreflect.FileDescriptor
var file_base_proto_rawDesc = []byte{
0x0a, 0x0a, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2d, 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, 0x42, 0x11, 0x5a, 0x0f, 0x73,
0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 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
}
var file_base_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
0, // [0:0] is the sub-list for method input_type
0, // [0:0] is the sub-list for extension type_name
0, // [0:0] is the sub-list for extension extendee
0, // [0:0] 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
}

View File

@ -0,0 +1,324 @@
// 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, 0x11, 0x5a, 0x0f, 0x73, 0x74, 0x72, 0x75, 0x63,
0x74, 0x75, 0x72, 0x65, 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
}

View File

@ -3,7 +3,7 @@ package stringx
import ( import (
"unsafe" "unsafe"
structure "gitee.com/timedb/wheatCache/pkg/structure/define" "gitee.com/timedb/wheatCache/pkg/structure"
) )
type StringxInt struct { type StringxInt struct {
@ -44,14 +44,6 @@ func (s *Stringx) ParseCommend(comm structure.ParseComm) ([]string, error) {
panic("not implemented") // TODO: Implement panic("not implemented") // TODO: Implement
} }
func (s *Stringx) GetValue(opt ...string) structure.CacheValue {
panic("not implemented") // TODO: Implement
}
func (s *Stringx) SetValue(opt ...string) error {
panic("not implemented") // TODO: Implement
}
func (s *Stringx) Encode() ([]byte, error) { func (s *Stringx) Encode() ([]byte, error) {
panic("not implemented") // TODO: Implement panic("not implemented") // TODO: Implement
} }