Skip to content

Commit 23fc4f7

Browse files
author
Christos Kotsis
committed
improvement: [minor] add emptyMap function
1 parent e32a1db commit 23fc4f7

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

db/sql.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func (s *SQL) deleteArrayItem(k string, o interface{}) bool {
172172
}
173173
for ki, kn := range o.([]interface{}) {
174174
if kn.(map[interface{}]interface{})[k] != nil {
175-
o.([]interface{})[ki] = make(map[interface{}]interface{})
175+
o.([]interface{})[ki] = emptyMap()
176176
return true
177177
}
178178
}
@@ -317,7 +317,7 @@ func (s *SQL) upsertRecursive(k []string, o, v interface{}) error {
317317
break
318318
}
319319

320-
obj[k[0]] = make(map[interface{}]interface{})
320+
obj[k[0]] = emptyMap()
321321

322322
if len(k) > 1 {
323323
return wrapErr(s.upsertRecursive(k[1:], obj[k[0]], v))

db/storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (s *Storage) AddDoc() error {
145145
} else {
146146
s.AD = len(s.Data)
147147
}
148-
s.Data = append(s.Data, make(map[interface{}]interface{}))
148+
s.Data = append(s.Data, emptyMap())
149149
return s.stateReload()
150150
}
151151

db/utils.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,17 @@ func copyMap(o interface{}) (interface{}, error) {
3838
return cache, nil
3939
}
4040

41+
func emptyMap() map[interface{}]interface{} {
42+
return make(map[interface{}]interface{})
43+
}
44+
4145
func interfaceToMap(o interface{}) (map[interface{}]interface{}, error) {
4246
obj, isMap := o.(map[interface{}]interface{})
4347
if !isMap {
4448
if o != nil {
4549
return nil, wrapErr(notAMap)
4650
}
47-
obj = make(map[interface{}]interface{})
51+
obj = emptyMap()
4852
}
4953
return obj, nil
5054
}

0 commit comments

Comments
 (0)