From 37a8c29702aa2bb69f41419ddcdad998431dc0f2 Mon Sep 17 00:00:00 2001
From: Garet Halliday <me@garet.holiday>
Date: Fri, 8 Sep 2023 12:38:12 -0500
Subject: [PATCH] rename pkg
---
cmd/cgat/main.go | 2 +-
contrib/discovery/k8s/k8s.go | 2 +-
go.mod | 2 +-
lib/auth/credentials/cleartext.go | 4 ++--
lib/auth/credentials/credentials_test.go | 2 +-
lib/auth/credentials/md5.go | 4 ++--
lib/auth/credentials/string.go | 2 +-
lib/bouncer/backends/v0/accept.go | 8 +++----
lib/bouncer/backends/v0/cancel.go | 2 +-
lib/bouncer/backends/v0/context.go | 2 +-
lib/bouncer/backends/v0/options.go | 6 ++---
lib/bouncer/backends/v0/params.go | 2 +-
lib/bouncer/backends/v0/query.go | 6 ++---
lib/bouncer/bouncers/v2/bouncer.go | 7 +++---
lib/bouncer/frontends/v0/accept.go | 10 ++++----
lib/bouncer/frontends/v0/authenticate.go | 8 +++----
lib/bouncer/frontends/v0/options.go | 4 ++--
lib/bouncer/frontends/v0/params.go | 2 +-
.../packets/v3.0/authenticationcleartext.go | 2 +-
lib/fed/packets/v3.0/authenticationmd5.go | 2 +-
lib/fed/packets/v3.0/authenticationok.go | 2 +-
.../packets/v3.0/authenticationresponse.go | 4 ++--
lib/fed/packets/v3.0/authenticationsasl.go | 2 +-
.../v3.0/authenticationsaslcontinue.go | 4 ++--
.../packets/v3.0/authenticationsaslfinal.go | 4 ++--
lib/fed/packets/v3.0/backendkeydata.go | 2 +-
lib/fed/packets/v3.0/bind.go | 4 ++--
lib/fed/packets/v3.0/close.go | 2 +-
lib/fed/packets/v3.0/copyfail.go | 2 +-
lib/fed/packets/v3.0/datarow.go | 4 ++--
lib/fed/packets/v3.0/describe.go | 2 +-
lib/fed/packets/v3.0/errorresponse.go | 4 ++--
lib/fed/packets/v3.0/errors.go | 2 +-
lib/fed/packets/v3.0/execute.go | 2 +-
.../packets/v3.0/negotiateprotocolversion.go | 4 ++--
lib/fed/packets/v3.0/parameterstatus.go | 2 +-
lib/fed/packets/v3.0/parse.go | 4 ++--
lib/fed/packets/v3.0/passwordmessage.go | 2 +-
lib/fed/packets/v3.0/query.go | 2 +-
lib/fed/packets/v3.0/readyforquery.go | 2 +-
lib/fed/packets/v3.0/rowdescription.go | 4 ++--
lib/fed/packets/v3.0/saslinitialresponse.go | 4 ++--
lib/fed/packets/v3.0/types.go | 2 +-
lib/gat/acceptor.go | 6 ++---
lib/gat/metrics/pool.go | 2 +-
lib/gat/modes/eddy/server.go | 2 +-
lib/gat/modes/pgbouncer/authfile.go | 4 ++--
lib/gat/modes/pgbouncer/config.go | 13 +++++------
lib/gat/modes/pgbouncer/pools.go | 23 +++++++++----------
lib/gat/modes/zalando/config.go | 6 ++---
lib/gat/pool/client.go | 14 +++++------
lib/gat/pool/conn.go | 6 ++---
lib/gat/pool/dialer/dialer.go | 3 +--
lib/gat/pool/dialer/net.go | 3 +--
lib/gat/pool/flow.go | 9 ++++----
lib/gat/pool/options.go | 4 ++--
lib/gat/pool/pool.go | 14 +++++------
lib/gat/pool/pools/session/pool.go | 2 +-
lib/gat/pool/pools/session/pooler.go | 4 ++--
lib/gat/pool/pools/transaction/pool.go | 2 +-
lib/gat/pool/pools/transaction/pooler.go | 5 ++--
lib/gat/pool/recipe/options.go | 2 +-
lib/gat/pool/recipe/recipe.go | 3 +--
lib/gat/pool/server.go | 12 +++++-----
lib/gat/pools.go | 6 ++---
lib/gsql/client.go | 4 ++--
lib/gsql/eq.go | 4 ++--
lib/gsql/query.go | 4 ++--
lib/gsql/query_test.go | 6 ++---
lib/gsql/result.go | 2 +-
lib/gsql/row.go | 4 ++--
lib/middleware/context.go | 2 +-
lib/middleware/interceptor/context.go | 6 ++---
lib/middleware/interceptor/interceptor.go | 4 ++--
lib/middleware/middleware.go | 2 +-
lib/middleware/middlewares/eqp/client.go | 6 ++---
lib/middleware/middlewares/eqp/portal.go | 4 ++--
.../middlewares/eqp/preparedStatement.go | 4 ++--
lib/middleware/middlewares/eqp/server.go | 8 +++----
lib/middleware/middlewares/ps/client.go | 8 +++----
lib/middleware/middlewares/ps/server.go | 8 +++----
lib/middleware/middlewares/ps/sync.go | 9 ++++----
.../middlewares/unterminate/unterminate.go | 6 ++---
lib/middleware/nil.go | 2 +-
lib/rob/schedulers/v2/scheduler.go | 10 ++++----
lib/rob/schedulers/v2/scheduler_test.go | 2 +-
lib/rob/schedulers/v2/sink/sink.go | 6 ++---
lib/util/pools/log2.go | 2 +-
lib/util/strutil/cistring.go | 2 +-
89 files changed, 196 insertions(+), 209 deletions(-)
diff --git a/cmd/cgat/main.go b/cmd/cgat/main.go
index c75996db..9c56e14a 100644
--- a/cmd/cgat/main.go
+++ b/cmd/cgat/main.go
@@ -6,7 +6,7 @@ import (
"tuxpa.in/a/zlog/log"
- "pggat2/lib/gat/modes/eddy"
+ "pggat/lib/gat/modes/eddy"
)
func main() {
diff --git a/contrib/discovery/k8s/k8s.go b/contrib/discovery/k8s/k8s.go
index 0eb431c6..15b5e0ec 100644
--- a/contrib/discovery/k8s/k8s.go
+++ b/contrib/discovery/k8s/k8s.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "pggat2/lib/gat"
+ "pggat/lib/gat"
"tuxpa.in/a/zlog/log"
diff --git a/go.mod b/go.mod
index c7800c8f..e1e15f63 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module pggat2
+module pggat
go 1.20
diff --git a/lib/auth/credentials/cleartext.go b/lib/auth/credentials/cleartext.go
index fdcb83ff..5fe0b7f5 100644
--- a/lib/auth/credentials/cleartext.go
+++ b/lib/auth/credentials/cleartext.go
@@ -7,8 +7,8 @@ import (
"github.com/xdg-go/scram"
- "pggat2/lib/auth"
- "pggat2/lib/util/slices"
+ "pggat/lib/auth"
+ "pggat/lib/util/slices"
)
type Cleartext struct {
diff --git a/lib/auth/credentials/credentials_test.go b/lib/auth/credentials/credentials_test.go
index aab8a815..2d045954 100644
--- a/lib/auth/credentials/credentials_test.go
+++ b/lib/auth/credentials/credentials_test.go
@@ -4,7 +4,7 @@ import (
"crypto/rand"
"testing"
- "pggat2/lib/auth"
+ "pggat/lib/auth"
)
func TestMD5(t *testing.T) {
diff --git a/lib/auth/credentials/md5.go b/lib/auth/credentials/md5.go
index 42fa877e..c96c4848 100644
--- a/lib/auth/credentials/md5.go
+++ b/lib/auth/credentials/md5.go
@@ -5,8 +5,8 @@ import (
"encoding/hex"
"strings"
- "pggat2/lib/auth"
- "pggat2/lib/util/slices"
+ "pggat/lib/auth"
+ "pggat/lib/util/slices"
)
type MD5 struct {
diff --git a/lib/auth/credentials/string.go b/lib/auth/credentials/string.go
index 78b57243..4f04779d 100644
--- a/lib/auth/credentials/string.go
+++ b/lib/auth/credentials/string.go
@@ -4,7 +4,7 @@ import (
"encoding/hex"
"strings"
- "pggat2/lib/auth"
+ "pggat/lib/auth"
)
func FromString(user, password string) auth.Credentials {
diff --git a/lib/bouncer/backends/v0/accept.go b/lib/bouncer/backends/v0/accept.go
index ec4dbb3c..3cc415b5 100644
--- a/lib/bouncer/backends/v0/accept.go
+++ b/lib/bouncer/backends/v0/accept.go
@@ -4,10 +4,10 @@ import (
"crypto/tls"
"errors"
- "pggat2/lib/auth"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/util/strutil"
+ "pggat/lib/auth"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/util/strutil"
)
func authenticationSASLChallenge(server fed.Conn, encoder auth.SASLEncoder) (done bool, err error) {
diff --git a/lib/bouncer/backends/v0/cancel.go b/lib/bouncer/backends/v0/cancel.go
index ae30d681..9c7fc5ff 100644
--- a/lib/bouncer/backends/v0/cancel.go
+++ b/lib/bouncer/backends/v0/cancel.go
@@ -1,6 +1,6 @@
package backends
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
func Cancel(server fed.ReadWriter, key [8]byte) error {
packet := fed.NewPacket(0, 12)
diff --git a/lib/bouncer/backends/v0/context.go b/lib/bouncer/backends/v0/context.go
index 58e21111..3a6c95eb 100644
--- a/lib/bouncer/backends/v0/context.go
+++ b/lib/bouncer/backends/v0/context.go
@@ -1,6 +1,6 @@
package backends
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type Context struct {
Peer fed.ReadWriter
diff --git a/lib/bouncer/backends/v0/options.go b/lib/bouncer/backends/v0/options.go
index 7d2b7619..b7582179 100644
--- a/lib/bouncer/backends/v0/options.go
+++ b/lib/bouncer/backends/v0/options.go
@@ -3,9 +3,9 @@ package backends
import (
"crypto/tls"
- "pggat2/lib/auth"
- "pggat2/lib/bouncer"
- "pggat2/lib/util/strutil"
+ "pggat/lib/auth"
+ "pggat/lib/bouncer"
+ "pggat/lib/util/strutil"
)
type AcceptOptions struct {
diff --git a/lib/bouncer/backends/v0/params.go b/lib/bouncer/backends/v0/params.go
index 9c71ca2d..fc81f9ee 100644
--- a/lib/bouncer/backends/v0/params.go
+++ b/lib/bouncer/backends/v0/params.go
@@ -1,6 +1,6 @@
package backends
-import "pggat2/lib/util/strutil"
+import "pggat/lib/util/strutil"
type AcceptParams struct {
SSLEnabled bool
diff --git a/lib/bouncer/backends/v0/query.go b/lib/bouncer/backends/v0/query.go
index f42c3968..facb7cea 100644
--- a/lib/bouncer/backends/v0/query.go
+++ b/lib/bouncer/backends/v0/query.go
@@ -1,9 +1,9 @@
package backends
import (
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/util/strutil"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/util/strutil"
)
func CopyIn(ctx *Context, server fed.ReadWriter, packet fed.Packet) error {
diff --git a/lib/bouncer/bouncers/v2/bouncer.go b/lib/bouncer/bouncers/v2/bouncer.go
index a4ce14f1..58fb8495 100644
--- a/lib/bouncer/bouncers/v2/bouncer.go
+++ b/lib/bouncer/bouncers/v2/bouncer.go
@@ -1,10 +1,9 @@
package bouncers
import (
- "pggat2/lib/bouncer/backends/v0"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/perror"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/perror"
)
func clientFail(client fed.ReadWriter, err perror.Error) {
diff --git a/lib/bouncer/frontends/v0/accept.go b/lib/bouncer/frontends/v0/accept.go
index 17f05cb0..2e1d2cb8 100644
--- a/lib/bouncer/frontends/v0/accept.go
+++ b/lib/bouncer/frontends/v0/accept.go
@@ -4,11 +4,11 @@ import (
"fmt"
"strings"
- "pggat2/lib/fed"
- "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/perror"
- "pggat2/lib/util/slices"
- "pggat2/lib/util/strutil"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/perror"
+ "pggat/lib/util/slices"
+ "pggat/lib/util/strutil"
)
func startup0(
diff --git a/lib/bouncer/frontends/v0/authenticate.go b/lib/bouncer/frontends/v0/authenticate.go
index ef55450a..38791993 100644
--- a/lib/bouncer/frontends/v0/authenticate.go
+++ b/lib/bouncer/frontends/v0/authenticate.go
@@ -4,10 +4,10 @@ import (
"crypto/rand"
"errors"
- "pggat2/lib/auth"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/perror"
+ "pggat/lib/auth"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/perror"
)
func authenticationSASLInitial(client fed.Conn, creds auth.SASL) (tool auth.SASLVerifier, resp []byte, done bool, err perror.Error) {
diff --git a/lib/bouncer/frontends/v0/options.go b/lib/bouncer/frontends/v0/options.go
index ef7dad7b..06684d8c 100644
--- a/lib/bouncer/frontends/v0/options.go
+++ b/lib/bouncer/frontends/v0/options.go
@@ -3,8 +3,8 @@ package frontends
import (
"crypto/tls"
- "pggat2/lib/auth"
- "pggat2/lib/util/strutil"
+ "pggat/lib/auth"
+ "pggat/lib/util/strutil"
)
type AcceptOptions struct {
diff --git a/lib/bouncer/frontends/v0/params.go b/lib/bouncer/frontends/v0/params.go
index 0909c5f9..27e67b92 100644
--- a/lib/bouncer/frontends/v0/params.go
+++ b/lib/bouncer/frontends/v0/params.go
@@ -1,6 +1,6 @@
package frontends
-import "pggat2/lib/util/strutil"
+import "pggat/lib/util/strutil"
type AcceptParams struct {
CancelKey [8]byte
diff --git a/lib/fed/packets/v3.0/authenticationcleartext.go b/lib/fed/packets/v3.0/authenticationcleartext.go
index 204f77ce..42af01dc 100644
--- a/lib/fed/packets/v3.0/authenticationcleartext.go
+++ b/lib/fed/packets/v3.0/authenticationcleartext.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type AuthenticationCleartext struct{}
diff --git a/lib/fed/packets/v3.0/authenticationmd5.go b/lib/fed/packets/v3.0/authenticationmd5.go
index 32a445c4..c8748de2 100644
--- a/lib/fed/packets/v3.0/authenticationmd5.go
+++ b/lib/fed/packets/v3.0/authenticationmd5.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type AuthenticationMD5 struct {
Salt [4]byte
diff --git a/lib/fed/packets/v3.0/authenticationok.go b/lib/fed/packets/v3.0/authenticationok.go
index 7cd9d1fe..f2a08908 100644
--- a/lib/fed/packets/v3.0/authenticationok.go
+++ b/lib/fed/packets/v3.0/authenticationok.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type AuthenticationOk struct{}
diff --git a/lib/fed/packets/v3.0/authenticationresponse.go b/lib/fed/packets/v3.0/authenticationresponse.go
index 4ea3c3ab..03728f95 100644
--- a/lib/fed/packets/v3.0/authenticationresponse.go
+++ b/lib/fed/packets/v3.0/authenticationresponse.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/util/slices"
+ "pggat/lib/fed"
+ "pggat/lib/util/slices"
)
type AuthenticationResponse []byte
diff --git a/lib/fed/packets/v3.0/authenticationsasl.go b/lib/fed/packets/v3.0/authenticationsasl.go
index 9c924923..cdf34d78 100644
--- a/lib/fed/packets/v3.0/authenticationsasl.go
+++ b/lib/fed/packets/v3.0/authenticationsasl.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type AuthenticationSASL struct {
Mechanisms []string
diff --git a/lib/fed/packets/v3.0/authenticationsaslcontinue.go b/lib/fed/packets/v3.0/authenticationsaslcontinue.go
index 4d543bea..7175e759 100644
--- a/lib/fed/packets/v3.0/authenticationsaslcontinue.go
+++ b/lib/fed/packets/v3.0/authenticationsaslcontinue.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/util/slices"
+ "pggat/lib/fed"
+ "pggat/lib/util/slices"
)
type AuthenticationSASLContinue []byte
diff --git a/lib/fed/packets/v3.0/authenticationsaslfinal.go b/lib/fed/packets/v3.0/authenticationsaslfinal.go
index aaf21370..368f0f53 100644
--- a/lib/fed/packets/v3.0/authenticationsaslfinal.go
+++ b/lib/fed/packets/v3.0/authenticationsaslfinal.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/util/slices"
+ "pggat/lib/fed"
+ "pggat/lib/util/slices"
)
type AuthenticationSASLFinal []byte
diff --git a/lib/fed/packets/v3.0/backendkeydata.go b/lib/fed/packets/v3.0/backendkeydata.go
index 1f04266d..b3ee5959 100644
--- a/lib/fed/packets/v3.0/backendkeydata.go
+++ b/lib/fed/packets/v3.0/backendkeydata.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type BackendKeyData struct {
CancellationKey [8]byte
diff --git a/lib/fed/packets/v3.0/bind.go b/lib/fed/packets/v3.0/bind.go
index 0ab6a258..1dc4dee3 100644
--- a/lib/fed/packets/v3.0/bind.go
+++ b/lib/fed/packets/v3.0/bind.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/util/slices"
+ "pggat/lib/fed"
+ "pggat/lib/util/slices"
)
type Bind struct {
diff --git a/lib/fed/packets/v3.0/close.go b/lib/fed/packets/v3.0/close.go
index 64d8e880..d4ec7fb1 100644
--- a/lib/fed/packets/v3.0/close.go
+++ b/lib/fed/packets/v3.0/close.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type Close struct {
Which byte
diff --git a/lib/fed/packets/v3.0/copyfail.go b/lib/fed/packets/v3.0/copyfail.go
index 51ee4042..e1c08fd3 100644
--- a/lib/fed/packets/v3.0/copyfail.go
+++ b/lib/fed/packets/v3.0/copyfail.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type CopyFail struct {
Reason string
diff --git a/lib/fed/packets/v3.0/datarow.go b/lib/fed/packets/v3.0/datarow.go
index 3b144ccb..62d02a6a 100644
--- a/lib/fed/packets/v3.0/datarow.go
+++ b/lib/fed/packets/v3.0/datarow.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/util/slices"
+ "pggat/lib/fed"
+ "pggat/lib/util/slices"
)
type DataRow struct {
diff --git a/lib/fed/packets/v3.0/describe.go b/lib/fed/packets/v3.0/describe.go
index 3617099a..a5346ea0 100644
--- a/lib/fed/packets/v3.0/describe.go
+++ b/lib/fed/packets/v3.0/describe.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type Describe struct {
Which byte
diff --git a/lib/fed/packets/v3.0/errorresponse.go b/lib/fed/packets/v3.0/errorresponse.go
index 46e0837a..3bf60fb3 100644
--- a/lib/fed/packets/v3.0/errorresponse.go
+++ b/lib/fed/packets/v3.0/errorresponse.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/perror"
+ "pggat/lib/fed"
+ "pggat/lib/perror"
)
type ErrorResponse struct {
diff --git a/lib/fed/packets/v3.0/errors.go b/lib/fed/packets/v3.0/errors.go
index 7fe48821..8b758cce 100644
--- a/lib/fed/packets/v3.0/errors.go
+++ b/lib/fed/packets/v3.0/errors.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/perror"
+import "pggat/lib/perror"
var (
ErrBadFormat = perror.New(
diff --git a/lib/fed/packets/v3.0/execute.go b/lib/fed/packets/v3.0/execute.go
index 86029e33..7b0fd858 100644
--- a/lib/fed/packets/v3.0/execute.go
+++ b/lib/fed/packets/v3.0/execute.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type Execute struct {
Target string
diff --git a/lib/fed/packets/v3.0/negotiateprotocolversion.go b/lib/fed/packets/v3.0/negotiateprotocolversion.go
index e8e5ed61..a6810e3f 100644
--- a/lib/fed/packets/v3.0/negotiateprotocolversion.go
+++ b/lib/fed/packets/v3.0/negotiateprotocolversion.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/util/slices"
+ "pggat/lib/fed"
+ "pggat/lib/util/slices"
)
type NegotiateProtocolVersion struct {
diff --git a/lib/fed/packets/v3.0/parameterstatus.go b/lib/fed/packets/v3.0/parameterstatus.go
index 10d906f4..f4b296e1 100644
--- a/lib/fed/packets/v3.0/parameterstatus.go
+++ b/lib/fed/packets/v3.0/parameterstatus.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type ParameterStatus struct {
Key string
diff --git a/lib/fed/packets/v3.0/parse.go b/lib/fed/packets/v3.0/parse.go
index a3f75b6a..55a93188 100644
--- a/lib/fed/packets/v3.0/parse.go
+++ b/lib/fed/packets/v3.0/parse.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/util/slices"
+ "pggat/lib/fed"
+ "pggat/lib/util/slices"
)
type Parse struct {
diff --git a/lib/fed/packets/v3.0/passwordmessage.go b/lib/fed/packets/v3.0/passwordmessage.go
index 315d4571..a568fe56 100644
--- a/lib/fed/packets/v3.0/passwordmessage.go
+++ b/lib/fed/packets/v3.0/passwordmessage.go
@@ -1,7 +1,7 @@
package packets
import (
- "pggat2/lib/fed"
+ "pggat/lib/fed"
)
type PasswordMessage struct {
diff --git a/lib/fed/packets/v3.0/query.go b/lib/fed/packets/v3.0/query.go
index c757507d..ea7085b1 100644
--- a/lib/fed/packets/v3.0/query.go
+++ b/lib/fed/packets/v3.0/query.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type Query string
diff --git a/lib/fed/packets/v3.0/readyforquery.go b/lib/fed/packets/v3.0/readyforquery.go
index cd07bc42..e306477a 100644
--- a/lib/fed/packets/v3.0/readyforquery.go
+++ b/lib/fed/packets/v3.0/readyforquery.go
@@ -1,7 +1,7 @@
package packets
import (
- "pggat2/lib/fed"
+ "pggat/lib/fed"
)
type ReadyForQuery byte
diff --git a/lib/fed/packets/v3.0/rowdescription.go b/lib/fed/packets/v3.0/rowdescription.go
index 8a051bce..5df7b587 100644
--- a/lib/fed/packets/v3.0/rowdescription.go
+++ b/lib/fed/packets/v3.0/rowdescription.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/util/slices"
+ "pggat/lib/fed"
+ "pggat/lib/util/slices"
)
type RowDescriptionField struct {
diff --git a/lib/fed/packets/v3.0/saslinitialresponse.go b/lib/fed/packets/v3.0/saslinitialresponse.go
index 27fbbfa9..944e1777 100644
--- a/lib/fed/packets/v3.0/saslinitialresponse.go
+++ b/lib/fed/packets/v3.0/saslinitialresponse.go
@@ -1,8 +1,8 @@
package packets
import (
- "pggat2/lib/fed"
- "pggat2/lib/util/slices"
+ "pggat/lib/fed"
+ "pggat/lib/util/slices"
)
type SASLInitialResponse struct {
diff --git a/lib/fed/packets/v3.0/types.go b/lib/fed/packets/v3.0/types.go
index 744873a0..b6d17592 100644
--- a/lib/fed/packets/v3.0/types.go
+++ b/lib/fed/packets/v3.0/types.go
@@ -1,6 +1,6 @@
package packets
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
const (
TypeAuthentication fed.Type = 'R'
diff --git a/lib/gat/acceptor.go b/lib/gat/acceptor.go
index 214ab12b..c394ecf6 100644
--- a/lib/gat/acceptor.go
+++ b/lib/gat/acceptor.go
@@ -7,9 +7,9 @@ import (
"tuxpa.in/a/zlog/log"
- "pggat2/lib/bouncer/frontends/v0"
- "pggat2/lib/fed"
- "pggat2/lib/util/beforeexit"
+ "pggat/lib/bouncer/frontends/v0"
+ "pggat/lib/fed"
+ "pggat/lib/util/beforeexit"
)
type Acceptor struct {
diff --git a/lib/gat/metrics/pool.go b/lib/gat/metrics/pool.go
index 509d4b94..a8cbce97 100644
--- a/lib/gat/metrics/pool.go
+++ b/lib/gat/metrics/pool.go
@@ -9,7 +9,7 @@ import (
"github.com/google/uuid"
- "pggat2/lib/util/maps"
+ "pggat/lib/util/maps"
)
type Pool struct {
diff --git a/lib/gat/modes/eddy/server.go b/lib/gat/modes/eddy/server.go
index c59869cb..a6202f85 100644
--- a/lib/gat/modes/eddy/server.go
+++ b/lib/gat/modes/eddy/server.go
@@ -12,7 +12,7 @@ import (
"k8s.io/client-go/tools/cache"
"tuxpa.in/a/zlog/log"
- "pggat2/lib/util/flip"
+ "pggat/lib/util/flip"
)
type Server struct {
diff --git a/lib/gat/modes/pgbouncer/authfile.go b/lib/gat/modes/pgbouncer/authfile.go
index 18649a9c..d6c988cd 100644
--- a/lib/gat/modes/pgbouncer/authfile.go
+++ b/lib/gat/modes/pgbouncer/authfile.go
@@ -3,8 +3,8 @@ package pgbouncer
import (
"os"
- "pggat2/lib/util/encoding/ini"
- "pggat2/lib/util/encoding/userlist"
+ "pggat/lib/util/encoding/ini"
+ "pggat/lib/util/encoding/userlist"
)
type AuthFile struct {
diff --git a/lib/gat/modes/pgbouncer/config.go b/lib/gat/modes/pgbouncer/config.go
index 94ec5cef..d2c30222 100644
--- a/lib/gat/modes/pgbouncer/config.go
+++ b/lib/gat/modes/pgbouncer/config.go
@@ -9,13 +9,12 @@ import (
"tuxpa.in/a/zlog/log"
- "pggat2/lib/bouncer"
- "pggat2/lib/bouncer/frontends/v0"
- "pggat2/lib/gat"
- "pggat2/lib/gat/metrics"
- "pggat2/lib/util/encoding/ini"
- "pggat2/lib/util/flip"
- "pggat2/lib/util/strutil"
+ "pggat/lib/bouncer"
+ "pggat/lib/gat"
+ "pggat/lib/gat/metrics"
+ "pggat/lib/util/encoding/ini"
+ "pggat/lib/util/flip"
+ "pggat/lib/util/strutil"
)
type PoolMode string
diff --git a/lib/gat/modes/pgbouncer/pools.go b/lib/gat/modes/pgbouncer/pools.go
index 4ef0386a..c32be216 100644
--- a/lib/gat/modes/pgbouncer/pools.go
+++ b/lib/gat/modes/pgbouncer/pools.go
@@ -10,18 +10,17 @@ import (
"tuxpa.in/a/zlog/log"
- "pggat2/lib/auth/credentials"
- "pggat2/lib/bouncer/backends/v0"
- "pggat2/lib/gat"
- "pggat2/lib/gat/metrics"
- "pggat2/lib/gat/pool"
- "pggat2/lib/gat/pool/dialer"
- "pggat2/lib/gat/pool/pools/session"
- "pggat2/lib/gat/pool/pools/transaction"
- "pggat2/lib/gat/pool/recipe"
- "pggat2/lib/gsql"
- "pggat2/lib/util/maps"
- "pggat2/lib/util/strutil"
+ "pggat/lib/auth/credentials"
+ "pggat/lib/gat"
+ "pggat/lib/gat/metrics"
+ "pggat/lib/gat/pool"
+ "pggat/lib/gat/pool/dialer"
+ "pggat/lib/gat/pool/pools/session"
+ "pggat/lib/gat/pool/pools/transaction"
+ "pggat/lib/gat/pool/recipe"
+ "pggat/lib/gsql"
+ "pggat/lib/util/maps"
+ "pggat/lib/util/strutil"
)
type authQueryResult struct {
diff --git a/lib/gat/modes/zalando/config.go b/lib/gat/modes/zalando/config.go
index 24ba25e7..44b3e255 100644
--- a/lib/gat/modes/zalando/config.go
+++ b/lib/gat/modes/zalando/config.go
@@ -6,9 +6,9 @@ import (
"gfx.cafe/util/go/gun"
- "pggat2/lib/bouncer"
- "pggat2/lib/gat/modes/pgbouncer"
- "pggat2/lib/util/strutil"
+ "pggat/lib/bouncer"
+ "pggat/lib/gat/modes/pgbouncer"
+ "pggat/lib/util/strutil"
)
type Config struct {
diff --git a/lib/gat/pool/client.go b/lib/gat/pool/client.go
index e8a7d1f6..5a91d3f6 100644
--- a/lib/gat/pool/client.go
+++ b/lib/gat/pool/client.go
@@ -3,13 +3,13 @@ package pool
import (
"github.com/google/uuid"
- "pggat2/lib/fed"
- "pggat2/lib/middleware"
- "pggat2/lib/middleware/interceptor"
- "pggat2/lib/middleware/middlewares/eqp"
- "pggat2/lib/middleware/middlewares/ps"
- "pggat2/lib/middleware/middlewares/unterminate"
- "pggat2/lib/util/strutil"
+ "pggat/lib/fed"
+ "pggat/lib/middleware"
+ "pggat/lib/middleware/interceptor"
+ "pggat/lib/middleware/middlewares/eqp"
+ "pggat/lib/middleware/middlewares/ps"
+ "pggat/lib/middleware/middlewares/unterminate"
+ "pggat/lib/util/strutil"
)
type Client struct {
diff --git a/lib/gat/pool/conn.go b/lib/gat/pool/conn.go
index 60ac051b..bfd5284d 100644
--- a/lib/gat/pool/conn.go
+++ b/lib/gat/pool/conn.go
@@ -7,9 +7,9 @@ import (
"github.com/google/uuid"
- "pggat2/lib/fed"
- "pggat2/lib/gat/metrics"
- "pggat2/lib/util/strutil"
+ "pggat/lib/fed"
+ "pggat/lib/gat/metrics"
+ "pggat/lib/util/strutil"
)
type Conn struct {
diff --git a/lib/gat/pool/dialer/dialer.go b/lib/gat/pool/dialer/dialer.go
index 21e03d05..c91a97b8 100644
--- a/lib/gat/pool/dialer/dialer.go
+++ b/lib/gat/pool/dialer/dialer.go
@@ -1,8 +1,7 @@
package dialer
import (
- "pggat2/lib/bouncer/backends/v0"
- "pggat2/lib/fed"
+ "pggat/lib/fed"
)
type Dialer interface {
diff --git a/lib/gat/pool/dialer/net.go b/lib/gat/pool/dialer/net.go
index e4ee1341..8c8c0df3 100644
--- a/lib/gat/pool/dialer/net.go
+++ b/lib/gat/pool/dialer/net.go
@@ -3,8 +3,7 @@ package dialer
import (
"net"
- "pggat2/lib/bouncer/backends/v0"
- "pggat2/lib/fed"
+ "pggat/lib/fed"
)
type Net struct {
diff --git a/lib/gat/pool/flow.go b/lib/gat/pool/flow.go
index e0dff1ec..5d8649c5 100644
--- a/lib/gat/pool/flow.go
+++ b/lib/gat/pool/flow.go
@@ -1,11 +1,10 @@
package pool
import (
- "pggat2/lib/bouncer/backends/v0"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/gat/metrics"
- "pggat2/lib/middleware/middlewares/ps"
- "pggat2/lib/util/slices"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/gat/metrics"
+ "pggat/lib/middleware/middlewares/ps"
+ "pggat/lib/util/slices"
)
func Pair(options Options, client *Client, server *Server) (clientErr, serverErr error) {
diff --git a/lib/gat/pool/options.go b/lib/gat/pool/options.go
index a6ad812d..e30e3cac 100644
--- a/lib/gat/pool/options.go
+++ b/lib/gat/pool/options.go
@@ -3,8 +3,8 @@ package pool
import (
"time"
- "pggat2/lib/auth"
- "pggat2/lib/util/strutil"
+ "pggat/lib/auth"
+ "pggat/lib/util/strutil"
)
type ParameterStatusSync int
diff --git a/lib/gat/pool/pool.go b/lib/gat/pool/pool.go
index d7c1a7fa..0c3122bf 100644
--- a/lib/gat/pool/pool.go
+++ b/lib/gat/pool/pool.go
@@ -6,14 +6,12 @@ import (
"github.com/google/uuid"
- "pggat2/lib/auth"
- "pggat2/lib/bouncer/backends/v0"
- "pggat2/lib/bouncer/bouncers/v2"
- "pggat2/lib/fed"
- "pggat2/lib/gat/metrics"
- "pggat2/lib/gat/pool/recipe"
- "pggat2/lib/util/slices"
- "pggat2/lib/util/strutil"
+ "pggat/lib/auth"
+ "pggat/lib/fed"
+ "pggat/lib/gat/metrics"
+ "pggat/lib/gat/pool/recipe"
+ "pggat/lib/util/slices"
+ "pggat/lib/util/strutil"
)
type Pool struct {
diff --git a/lib/gat/pool/pools/session/pool.go b/lib/gat/pool/pools/session/pool.go
index 196a92b6..4f405641 100644
--- a/lib/gat/pool/pools/session/pool.go
+++ b/lib/gat/pool/pools/session/pool.go
@@ -1,7 +1,7 @@
package session
import (
- "pggat2/lib/gat/pool"
+ "pggat/lib/gat/pool"
)
func NewPool(options pool.Options) *pool.Pool {
diff --git a/lib/gat/pool/pools/session/pooler.go b/lib/gat/pool/pools/session/pooler.go
index 26b28b9d..a8c8cc12 100644
--- a/lib/gat/pool/pools/session/pooler.go
+++ b/lib/gat/pool/pools/session/pooler.go
@@ -5,8 +5,8 @@ import (
"github.com/google/uuid"
- "pggat2/lib/gat/pool"
- "pggat2/lib/util/slices"
+ "pggat/lib/gat/pool"
+ "pggat/lib/util/slices"
)
type Pooler struct {
diff --git a/lib/gat/pool/pools/transaction/pool.go b/lib/gat/pool/pools/transaction/pool.go
index 0c9faf01..922f244d 100644
--- a/lib/gat/pool/pools/transaction/pool.go
+++ b/lib/gat/pool/pools/transaction/pool.go
@@ -1,6 +1,6 @@
package transaction
-import "pggat2/lib/gat/pool"
+import "pggat/lib/gat/pool"
func NewPool(options pool.Options) *pool.Pool {
options.Pooler = new(Pooler)
diff --git a/lib/gat/pool/pools/transaction/pooler.go b/lib/gat/pool/pools/transaction/pooler.go
index 25fec284..15858369 100644
--- a/lib/gat/pool/pools/transaction/pooler.go
+++ b/lib/gat/pool/pools/transaction/pooler.go
@@ -3,9 +3,8 @@ package transaction
import (
"github.com/google/uuid"
- "pggat2/lib/gat/pool"
- "pggat2/lib/rob"
- "pggat2/lib/rob/schedulers/v2"
+ "pggat/lib/gat/pool"
+ "pggat/lib/rob"
)
type Pooler struct {
diff --git a/lib/gat/pool/recipe/options.go b/lib/gat/pool/recipe/options.go
index 3c454875..094caeb3 100644
--- a/lib/gat/pool/recipe/options.go
+++ b/lib/gat/pool/recipe/options.go
@@ -1,6 +1,6 @@
package recipe
-import "pggat2/lib/gat/pool/dialer"
+import "pggat/lib/gat/pool/dialer"
type Options struct {
Dialer dialer.Dialer
diff --git a/lib/gat/pool/recipe/recipe.go b/lib/gat/pool/recipe/recipe.go
index b3615811..997f1c8b 100644
--- a/lib/gat/pool/recipe/recipe.go
+++ b/lib/gat/pool/recipe/recipe.go
@@ -3,8 +3,7 @@ package recipe
import (
"sync"
- "pggat2/lib/bouncer/backends/v0"
- "pggat2/lib/fed"
+ "pggat/lib/fed"
)
type Recipe struct {
diff --git a/lib/gat/pool/server.go b/lib/gat/pool/server.go
index fbddda79..a051085d 100644
--- a/lib/gat/pool/server.go
+++ b/lib/gat/pool/server.go
@@ -3,12 +3,12 @@ package pool
import (
"github.com/google/uuid"
- "pggat2/lib/fed"
- "pggat2/lib/middleware"
- "pggat2/lib/middleware/interceptor"
- "pggat2/lib/middleware/middlewares/eqp"
- "pggat2/lib/middleware/middlewares/ps"
- "pggat2/lib/util/strutil"
+ "pggat/lib/fed"
+ "pggat/lib/middleware"
+ "pggat/lib/middleware/interceptor"
+ "pggat/lib/middleware/middlewares/eqp"
+ "pggat/lib/middleware/middlewares/ps"
+ "pggat/lib/util/strutil"
)
type Server struct {
diff --git a/lib/gat/pools.go b/lib/gat/pools.go
index db20e1fd..f9331ec5 100644
--- a/lib/gat/pools.go
+++ b/lib/gat/pools.go
@@ -1,9 +1,9 @@
package gat
import (
- "pggat2/lib/gat/metrics"
- "pggat2/lib/gat/pool"
- "pggat2/lib/util/maps"
+ "pggat/lib/gat/metrics"
+ "pggat/lib/gat/pool"
+ "pggat/lib/util/maps"
)
type Pools interface {
diff --git a/lib/gsql/client.go b/lib/gsql/client.go
index 4db902d4..0e672ba8 100644
--- a/lib/gsql/client.go
+++ b/lib/gsql/client.go
@@ -5,8 +5,8 @@ import (
"net"
"sync"
- "pggat2/lib/fed"
- "pggat2/lib/util/ring"
+ "pggat/lib/fed"
+ "pggat/lib/util/ring"
)
type Client struct {
diff --git a/lib/gsql/eq.go b/lib/gsql/eq.go
index 2d78bced..46100e07 100644
--- a/lib/gsql/eq.go
+++ b/lib/gsql/eq.go
@@ -4,8 +4,8 @@ import (
"reflect"
"strconv"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
)
func (T *Client) ExtendedQuery(result any, query string, args ...any) error {
diff --git a/lib/gsql/query.go b/lib/gsql/query.go
index 66472e69..a2eb1e1d 100644
--- a/lib/gsql/query.go
+++ b/lib/gsql/query.go
@@ -1,8 +1,8 @@
package gsql
import (
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
)
func (T *Client) Query(query string, results ...any) {
diff --git a/lib/gsql/query_test.go b/lib/gsql/query_test.go
index ca5947e5..48f0cb5a 100644
--- a/lib/gsql/query_test.go
+++ b/lib/gsql/query_test.go
@@ -6,10 +6,8 @@ import (
"tuxpa.in/a/zlog/log"
- "pggat2/lib/auth/credentials"
- "pggat2/lib/bouncer/backends/v0"
- "pggat2/lib/bouncer/bouncers/v2"
- "pggat2/lib/fed"
+ "pggat/lib/auth/credentials"
+ "pggat/lib/fed"
)
type Result struct {
diff --git a/lib/gsql/result.go b/lib/gsql/result.go
index 03eefc20..ccb7c040 100644
--- a/lib/gsql/result.go
+++ b/lib/gsql/result.go
@@ -1,6 +1,6 @@
package gsql
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type ResultWriter interface {
WritePacket(packet fed.Packet) error
diff --git a/lib/gsql/row.go b/lib/gsql/row.go
index 9ca877fb..32d51a6c 100644
--- a/lib/gsql/row.go
+++ b/lib/gsql/row.go
@@ -5,8 +5,8 @@ import (
"reflect"
"strconv"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
)
type RowWriter struct {
diff --git a/lib/middleware/context.go b/lib/middleware/context.go
index 0cdf7163..e0a139a9 100644
--- a/lib/middleware/context.go
+++ b/lib/middleware/context.go
@@ -1,6 +1,6 @@
package middleware
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type Context interface {
// Cancel the current packet
diff --git a/lib/middleware/interceptor/context.go b/lib/middleware/interceptor/context.go
index bc52f04b..b8ab9efd 100644
--- a/lib/middleware/interceptor/context.go
+++ b/lib/middleware/interceptor/context.go
@@ -1,9 +1,9 @@
package interceptor
import (
- "pggat2/lib/fed"
- "pggat2/lib/middleware"
- "pggat2/lib/util/decorator"
+ "pggat/lib/fed"
+ "pggat/lib/middleware"
+ "pggat/lib/util/decorator"
)
type Context struct {
diff --git a/lib/middleware/interceptor/interceptor.go b/lib/middleware/interceptor/interceptor.go
index 1f253ade..89d29e97 100644
--- a/lib/middleware/interceptor/interceptor.go
+++ b/lib/middleware/interceptor/interceptor.go
@@ -3,8 +3,8 @@ package interceptor
import (
"crypto/tls"
- "pggat2/lib/fed"
- "pggat2/lib/middleware"
+ "pggat/lib/fed"
+ "pggat/lib/middleware"
)
type Interceptor struct {
diff --git a/lib/middleware/middleware.go b/lib/middleware/middleware.go
index 941dbcb7..fcad4376 100644
--- a/lib/middleware/middleware.go
+++ b/lib/middleware/middleware.go
@@ -1,6 +1,6 @@
package middleware
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type Middleware interface {
Read(ctx Context, packet fed.Packet) error
diff --git a/lib/middleware/middlewares/eqp/client.go b/lib/middleware/middlewares/eqp/client.go
index 4399b3c9..2f8efee5 100644
--- a/lib/middleware/middlewares/eqp/client.go
+++ b/lib/middleware/middlewares/eqp/client.go
@@ -3,9 +3,9 @@ package eqp
import (
"errors"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/middleware"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/middleware"
)
type Client struct {
diff --git a/lib/middleware/middlewares/eqp/portal.go b/lib/middleware/middlewares/eqp/portal.go
index cdad7a6f..a3c8a382 100644
--- a/lib/middleware/middlewares/eqp/portal.go
+++ b/lib/middleware/middlewares/eqp/portal.go
@@ -3,8 +3,8 @@ package eqp
import (
"hash/maphash"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
)
type Portal struct {
diff --git a/lib/middleware/middlewares/eqp/preparedStatement.go b/lib/middleware/middlewares/eqp/preparedStatement.go
index ff586681..c0bad802 100644
--- a/lib/middleware/middlewares/eqp/preparedStatement.go
+++ b/lib/middleware/middlewares/eqp/preparedStatement.go
@@ -3,8 +3,8 @@ package eqp
import (
"hash/maphash"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
)
type PreparedStatement struct {
diff --git a/lib/middleware/middlewares/eqp/server.go b/lib/middleware/middlewares/eqp/server.go
index bdbad666..a7c8884d 100644
--- a/lib/middleware/middlewares/eqp/server.go
+++ b/lib/middleware/middlewares/eqp/server.go
@@ -3,10 +3,10 @@ package eqp
import (
"errors"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/middleware"
- "pggat2/lib/util/ring"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/middleware"
+ "pggat/lib/util/ring"
)
type HashedPortal struct {
diff --git a/lib/middleware/middlewares/ps/client.go b/lib/middleware/middlewares/ps/client.go
index 21a69259..bdc92e77 100644
--- a/lib/middleware/middlewares/ps/client.go
+++ b/lib/middleware/middlewares/ps/client.go
@@ -3,10 +3,10 @@ package ps
import (
"errors"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/middleware"
- "pggat2/lib/util/strutil"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/middleware"
+ "pggat/lib/util/strutil"
)
type Client struct {
diff --git a/lib/middleware/middlewares/ps/server.go b/lib/middleware/middlewares/ps/server.go
index 110e5925..187d46e1 100644
--- a/lib/middleware/middlewares/ps/server.go
+++ b/lib/middleware/middlewares/ps/server.go
@@ -3,10 +3,10 @@ package ps
import (
"errors"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/middleware"
- "pggat2/lib/util/strutil"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/middleware"
+ "pggat/lib/util/strutil"
)
type Server struct {
diff --git a/lib/middleware/middlewares/ps/sync.go b/lib/middleware/middlewares/ps/sync.go
index 7fc74a81..c37894b4 100644
--- a/lib/middleware/middlewares/ps/sync.go
+++ b/lib/middleware/middlewares/ps/sync.go
@@ -1,11 +1,10 @@
package ps
import (
- "pggat2/lib/bouncer/backends/v0"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/util/slices"
- "pggat2/lib/util/strutil"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/util/slices"
+ "pggat/lib/util/strutil"
)
func sync(tracking []strutil.CIString, client fed.ReadWriter, c *Client, server fed.ReadWriter, s *Server, name strutil.CIString) error {
diff --git a/lib/middleware/middlewares/unterminate/unterminate.go b/lib/middleware/middlewares/unterminate/unterminate.go
index 34a914f0..3850e667 100644
--- a/lib/middleware/middlewares/unterminate/unterminate.go
+++ b/lib/middleware/middlewares/unterminate/unterminate.go
@@ -3,9 +3,9 @@ package unterminate
import (
"io"
- "pggat2/lib/fed"
- packets "pggat2/lib/fed/packets/v3.0"
- "pggat2/lib/middleware"
+ "pggat/lib/fed"
+ packets "pggat/lib/fed/packets/v3.0"
+ "pggat/lib/middleware"
)
// Unterminate catches the Terminate packet and returns io.EOF instead.
diff --git a/lib/middleware/nil.go b/lib/middleware/nil.go
index 7b1c60df..4d838bb0 100644
--- a/lib/middleware/nil.go
+++ b/lib/middleware/nil.go
@@ -1,6 +1,6 @@
package middleware
-import "pggat2/lib/fed"
+import "pggat/lib/fed"
type Nil struct{}
diff --git a/lib/rob/schedulers/v2/scheduler.go b/lib/rob/schedulers/v2/scheduler.go
index 712c51b1..d5efd37e 100644
--- a/lib/rob/schedulers/v2/scheduler.go
+++ b/lib/rob/schedulers/v2/scheduler.go
@@ -5,11 +5,11 @@ import (
"github.com/google/uuid"
- "pggat2/lib/rob"
- "pggat2/lib/rob/schedulers/v2/job"
- "pggat2/lib/rob/schedulers/v2/sink"
- "pggat2/lib/util/maps"
- "pggat2/lib/util/pools"
+ "pggat/lib/rob"
+ "pggat/lib/rob/schedulers/v2/job"
+ "pggat/lib/rob/schedulers/v2/sink"
+ "pggat/lib/util/maps"
+ "pggat/lib/util/pools"
)
type Scheduler struct {
diff --git a/lib/rob/schedulers/v2/scheduler_test.go b/lib/rob/schedulers/v2/scheduler_test.go
index 76b75150..d7546402 100644
--- a/lib/rob/schedulers/v2/scheduler_test.go
+++ b/lib/rob/schedulers/v2/scheduler_test.go
@@ -8,7 +8,7 @@ import (
"github.com/google/uuid"
- "pggat2/lib/rob"
+ "pggat/lib/rob"
)
type ShareTable struct {
diff --git a/lib/rob/schedulers/v2/sink/sink.go b/lib/rob/schedulers/v2/sink/sink.go
index c8e3519b..d8473821 100644
--- a/lib/rob/schedulers/v2/sink/sink.go
+++ b/lib/rob/schedulers/v2/sink/sink.go
@@ -6,9 +6,9 @@ import (
"github.com/google/uuid"
- "pggat2/lib/rob/schedulers/v2/job"
- "pggat2/lib/util/rbtree"
- "pggat2/lib/util/ring"
+ "pggat/lib/rob/schedulers/v2/job"
+ "pggat/lib/util/rbtree"
+ "pggat/lib/util/ring"
)
type Sink struct {
diff --git a/lib/util/pools/log2.go b/lib/util/pools/log2.go
index 8679a287..f4a14a85 100644
--- a/lib/util/pools/log2.go
+++ b/lib/util/pools/log2.go
@@ -3,7 +3,7 @@ package pools
import (
"math/bits"
- "pggat2/lib/util/slices"
+ "pggat/lib/util/slices"
)
type Log2[T any] struct {
diff --git a/lib/util/strutil/cistring.go b/lib/util/strutil/cistring.go
index 096bb366..aa8de4ff 100644
--- a/lib/util/strutil/cistring.go
+++ b/lib/util/strutil/cistring.go
@@ -5,7 +5,7 @@ import (
"encoding/json"
"strings"
- "pggat2/lib/util/encoding/ini"
+ "pggat/lib/util/encoding/ini"
)
// CIString is a case-insensitive string.
--
GitLab