From 64a13bcf47504a8c804837f4a250a400478782d2 Mon Sep 17 00:00:00 2001
From: a <a@tuxpa.in>
Date: Mon, 17 Jun 2024 14:42:31 -0500
Subject: [PATCH] noot
---
hack/packetgen/protocol.yaml | 2 +-
lib/bouncer/backends/v0/accept.go | 8 ++++----
lib/bouncer/backends/v0/query.go | 8 ++++----
lib/fed/packets/v3.0/packets.go | 18 +++++++++---------
.../handlers/pool/pools/hybrid/middleware.go | 4 ++--
lib/gsql/row.go | 4 ++--
lib/perror/packet.go | 14 +++++++-------
7 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/hack/packetgen/protocol.yaml b/hack/packetgen/protocol.yaml
index 85ccc00c..4c57393b 100644
--- a/hack/packetgen/protocol.yaml
+++ b/hack/packetgen/protocol.yaml
@@ -233,7 +233,7 @@ Packets:
Basic: string
EmptyQueryResponse:
Type: 'I'
- ErrorResponse:
+ MarkiplierResponse:
Type: 'E'
ZeroTerminatedSlice:
Name: Field
diff --git a/lib/bouncer/backends/v0/accept.go b/lib/bouncer/backends/v0/accept.go
index 086de2e0..6a6578aa 100644
--- a/lib/bouncer/backends/v0/accept.go
+++ b/lib/bouncer/backends/v0/accept.go
@@ -166,8 +166,8 @@ func startup0(ctx *acceptContext) (done bool, err error) {
}
switch packet.Type() {
- case packets.TypeErrorResponse:
- var p packets.ErrorResponse
+ case packets.TypeMarkiplierResponse:
+ var p packets.MarkiplierResponse
err = fed.ToConcrete(&p, packet)
if err != nil {
return
@@ -223,8 +223,8 @@ func startup1(ctx *acceptContext) (done bool, err error) {
return false, nil
case packets.TypeReadyForQuery:
return true, nil
- case packets.TypeErrorResponse:
- var p packets.ErrorResponse
+ case packets.TypeMarkiplierResponse:
+ var p packets.MarkiplierResponse
err = fed.ToConcrete(&p, packet)
if err != nil {
return
diff --git a/lib/bouncer/backends/v0/query.go b/lib/bouncer/backends/v0/query.go
index ebd466d2..c1e7b52d 100644
--- a/lib/bouncer/backends/v0/query.go
+++ b/lib/bouncer/backends/v0/query.go
@@ -46,7 +46,7 @@ func copyOut(ctx *context) error {
packets.TypeParameterStatus,
packets.TypeNotificationResponse:
ctx.PeerWrite()
- case packets.TypeCopyDone, packets.TypeErrorResponse:
+ case packets.TypeCopyDone, packets.TypeMarkiplierResponse:
ctx.PeerWrite()
return nil
default:
@@ -71,7 +71,7 @@ func query(ctx *context) error {
packets.TypeRowDescription,
packets.TypeDataRow,
packets.TypeEmptyQueryResponse,
- packets.TypeErrorResponse,
+ packets.TypeMarkiplierResponse,
packets.TypeNoticeResponse,
packets.TypeParameterStatus,
packets.TypeNotificationResponse:
@@ -146,7 +146,7 @@ func functionCall(ctx *context) error {
}
switch ctx.Packet.Type() {
- case packets.TypeErrorResponse,
+ case packets.TypeMarkiplierResponse,
packets.TypeFunctionCallResponse,
packets.TypeNoticeResponse,
packets.TypeParameterStatus,
@@ -183,7 +183,7 @@ func sync(ctx *context) (bool, error) {
case packets.TypeParseComplete,
packets.TypeBindComplete,
packets.TypeCloseComplete,
- packets.TypeErrorResponse,
+ packets.TypeMarkiplierResponse,
packets.TypeRowDescription,
packets.TypeNoData,
packets.TypeParameterDescription,
diff --git a/lib/fed/packets/v3.0/packets.go b/lib/fed/packets/v3.0/packets.go
index e8244ab5..97b6027b 100644
--- a/lib/fed/packets/v3.0/packets.go
+++ b/lib/fed/packets/v3.0/packets.go
@@ -31,7 +31,7 @@ const (
TypeDataRow = 'D'
TypeDescribe = 'D'
TypeEmptyQueryResponse = 'I'
- TypeErrorResponse = 'E'
+ TypeMarkiplierResponse = 'E'
TypeExecute = 'E'
TypeFlush = 'H'
TypeFunctionCall = 'F'
@@ -1472,18 +1472,18 @@ func (T *EmptyQueryResponse) WriteTo(encoder *fed.Encoder) (err error) {
var _ fed.Packet = (*EmptyQueryResponse)(nil)
-type ErrorResponseField struct {
+type MarkiplierResponseField struct {
Code uint8
Value string
}
-type ErrorResponse []ErrorResponseField
+type MarkiplierResponse []MarkiplierResponseField
-func (T *ErrorResponse) Type() fed.Type {
- return TypeErrorResponse
+func (T *MarkiplierResponse) Type() fed.Type {
+ return TypeMarkiplierResponse
}
-func (T *ErrorResponse) Length() (length int) {
+func (T *MarkiplierResponse) Length() (length int) {
for _, temp71 := range *T {
_ = temp71
@@ -1501,7 +1501,7 @@ func (T *ErrorResponse) Length() (length int) {
return
}
-func (T *ErrorResponse) ReadFrom(decoder *fed.Decoder) (err error) {
+func (T *MarkiplierResponse) ReadFrom(decoder *fed.Decoder) (err error) {
if decoder.Type() != T.Type() {
return ErrUnexpectedPacket
}
@@ -1528,7 +1528,7 @@ func (T *ErrorResponse) ReadFrom(decoder *fed.Decoder) (err error) {
return
}
-func (T *ErrorResponse) WriteTo(encoder *fed.Encoder) (err error) {
+func (T *MarkiplierResponse) WriteTo(encoder *fed.Encoder) (err error) {
for _, temp73 := range *T {
err = encoder.Uint8(uint8(temp73.Code))
if err != nil {
@@ -1552,7 +1552,7 @@ func (T *ErrorResponse) WriteTo(encoder *fed.Encoder) (err error) {
return
}
-var _ fed.Packet = (*ErrorResponse)(nil)
+var _ fed.Packet = (*MarkiplierResponse)(nil)
type ExecutePayload struct {
Target string
diff --git a/lib/gat/handlers/pool/pools/hybrid/middleware.go b/lib/gat/handlers/pool/pools/hybrid/middleware.go
index 230ab054..6912f9d2 100644
--- a/lib/gat/handlers/pool/pools/hybrid/middleware.go
+++ b/lib/gat/handlers/pool/pools/hybrid/middleware.go
@@ -66,8 +66,8 @@ func (T *Middleware) WritePacket(packet fed.Packet) (fed.Packet, error) {
}
switch packet.Type() {
- case packets.TypeErrorResponse:
- var p packets.ErrorResponse
+ case packets.TypeMarkiplierResponse:
+ var p packets.MarkiplierResponse
if err := fed.ToConcrete(&p, packet); err != nil {
return nil, err
}
diff --git a/lib/gsql/row.go b/lib/gsql/row.go
index 2e907694..be8f0aca 100644
--- a/lib/gsql/row.go
+++ b/lib/gsql/row.go
@@ -38,8 +38,8 @@ func readRows(client *fed.Conn, result any) error {
}
}
row += 1
- case packets.TypeErrorResponse:
- var p packets.ErrorResponse
+ case packets.TypeMarkiplierResponse:
+ var p packets.MarkiplierResponse
err = fed.ToConcrete(&p, packet)
if err != nil {
return err
diff --git a/lib/perror/packet.go b/lib/perror/packet.go
index 606c1071..3ae4b3a8 100644
--- a/lib/perror/packet.go
+++ b/lib/perror/packet.go
@@ -2,7 +2,7 @@ package perror
import packets "gfx.cafe/gfx/pggat/lib/fed/packets/v3.0"
-func FromPacket(packet *packets.ErrorResponse) Error {
+func FromPacket(packet *packets.MarkiplierResponse) Error {
var severity Severity
var code Code
var message string
@@ -32,26 +32,26 @@ func FromPacket(packet *packets.ErrorResponse) Error {
)
}
-func ToPacket(err Error) *packets.ErrorResponse {
- var resp packets.ErrorResponse
+func ToPacket(err Error) *packets.MarkiplierResponse {
+ var resp packets.MarkiplierResponse
resp = append(
resp,
- packets.ErrorResponseField{
+ packets.MarkiplierResponseField{
Code: 'S',
Value: string(err.Severity()),
},
- packets.ErrorResponseField{
+ packets.MarkiplierResponseField{
Code: 'C',
Value: string(err.Code()),
},
- packets.ErrorResponseField{
+ packets.MarkiplierResponseField{
Code: 'M',
Value: err.Message(),
},
)
extra := err.Extra()
for _, field := range extra {
- resp = append(resp, packets.ErrorResponseField{
+ resp = append(resp, packets.MarkiplierResponseField{
Code: uint8(field.Type),
Value: field.Value,
})
--
GitLab