Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Simplify relay internals. #980

Merged
merged 4 commits into from
Jan 28, 2025
Merged

Simplify relay internals. #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c13c94
Simplify relay internals.
reshke Jan 28, 2025
7283ada
add pooler error tests
reshke Jan 28, 2025
110a096
add test
reshke Jan 28, 2025
8414b46
fix
reshke Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/txstatus/txstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ const (
TXIDLE = TXStatus(73)
TXERR = TXStatus(69)
TXACT = TXStatus(84)
TXCONT = TXStatus(1)
)

type TxStatusMgr interface {
Expand All @@ -24,8 +23,6 @@ func (s TXStatus) String() string {
return "ERROR"
case TXACT:
return "ACTIVE"
case TXCONT:
return "INTERNAL STATE"
}
return "invalid"
}
1 change: 0 additions & 1 deletion pkg/txstatus/txstatus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ func TestString(t *testing.T) {
TXStatus(73): "IDLE",
TXStatus(69): "ERROR",
TXStatus(84): "ACTIVE",
TXStatus(1): "INTERNAL STATE",
TXStatus(0): "invalid",
}
for status, except := range cases {
Expand Down
9 changes: 3 additions & 6 deletions router/frontend/frontend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ func ProcessMessage(qr qrouter.QueryRouter, rst relay.RelayStateMgr, msg pgproto
q = &cpQ
if err := relay.ProcQueryAdvanced(rst, q.Query, ph, func() error {
rst.AddQuery(q)
_, err := rst.ProcessMessageBuf(true, true, false)
return err
return rst.ProcessMessageBuf(true, true, false)
}, true); err != nil {
return err
}
Expand Down Expand Up @@ -67,8 +66,7 @@ func ProcessMessage(qr qrouter.QueryRouter, rst relay.RelayStateMgr, msg pgproto
if err := relay.ProcQueryAdvanced(rst, q.String, ph, func() error {
rst.AddQuery(q)

_, err := rst.ProcessMessageBuf(true, true, false)
return err
return rst.ProcessMessageBuf(true, true, false)
}, false); err != nil {
return err
}
Expand Down Expand Up @@ -134,8 +132,7 @@ func ProcessMessage(qr qrouter.QueryRouter, rst relay.RelayStateMgr, msg pgproto
if err := relay.ProcQueryAdvanced(rst, q.String, ph, func() error {
rst.AddQuery(q)
// this call compeletes relay, sends RFQ
_, err := rst.ProcessMessageBuf(true, true, false)
return err
return rst.ProcessMessageBuf(true, true, false)
}, false); err != nil {
return err
}
Expand Down
22 changes: 11 additions & 11 deletions router/relay/phs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ func (s *SimpleProtoStateHandler) ExecCommit(rst RelayStateMgr, query string) er
rst.AddQuery(&pgproto3.Query{
String: query,
})
ok, err := rst.ProcessMessageBuf(true, true, false)
if ok {
err := rst.ProcessMessageBuf(true, true, false)
if err == nil {
rst.Client().CommitActiveSet()
}
return err
Expand All @@ -69,8 +69,8 @@ func (s *SimpleProtoStateHandler) ExecRollback(rst RelayStateMgr, query string)
rst.AddQuery(&pgproto3.Query{
String: query,
})
ok, err := rst.ProcessMessageBuf(true, true, false)
if ok {
err := rst.ProcessMessageBuf(true, true, false)
if err == nil {
rst.Client().Rollback()
}
return err
Expand All @@ -87,11 +87,11 @@ func (s *SimpleProtoStateHandler) ExecSet(rst RelayStateMgr, query string, name,
}
spqrlog.Zero.Debug().Str("name", name).Str("value", value).Msg("execute set query")
rst.AddQuery(&pgproto3.Query{String: query})
if ok, err := rst.ProcessMessageBuf(true, true, false); err != nil {
if err := rst.ProcessMessageBuf(true, true, false); err != nil {
return err
} else if ok {
rst.Client().SetParam(name, value)
}
rst.Client().SetParam(name, value)

return nil
}

Expand All @@ -107,8 +107,8 @@ func (s *SimpleProtoStateHandler) ExecResetMetadata(rst RelayStateMgr, query str
return nil
}
rst.AddQuery(&pgproto3.Query{String: query})
_, err := rst.ProcessMessageBuf(true, true, false)
if err != nil {

if err := rst.ProcessMessageBuf(true, true, false); err != nil {
return err
}

Expand All @@ -122,8 +122,8 @@ func (s *SimpleProtoStateHandler) ExecResetMetadata(rst RelayStateMgr, query str
func (s *SimpleProtoStateHandler) ExecSetLocal(rst RelayStateMgr, query, name, value string) error {
if rst.PoolMgr().ConnectionActive(rst) {
rst.AddQuery(&pgproto3.Query{String: query})
_, err := rst.ProcessMessageBuf(true, true, false)
return err
return rst.ProcessMessageBuf(true, true, false)

}
return nil
}
Expand Down
Loading
Loading