diff --git a/core/collection/timingwheel.go b/core/collection/timingwheel.go index d1f1ea330..327b17648 100644 --- a/core/collection/timingwheel.go +++ b/core/collection/timingwheel.go @@ -65,7 +65,8 @@ type ( // NewTimingWheel returns a TimingWheel. func NewTimingWheel(interval time.Duration, numSlots int, execute Execute) (*TimingWheel, error) { if interval <= 0 || numSlots <= 0 || execute == nil { - return nil, fmt.Errorf("interval: %v, slots: %d, execute: %p", interval, numSlots, execute) + return nil, fmt.Errorf("interval: %v, slots: %d, execute: %p", + interval, numSlots, execute) } return newTimingWheelWithClock(interval, numSlots, execute, timex.NewTicker(interval)) diff --git a/core/stores/pg/postgresql.go b/core/stores/pg/postgresql.go deleted file mode 100644 index f813836f8..000000000 --- a/core/stores/pg/postgresql.go +++ /dev/null @@ -1,14 +0,0 @@ -package pg - -import ( - // imports the driver, don't remove this comment, golint requires. - _ "github.com/lib/pq" - "github.com/zeromicro/go-zero/core/stores/sqlx" -) - -const postgresDriverName = "postgres" - -// New returns a postgres connection. -func New(datasource string, opts ...sqlx.SqlOption) sqlx.SqlConn { - return sqlx.NewSqlConn(postgresDriverName, datasource, opts...) -} diff --git a/core/stores/pg/postgresql_test.go b/core/stores/pg/postgresql_test.go deleted file mode 100644 index 15628ec95..000000000 --- a/core/stores/pg/postgresql_test.go +++ /dev/null @@ -1,11 +0,0 @@ -package pg - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestPostgreSql(t *testing.T) { - assert.NotNil(t, New("postgre")) -} diff --git a/core/stores/postgres/postgresql.go b/core/stores/postgres/postgresql.go index 4aee19337..48d6e3a00 100644 --- a/core/stores/postgres/postgresql.go +++ b/core/stores/postgres/postgresql.go @@ -1,7 +1,14 @@ package postgres -import "github.com/zeromicro/go-zero/core/stores/pg" +import ( + // imports the driver, don't remove this comment, golint requires. + _ "github.com/lib/pq" + "github.com/zeromicro/go-zero/core/stores/sqlx" +) -// New creates a new postgresql store. -// Deprecated: use pg.New instead. -var New = pg.New +const postgresDriverName = "postgres" + +// New returns a postgres connection. +func New(datasource string, opts ...sqlx.SqlOption) sqlx.SqlConn { + return sqlx.NewSqlConn(postgresDriverName, datasource, opts...) +}