Rewrite the store interface (#1335)

* WIP store rewrite * Fix memory store tests * Store hard expiry times rather than duration! * Clarify memory test * Add limit to store interface * Implement suffix option * Don't return nils from noop store * Fix syncmap * Start fixing store service * wip service and cache * Use _ for special characters in cockroachdb namespace * Improve cockroach namespace comment * Use service name as default store namespace * Fixes * Implement Store Scope * Start fixing etcd * implement read and write with expiry and prefix * Fix etcd tests * Fix cockroach store * Fix cloudflare interface * Fix certmagic / cloudflare store * comment lint * cache isn't implemented yet * Only prepare DB staements once Co-authored-by: Ben Toogood <ben@micro.mu> Co-authored-by: ben-toogood <bentoogood@gmail.com>
2020-03-12 13:41:30 +00:00
parent 20ce61da5a
commit 1b4e881d74
24 changed files with 1905 additions and 518 deletions
--- a/store/service/proto/store.pb.go
+++ b/store/service/proto/store.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
-// source: micro/go-micro/store/service/proto/store.proto
+// source: store.proto

 package go_micro_store

@@ -25,7 +25,7 @@ type Record struct {
 	Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// value in the record
 	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-	// timestamp in unix seconds
+	// time.Duration (signed int64 nanoseconds)
 	Expiry               int64    `protobuf:"varint,3,opt,name=expiry,proto3" json:"expiry,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -36,7 +36,7 @@ func (m *Record) Reset()         { *m = Record{} }
 func (m *Record) String() string { return proto.CompactTextString(m) }
 func (*Record) ProtoMessage()    {}
 func (*Record) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{0}
+	return fileDescriptor_98bbca36ef968dfc, []int{0}
 }

 func (m *Record) XXX_Unmarshal(b []byte) error {
@@ -80,6 +80,9 @@ func (m *Record) GetExpiry() int64 {

 type ReadOptions struct {
 	Prefix               bool     `protobuf:"varint,1,opt,name=prefix,proto3" json:"prefix,omitempty"`
+	Suffix               bool     `protobuf:"varint,2,opt,name=suffix,proto3" json:"suffix,omitempty"`
+	Limit                uint64   `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"`
+	Offset               uint64   `protobuf:"varint,4,opt,name=offset,proto3" json:"offset,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -89,7 +92,7 @@ func (m *ReadOptions) Reset()         { *m = ReadOptions{} }
 func (m *ReadOptions) String() string { return proto.CompactTextString(m) }
 func (*ReadOptions) ProtoMessage()    {}
 func (*ReadOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{1}
+	return fileDescriptor_98bbca36ef968dfc, []int{1}
 }

 func (m *ReadOptions) XXX_Unmarshal(b []byte) error {
@@ -117,6 +120,27 @@ func (m *ReadOptions) GetPrefix() bool {
 	return false
 }

+func (m *ReadOptions) GetSuffix() bool {
+	if m != nil {
+		return m.Suffix
+	}
+	return false
+}
+
+func (m *ReadOptions) GetLimit() uint64 {
+	if m != nil {
+		return m.Limit
+	}
+	return 0
+}
+
+func (m *ReadOptions) GetOffset() uint64 {
+	if m != nil {
+		return m.Offset
+	}
+	return 0
+}
+
 type ReadRequest struct {
 	Key                  string       `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	Options              *ReadOptions `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
@@ -129,7 +153,7 @@ func (m *ReadRequest) Reset()         { *m = ReadRequest{} }
 func (m *ReadRequest) String() string { return proto.CompactTextString(m) }
 func (*ReadRequest) ProtoMessage()    {}
 func (*ReadRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{2}
+	return fileDescriptor_98bbca36ef968dfc, []int{2}
 }

 func (m *ReadRequest) XXX_Unmarshal(b []byte) error {
@@ -175,7 +199,7 @@ func (m *ReadResponse) Reset()         { *m = ReadResponse{} }
 func (m *ReadResponse) String() string { return proto.CompactTextString(m) }
 func (*ReadResponse) ProtoMessage()    {}
 func (*ReadResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{3}
+	return fileDescriptor_98bbca36ef968dfc, []int{3}
 }

 func (m *ReadResponse) XXX_Unmarshal(b []byte) error {
@@ -203,18 +227,68 @@ func (m *ReadResponse) GetRecords() []*Record {
 	return nil
 }

-type WriteRequest struct {
-	Record               *Record  `protobuf:"bytes,1,opt,name=record,proto3" json:"record,omitempty"`
+type WriteOptions struct {
+	// time.Time
+	Expiry int64 `protobuf:"varint,1,opt,name=expiry,proto3" json:"expiry,omitempty"`
+	// time.Duration
+	Ttl                  int64    `protobuf:"varint,2,opt,name=ttl,proto3" json:"ttl,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 }

+func (m *WriteOptions) Reset()         { *m = WriteOptions{} }
+func (m *WriteOptions) String() string { return proto.CompactTextString(m) }
+func (*WriteOptions) ProtoMessage()    {}
+func (*WriteOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_98bbca36ef968dfc, []int{4}
+}
+
+func (m *WriteOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_WriteOptions.Unmarshal(m, b)
+}
+func (m *WriteOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_WriteOptions.Marshal(b, m, deterministic)
+}
+func (m *WriteOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_WriteOptions.Merge(m, src)
+}
+func (m *WriteOptions) XXX_Size() int {
+	return xxx_messageInfo_WriteOptions.Size(m)
+}
+func (m *WriteOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_WriteOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WriteOptions proto.InternalMessageInfo
+
+func (m *WriteOptions) GetExpiry() int64 {
+	if m != nil {
+		return m.Expiry
+	}
+	return 0
+}
+
+func (m *WriteOptions) GetTtl() int64 {
+	if m != nil {
+		return m.Ttl
+	}
+	return 0
+}
+
+type WriteRequest struct {
+	Record               *Record       `protobuf:"bytes,1,opt,name=record,proto3" json:"record,omitempty"`
+	Options              *WriteOptions `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
 func (m *WriteRequest) Reset()         { *m = WriteRequest{} }
 func (m *WriteRequest) String() string { return proto.CompactTextString(m) }
 func (*WriteRequest) ProtoMessage()    {}
 func (*WriteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{4}
+	return fileDescriptor_98bbca36ef968dfc, []int{5}
 }

 func (m *WriteRequest) XXX_Unmarshal(b []byte) error {
@@ -242,6 +316,13 @@ func (m *WriteRequest) GetRecord() *Record {
 	return nil
 }

+func (m *WriteRequest) GetOptions() *WriteOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
 type WriteResponse struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -252,7 +333,7 @@ func (m *WriteResponse) Reset()         { *m = WriteResponse{} }
 func (m *WriteResponse) String() string { return proto.CompactTextString(m) }
 func (*WriteResponse) ProtoMessage()    {}
 func (*WriteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{5}
+	return fileDescriptor_98bbca36ef968dfc, []int{6}
 }

 func (m *WriteResponse) XXX_Unmarshal(b []byte) error {
@@ -273,18 +354,50 @@ func (m *WriteResponse) XXX_DiscardUnknown() {

 var xxx_messageInfo_WriteResponse proto.InternalMessageInfo

-type DeleteRequest struct {
-	Key                  string   `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+type DeleteOptions struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 }

+func (m *DeleteOptions) Reset()         { *m = DeleteOptions{} }
+func (m *DeleteOptions) String() string { return proto.CompactTextString(m) }
+func (*DeleteOptions) ProtoMessage()    {}
+func (*DeleteOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_98bbca36ef968dfc, []int{7}
+}
+
+func (m *DeleteOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_DeleteOptions.Unmarshal(m, b)
+}
+func (m *DeleteOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_DeleteOptions.Marshal(b, m, deterministic)
+}
+func (m *DeleteOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_DeleteOptions.Merge(m, src)
+}
+func (m *DeleteOptions) XXX_Size() int {
+	return xxx_messageInfo_DeleteOptions.Size(m)
+}
+func (m *DeleteOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_DeleteOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_DeleteOptions proto.InternalMessageInfo
+
+type DeleteRequest struct {
+	Key                  string         `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	Options              *DeleteOptions `protobuf:"bytes,2,opt,name=options,proto3" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
+	XXX_unrecognized     []byte         `json:"-"`
+	XXX_sizecache        int32          `json:"-"`
+}
+
 func (m *DeleteRequest) Reset()         { *m = DeleteRequest{} }
 func (m *DeleteRequest) String() string { return proto.CompactTextString(m) }
 func (*DeleteRequest) ProtoMessage()    {}
 func (*DeleteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{6}
+	return fileDescriptor_98bbca36ef968dfc, []int{8}
 }

 func (m *DeleteRequest) XXX_Unmarshal(b []byte) error {
@@ -312,6 +425,13 @@ func (m *DeleteRequest) GetKey() string {
 	return ""
 }

+func (m *DeleteRequest) GetOptions() *DeleteOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
 type DeleteResponse struct {
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -322,7 +442,7 @@ func (m *DeleteResponse) Reset()         { *m = DeleteResponse{} }
 func (m *DeleteResponse) String() string { return proto.CompactTextString(m) }
 func (*DeleteResponse) ProtoMessage()    {}
 func (*DeleteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{7}
+	return fileDescriptor_98bbca36ef968dfc, []int{9}
 }

 func (m *DeleteResponse) XXX_Unmarshal(b []byte) error {
@@ -343,17 +463,81 @@ func (m *DeleteResponse) XXX_DiscardUnknown() {

 var xxx_messageInfo_DeleteResponse proto.InternalMessageInfo

-type ListRequest struct {
+type ListOptions struct {
+	Prefix               string   `protobuf:"bytes,1,opt,name=prefix,proto3" json:"prefix,omitempty"`
+	Suffix               string   `protobuf:"bytes,2,opt,name=suffix,proto3" json:"suffix,omitempty"`
+	Limit                uint64   `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"`
+	Offset               uint64   `protobuf:"varint,4,opt,name=offset,proto3" json:"offset,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 }

+func (m *ListOptions) Reset()         { *m = ListOptions{} }
+func (m *ListOptions) String() string { return proto.CompactTextString(m) }
+func (*ListOptions) ProtoMessage()    {}
+func (*ListOptions) Descriptor() ([]byte, []int) {
+	return fileDescriptor_98bbca36ef968dfc, []int{10}
+}
+
+func (m *ListOptions) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ListOptions.Unmarshal(m, b)
+}
+func (m *ListOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ListOptions.Marshal(b, m, deterministic)
+}
+func (m *ListOptions) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ListOptions.Merge(m, src)
+}
+func (m *ListOptions) XXX_Size() int {
+	return xxx_messageInfo_ListOptions.Size(m)
+}
+func (m *ListOptions) XXX_DiscardUnknown() {
+	xxx_messageInfo_ListOptions.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ListOptions proto.InternalMessageInfo
+
+func (m *ListOptions) GetPrefix() string {
+	if m != nil {
+		return m.Prefix
+	}
+	return ""
+}
+
+func (m *ListOptions) GetSuffix() string {
+	if m != nil {
+		return m.Suffix
+	}
+	return ""
+}
+
+func (m *ListOptions) GetLimit() uint64 {
+	if m != nil {
+		return m.Limit
+	}
+	return 0
+}
+
+func (m *ListOptions) GetOffset() uint64 {
+	if m != nil {
+		return m.Offset
+	}
+	return 0
+}
+
+type ListRequest struct {
+	Options              *ListOptions `protobuf:"bytes,1,opt,name=options,proto3" json:"options,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
+	XXX_unrecognized     []byte       `json:"-"`
+	XXX_sizecache        int32        `json:"-"`
+}
+
 func (m *ListRequest) Reset()         { *m = ListRequest{} }
 func (m *ListRequest) String() string { return proto.CompactTextString(m) }
 func (*ListRequest) ProtoMessage()    {}
 func (*ListRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{8}
+	return fileDescriptor_98bbca36ef968dfc, []int{11}
 }

 func (m *ListRequest) XXX_Unmarshal(b []byte) error {
@@ -374,18 +558,25 @@ func (m *ListRequest) XXX_DiscardUnknown() {

 var xxx_messageInfo_ListRequest proto.InternalMessageInfo

+func (m *ListRequest) GetOptions() *ListOptions {
+	if m != nil {
+		return m.Options
+	}
+	return nil
+}
+
 type ListResponse struct {
-	Records              []*Record `protobuf:"bytes,1,rep,name=records,proto3" json:"records,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}  `json:"-"`
-	XXX_unrecognized     []byte    `json:"-"`
-	XXX_sizecache        int32     `json:"-"`
+	Keys                 []string `protobuf:"bytes,2,rep,name=keys,proto3" json:"keys,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
 }

 func (m *ListResponse) Reset()         { *m = ListResponse{} }
 func (m *ListResponse) String() string { return proto.CompactTextString(m) }
 func (*ListResponse) ProtoMessage()    {}
 func (*ListResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_f84ccc98e143ed3e, []int{9}
+	return fileDescriptor_98bbca36ef968dfc, []int{12}
 }

 func (m *ListResponse) XXX_Unmarshal(b []byte) error {
@@ -406,9 +597,9 @@ func (m *ListResponse) XXX_DiscardUnknown() {

 var xxx_messageInfo_ListResponse proto.InternalMessageInfo

-func (m *ListResponse) GetRecords() []*Record {
+func (m *ListResponse) GetKeys() []string {
 	if m != nil {
-		return m.Records
+		return m.Keys
 	}
 	return nil
 }
@@ -418,41 +609,48 @@ func init() {
 	proto.RegisterType((*ReadOptions)(nil), "go.micro.store.ReadOptions")
 	proto.RegisterType((*ReadRequest)(nil), "go.micro.store.ReadRequest")
 	proto.RegisterType((*ReadResponse)(nil), "go.micro.store.ReadResponse")
+	proto.RegisterType((*WriteOptions)(nil), "go.micro.store.WriteOptions")
 	proto.RegisterType((*WriteRequest)(nil), "go.micro.store.WriteRequest")
 	proto.RegisterType((*WriteResponse)(nil), "go.micro.store.WriteResponse")
+	proto.RegisterType((*DeleteOptions)(nil), "go.micro.store.DeleteOptions")
 	proto.RegisterType((*DeleteRequest)(nil), "go.micro.store.DeleteRequest")
 	proto.RegisterType((*DeleteResponse)(nil), "go.micro.store.DeleteResponse")
+	proto.RegisterType((*ListOptions)(nil), "go.micro.store.ListOptions")
 	proto.RegisterType((*ListRequest)(nil), "go.micro.store.ListRequest")
 	proto.RegisterType((*ListResponse)(nil), "go.micro.store.ListResponse")
 }

-func init() {
-	proto.RegisterFile("micro/go-micro/store/service/proto/store.proto", fileDescriptor_f84ccc98e143ed3e)
-}
+func init() { proto.RegisterFile("store.proto", fileDescriptor_98bbca36ef968dfc) }

-var fileDescriptor_f84ccc98e143ed3e = []byte{
-	// 364 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x4d, 0x4b, 0xc3, 0x40,
-	0x10, 0x6d, 0x9a, 0x36, 0xd5, 0x49, 0x5b, 0xcb, 0x22, 0x25, 0xd4, 0x0f, 0xe2, 0x82, 0x90, 0x8b,
-	0x69, 0xa9, 0x78, 0x15, 0xc1, 0x0f, 0x14, 0x04, 0x61, 0x05, 0x3d, 0xd7, 0x76, 0x2c, 0xc1, 0xda,
-	0x8d, 0xbb, 0x69, 0x69, 0xff, 0x90, 0xbf, 0x53, 0xb2, 0xbb, 0xd1, 0x94, 0x34, 0x17, 0x6f, 0x33,
-	0xfb, 0xde, 0xbc, 0x99, 0x79, 0xc3, 0x42, 0xf8, 0x19, 0x8d, 0x05, 0xef, 0x4f, 0xf9, 0x99, 0x0e,
-	0x64, 0xc2, 0x05, 0xf6, 0x25, 0x8a, 0x65, 0x34, 0xc6, 0x7e, 0x2c, 0x78, 0x62, 0xde, 0x42, 0x15,
-	0x93, 0xf6, 0x94, 0xeb, 0x92, 0x50, 0xbd, 0xd2, 0x7b, 0x70, 0x18, 0x8e, 0xb9, 0x98, 0x90, 0x0e,
-	0xd8, 0x1f, 0xb8, 0xf6, 0x2c, 0xdf, 0x0a, 0x76, 0x59, 0x1a, 0x92, 0x7d, 0xa8, 0x2f, 0x47, 0xb3,
-	0x05, 0x7a, 0x55, 0xdf, 0x0a, 0x9a, 0x4c, 0x27, 0xa4, 0x0b, 0x0e, 0xae, 0xe2, 0x48, 0xac, 0x3d,
-	0xdb, 0xb7, 0x02, 0x9b, 0x99, 0x8c, 0x9e, 0x82, 0xcb, 0x70, 0x34, 0x79, 0x8a, 0x93, 0x88, 0xcf,
-	0x65, 0x4a, 0x8b, 0x05, 0xbe, 0x47, 0x2b, 0xa5, 0xb8, 0xc3, 0x4c, 0x46, 0x5f, 0x34, 0x8d, 0xe1,
-	0xd7, 0x02, 0x65, 0xb2, 0xa5, 0xeb, 0x05, 0x34, 0xb8, 0xd6, 0x50, 0x7d, 0xdd, 0xe1, 0x41, 0xb8,
-	0x39, 0x73, 0x98, 0x6b, 0xc3, 0x32, 0x2e, 0xbd, 0x82, 0xa6, 0xd6, 0x95, 0x31, 0x9f, 0x4b, 0x24,
-	0x03, 0x68, 0x08, 0xb5, 0x98, 0xf4, 0x2c, 0xdf, 0x0e, 0xdc, 0x61, 0xb7, 0x28, 0x93, 0xc2, 0x2c,
-	0xa3, 0xd1, 0x4b, 0x68, 0xbe, 0x8a, 0x28, 0xc1, 0x6c, 0xb4, 0x10, 0x1c, 0x0d, 0xa9, 0xe9, 0xca,
-	0x05, 0x0c, 0x8b, 0xee, 0x41, 0xcb, 0xd4, 0xeb, 0x11, 0xe8, 0x09, 0xb4, 0x6e, 0x70, 0x86, 0x7f,
-	0x8a, 0x85, 0x65, 0x69, 0x07, 0xda, 0x19, 0xc5, 0x14, 0xb5, 0xc0, 0x7d, 0x8c, 0x64, 0x62, 0x4a,
-	0xd2, 0xb5, 0x74, 0xfa, 0xdf, 0xb5, 0x86, 0xdf, 0x55, 0xa8, 0x3f, 0xa7, 0x08, 0xb9, 0x85, 0x5a,
-	0xaa, 0x45, 0x0a, 0x86, 0xe6, 0x1a, 0xf6, 0x0e, 0xb7, 0x83, 0x66, 0xba, 0xca, 0xc0, 0x22, 0xd7,
-	0x50, 0x4b, 0x9d, 0x26, 0x5b, 0xef, 0x52, 0x2a, 0x93, 0x3f, 0x0e, 0xad, 0x90, 0x3b, 0xa8, 0x2b,
-	0xb3, 0x48, 0x81, 0x98, 0xbf, 0x41, 0xef, 0xa8, 0x04, 0xfd, 0xd5, 0x79, 0x00, 0x47, 0x1b, 0x48,
-	0x0a, 0xd4, 0x0d, 0xef, 0x7b, 0xc7, 0x65, 0x70, 0x26, 0xf5, 0xe6, 0xa8, 0x1f, 0x72, 0xfe, 0x13,
-	0x00, 0x00, 0xff, 0xff, 0xf9, 0x20, 0x54, 0x71, 0x53, 0x03, 0x00, 0x00,
+var fileDescriptor_98bbca36ef968dfc = []byte{
+	// 463 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5d, 0x6b, 0xd4, 0x40,
+	0x14, 0xed, 0x6c, 0xb2, 0x69, 0xf7, 0x26, 0xd6, 0x65, 0x90, 0x12, 0xb4, 0x95, 0x30, 0x4f, 0x79,
+	0x0a, 0x65, 0xc5, 0x8f, 0x47, 0xc1, 0x2a, 0x2a, 0x82, 0x30, 0x82, 0x82, 0x6f, 0xb5, 0x9d, 0xc8,
+	0x90, 0xb4, 0x13, 0x67, 0x66, 0x4b, 0xf7, 0x0f, 0xf9, 0x3b, 0x65, 0xbe, 0x76, 0xb3, 0x31, 0x79,
+	0xe9, 0x5b, 0xee, 0x9d, 0x3b, 0xe7, 0xdc, 0x73, 0xe6, 0x10, 0x48, 0x95, 0x16, 0x92, 0x55, 0x9d,
+	0x14, 0x5a, 0xe0, 0xe3, 0xdf, 0xa2, 0xba, 0xe1, 0x57, 0x52, 0x54, 0xb6, 0x4b, 0x3e, 0x42, 0x42,
+	0xd9, 0x95, 0x90, 0xd7, 0x78, 0x09, 0x51, 0xc3, 0x36, 0x39, 0x2a, 0x50, 0xb9, 0xa0, 0xe6, 0x13,
+	0x3f, 0x81, 0xf9, 0xdd, 0x65, 0xbb, 0x66, 0xf9, 0xac, 0x40, 0x65, 0x46, 0x5d, 0x81, 0x4f, 0x20,
+	0x61, 0xf7, 0x1d, 0x97, 0x9b, 0x3c, 0x2a, 0x50, 0x19, 0x51, 0x5f, 0x91, 0x06, 0x52, 0xca, 0x2e,
+	0xaf, 0xbf, 0x76, 0x9a, 0x8b, 0x5b, 0x65, 0xc6, 0x3a, 0xc9, 0x6a, 0x7e, 0x6f, 0x11, 0x8f, 0xa8,
+	0xaf, 0x4c, 0x5f, 0xad, 0x6b, 0xd3, 0x9f, 0xb9, 0xbe, 0xab, 0x0c, 0x59, 0xcb, 0x6f, 0xb8, 0xb6,
+	0xa8, 0x31, 0x75, 0x85, 0x99, 0x16, 0x75, 0xad, 0x98, 0xce, 0x63, 0xdb, 0xf6, 0x15, 0xf9, 0xee,
+	0xc8, 0x28, 0xfb, 0xb3, 0x66, 0x4a, 0x8f, 0xec, 0xfe, 0x12, 0x0e, 0x85, 0xdb, 0xc4, 0xf2, 0xa4,
+	0xab, 0x67, 0xd5, 0xbe, 0xf2, 0xaa, 0xb7, 0x2c, 0x0d, 0xb3, 0xe4, 0x2d, 0x64, 0x0e, 0x57, 0x75,
+	0xe2, 0x56, 0x31, 0x7c, 0x0e, 0x87, 0xd2, 0xda, 0xa3, 0x72, 0x54, 0x44, 0x65, 0xba, 0x3a, 0xf9,
+	0x1f, 0xc6, 0x1c, 0xd3, 0x30, 0x46, 0xde, 0x40, 0xf6, 0x43, 0x72, 0xcd, 0x7a, 0x3e, 0x78, 0xbb,
+	0x50, 0xdf, 0x2e, 0xb3, 0xb2, 0xd6, 0xad, 0x5d, 0x2e, 0xa2, 0xe6, 0x93, 0xdc, 0xf9, 0x9b, 0x41,
+	0x54, 0x05, 0x89, 0x03, 0xb5, 0x37, 0xa7, 0xa9, 0xfd, 0x14, 0x7e, 0x35, 0x94, 0x7c, 0x3a, 0xbc,
+	0xd0, 0x5f, 0x6c, 0xa7, 0xf9, 0x31, 0x3c, 0xf2, 0xbc, 0x4e, 0xb4, 0x69, 0x5c, 0xb0, 0x96, 0x6d,
+	0x47, 0xc9, 0xcf, 0xd0, 0x98, 0xf6, 0xfb, 0xf5, 0x90, 0xfc, 0x6c, 0x48, 0xbe, 0x07, 0xb9, 0x63,
+	0x5f, 0xc2, 0x71, 0xc0, 0xf6, 0xf4, 0x0d, 0xa4, 0x5f, 0xb8, 0xd2, 0xe3, 0x41, 0x5a, 0x4c, 0x04,
+	0x69, 0xf1, 0xc0, 0x20, 0x5d, 0x38, 0xb2, 0x20, 0xac, 0x17, 0x1b, 0x34, 0x1e, 0x9b, 0xde, 0x6a,
+	0x3b, 0x11, 0x25, 0x64, 0x0e, 0xc5, 0xc7, 0x06, 0x43, 0xdc, 0xb0, 0x8d, 0xb1, 0x22, 0x2a, 0x17,
+	0xd4, 0x7e, 0x7f, 0x8e, 0x8f, 0xd0, 0x72, 0xb6, 0xfa, 0x3b, 0x83, 0xf9, 0x37, 0x03, 0x84, 0xdf,
+	0x41, 0x6c, 0xa2, 0x86, 0x47, 0x83, 0xe9, 0xf7, 0x79, 0x7a, 0x3a, 0x7e, 0xe8, 0x9d, 0x3a, 0xc0,
+	0x1f, 0x60, 0x6e, 0xdf, 0x0e, 0x8f, 0xbf, 0x75, 0x80, 0x39, 0x9b, 0x38, 0xdd, 0xe2, 0x7c, 0x82,
+	0xc4, 0xbd, 0x02, 0x9e, 0x78, 0xb7, 0x80, 0xf4, 0x7c, 0xea, 0x78, 0x0b, 0xf5, 0x1e, 0x62, 0xe3,
+	0x05, 0x1e, 0x75, 0x6e, 0x52, 0x57, 0xdf, 0x3e, 0x72, 0x70, 0x8e, 0x7e, 0x25, 0xf6, 0x7f, 0xf5,
+	0xe2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x11, 0xc3, 0x50, 0xbe, 0x04, 0x00, 0x00,
 }
--- a/store/service/proto/store.pb.micro.go
+++ b/store/service/proto/store.pb.micro.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-micro. DO NOT EDIT.
-// source: micro/go-micro/store/service/proto/store.proto
+// source: store.proto

 package go_micro_store

@@ -34,10 +34,10 @@ var _ server.Option
 // Client API for Store service

 type StoreService interface {
-	List(ctx context.Context, in *ListRequest, opts ...client.CallOption) (Store_ListService, error)
 	Read(ctx context.Context, in *ReadRequest, opts ...client.CallOption) (*ReadResponse, error)
 	Write(ctx context.Context, in *WriteRequest, opts ...client.CallOption) (*WriteResponse, error)
 	Delete(ctx context.Context, in *DeleteRequest, opts ...client.CallOption) (*DeleteResponse, error)
+	List(ctx context.Context, in *ListRequest, opts ...client.CallOption) (Store_ListService, error)
 }

 type storeService struct {
@@ -46,62 +46,12 @@ type storeService struct {
 }

 func NewStoreService(name string, c client.Client) StoreService {
-	if c == nil {
-		c = client.NewClient()
-	}
-	if len(name) == 0 {
-		name = "go.micro.store"
-	}
 	return &storeService{
 		c:    c,
 		name: name,
 	}
 }

-func (c *storeService) List(ctx context.Context, in *ListRequest, opts ...client.CallOption) (Store_ListService, error) {
-	req := c.c.NewRequest(c.name, "Store.List", &ListRequest{})
-	stream, err := c.c.Stream(ctx, req, opts...)
-	if err != nil {
-		return nil, err
-	}
-	if err := stream.Send(in); err != nil {
-		return nil, err
-	}
-	return &storeServiceList{stream}, nil
-}
-
-type Store_ListService interface {
-	SendMsg(interface{}) error
-	RecvMsg(interface{}) error
-	Close() error
-	Recv() (*ListResponse, error)
-}
-
-type storeServiceList struct {
-	stream client.Stream
-}
-
-func (x *storeServiceList) Close() error {
-	return x.stream.Close()
-}
-
-func (x *storeServiceList) SendMsg(m interface{}) error {
-	return x.stream.Send(m)
-}
-
-func (x *storeServiceList) RecvMsg(m interface{}) error {
-	return x.stream.Recv(m)
-}
-
-func (x *storeServiceList) Recv() (*ListResponse, error) {
-	m := new(ListResponse)
-	err := x.stream.Recv(m)
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
 func (c *storeService) Read(ctx context.Context, in *ReadRequest, opts ...client.CallOption) (*ReadResponse, error) {
 	req := c.c.NewRequest(c.name, "Store.Read", in)
 	out := new(ReadResponse)
@@ -132,21 +82,70 @@ func (c *storeService) Delete(ctx context.Context, in *DeleteRequest, opts ...cl
 	return out, nil
 }

+func (c *storeService) List(ctx context.Context, in *ListRequest, opts ...client.CallOption) (Store_ListService, error) {
+	req := c.c.NewRequest(c.name, "Store.List", &ListRequest{})
+	stream, err := c.c.Stream(ctx, req, opts...)
+	if err != nil {
+		return nil, err
+	}
+	if err := stream.Send(in); err != nil {
+		return nil, err
+	}
+	return &storeServiceList{stream}, nil
+}
+
+type Store_ListService interface {
+	Context() context.Context
+	SendMsg(interface{}) error
+	RecvMsg(interface{}) error
+	Close() error
+	Recv() (*ListResponse, error)
+}
+
+type storeServiceList struct {
+	stream client.Stream
+}
+
+func (x *storeServiceList) Close() error {
+	return x.stream.Close()
+}
+
+func (x *storeServiceList) Context() context.Context {
+	return x.stream.Context()
+}
+
+func (x *storeServiceList) SendMsg(m interface{}) error {
+	return x.stream.Send(m)
+}
+
+func (x *storeServiceList) RecvMsg(m interface{}) error {
+	return x.stream.Recv(m)
+}
+
+func (x *storeServiceList) Recv() (*ListResponse, error) {
+	m := new(ListResponse)
+	err := x.stream.Recv(m)
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 // Server API for Store service

 type StoreHandler interface {
-	List(context.Context, *ListRequest, Store_ListStream) error
 	Read(context.Context, *ReadRequest, *ReadResponse) error
 	Write(context.Context, *WriteRequest, *WriteResponse) error
 	Delete(context.Context, *DeleteRequest, *DeleteResponse) error
+	List(context.Context, *ListRequest, Store_ListStream) error
 }

 func RegisterStoreHandler(s server.Server, hdlr StoreHandler, opts ...server.HandlerOption) error {
 	type store interface {
-		List(ctx context.Context, stream server.Stream) error
 		Read(ctx context.Context, in *ReadRequest, out *ReadResponse) error
 		Write(ctx context.Context, in *WriteRequest, out *WriteResponse) error
 		Delete(ctx context.Context, in *DeleteRequest, out *DeleteResponse) error
+		List(ctx context.Context, stream server.Stream) error
 	}
 	type Store struct {
 		store
@@ -159,6 +158,18 @@ type storeHandler struct {
 	StoreHandler
 }

+func (h *storeHandler) Read(ctx context.Context, in *ReadRequest, out *ReadResponse) error {
+	return h.StoreHandler.Read(ctx, in, out)
+}
+
+func (h *storeHandler) Write(ctx context.Context, in *WriteRequest, out *WriteResponse) error {
+	return h.StoreHandler.Write(ctx, in, out)
+}
+
+func (h *storeHandler) Delete(ctx context.Context, in *DeleteRequest, out *DeleteResponse) error {
+	return h.StoreHandler.Delete(ctx, in, out)
+}
+
 func (h *storeHandler) List(ctx context.Context, stream server.Stream) error {
 	m := new(ListRequest)
 	if err := stream.Recv(m); err != nil {
@@ -168,6 +179,7 @@ func (h *storeHandler) List(ctx context.Context, stream server.Stream) error {
 }

 type Store_ListStream interface {
+	Context() context.Context
 	SendMsg(interface{}) error
 	RecvMsg(interface{}) error
 	Close() error
@@ -182,6 +194,10 @@ func (x *storeListStream) Close() error {
 	return x.stream.Close()
 }

+func (x *storeListStream) Context() context.Context {
+	return x.stream.Context()
+}
+
 func (x *storeListStream) SendMsg(m interface{}) error {
 	return x.stream.Send(m)
 }
@@ -193,15 +209,3 @@ func (x *storeListStream) RecvMsg(m interface{}) error {
 func (x *storeListStream) Send(m *ListResponse) error {
 	return x.stream.Send(m)
 }
-
-func (h *storeHandler) Read(ctx context.Context, in *ReadRequest, out *ReadResponse) error {
-	return h.StoreHandler.Read(ctx, in, out)
-}
-
-func (h *storeHandler) Write(ctx context.Context, in *WriteRequest, out *WriteResponse) error {
-	return h.StoreHandler.Write(ctx, in, out)
-}
-
-func (h *storeHandler) Delete(ctx context.Context, in *DeleteRequest, out *DeleteResponse) error {
-	return h.StoreHandler.Delete(ctx, in, out)
-}
--- a/store/service/proto/store.proto
+++ b/store/service/proto/store.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 package go.micro.store;

 service Store {
-	rpc List(ListRequest) returns (stream ListResponse) {};
 	rpc Read(ReadRequest) returns (ReadResponse) {};
 	rpc Write(WriteRequest) returns (WriteResponse) {};
 	rpc Delete(DeleteRequest) returns (DeleteResponse) {};
+	rpc List(ListRequest) returns (stream ListResponse) {};
 }

 message Record {
@@ -14,16 +14,19 @@ message Record {
 	string key = 1;
 	// value in the record
 	bytes value = 2;
-	// timestamp in unix seconds
+	// time.Duration (signed int64 nanoseconds)
 	int64 expiry = 3;
 }

 message ReadOptions {
-	bool prefix = 1;
+	bool prefix   = 1;
+	bool suffix   = 2;
+	uint64 limit  = 3;
+	uint64 offset = 4;
 }

 message ReadRequest {
-	string key = 1;
+	string key          = 1;
 	ReadOptions options = 2;
 }

@@ -31,20 +34,41 @@ message ReadResponse {
 	repeated Record records = 1;
 }

+message WriteOptions {
+	// time.Time
+	int64 expiry = 1;
+	// time.Duration
+	int64 ttl = 2;
+}
+
 message WriteRequest {
-	Record record = 1;
+	Record record        = 1;
+	WriteOptions options = 2;
 }

 message WriteResponse {}

+message DeleteOptions {}
+
 message DeleteRequest {
-	string key = 1;
+	string key            = 1;
+	DeleteOptions options = 2;
 }

 message DeleteResponse {}

-message ListRequest {}
+message ListOptions {
+	string prefix = 1;
+	string suffix = 2;
+	uint64 limit  = 3;
+	uint64 offset = 4;
+}
+
+message ListRequest {
+	ListOptions options = 1;
+}

 message ListResponse {
-	repeated Record records = 1;
+	reserved 1; //repeated Record records = 1;
+	repeated string keys = 2;
 }
--- a/store/service/service.go
+++ b/store/service/service.go
@@ -24,6 +24,9 @@ type serviceStore struct {
 	// Prefix to use
 	Prefix string

+	// Suffix to use
+	Suffix string
+
 	// store service client
 	Client pb.StoreService
 }
@@ -56,14 +59,14 @@ func (s *serviceStore) Context() context.Context {
 }

 // Sync all the known records
-func (s *serviceStore) List() ([]*store.Record, error) {
+func (s *serviceStore) List(opts ...store.ListOption) ([]string, error) {
 	stream, err := s.Client.List(s.Context(), &pb.ListRequest{}, client.WithAddress(s.Nodes...))
 	if err != nil {
 		return nil, err
 	}
 	defer stream.Close()

-	var records []*store.Record
+	var keys []string

 	for {
 		rsp, err := stream.Recv()
@@ -71,19 +74,15 @@ func (s *serviceStore) List() ([]*store.Record, error) {
 			break
 		}
 		if err != nil {
-			return records, err
+			return keys, err
 		}

-		for _, record := range rsp.Records {
-			records = append(records, &store.Record{
-				Key:    record.Key,
-				Value:  record.Value,
-				Expiry: time.Duration(record.Expiry) * time.Second,
-			})
+		for _, key := range rsp.Keys {
+			keys = append(keys, key)
 		}
 	}

-	return records, nil
+	return keys, nil
 }

 // Read a record with key
@@ -117,7 +116,7 @@ func (s *serviceStore) Read(key string, opts ...store.ReadOption) ([]*store.Reco
 }

 // Write a record
-func (s *serviceStore) Write(record *store.Record) error {
+func (s *serviceStore) Write(record *store.Record, opts ...store.WriteOption) error {
 	_, err := s.Client.Write(s.Context(), &pb.WriteRequest{
 		Record: &pb.Record{
 			Key:    record.Key,
@@ -130,7 +129,7 @@ func (s *serviceStore) Write(record *store.Record) error {
 }

 // Delete a record with key
-func (s *serviceStore) Delete(key string) error {
+func (s *serviceStore) Delete(key string, opts ...store.DeleteOption) error {
 	_, err := s.Client.Delete(s.Context(), &pb.DeleteRequest{
 		Key: key,
 	}, client.WithAddress(s.Nodes...))
@@ -141,6 +140,10 @@ func (s *serviceStore) String() string {
 	return "service"
 }

+func (s *serviceStore) Options() store.Options {
+	return s.options
+}
+
 // NewStore returns a new store service implementation
 func NewStore(opts ...store.Option) store.Store {
 	var options store.Options