vitalif
/
imposm3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

exit on errors in mapping before starting -read 

closes #131
master
Oliver Tonnhofer 2017-05-12 14:52:20 +02:00
parent b3c8e350ba
commit 18d14fbb9a
15 changed files with 689 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
database/postgis/postgis.go
View File

@ -623,7 +623,10 @@ func New(conf database.Config, m *config.Mapping) (database.DB, error) {
params, db.Prefix = stripPrefixFromConnectionParams(params)
for name, table := range m.Tables {
db.Tables[name] = NewTableSpec(db, table)
db.Tables[name], err = NewTableSpec(db, table)
if err != nil {
return nil, err
}
}
for name, table := range m.GeneralizedTables {
db.GeneralizedTables[name] = NewGeneralizedTableSpec(db, table)

13
database/postgis/spec.go
View File

@ -6,6 +6,7 @@ import (
"github.com/omniscale/imposm3/mapping"
"github.com/omniscale/imposm3/mapping/config"
"github.com/pkg/errors"
)
type ColumnSpec struct {
@ -125,7 +126,7 @@ func (spec *TableSpec) DeleteSQL() string {
)
}
func NewTableSpec(pg *PostGIS, t *config.Table) *TableSpec {
func NewTableSpec(pg *PostGIS, t *config.Table) (*TableSpec, error) {
var geomType string
if mapping.TableType(t.Type) == mapping.RelationMemberTable {
geomType = "geometry"
@ -141,19 +142,19 @@ func NewTableSpec(pg *PostGIS, t *config.Table) *TableSpec {
Srid: pg.Config.Srid,
}
for _, column := range t.Columns {
columnType := mapping.MakeColumnType(column)
if columnType == nil {
continue
columnType, err := mapping.MakeColumnType(column)
if err != nil {
return nil, err
}
pgType, ok := pgTypes[columnType.GoType]
if !ok {
log.Errorf("unhandled column type %v, using string type", columnType)
return nil, errors.Errorf("unhandled column type %v, using string type", columnType)
pgType = pgTypes["string"]
}
col := ColumnSpec{column.Name, *columnType, pgType}
spec.Columns = append(spec.Columns, col)
}
return &spec
return &spec, nil
}
func NewGeneralizedTableSpec(pg *PostGIS, t *config.GeneralizedTable) *GeneralizedTableSpec {

12
import_/import.go
View File

@ -51,7 +51,7 @@ func Import() {
tagmapping, err := mapping.NewMapping(config.BaseOptions.MappingFile)
if err != nil {
log.Fatal("mapping file: ", err)
log.Fatal("error in mapping file: ", err)
}
var db database.DB
@ -184,9 +184,9 @@ func Import() {
tagmapping.Conf.SingleIdSpace,
relations,
db, progress,
tagmapping.PolygonMatcher(),
tagmapping.RelationMatcher(),
tagmapping.RelationMemberMatcher(),
tagmapping.PolygonMatcher,
tagmapping.RelationMatcher,
tagmapping.RelationMemberMatcher,
config.BaseOptions.Srid)
relWriter.SetLimiter(geometryLimiter)
relWriter.EnableConcurrent()
@ -199,7 +199,7 @@ func Import() {
tagmapping.Conf.SingleIdSpace,
ways, db,
progress,
tagmapping.PolygonMatcher(), tagmapping.LineStringMatcher(),
tagmapping.PolygonMatcher, tagmapping.LineStringMatcher,
config.BaseOptions.Srid)
wayWriter.SetLimiter(geometryLimiter)
wayWriter.EnableConcurrent()
@ -210,7 +210,7 @@ func Import() {
nodes := osmCache.Nodes.Iter()
nodeWriter := writer.NewNodeWriter(osmCache, nodes, db,
progress,
tagmapping.PointMatcher(),
tagmapping.PointMatcher,
config.BaseOptions.Srid)
nodeWriter.SetLimiter(geometryLimiter)
nodeWriter.EnableConcurrent()

9
mapping/columns.go
View File

@ -1,8 +1,6 @@
package mapping
import (
"errors"
"fmt"
"math"
"regexp"
"strconv"
@ -12,6 +10,7 @@ import (
"github.com/omniscale/imposm3/geom"
"github.com/omniscale/imposm3/logging"
"github.com/omniscale/imposm3/mapping/config"
"github.com/pkg/errors"
)
var log = logging.NewLogger("mapping")
@ -351,19 +350,19 @@ func MakeEnumerate(columnName string, columnType ColumnType, column config.Colum
func decodeEnumArg(column config.Column, key string) (map[string]int, error) {
_valuesList, ok := column.Args[key]
if !ok {
return nil, fmt.Errorf("missing '%v' in args for %s", key, column.Type)
return nil, errors.Errorf("missing '%v' in args for %s", key, column.Type)
}
valuesList, ok := _valuesList.([]interface{})
if !ok {
return nil, fmt.Errorf("'%v' in args for %s not a list", key, column.Type)
return nil, errors.Errorf("'%v' in args for %s not a list", key, column.Type)
}
values := make(map[string]int)
for i, value := range valuesList {
valueName, ok := value.(string)
if !ok {
return nil, fmt.Errorf("value in '%v' not a string", key)
return nil, errors.Errorf("value in '%v' not a string", key)
}
values[valueName] = i + 1

8
mapping/filter_test.go
View File

@ -155,7 +155,7 @@ func TestPointMatcher(t *testing.T) {
}
elem := element.Node{}
m := mapping.PointMatcher()
m := mapping.PointMatcher
for i, test := range tests {
elem.Tags = test.tags
actual := m.MatchNode(&elem)
@ -205,7 +205,7 @@ func TestLineStringMatcher(t *testing.T) {
if !elem.IsClosed() {
t.Fatal("way not closed")
}
m := mapping.LineStringMatcher()
m := mapping.LineStringMatcher
for i, test := range tests {
elem.Tags = test.tags
actual := m.MatchWay(&elem)
@ -276,7 +276,7 @@ func TestPolygonMatcher_MatchWay(t *testing.T) {
if !elem.IsClosed() {
t.Fatal("way not closed")
}
m := mapping.PolygonMatcher()
m := mapping.PolygonMatcher
for i, test := range tests {
elem.Tags = test.tags
actual := m.MatchWay(&elem)
@ -335,7 +335,7 @@ func TestPolygonMatcher_MatchRelation(t *testing.T) {
}
elem := element.Relation{}
m := mapping.PolygonMatcher()
m := mapping.PolygonMatcher
for i, test := range tests {
elem.Tags = test.tags
actual := m.MatchRelation(&elem)

97
mapping/mapping.go
View File

@ -1,12 +1,12 @@
package mapping
import (
"errors"
"io/ioutil"
"github.com/omniscale/imposm3/element"
"github.com/omniscale/imposm3/mapping/config"
"github.com/pkg/errors"
"gopkg.in/yaml.v2"
)
@ -66,10 +66,8 @@ func (tt *TableType) UnmarshalJSON(data []byte) error {
*tt = RelationTable
case `"relation_member"`:
*tt = RelationMemberTable
default:
return errors.New("unknown type " + string(data))
}
return nil
return errors.New("unknown type " + string(data))
}
const (
@ -82,7 +80,12 @@ const (
)
type Mapping struct {
Conf config.Mapping
Conf config.Mapping
PointMatcher NodeMatcher
LineStringMatcher WayMatcher
PolygonMatcher RelWayMatcher
RelationMatcher RelationMatcher
RelationMemberMatcher RelationMatcher
}
func NewMapping(filename string) (*Mapping, error) {
@ -101,6 +104,11 @@ func NewMapping(filename string) (*Mapping, error) {
if err != nil {
return nil, err
}
err = mapping.createMatcher()
if err != nil {
return nil, err
}
return &mapping, nil
}
@ -111,6 +119,9 @@ func (m *Mapping) prepare() error {
// todo deprecate 'fields'
t.Columns = t.OldFields
}
if t.Type == "" {
return errors.Errorf("missing type for table %s", name)
}
}
for name, t := range m.Conf.GeneralizedTables {
@ -119,6 +130,31 @@ func (m *Mapping) prepare() error {
return nil
}
func (m *Mapping) createMatcher() error {
var err error
m.PointMatcher, err = m.pointMatcher()
if err != nil {
return err
}
m.LineStringMatcher, err = m.lineStringMatcher()
if err != nil {
return err
}
m.PolygonMatcher, err = m.polygonMatcher()
if err != nil {
return err
}
m.RelationMatcher, err = m.relationMatcher()
if err != nil {
return err
}
m.RelationMemberMatcher, err = m.relationMemberMatcher()
if err != nil {
return err
}
return nil
}
func (m *Mapping) mappings(tableType TableType, mappings TagTableMapping) {
for name, t := range m.Conf.Tables {
if TableType(t.Type) != GeometryTable && TableType(t.Type) != tableType {
@ -141,48 +177,53 @@ func (m *Mapping) mappings(tableType TableType, mappings TagTableMapping) {
}
}
func (m *Mapping) tables(tableType TableType) map[string]*rowBuilder {
func (m *Mapping) tables(tableType TableType) (map[string]*rowBuilder, error) {
var err error
result := make(map[string]*rowBuilder)
for name, t := range m.Conf.Tables {
if TableType(t.Type) == tableType || TableType(t.Type) == GeometryTable {
result[name] = makeRowBuilder(t)
result[name], err = makeRowBuilder(t)
if err != nil {
return nil, errors.Wrapf(err, "creating row builder for %s", name)
}
}
}
return result
return result, nil
}
func makeRowBuilder(tbl *config.Table) *rowBuilder {
func makeRowBuilder(tbl *config.Table) (*rowBuilder, error) {
result := rowBuilder{}
for _, mappingColumn := range tbl.Columns {
column := valueBuilder{}
column.key = Key(mappingColumn.Key)
columnType := MakeColumnType(mappingColumn)
if columnType != nil {
column.colType = *columnType
} else {
log.Warn("unhandled type: ", mappingColumn.Type)
columnType, err := MakeColumnType(mappingColumn)
if err != nil {
return nil, errors.Wrapf(err, "creating column %s", mappingColumn.Name)
}
column.colType = *columnType
result.columns = append(result.columns, column)
}
return &result
return &result, nil
}
func MakeColumnType(c *config.Column) *ColumnType {
if columnType, ok := AvailableColumnTypes[c.Type]; ok {
if columnType.MakeFunc != nil {
makeValue, err := columnType.MakeFunc(c.Name, columnType, *c)
if err != nil {
log.Print(err)
return nil
}
columnType = ColumnType{columnType.Name, columnType.GoType, makeValue, nil, nil, columnType.FromMember}
}
columnType.FromMember = c.FromMember
return &columnType
func MakeColumnType(c *config.Column) (*ColumnType, error) {
columnType, ok := AvailableColumnTypes[c.Type]
if !ok {
return nil, errors.Errorf("unhandled type %s", c.Type)
}
return nil
if columnType.MakeFunc != nil {
makeValue, err := columnType.MakeFunc(c.Name, columnType, *c)
if err != nil {
return nil, err
}
columnType = ColumnType{columnType.Name, columnType.GoType, makeValue, nil, nil, columnType.FromMember}
}
columnType.FromMember = c.FromMember
return &columnType, nil
}
func (m *Mapping) extraTags(tableType TableType, tags map[Key]bool) {

35
mapping/matcher.go
View File

@ -5,35 +5,37 @@ import (
"github.com/omniscale/imposm3/geom"
)
func (m *Mapping) PointMatcher() NodeMatcher {
func (m *Mapping) pointMatcher() (NodeMatcher, error) {
mappings := make(TagTableMapping)
m.mappings(PointTable, mappings)
filters := make(tableElementFilters)
m.addFilters(filters)
m.addTypedFilters(PointTable, filters)
tables, err := m.tables(PointTable)
return &tagMatcher{
mappings: mappings,
tables: m.tables(PointTable),
filters: filters,
tables: tables,
matchAreas: false,
}
}, err
}
func (m *Mapping) LineStringMatcher() WayMatcher {
func (m *Mapping) lineStringMatcher() (WayMatcher, error) {
mappings := make(TagTableMapping)
m.mappings(LineStringTable, mappings)
filters := make(tableElementFilters)
m.addFilters(filters)
m.addTypedFilters(LineStringTable, filters)
tables, err := m.tables(LineStringTable)
return &tagMatcher{
mappings: mappings,
tables: m.tables(LineStringTable),
filters: filters,
tables: tables,
matchAreas: false,
}
}, err
}
func (m *Mapping) PolygonMatcher() RelWayMatcher {
func (m *Mapping) polygonMatcher() (RelWayMatcher, error) {
mappings := make(TagTableMapping)
m.mappings(PolygonTable, mappings)
filters := make(tableElementFilters)
@ -41,16 +43,17 @@ func (m *Mapping) PolygonMatcher() RelWayMatcher {
m.addTypedFilters(PolygonTable, filters)
relFilters := make(tableElementFilters)
m.addRelationFilters(PolygonTable, relFilters)
tables, err := m.tables(PolygonTable)
return &tagMatcher{
mappings: mappings,
tables: m.tables(PolygonTable),
filters: filters,
tables: tables,
relFilters: relFilters,
matchAreas: true,
}
}, err
}
func (m *Mapping) RelationMatcher() RelationMatcher {
func (m *Mapping) relationMatcher() (RelationMatcher, error) {
mappings := make(TagTableMapping)
m.mappings(RelationTable, mappings)
filters := make(tableElementFilters)
@ -59,16 +62,17 @@ func (m *Mapping) RelationMatcher() RelationMatcher {
m.addTypedFilters(RelationTable, filters)
relFilters := make(tableElementFilters)
m.addRelationFilters(RelationTable, relFilters)
tables, err := m.tables(RelationTable)
return &tagMatcher{
mappings: mappings,
tables: m.tables(RelationTable),
filters: filters,
tables: tables,
relFilters: relFilters,
matchAreas: true,
}
}, err
}
func (m *Mapping) RelationMemberMatcher() RelationMatcher {
func (m *Mapping) relationMemberMatcher() (RelationMatcher, error) {
mappings := make(TagTableMapping)
m.mappings(RelationMemberTable, mappings)
filters := make(tableElementFilters)
@ -76,13 +80,14 @@ func (m *Mapping) RelationMemberMatcher() RelationMatcher {
m.addTypedFilters(RelationMemberTable, filters)
relFilters := make(tableElementFilters)
m.addRelationFilters(RelationMemberTable, relFilters)
tables, err := m.tables(RelationMemberTable)
return &tagMatcher{
mappings: mappings,
tables: m.tables(RelationMemberTable),
filters: filters,
tables: tables,
relFilters: relFilters,
matchAreas: true,
}
}, err
}
type NodeMatcher interface {

12
mapping/matcher_test.go
View File

@ -11,7 +11,7 @@ func BenchmarkTagMatch(b *testing.B) {
if err != nil {
b.Fatal(err)
}
matcher := m.PolygonMatcher()
matcher := m.PolygonMatcher
for i := 0; i < b.N; i++ {
e := element.Relation{}
e.Tags = element.Tags{"landuse": "forest", "name": "Forest", "source": "bling", "tourism": "zoo"}
@ -51,7 +51,7 @@ func TestSelectRelationPolygonsSimple(t *testing.T) {
makeMember(4, element.Tags{"foo": "bar"}),
}
filtered := SelectRelationPolygons(
mapping.PolygonMatcher(),
mapping.PolygonMatcher,
&r,
)
if len(filtered) != 1 {
@ -74,7 +74,7 @@ func TestSelectRelationPolygonsUnrelatedTags(t *testing.T) {
makeMember(1, element.Tags{"landuse": "forest"}),
}
filtered := SelectRelationPolygons(
mapping.PolygonMatcher(),
mapping.PolygonMatcher,
&r,
)
if len(filtered) != 1 {
@ -100,7 +100,7 @@ func TestSelectRelationPolygonsMultiple(t *testing.T) {
makeMember(4, element.Tags{"landuse": "park", "layer": "2", "name": "foo"}),
}
filtered := SelectRelationPolygons(
mapping.PolygonMatcher(),
mapping.PolygonMatcher,
&r,
)
if len(filtered) != 3 {
@ -123,7 +123,7 @@ func TestSelectRelationPolygonsMultipleTags(t *testing.T) {
makeMember(1, element.Tags{"landuse": "forest"}),
}
filtered := SelectRelationPolygons(
mapping.PolygonMatcher(),
mapping.PolygonMatcher,
&r,
)
// TODO both should be filterd out, but we only get one,
@ -146,7 +146,7 @@ func TestSelectRelationPolygonsMultipleTagsOnWay(t *testing.T) {
makeMemberRole(2, element.Tags{"place": "islet"}, "inner"),
}
filtered := SelectRelationPolygons(
mapping.PolygonMatcher(),
mapping.PolygonMatcher,
&r,
)

18
update/process.go
View File

@ -145,9 +145,9 @@ func Update(oscFile string, geometryLimiter *limit.Limiter, expireor expire.Expi
osmCache,
diffCache,
tagmapping.Conf.SingleIdSpace,
tagmapping.PointMatcher(),
tagmapping.LineStringMatcher(),
tagmapping.PolygonMatcher(),
tagmapping.PointMatcher,
tagmapping.LineStringMatcher,
tagmapping.PolygonMatcher,
)
deleter.SetExpireor(expireor)
@ -165,9 +165,9 @@ func Update(oscFile string, geometryLimiter *limit.Limiter, expireor expire.Expi
tagmapping.Conf.SingleIdSpace,
relations,
db, progress,
tagmapping.PolygonMatcher(),
tagmapping.RelationMatcher(),
tagmapping.RelationMemberMatcher(),
tagmapping.PolygonMatcher,
tagmapping.RelationMatcher,
tagmapping.RelationMemberMatcher,
config.BaseOptions.Srid)
relWriter.SetLimiter(geometryLimiter)
relWriter.SetExpireor(expireor)
@ -177,8 +177,8 @@ func Update(oscFile string, geometryLimiter *limit.Limiter, expireor expire.Expi
tagmapping.Conf.SingleIdSpace,
ways, db,
progress,
tagmapping.PolygonMatcher(),
tagmapping.LineStringMatcher(),
tagmapping.PolygonMatcher,
tagmapping.LineStringMatcher,
config.BaseOptions.Srid)
wayWriter.SetLimiter(geometryLimiter)
wayWriter.SetExpireor(expireor)
@ -186,7 +186,7 @@ func Update(oscFile string, geometryLimiter *limit.Limiter, expireor expire.Expi
nodeWriter := writer.NewNodeWriter(osmCache, nodes, db,
progress,
tagmapping.PointMatcher(),
tagmapping.PointMatcher,
config.BaseOptions.Srid)
nodeWriter.SetLimiter(geometryLimiter)
nodeWriter.SetExpireor(expireor)

23
vendor/github.com/pkg/errors/LICENSE generated vendored Normal file
View File

@ -0,0 +1,23 @@
Copyright (c) 2015, Dave Cheney <dave@cheney.net>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

52
vendor/github.com/pkg/errors/README.md generated vendored Normal file
View File

@ -0,0 +1,52 @@
# errors [![Travis-CI](https://travis-ci.org/pkg/errors.svg)](https://travis-ci.org/pkg/errors) [![AppVeyor](https://ci.appveyor.com/api/projects/status/b98mptawhudj53ep/branch/master?svg=true)](https://ci.appveyor.com/project/davecheney/errors/branch/master) [![GoDoc](https://godoc.org/github.com/pkg/errors?status.svg)](http://godoc.org/github.com/pkg/errors) [![Report card](https://goreportcard.com/badge/github.com/pkg/errors)](https://goreportcard.com/report/github.com/pkg/errors)
Package errors provides simple error handling primitives.
`go get github.com/pkg/errors`
The traditional error handling idiom in Go is roughly akin to
```go
if err != nil {
return err
}
```
which applied recursively up the call stack results in error reports without context or debugging information. The errors package allows programmers to add context to the failure path in their code in a way that does not destroy the original value of the error.
## Adding context to an error
The errors.Wrap function returns a new error that adds context to the original error. For example
```go
_, err := ioutil.ReadAll(r)
if err != nil {
return errors.Wrap(err, "read failed")
}
```
## Retrieving the cause of an error
Using `errors.Wrap` constructs a stack of errors, adding context to the preceding error. Depending on the nature of the error it may be necessary to reverse the operation of errors.Wrap to retrieve the original error for inspection. Any error value which implements this interface can be inspected by `errors.Cause`.
```go
type causer interface {
Cause() error
}
```
`errors.Cause` will recursively retrieve the topmost error which does not implement `causer`, which is assumed to be the original cause. For example:
```go
switch err := errors.Cause(err).(type) {
case *MyError:
// handle specifically
default:
// unknown error
}
```
[Read the package documentation for more information](https://godoc.org/github.com/pkg/errors).
## Contributing
We welcome pull requests, bug fixes and issue reports. With that said, the bar for adding new symbols to this package is intentionally set high.
Before proposing a change, please discuss your change by raising an issue.
## Licence
BSD-2-Clause

32
vendor/github.com/pkg/errors/appveyor.yml generated vendored Normal file
View File

@ -0,0 +1,32 @@
version: build-{build}.{branch}
clone_folder: C:\gopath\src\github.com\pkg\errors
shallow_clone: true # for startup speed
environment:
GOPATH: C:\gopath
platform:
- x64
# http://www.appveyor.com/docs/installed-software
install:
# some helpful output for debugging builds
- go version
- go env
# pre-installed MinGW at C:\MinGW is 32bit only
# but MSYS2 at C:\msys64 has mingw64
- set PATH=C:\msys64\mingw64\bin;%PATH%
- gcc --version
- g++ --version
build_script:
- go install -v ./...
test_script:
- set PATH=C:\gopath\bin;%PATH%
- go test -v ./...
#artifacts:
# - path: '%GOPATH%\bin\*.exe'
deploy: off

269
vendor/github.com/pkg/errors/errors.go generated vendored Normal file
View File

@ -0,0 +1,269 @@
// Package errors provides simple error handling primitives.
//
// The traditional error handling idiom in Go is roughly akin to
//
// if err != nil {
// return err
// }
//
// which applied recursively up the call stack results in error reports
// without context or debugging information. The errors package allows
// programmers to add context to the failure path in their code in a way
// that does not destroy the original value of the error.
//
// Adding context to an error
//
// The errors.Wrap function returns a new error that adds context to the
// original error by recording a stack trace at the point Wrap is called,
// and the supplied message. For example
//
// _, err := ioutil.ReadAll(r)
// if err != nil {
// return errors.Wrap(err, "read failed")
// }
//
// If additional control is required the errors.WithStack and errors.WithMessage
// functions destructure errors.Wrap into its component operations of annotating
// an error with a stack trace and an a message, respectively.
//
// Retrieving the cause of an error
//
// Using errors.Wrap constructs a stack of errors, adding context to the
// preceding error. Depending on the nature of the error it may be necessary
// to reverse the operation of errors.Wrap to retrieve the original error
// for inspection. Any error value which implements this interface
//
// type causer interface {
// Cause() error
// }
//
// can be inspected by errors.Cause. errors.Cause will recursively retrieve
// the topmost error which does not implement causer, which is assumed to be
// the original cause. For example:
//
// switch err := errors.Cause(err).(type) {
// case *MyError:
// // handle specifically
// default:
// // unknown error
// }
//
// causer interface is not exported by this package, but is considered a part
// of stable public API.
//
// Formatted printing of errors
//
// All error values returned from this package implement fmt.Formatter and can
// be formatted by the fmt package. The following verbs are supported
//
// %s print the error. If the error has a Cause it will be
// printed recursively
// %v see %s
// %+v extended format. Each Frame of the error's StackTrace will
// be printed in detail.
//
// Retrieving the stack trace of an error or wrapper
//
// New, Errorf, Wrap, and Wrapf record a stack trace at the point they are
// invoked. This information can be retrieved with the following interface.
//
// type stackTracer interface {
// StackTrace() errors.StackTrace
// }
//
// Where errors.StackTrace is defined as
//
// type StackTrace []Frame
//
// The Frame type represents a call site in the stack trace. Frame supports
// the fmt.Formatter interface that can be used for printing information about
// the stack trace of this error. For example:
//
// if err, ok := err.(stackTracer); ok {
// for _, f := range err.StackTrace() {
// fmt.Printf("%+s:%d", f)
// }
// }
//
// stackTracer interface is not exported by this package, but is considered a part
// of stable public API.
//
// See the documentation for Frame.Format for more details.
package errors
import (
"fmt"
"io"
)
// New returns an error with the supplied message.
// New also records the stack trace at the point it was called.
func New(message string) error {
return &fundamental{
msg: message,
stack: callers(),
}
}
// Errorf formats according to a format specifier and returns the string
// as a value that satisfies error.
// Errorf also records the stack trace at the point it was called.
func Errorf(format string, args ...interface{}) error {
return &fundamental{
msg: fmt.Sprintf(format, args...),
stack: callers(),
}
}
// fundamental is an error that has a message and a stack, but no caller.
type fundamental struct {
msg string
*stack
}
func (f *fundamental) Error() string { return f.msg }
func (f *fundamental) Format(s fmt.State, verb rune) {
switch verb {
case 'v':
if s.Flag('+') {
io.WriteString(s, f.msg)
f.stack.Format(s, verb)
return
}
fallthrough
case 's':
io.WriteString(s, f.msg)
case 'q':
fmt.Fprintf(s, "%q", f.msg)
}
}
// WithStack annotates err with a stack trace at the point WithStack was called.
// If err is nil, WithStack returns nil.
func WithStack(err error) error {
if err == nil {
return nil
}
return &withStack{
err,
callers(),
}
}
type withStack struct {
error
*stack
}
func (w *withStack) Cause() error { return w.error }
func (w *withStack) Format(s fmt.State, verb rune) {
switch verb {
case 'v':
if s.Flag('+') {
fmt.Fprintf(s, "%+v", w.Cause())
w.stack.Format(s, verb)
return
}
fallthrough
case 's':
io.WriteString(s, w.Error())
case 'q':
fmt.Fprintf(s, "%q", w.Error())
}
}
// Wrap returns an error annotating err with a stack trace
// at the point Wrap is called, and the supplied message.
// If err is nil, Wrap returns nil.
func Wrap(err error, message string) error {
if err == nil {
return nil
}
err = &withMessage{
cause: err,
msg: message,
}
return &withStack{
err,
callers(),
}
}
// Wrapf returns an error annotating err with a stack trace
// at the point Wrapf is call, and the format specifier.
// If err is nil, Wrapf returns nil.
func Wrapf(err error, format string, args ...interface{}) error {
if err == nil {
return nil
}
err = &withMessage{
cause: err,
msg: fmt.Sprintf(format, args...),
}
return &withStack{
err,
callers(),
}
}
// WithMessage annotates err with a new message.
// If err is nil, WithMessage returns nil.
func WithMessage(err error, message string) error {
if err == nil {
return nil
}
return &withMessage{
cause: err,
msg: message,
}
}
type withMessage struct {
cause error
msg string
}
func (w *withMessage) Error() string { return w.msg + ": " + w.cause.Error() }
func (w *withMessage) Cause() error { return w.cause }
func (w *withMessage) Format(s fmt.State, verb rune) {
switch verb {
case 'v':
if s.Flag('+') {
fmt.Fprintf(s, "%+v\n", w.Cause())
io.WriteString(s, w.msg)
return
}
fallthrough
case 's', 'q':
io.WriteString(s, w.Error())
}
}
// Cause returns the underlying cause of the error, if possible.
// An error value has a cause if it implements the following
// interface:
//
// type causer interface {
// Cause() error
// }
//
// If the error does not implement Cause, the original error will
// be returned. If the error is nil, nil will be returned without further
// investigation.
func Cause(err error) error {
type causer interface {
Cause() error
}
for err != nil {
cause, ok := err.(causer)
if !ok {
break
}
err = cause.Cause()
}
return err
}

178
vendor/github.com/pkg/errors/stack.go generated vendored Normal file
View File

@ -0,0 +1,178 @@
package errors
import (
"fmt"
"io"
"path"
"runtime"
"strings"
)
// Frame represents a program counter inside a stack frame.
type Frame uintptr
// pc returns the program counter for this frame;
// multiple frames may have the same PC value.
func (f Frame) pc() uintptr { return uintptr(f) - 1 }
// file returns the full path to the file that contains the
// function for this Frame's pc.
func (f Frame) file() string {
fn := runtime.FuncForPC(f.pc())
if fn == nil {
return "unknown"
}
file, _ := fn.FileLine(f.pc())
return file
}
// line returns the line number of source code of the
// function for this Frame's pc.
func (f Frame) line() int {
fn := runtime.FuncForPC(f.pc())
if fn == nil {
return 0
}
_, line := fn.FileLine(f.pc())
return line
}
// Format formats the frame according to the fmt.Formatter interface.
//
// %s source file
// %d source line
// %n function name
// %v equivalent to %s:%d
//
// Format accepts flags that alter the printing of some verbs, as follows:
//
// %+s path of source file relative to the compile time GOPATH
// %+v equivalent to %+s:%d
func (f Frame) Format(s fmt.State, verb rune) {
switch verb {
case 's':
switch {
case s.Flag('+'):
pc := f.pc()
fn := runtime.FuncForPC(pc)
if fn == nil {
io.WriteString(s, "unknown")
} else {
file, _ := fn.FileLine(pc)
fmt.Fprintf(s, "%s\n\t%s", fn.Name(), file)
}
default:
io.WriteString(s, path.Base(f.file()))
}
case 'd':
fmt.Fprintf(s, "%d", f.line())
case 'n':
name := runtime.FuncForPC(f.pc()).Name()
io.WriteString(s, funcname(name))
case 'v':
f.Format(s, 's')
io.WriteString(s, ":")
f.Format(s, 'd')
}
}
// StackTrace is stack of Frames from innermost (newest) to outermost (oldest).
type StackTrace []Frame
func (st StackTrace) Format(s fmt.State, verb rune) {
switch verb {
case 'v':
switch {
case s.Flag('+'):
for _, f := range st {
fmt.Fprintf(s, "\n%+v", f)
}
case s.Flag('#'):
fmt.Fprintf(s, "%#v", []Frame(st))
default:
fmt.Fprintf(s, "%v", []Frame(st))
}
case 's':
fmt.Fprintf(s, "%s", []Frame(st))
}
}
// stack represents a stack of program counters.
type stack []uintptr
func (s *stack) Format(st fmt.State, verb rune) {
switch verb {
case 'v':
switch {
case st.Flag('+'):
for _, pc := range *s {
f := Frame(pc)
fmt.Fprintf(st, "\n%+v", f)
}
}
}
}
func (s *stack) StackTrace() StackTrace {
f := make([]Frame, len(*s))
for i := 0; i < len(f); i++ {
f[i] = Frame((*s)[i])
}
return f
}
func callers() *stack {
const depth = 32
var pcs [depth]uintptr
n := runtime.Callers(3, pcs[:])
var st stack = pcs[0:n]
return &st
}
// funcname removes the path prefix component of a function's name reported by func.Name().
func funcname(name string) string {
i := strings.LastIndex(name, "/")
name = name[i+1:]
i = strings.Index(name, ".")
return name[i+1:]
}
func trimGOPATH(name, file string) string {
// Here we want to get the source file path relative to the compile time
// GOPATH. As of Go 1.6.x there is no direct way to know the compiled
// GOPATH at runtime, but we can infer the number of path segments in the
// GOPATH. We note that fn.Name() returns the function name qualified by
// the import path, which does not include the GOPATH. Thus we can trim
// segments from the beginning of the file path until the number of path
// separators remaining is one more than the number of path separators in
// the function name. For example, given:
//
// GOPATH /home/user
// file /home/user/src/pkg/sub/file.go
// fn.Name() pkg/sub.Type.Method
//
// We want to produce:
//
// pkg/sub/file.go
//
// From this we can easily see that fn.Name() has one less path separator
// than our desired output. We count separators from the end of the file
// path until it finds two more than in the function name and then move
// one character forward to preserve the initial path segment without a
// leading separator.
const sep = "/"
goal := strings.Count(name, sep) + 2
i := len(file)
for n := 0; n < goal; n++ {
i = strings.LastIndex(file[:i], sep)
if i == -1 {
// not enough separators found, set i so that the slice expression
// below leaves file unmodified
i = -len(sep)
break
}
}
// get back to 0 or trim the leading separator
file = file[i+len(sep):]
return file
}

6
vendor/vendor.json vendored
View File

@ -27,6 +27,12 @@
"revision": "93e9980741c9e593411b94e07d5bad8cfb4809db",
"revisionTime": "2015-05-02T14:36:36+03:00"
},
{
"checksumSHA1": "ynJSWoF6v+3zMnh9R0QmmG6iGV8=",
"path": "github.com/pkg/errors",
"revision": "248dadf4e9068a0b3e79f02ed0a610d935de5302",
"revisionTime": "2016-10-29T09:36:37Z"
},
{
"checksumSHA1": "8SH0adTcQlA+W5dzqiQ3Hft2VXg=",
"path": "golang.org/x/sys/unix",