Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update pgx to v4 #820

Merged
merged 2 commits into from
Jan 26, 2022
Merged

chore: update pgx to v4 #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aa41c7
Vendor pgx v4 and sub packages
ARolek Jan 14, 2022
2d6046c
Refactor providers/postgis to use pgx v4
ARolek Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions atlas/map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,14 @@ func (m Map) encodeMVTTile(ctx context.Context, tile *slippy.Tile) ([]byte, erro
case errors.Is(err, context.Canceled):
// Do nothing if we were cancelled.

// the underlying net.Dial function is not properly reporting
// context.Canceled errors. Because of this, a string check on the error is performed.
// there's an open issue for this and it appears it will be fixed eventually
// but for now we have this check to avoid unnecessary logs
// https://github.com/golang/go/issues/36208
case strings.Contains(err.Error(), "operation was canceled"):
// Do nothing, context was canceled

default:
z, x, y := tile.ZXY()
// TODO (arolek): should we return an error to the response or just log the error?
Expand Down
10 changes: 4 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,22 @@ require (
github.com/akrylysov/algnhsa v0.12.1
github.com/arolek/p v0.0.0-20191103215535-df3c295ed582 // indirect
github.com/aws/aws-sdk-go v1.27.0
github.com/cockroachdb/apd v1.1.0 // indirect
github.com/dimfeld/httptreemux v5.0.1+incompatible
github.com/gdey/tbltest v0.0.0-20170331191646-af8abc47b052
github.com/go-redis/redis v6.9.0+incompatible
github.com/go-spatial/cobra v0.0.3-0.20181105183926-68194e4fbcc6
github.com/go-spatial/geom v0.0.0-20190821234737-802ab2533ab4
github.com/go-test/deep v0.0.0-20170429201529-f49763a6ea0a
github.com/gofrs/uuid v4.0.0+incompatible // indirect
github.com/golang/protobuf v1.4.3
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
github.com/jackc/pgx v3.2.0+incompatible
github.com/jackc/pgproto3/v2 v2.2.0
github.com/jackc/pgtype v1.9.1
github.com/jackc/pgx/v4 v4.14.1
github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible
github.com/lib/pq v1.10.2 // indirect
github.com/mattn/go-sqlite3 v1.14.6
github.com/mattn/goveralls v0.0.5
github.com/pborman/uuid v1.2.0
github.com/prometheus/client_golang v1.9.0
github.com/satori/go.uuid v1.2.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/theckman/goconstraint v1.10.1-0.20180216224824-e867bde6e4e1
golang.org/x/tools v0.0.0-20200507205054-480da3ebd79c // indirect
gopkg.in/go-playground/colors.v1 v1.0.2-0.20150924111726-b53ecfb39623
Expand Down
123 changes: 112 additions & 11 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

Loading