-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
locode: update with new locodedb package
Removed command connected to locodedb generation. Import the new package into IR and CLI to do the same checks and queries. Removed IR DB configuration option. Refs: #2610. Signed-off-by: Ekaterina Pavlova <[email protected]>
- Loading branch information
1 parent
219c49c
commit 37a455b
Showing
39 changed files
with
88 additions
and
2,274 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,53 +1,38 @@ | ||
| package innerring | ||
|
|
||
| import ( | ||
| "github.com/nspcc-dev/locode-db/locodedb" | ||
|
|
||
| "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap" | ||
| irlocode "github.com/nspcc-dev/neofs-node/pkg/innerring/processors/netmap/nodevalidation/locode" | ||
| "github.com/nspcc-dev/neofs-node/pkg/util/locode" | ||
| locodedb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db" | ||
| locodebolt "github.com/nspcc-dev/neofs-node/pkg/util/locode/db/boltdb" | ||
| "github.com/spf13/viper" | ||
| ) | ||
|
|
||
| func (s *Server) newLocodeValidator(cfg *viper.Viper) (netmap.NodeValidator, error) { | ||
| locodeDB := locodebolt.New(locodebolt.Prm{ | ||
| Path: cfg.GetString("locode.db.path"), | ||
| }, | ||
| locodebolt.ReadOnly(), | ||
| ) | ||
|
|
||
| s.registerStarter(locodeDB.Open) | ||
| s.registerIOCloser(locodeDB) | ||
|
|
||
| return irlocode.New(irlocode.Prm{ | ||
| DB: (*locodeBoltDBWrapper)(locodeDB), | ||
| }), nil | ||
| } | ||
|
|
||
| type locodeBoltEntryWrapper struct { | ||
| *locodedb.Key | ||
| *locodedb.Record | ||
| func (s *Server) newLocodeValidator() (netmap.NodeValidator, error) { | ||
| return irlocode.New(), nil | ||
| } | ||
|
|
||
| func (l *locodeBoltEntryWrapper) LocationName() string { | ||
| return l.Record.LocationName() | ||
| } | ||
|
|
||
| type locodeBoltDBWrapper locodebolt.DB | ||
|
|
||
| func (l *locodeBoltDBWrapper) Get(lc *locode.LOCODE) (irlocode.Record, error) { | ||
| key, err := locodedb.NewKey(*lc) | ||
| func (s *Server) Get(lc string) (irlocode.Record, error) { | ||
| newLocode := [2]string{lc[:2], lc[2:]} | ||
| key, err := locodedb.NewKey(newLocode) | ||
| if err != nil { | ||
| return nil, err | ||
| return irlocode.Record{}, err | ||
| } | ||
|
|
||
| rec, err := (*locodebolt.DB)(l).Get(*key) | ||
| rec, err := locodedb.Get(lc) | ||
| if err != nil { | ||
| return nil, err | ||
| return irlocode.Record{}, err | ||
| } | ||
|
|
||
| return &locodeBoltEntryWrapper{ | ||
| Key: key, | ||
| Record: rec, | ||
| if err != nil { | ||
| return irlocode.Record{}, err | ||
| } | ||
| return irlocode.Record{ | ||
| CountryCode: key.CountryCode(), | ||
| CountryName: rec.Country, | ||
| LocationName: rec.Location, | ||
| LocationCode: key.LocationCode(), | ||
| SubDivCode: rec.SubDivCode, | ||
| SubDivName: rec.SubDivName, | ||
| Continent: rec.Cont, | ||
| }, nil | ||
| } |
Oops, something went wrong.