Skip to content

Commit 017eb12

Browse files
asimasim
committed
fix build
1 parent c80c7a4 commit 017eb12

File tree

3 files changed

+49
-49
lines changed

3 files changed

+49
-49
lines changed

‎store/file/file.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var (
2727
dataBucket = "data"
2828
)
2929

30-
func NewStore(opts ...Option) store.Store {
30+
func NewStore(opts ...store.Option) store.Store {
3131
s := &fileStore{
3232
handles: make(map[string]*fileHandle),
3333
}
@@ -71,7 +71,7 @@ func (m *fileStore) delete(fd *fileHandle, key string) error {
7171
})
7272
}
7373

74-
func (m *fileStore) init(opts ...Option) error {
74+
func (m *fileStore) init(opts ...store.Option) error {
7575
for _, o := range opts {
7676
o(&m.options)
7777
}
@@ -222,7 +222,7 @@ func (m *fileStore) get(fd *fileHandle, k string) (*store.Record, error) {
222222
})
223223

224224
if value == nil {
225-
return nil, ErrNotFound
225+
return nil, store.ErrNotFound
226226
}
227227

228228
storedRecord := &record{}
@@ -242,15 +242,15 @@ func (m *fileStore) get(fd *fileHandle, k string) (*store.Record, error) {
242242

243243
if !storedRecord.ExpiresAt.IsZero() {
244244
if storedRecord.ExpiresAt.Before(time.Now()) {
245-
return nil, ErrNotFound
245+
return nil, store.ErrNotFound
246246
}
247247
newRecord.Expiry = time.Until(storedRecord.ExpiresAt)
248248
}
249249

250250
return newRecord, nil
251251
}
252252

253-
func (m *fileStore) set(fd *fileHandle, r *Record) error {
253+
func (m *fileStore) set(fd *fileHandle, r *store.Record) error {
254254
// copy the incoming record and then
255255
// convert the expiry in to a hard timestamp
256256
item := &record{}
@@ -297,7 +297,7 @@ func (f *fileStore) Init(opts ...store.Option) error {
297297
}
298298

299299
func (m *fileStore) Delete(key string, opts ...store.DeleteOption) error {
300-
var deleteOptions DeleteOptions
300+
var deleteOptions store.DeleteOptions
301301
for _, o := range opts {
302302
o(&deleteOptions)
303303
}
@@ -311,7 +311,7 @@ func (m *fileStore) Delete(key string, opts ...store.DeleteOption) error {
311311
}
312312

313313
func (m *fileStore) Read(key string, opts ...store.ReadOption) ([]*store.Record, error) {
314-
var readOpts ReadOptions
314+
var readOpts store.ReadOptions
315315
for _, o := range opts {
316316
o(&readOpts)
317317
}
@@ -343,7 +343,7 @@ func (m *fileStore) Read(key string, opts ...store.ReadOption) ([]*store.Record,
343343
keys = []string{key}
344344
}
345345

346-
var results []*Record
346+
var results []*store.Record
347347

348348
for _, k := range keys {
349349
r, err := m.get(fd, k)
@@ -356,8 +356,8 @@ func (m *fileStore) Read(key string, opts ...store.ReadOption) ([]*store.Record,
356356
return results, nil
357357
}
358358

359-
func (m *fileStore) Write(r *Record, opts ...WriteOption) error {
360-
var writeOpts WriteOptions
359+
func (m *fileStore) Write(r *store.Record, opts ...store.WriteOption) error {
360+
var writeOpts store.WriteOptions
361361
for _, o := range opts {
362362
o(&writeOpts)
363363
}
@@ -369,7 +369,7 @@ func (m *fileStore) Write(r *Record, opts ...WriteOption) error {
369369

370370
if len(opts) > 0 {
371371
// Copy the record before applying options, or the incoming record will be mutated
372-
newRecord := Record{}
372+
newRecord := store.Record{}
373373
newRecord.Key = r.Key
374374
newRecord.Value = r.Value
375375
newRecord.Metadata = make(map[string]interface{})
@@ -396,8 +396,8 @@ func (m *fileStore) Options() store.Options {
396396
return m.options
397397
}
398398

399-
func (m *fileStore) List(opts ...ListOption) ([]string, error) {
400-
var listOptions ListOptions
399+
func (m *fileStore) List(opts ...store.ListOption) ([]string, error) {
400+
var listOptions store.ListOptions
401401

402402
for _, o := range opts {
403403
o(&listOptions)
@@ -442,7 +442,7 @@ type dirOptionKey struct{}
442442

443443
// DirOption is a file store store.Option to set the directory for the file
444444
func DirOption(dir string) store.Option {
445-
return func(o *Options) {
445+
return func(o *store.Options) {
446446
if o.Context == nil {
447447
o.Context = context.Background()
448448
}

‎store/file/file_test.go

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ func cleanup(db string, s store.Store) {
2020
}
2121

2222
func TestFileStoreReInit(t *testing.T) {
23-
s := NewStore(Table("aaa"))
23+
s := NewStore(store.Table("aaa"))
2424
defer cleanup(DefaultDatabase, s)
25-
s.Init(Table("bbb"))
25+
s.Init(store.Table("bbb"))
2626
if s.Options().Table != "bbb" {
2727
t.Error("Init didn't reinitialise the store")
2828
}
@@ -35,19 +35,19 @@ func TestFileStoreBasic(t *testing.T) {
3535
}
3636

3737
func TestFileStoreTable(t *testing.T) {
38-
s := NewStore(Table("testTable"))
38+
s := NewStore(store.Table("teststore.Table"))
3939
defer cleanup(DefaultDatabase, s)
4040
fileTest(s, t)
4141
}
4242

4343
func TestFileStoreDatabase(t *testing.T) {
44-
s := NewStore(Database("testdb"))
44+
s := NewStore(store.Database("testdb"))
4545
defer cleanup("testdb", s)
4646
fileTest(s, t)
4747
}
4848

4949
func TestFileStoreDatabaseTable(t *testing.T) {
50-
s := NewStore(Table("testTable"), Database("testdb"))
50+
s := NewStore(store.Table("teststore.Table"), store.Database("testdb"))
5151
defer cleanup("testdb", s)
5252
fileTest(s, t)
5353
}
@@ -57,7 +57,7 @@ func fileTest(s store.Store, t *testing.T) {
5757
t.Logf("Options %s %v\n", s.String(), s.Options())
5858
}
5959
// Read and Write an expiring Record
60-
if err := s.Write(&Record{
60+
if err := s.Write(&store.Record{
6161
Key: "Hello",
6262
Value: []byte("World"),
6363
Expiry: time.Millisecond * 150,
@@ -82,12 +82,12 @@ func fileTest(s store.Store, t *testing.T) {
8282
// wait for expiry
8383
time.Sleep(time.Millisecond * 200)
8484

85-
if _, err := s.Read("Hello"); err != ErrNotFound {
86-
t.Errorf("Expected %# v, got %# v", ErrNotFound, err)
85+
if _, err := s.Read("Hello"); err != store.ErrNotFound {
86+
t.Errorf("Expected %# v, got %# v", store.ErrNotFound, err)
8787
}
8888

89-
// Write 3 records with various expiry and get with Table
90-
records := []*Record{
89+
// Write 3 records with various expiry and get with store.Table
90+
records := []*store.Record{
9191
{
9292
Key: "foo",
9393
Value: []byte("foofoo"),
@@ -105,30 +105,30 @@ func fileTest(s store.Store, t *testing.T) {
105105
}
106106
}
107107

108-
if results, err := s.Read("foo", ReadPrefix()); err != nil {
108+
if results, err := s.Read("foo", store.ReadPrefix()); err != nil {
109109
t.Errorf("Couldn't read all \"foo\" keys, got %# v (%s)", spew.Sdump(results), err)
110110
} else {
111111
if len(results) != 2 {
112112
t.Errorf("Expected 2 items, got %d", len(results))
113-
// t.Logf("Table test: %v\n", spew.Sdump(results))
113+
// t.Logf("store.Table test: %v\n", spew.Sdump(results))
114114
}
115115
}
116116

117117
// wait for the expiry
118118
time.Sleep(time.Millisecond * 200)
119119

120-
if results, err := s.Read("foo", ReadPrefix()); err != nil {
120+
if results, err := s.Read("foo", store.ReadPrefix()); err != nil {
121121
t.Errorf("Couldn't read all \"foo\" keys, got %# v (%s)", spew.Sdump(results), err)
122122
} else if len(results) != 1 {
123123
t.Errorf("Expected 1 item, got %d", len(results))
124-
// t.Logf("Table test: %v\n", spew.Sdump(results))
124+
// t.Logf("store.Table test: %v\n", spew.Sdump(results))
125125
}
126126

127127
if err := s.Delete("foo"); err != nil {
128128
t.Errorf("Delete failed (%v)", err)
129129
}
130130

131-
if results, err := s.Read("foo"); err != ErrNotFound {
131+
if results, err := s.Read("foo"); err != store.ErrNotFound {
132132
t.Errorf("Expected read failure read all \"foo\" keys, got %# v (%s)", spew.Sdump(results), err)
133133
} else {
134134
if len(results) != 0 {
@@ -137,7 +137,7 @@ func fileTest(s store.Store, t *testing.T) {
137137
}
138138

139139
// Write 3 records with various expiry and get with Suffix
140-
records = []*Record{
140+
records = []*store.Record{
141141
{
142142
Key: "foo",
143143
Value: []byte("foofoo"),
@@ -159,65 +159,65 @@ func fileTest(s store.Store, t *testing.T) {
159159
t.Errorf("Couldn't write k: %s, v: %# v (%s)", r.Key, pretty.Formatter(r.Value), err)
160160
}
161161
}
162-
if results, err := s.Read("foo", ReadSuffix()); err != nil {
162+
if results, err := s.Read("foo", store.ReadSuffix()); err != nil {
163163
t.Errorf("Couldn't read all \"foo\" keys, got %# v (%s)", spew.Sdump(results), err)
164164
} else {
165165
if len(results) != 3 {
166166
t.Errorf("Expected 3 items, got %d", len(results))
167-
// t.Logf("Table test: %v\n", spew.Sdump(results))
167+
// t.Logf("store.Table test: %v\n", spew.Sdump(results))
168168
}
169169
}
170170
time.Sleep(time.Millisecond * 100)
171-
if results, err := s.Read("foo", ReadSuffix()); err != nil {
171+
if results, err := s.Read("foo", store.ReadSuffix()); err != nil {
172172
t.Errorf("Couldn't read all \"foo\" keys, got %# v (%s)", spew.Sdump(results), err)
173173
} else {
174174
if len(results) != 2 {
175175
t.Errorf("Expected 2 items, got %d", len(results))
176-
// t.Logf("Table test: %v\n", spew.Sdump(results))
176+
// t.Logf("store.Table test: %v\n", spew.Sdump(results))
177177
}
178178
}
179179
time.Sleep(time.Millisecond * 100)
180-
if results, err := s.Read("foo", ReadSuffix()); err != nil {
180+
if results, err := s.Read("foo", store.ReadSuffix()); err != nil {
181181
t.Errorf("Couldn't read all \"foo\" keys, got %# v (%s)", spew.Sdump(results), err)
182182
} else {
183183
if len(results) != 1 {
184184
t.Errorf("Expected 1 item, got %d", len(results))
185-
// t.Logf("Table test: %# v\n", spew.Sdump(results))
185+
// t.Logf("store.Table test: %# v\n", spew.Sdump(results))
186186
}
187187
}
188188
if err := s.Delete("foo"); err != nil {
189189
t.Errorf("Delete failed (%v)", err)
190190
}
191-
if results, err := s.Read("foo", ReadSuffix()); err != nil {
191+
if results, err := s.Read("foo", store.ReadSuffix()); err != nil {
192192
t.Errorf("Couldn't read all \"foo\" keys, got %# v (%s)", spew.Sdump(results), err)
193193
} else {
194194
if len(results) != 0 {
195195
t.Errorf("Expected 0 items, got %d (%# v)", len(results), spew.Sdump(results))
196196
}
197197
}
198198

199-
// Test Table, Suffix and WriteOptions
200-
if err := s.Write(&Record{
199+
// Test store.Table, Suffix and WriteOptions
200+
if err := s.Write(&store.Record{
201201
Key: "foofoobarbar",
202202
Value: []byte("something"),
203-
}, WriteTTL(time.Millisecond*100)); err != nil {
203+
}, store.WriteTTL(time.Millisecond*100)); err != nil {
204204
t.Error(err)
205205
}
206-
if err := s.Write(&Record{
206+
if err := s.Write(&store.Record{
207207
Key: "foofoo",
208208
Value: []byte("something"),
209-
}, WriteExpiry(time.Now().Add(time.Millisecond*100))); err != nil {
209+
}, store.WriteExpiry(time.Now().Add(time.Millisecond*100))); err != nil {
210210
t.Error(err)
211211
}
212-
if err := s.Write(&Record{
212+
if err := s.Write(&store.Record{
213213
Key: "barbar",
214214
Value: []byte("something"),
215215
// TTL has higher precedence than expiry
216-
}, WriteExpiry(time.Now().Add(time.Hour)), WriteTTL(time.Millisecond*100)); err != nil {
216+
}, store.WriteExpiry(time.Now().Add(time.Hour)), store.WriteTTL(time.Millisecond*100)); err != nil {
217217
t.Error(err)
218218
}
219219

220-
if results, err := s.Read("foo", ReadPrefix(), ReadSuffix()); err != nil {
220+
if results, err := s.Read("foo", store.ReadPrefix(), store.ReadSuffix()); err != nil {
221221
t.Error(err)
222222
} else {
223223
if len(results) != 1 {
@@ -237,14 +237,14 @@ func fileTest(s store.Store, t *testing.T) {
237237

238238
// write the following records
239239
for i := 0; i < 10; i++ {
240-
s.Write(&Record{
240+
s.Write(&store.Record{
241241
Key: fmt.Sprintf("a%d", i),
242242
Value: []byte{},
243243
})
244244
}
245245

246246
// read back a few records
247-
if results, err := s.Read("a", ReadLimit(5), ReadPrefix()); err != nil {
247+
if results, err := s.Read("a", store.ReadLimit(5), store.ReadPrefix()); err != nil {
248248
t.Error(err)
249249
} else {
250250
if len(results) != 5 {
@@ -256,7 +256,7 @@ func fileTest(s store.Store, t *testing.T) {
256256
}
257257

258258
// read the rest back
259-
if results, err := s.Read("a", ReadLimit(30), ReadOffset(5), ReadPrefix()); err != nil {
259+
if results, err := s.Read("a", store.ReadLimit(30), store.ReadOffset(5), store.ReadPrefix()); err != nil {
260260
t.Fatal(err)
261261
} else {
262262
if len(results) != 5 {

‎store/store.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ type Record struct {
4949
}
5050

5151
func NewStore(opts ...Option) Store {
52-
return NewFileStore(opts...)
52+
return NewMemoryStore(opts...)
5353
}
5454

5555
func NewRecord(key string, val interface{}) *Record {

0 commit comments

Comments
 (0)