diff --git a/cmd/cgat/main.go b/cmd/cgat/main.go index c75996db6a9bfa5ef2ca4d7437f0dcc8247c2996..9c56e14a1f88d4905dee93331aeda0350ae6f236 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 0eb431c68408a01834038489aa6bf0d8b1d730ab..15b5e0ec8cb9864e64de162994f5897f068738ae 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 c7800c8f131e07ac7ac9843bb3263c9b7513899d..e1e15f63976f41248f5321b0adfb60ce251a5679 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 fdcb83ffe820ec9ca156c0bfc2a6adbe2d0d8198..5fe0b7f5a717b3de5ed9e164eb6424bf1a71f2ad 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 aab8a815dd54f1f4f236e2a384dafbd4b945201e..2d045954233f0e0eb3b7e0be0790d32be360132e 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 42fa877eaf5bf3ee3622f84d9feced261b8d77ec..c96c48487a40b355e03dcba04ef97d4c0b66f7cc 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 78b57243173b8d21a8f182e1b5410c6932f69e93..4f04779d0e9164cc9873c7ce66c63005461a3bcb 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 ec4dbb3c8d30bcf49c1c3778f70505e178aea2da..3cc415b592c595fe7f46b5a95f9cc1f6a334e2f5 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 ae30d68135d0d0a00a2e1a77afb3a1ac6ce06a42..9c7fc5fff9d5202454be976ef1119655792f045a 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 58e21111763379c9c55679d75ac3e5208000f8aa..3a6c95eb64b9a99ac7a6796e7edb5d55f76e7131 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 7d2b7619d4d51fcad535b3f275d71fe86fbc6108..b75821792c0eb02ee912423a2a954d8e14fe22bf 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 9c71ca2d64ecbe2a5e1e7e73cc1a5edc59d9ba47..fc81f9eee6ecb179be28262181c788f5cdd9d134 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 f42c39683fd98731524da256bf4350a4a3cf7bef..facb7cea3e3e14719432e5338ed02173ecdc0b66 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 a4ce14f10fa50ad0a42ce6fc17e90ebb1a76fd3a..58fb8495688f929cf018d523af81b964559d5015 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 17f05cb03f95ffee9110c58cc932833f205e2b2f..2e1d2cb838ff995a76ff5d25824db01e912d3cd0 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 ef55450a9dc7d020ab59c574605dde82484c586c..38791993da287e88a3a4a4fdb0a84d4e16840a50 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 ef7dad7b9d388eea9eeec5ae4588c4b6674db928..06684d8cf94739a499fd90bfc4346ad967819e21 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 0909c5f9311ac79c7eb5d61a51c082c630742918..27e67b92cdb88429c4eb16420371a7062d2a1d06 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 204f77ceda19dd253bb2cf0eb5e0dee28fdfd75b..42af01dc6d7e5e335639b8261aea1ceb24e0861d 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 32a445c4a3246f6e8c2e0fb4dfa5d7a3ec1d652f..c8748de25bc6bf5fd8283a5933499a7223e9230a 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 7cd9d1fe3f8f888b570193adb7a09af6799e46cd..f2a089083917ae5640bf1a843b29007673472dc4 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 4ea3c3ab33a6a436023926538f23faea642b9e8c..03728f95295f41111f52681dffaa8a52f530f355 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 9c9249239fc36c2bb3f846f60c142970f84376a3..cdf34d78676faafbb03678cf697baaa38d210ad1 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 4d543bea434b8b9773ef970cbcd23734d6a5b572..7175e759964ba69a75ba6985a18c2574c7d6564e 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 aaf2137090d54f5f1cd5c89be05dcccbef0514bd..368f0f53fd19224fec7b3fe3f08eaf4fbed84920 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 1f04266deeb0fd1accc1d00ab8bf08395b9db503..b3ee5959aea949d7c560aa4a3ac65405d72aefe1 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 0ab6a25861f45eacebb8b6d5148ac86c88a07dde..1dc4dee31379cac65c56629bae199988e4b25061 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 64d8e88077cfb2f908727e60a944c3c17c5f4b54..d4ec7fb1a8c72afc050cbcef4da6f10be821fed2 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 51ee40428fbd92d9fd8d8692d833a6578ff029ef..e1c08fd371bace7d9793fec4e02abad8253633f9 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 3b144ccbca6800e116592f8e1ea12b75f437df71..62d02a6a3948db30a6ade5f75df2542b001e677b 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 3617099a5aaef96ffffba54c4727d5b4c5c44caa..a5346ea0e1b933b1888cc6c67211edfadfab3ee4 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 46e0837a5be8fde13d2f332cb4e8c435fc3eda52..3bf60fb3bddfa053b84abf37e6b1ff07ff52e7ea 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 7fe488210c45ea31a7423b59c7de9da07c77515e..8b758ccedd8e575a74c3894ae1e234eb7bc4f913 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 86029e33ffa2751ac47733aa49b389b690a1b80c..7b0fd858bab5be5d53b3bdfe218b8776c9ba4dce 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 e8e5ed61dbdc8fdf6474c317a3fddf41743fe08a..a6810e3f9bd7d551cc3a7c840f2ac42a6dac7b5d 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 10d906f49ace5e7cc1b454af2eafd2af0a9d1b21..f4b296e1afa6df0e93814f45eab84226d34ceea0 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 a3f75b6ac40889894dbbb6fa646704d0315dffac..55a93188ae1045f9705dc5888238c3c253c5038c 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 315d4571386354f5a3ca7612ebb5a451aab8ef34..a568fe5646897743b3f1dcbb3b1e123eed31878d 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 c757507dfadcc299c4dbda561e5d273ef5d539cc..ea7085b112d9225e0bab07e73bce06dd3633a128 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 cd07bc4228d70c8f1c5d8a2169f8fe711592d7ea..e306477a506aa072ea993b2b87a0dccf2f7d3d07 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 8a051bce164654a32822d0349a34e1dba475e8a6..5df7b58762de7f882ae9b087b00b08955325441d 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 27fbbfa94d3fe267407986dfa7680c98aca70875..944e17778f14207928a876aa9319f7fdf14c0260 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 744873a0361ffcb13f10da7fcaee6bfcf2691dc0..b6d17592aa02ea93b45027079de689f0d11c5c74 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 214ab12bb98ce2b9f7ab5e482aecc1f03d40c4c8..c394ecf60153744b526ac204ea48e533e302e234 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 509d4b94376f5c9b407920fc688d186f6e3b7519..a8cbce97c3c150fa20033a223d55f9158a3c104a 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 c59869cb994881f46618c94cae16463882a082b3..a6202f8514c3cfd4a7abb98cf7d329edd6fa8896 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 18649a9c4e1f3b367358f4b73331eec8fe1c6d00..d6c988cd398fcb95e2e6dc73a7a4fb02f1229bf1 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 94ec5cefec11ef833d1b82f7df2ba321c4a7f6de..d2c30222b4cfad30deb9e0ebf54a734e86364c2e 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 4ef0386ab878a07335d428b8e511b3be04f7102a..c32be216f381d70f9dd052edd961f26ecc9a5b66 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 24ba25e72d4c03ee392ff0644e310bdb37a3306d..44b3e255986aedf3bdb546ba6bab3bb9ca8f2676 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 e8a7d1f6d28f807babc036c1988c92d47c27288f..5a91d3f601c80bf9ffcebca3fdbd22abff3789c1 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 60ac051b0c64734e9135588374d0fdbd8cc6bff7..bfd5284dee8824b8485d6ab94e8fb3aabd30af8b 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 21e03d0537df8f50a704921676c82010fe6deeb9..c91a97b8d3d0327f1e80d041468d45d219e33ac7 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 e4ee1341dd8be15694748e885ae508991d4f224e..8c8c0df3216a9c8dac8706fe10c06a5355d3c9b6 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 e0dff1ec77dd5f4abddc41089d7bea60ba64d4ab..5d8649c582c90c3051365d7df9d307c0d7155a75 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 a6ad812de853c159cbdf5e1bde0e5b8668dd2ff3..e30e3cac486252eec5be045641c4a416267e7b4c 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 d7c1a7fa3e1747c4c25942268265432d75441d13..0c3122bfb6b04d2b6986712cfc9689c3cdb070d1 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 196a92b69e3e4cd45a4405d0d26174de25871f50..4f405641c735e0a59aff5caac5ac951f1119283b 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 26b28b9de9577a3eb5ad533b09f23950cd769a85..a8c8cc129e8f8579840c4a8f9d5c22478a5920a7 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 0c9faf01916ed9c39d333ad699d1ebe9e6a8b672..922f244df951fb1a77ced300c832da9f5d196fbe 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 25fec2842761b222b2b2e8f40fb7f898b95fa414..158583699a54f78f2707176e2f600a0321d002f3 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 3c454875350a88236124e7b26c2cfc1cb35398f6..094caeb3190b3f7c885af616f04735a4e3dbf174 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 b36158117d8450766c69db8cdd8d4aaf07b5ee74..997f1c8b6d21e364f855957796d1ff83f3758006 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 fbddda7981d548b402f4e4207e5968fba9b44ad7..a051085df6220029fd0af33a37d62060c01e6ecd 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 db20e1fd0c71cf574b327dc1f3da377e3709fdb7..f9331ec54623999508ecb911482d86a254bf1992 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 4db902d49494056ae0afe0f0cae4aaed0ce55903..0e672ba86eb84b10dd89195a7a5d609420aea545 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 2d78bceddf198675764c8a484a7b9ca72aa023da..46100e074ca7c79040e4d6184fc3cd518931ac20 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 66472e69c21b54e90e29e03fa8659b5946566180..a2eb1e1d8ae3e4dbe2fcf5d3d0821f0d9bbbf23b 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 ca5947e5d3062960c6eba28373590c48de5e3ee5..48f0cb5ae2e67d18593f9e23e6a67101902682fe 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 03eefc20a7946a1cb6525f9bbef357c91b7a9b3a..ccb7c040b6483b391c2f4be70aecb44def59875d 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 9ca877fb67f0129470ea552e8e4a5a96b764b441..32d51a6ce2478aec7d7323923a244d5b27eaa6d5 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 0cdf7163f5a695f5771d43c14b527c9bede0b5d5..e0a139a924fd2ea671e4274a7d9e891078861556 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 bc52f04b465fcd326542d24d3adca3deeedec49e..b8ab9efd5ad35cf6f5caaf81e28e3507e93a3d88 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 1f253adee3526e6a41d09797947199df4931b2e7..89d29e97e9cb8085543e6dcfbca01dae9a0eed89 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 941dbcb7deb4411cab9f530c33e6651524b3973e..fcad437607fe4b0e2a65870ad377d388b16d468b 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 4399b3c99cbf57c569af2cc338e59419f4e81346..2f8efee5e9cd44382899a03251d56c198d4c04d3 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 cdad7a6fcbe1f01af113b05a6e014ab41b70053a..a3c8a382bf2ccb310ee717c6f67ae3be2ec2606c 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 ff586681d8aa76e9ae86e45d3b46922eeeeeda46..c0bad80234d635913dd0509e06c54871ffec6d54 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 bdbad666513d1aa217f3912468cae004d7ebd987..a7c8884d49e854e0ddb836e1898b11b666c408dc 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 21a69259c9ed3470d2ee7da1e614db412b958e6a..bdc92e77157d12e7a15dc0ca3956666c5a5e4169 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 110e5925161bbaa40bd94f24848170b0d99ba594..187d46e1978617efc223768ee95184b5b30e9a96 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 7fc74a811bcfc994f9ef69cb9c2bed52552c2e4e..c37894b4b760c334f3711bd61ecfa4939c7d70a5 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 34a914f0a951f8cbdcd8146366e4da72ff54ba67..3850e66740ccd6e626e20d45c9fd0337a6989a5c 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 7b1c60dfa4ab435030bd90ca603a3d12d7be1814..4d838bb0da1ec0cefce52015c3e5141d99d4532a 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 712c51b167e9e8e445081d3aface66d09e94eb6f..d5efd37e03cbbee32305afa70b539df17261a3f2 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 76b7515032e52cd59221f7d92e260a6683daaa6f..d75464021e02c8423c8966968716ebe63db81aaf 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 c8e3519b1ad054075e9e1424108c503ba6c8775d..d84738212fea0cea177b5949840198f8477bba16 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 8679a2872e91a03fe42834ea08b08e6d94a01cbb..f4a14a85e2156b754626f073f5b8ce9bdeafd8c6 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 096bb366cfa6e1a4cd8a1994862c0bd21c1eeebe..aa8de4ff6ac2e00c4c174e1b1d2f4167a772214d 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.