yolokube/country-geo-locations
yolokube/country-geo-locations
2
1
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages 1 Wiki Activity

pkg/geoloc/database.go: optimize database functions & resolve nil pointer dereference

Browse source
This commit is contained in:
Tom Neuber 2024-02-26 09:39:45 +01:00
parent 82e8d3ca45
commit 177f378715
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkg/geoloc/database.go
View file

@ -8,7 +8,7 @@ import (
var database *memdb.MemDB var database *memdb.MemDB
func CreateDatabase(ipinfos []IPInfo) error { func CreateDatabase(ipinfos []IPInfo) (err error) {
schema := &memdb.DBSchema{ schema := &memdb.DBSchema{
Tables: map[string]*memdb.TableSchema{ Tables: map[string]*memdb.TableSchema{
"ipinfo": { "ipinfo": {
@ -24,38 +24,28 @@ func CreateDatabase(ipinfos []IPInfo) error {
}, },
} }
db, err := memdb.NewMemDB(schema) database, err = memdb.NewMemDB(schema)
if err != nil { if err != nil {
return err return
} }
txn := db.Txn(true) txn := database.Txn(true)
defer txn.Abort() defer txn.Abort()
for _, ipinfo := range ipinfos { for _, ipinfo := range ipinfos {
if err := txn.Insert("ipinfo", ipinfo); err != nil { if err = txn.Insert("ipinfo", ipinfo); err != nil {
return err return
} }
} }
txn.Commit() txn.Commit()
return
database = db
return nil
} }
func SearchIPNet(ipnetnum uint) (*IPInfo, error) { func SearchIPNet(ipnetnum uint) (*IPInfo, error) {
txn := database.Txn(false) txn := database.Txn(false)
defer txn.Abort() defer txn.Abort()
raw, err := txn.First("ipinfo", "id", ipnetnum)
if err != nil {
return nil, err
}
if raw == nil {
return nil, nil
}
var ipinfo IPInfo var ipinfo IPInfo
for { for {
raw, err := txn.First("ipinfo", "id", ipnetnum) raw, err := txn.First("ipinfo", "id", ipnetnum)