@@ -20,9 +20,9 @@ func cleanup(db string, s store.Store) {
20
20
}
21
21
22
22
func TestFileStoreReInit (t * testing.T ) {
23
- s := NewStore (Table ("aaa" ))
23
+ s := NewStore (store . Table ("aaa" ))
24
24
defer cleanup (DefaultDatabase , s )
25
- s .Init (Table ("bbb" ))
25
+ s .Init (store . Table ("bbb" ))
26
26
if s .Options ().Table != "bbb" {
27
27
t .Error ("Init didn't reinitialise the store" )
28
28
}
@@ -35,19 +35,19 @@ func TestFileStoreBasic(t *testing.T) {
35
35
}
36
36
37
37
func TestFileStoreTable (t * testing.T ) {
38
- s := NewStore (Table ("testTable " ))
38
+ s := NewStore (store . Table ("teststore.Table " ))
39
39
defer cleanup (DefaultDatabase , s )
40
40
fileTest (s , t )
41
41
}
42
42
43
43
func TestFileStoreDatabase (t * testing.T ) {
44
- s := NewStore (Database ("testdb" ))
44
+ s := NewStore (store . Database ("testdb" ))
45
45
defer cleanup ("testdb" , s )
46
46
fileTest (s , t )
47
47
}
48
48
49
49
func TestFileStoreDatabaseTable (t * testing.T ) {
50
- s := NewStore (Table ("testTable " ), Database ("testdb" ))
50
+ s := NewStore (store . Table ("teststore.Table " ), store . Database ("testdb" ))
51
51
defer cleanup ("testdb" , s )
52
52
fileTest (s , t )
53
53
}
@@ -57,7 +57,7 @@ func fileTest(s store.Store, t *testing.T) {
57
57
t .Logf ("Options %s %v\n " , s .String (), s .Options ())
58
58
}
59
59
// Read and Write an expiring Record
60
- if err := s .Write (& Record {
60
+ if err := s .Write (& store. Record {
61
61
Key : "Hello" ,
62
62
Value : []byte ("World" ),
63
63
Expiry : time .Millisecond * 150 ,
@@ -82,12 +82,12 @@ func fileTest(s store.Store, t *testing.T) {
82
82
// wait for expiry
83
83
time .Sleep (time .Millisecond * 200 )
84
84
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 )
87
87
}
88
88
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 {
91
91
{
92
92
Key : "foo" ,
93
93
Value : []byte ("foofoo" ),
@@ -105,30 +105,30 @@ func fileTest(s store.Store, t *testing.T) {
105
105
}
106
106
}
107
107
108
- if results , err := s .Read ("foo" , ReadPrefix ()); err != nil {
108
+ if results , err := s .Read ("foo" , store . ReadPrefix ()); err != nil {
109
109
t .Errorf ("Couldn't read all \" foo\" keys, got %# v (%s)" , spew .Sdump (results ), err )
110
110
} else {
111
111
if len (results ) != 2 {
112
112
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))
114
114
}
115
115
}
116
116
117
117
// wait for the expiry
118
118
time .Sleep (time .Millisecond * 200 )
119
119
120
- if results , err := s .Read ("foo" , ReadPrefix ()); err != nil {
120
+ if results , err := s .Read ("foo" , store . ReadPrefix ()); err != nil {
121
121
t .Errorf ("Couldn't read all \" foo\" keys, got %# v (%s)" , spew .Sdump (results ), err )
122
122
} else if len (results ) != 1 {
123
123
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))
125
125
}
126
126
127
127
if err := s .Delete ("foo" ); err != nil {
128
128
t .Errorf ("Delete failed (%v)" , err )
129
129
}
130
130
131
- if results , err := s .Read ("foo" ); err != ErrNotFound {
131
+ if results , err := s .Read ("foo" ); err != store . ErrNotFound {
132
132
t .Errorf ("Expected read failure read all \" foo\" keys, got %# v (%s)" , spew .Sdump (results ), err )
133
133
} else {
134
134
if len (results ) != 0 {
@@ -137,7 +137,7 @@ func fileTest(s store.Store, t *testing.T) {
137
137
}
138
138
139
139
// Write 3 records with various expiry and get with Suffix
140
- records = []* Record {
140
+ records = []* store. Record {
141
141
{
142
142
Key : "foo" ,
143
143
Value : []byte ("foofoo" ),
@@ -159,65 +159,65 @@ func fileTest(s store.Store, t *testing.T) {
159
159
t .Errorf ("Couldn't write k: %s, v: %# v (%s)" , r .Key , pretty .Formatter (r .Value ), err )
160
160
}
161
161
}
162
- if results , err := s .Read ("foo" , ReadSuffix ()); err != nil {
162
+ if results , err := s .Read ("foo" , store . ReadSuffix ()); err != nil {
163
163
t .Errorf ("Couldn't read all \" foo\" keys, got %# v (%s)" , spew .Sdump (results ), err )
164
164
} else {
165
165
if len (results ) != 3 {
166
166
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))
168
168
}
169
169
}
170
170
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 {
172
172
t .Errorf ("Couldn't read all \" foo\" keys, got %# v (%s)" , spew .Sdump (results ), err )
173
173
} else {
174
174
if len (results ) != 2 {
175
175
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))
177
177
}
178
178
}
179
179
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 {
181
181
t .Errorf ("Couldn't read all \" foo\" keys, got %# v (%s)" , spew .Sdump (results ), err )
182
182
} else {
183
183
if len (results ) != 1 {
184
184
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))
186
186
}
187
187
}
188
188
if err := s .Delete ("foo" ); err != nil {
189
189
t .Errorf ("Delete failed (%v)" , err )
190
190
}
191
- if results , err := s .Read ("foo" , ReadSuffix ()); err != nil {
191
+ if results , err := s .Read ("foo" , store . ReadSuffix ()); err != nil {
192
192
t .Errorf ("Couldn't read all \" foo\" keys, got %# v (%s)" , spew .Sdump (results ), err )
193
193
} else {
194
194
if len (results ) != 0 {
195
195
t .Errorf ("Expected 0 items, got %d (%# v)" , len (results ), spew .Sdump (results ))
196
196
}
197
197
}
198
198
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 {
201
201
Key : "foofoobarbar" ,
202
202
Value : []byte ("something" ),
203
- }, WriteTTL (time .Millisecond * 100 )); err != nil {
203
+ }, store . WriteTTL (time .Millisecond * 100 )); err != nil {
204
204
t .Error (err )
205
205
}
206
- if err := s .Write (& Record {
206
+ if err := s .Write (& store. Record {
207
207
Key : "foofoo" ,
208
208
Value : []byte ("something" ),
209
- }, WriteExpiry (time .Now ().Add (time .Millisecond * 100 ))); err != nil {
209
+ }, store . WriteExpiry (time .Now ().Add (time .Millisecond * 100 ))); err != nil {
210
210
t .Error (err )
211
211
}
212
- if err := s .Write (& Record {
212
+ if err := s .Write (& store. Record {
213
213
Key : "barbar" ,
214
214
Value : []byte ("something" ),
215
215
// 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 {
217
217
t .Error (err )
218
218
}
219
219
220
- if results , err := s .Read ("foo" , ReadPrefix (), ReadSuffix ()); err != nil {
220
+ if results , err := s .Read ("foo" , store . ReadPrefix (), store . ReadSuffix ()); err != nil {
221
221
t .Error (err )
222
222
} else {
223
223
if len (results ) != 1 {
@@ -237,14 +237,14 @@ func fileTest(s store.Store, t *testing.T) {
237
237
238
238
// write the following records
239
239
for i := 0 ; i < 10 ; i ++ {
240
- s .Write (& Record {
240
+ s .Write (& store. Record {
241
241
Key : fmt .Sprintf ("a%d" , i ),
242
242
Value : []byte {},
243
243
})
244
244
}
245
245
246
246
// 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 {
248
248
t .Error (err )
249
249
} else {
250
250
if len (results ) != 5 {
@@ -256,7 +256,7 @@ func fileTest(s store.Store, t *testing.T) {
256
256
}
257
257
258
258
// 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 {
260
260
t .Fatal (err )
261
261
} else {
262
262
if len (results ) != 5 {
0 commit comments