Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Group by in Coordinator SHOW #771

Merged
merged 5 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
66 changes: 57 additions & 9 deletions pkg/clientinteractor/interactor.go
Original file line number Diff line number Diff line change
Expand Up @@ -1303,24 +1303,46 @@ func (pi *PSQLInteractor) KillClient(clientID uint) error {
//
// Returns:
// - error: An error if any occurred during the operation.
func (pi *PSQLInteractor) BackendConnections(ctx context.Context, shs []shard.Shardinfo) error {
if err := pi.WriteHeader("backend connection id", "router", "shard key name", "hostname", "pid", "user", "dbname", "sync", "tx_served", "tx status"); err != nil {
func (pi *PSQLInteractor) BackendConnections(ctx context.Context, shs []shard.Shardinfo, groupByClause *spqrparser.Group) error {
headers := []string{"backend connection id", "router", "shard key name", "hostname", "pid", "user", "dbname", "sync", "tx_served", "tx status"}
getters := []func(sh shard.Shardinfo) string{
func(sh shard.Shardinfo) string { return fmt.Sprintf("%d", sh.ID()) },
func(sh shard.Shardinfo) string {
router := "no data"
s, ok := sh.(shard.CoordShardinfo)
if ok {
router = s.Router()
}
return router
},
func(sh shard.Shardinfo) string { return sh.ShardKeyName() },
func(sh shard.Shardinfo) string { return sh.InstanceHostname() },
func(sh shard.Shardinfo) string { return fmt.Sprintf("%d", sh.Pid()) },
func(sh shard.Shardinfo) string { return sh.Usr() },
func(sh shard.Shardinfo) string { return sh.DB() },
func(sh shard.Shardinfo) string { return strconv.FormatInt(sh.Sync(), 10) },
func(sh shard.Shardinfo) string { return strconv.FormatInt(sh.TxServed(), 10) },
func(sh shard.Shardinfo) string { return sh.TxStatus().String() },
}

if groupByClause != nil {
return groupBy(headers, shs, getters, groupByClause.Col.ColName, pi)
}

if err := pi.WriteHeader(headers...); err != nil {
spqrlog.Zero.Error().Err(err).Msg("")
return err
}

for _, sh := range shs {
router := "no data"
s, ok := sh.(shard.CoordShardinfo)
if ok {
router = s.Router()
vals := []string{}
for _, getter := range getters {
vals = append(vals, getter(sh))
}

if err := pi.WriteDataRow(fmt.Sprintf("%d", sh.ID()), router, sh.ShardKeyName(), sh.InstanceHostname(), fmt.Sprintf("%d", sh.Pid()), sh.Usr(), sh.DB(), strconv.FormatInt(sh.Sync(), 10), strconv.FormatInt(sh.TxServed(), 10), sh.TxStatus().String()); err != nil {
if err := pi.WriteDataRow(vals...); err != nil {
spqrlog.Zero.Error().Err(err).Msg("")
return err
}

}

return pi.CompleteMsg(len(shs))
Expand Down Expand Up @@ -1408,3 +1430,29 @@ func (pi *PSQLInteractor) PreparedStatements(ctx context.Context, shs []shard.Pr

return pi.CompleteMsg(len(shs))
}

func groupBy[T any](headers []string, values []T, getters []func(s T) string, groupBy string, pi *PSQLInteractor) error {
ind := -1
for i, header := range headers {
if header == groupBy {
if err := pi.WriteHeader(groupBy, "count"); err != nil {
return err
}
ind = i
break
}
}

cnt := make(map[string]int)
for _, value := range values {
cnt[getters[ind](value)]++
}

for k, v := range cnt {
if err := pi.WriteDataRow(k, fmt.Sprintf("%d", v)); err != nil {
return err
}
}

return pi.CompleteMsg(len(cnt))
}
6 changes: 5 additions & 1 deletion pkg/meta/meta.go
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,11 @@ func ProcessShow(ctx context.Context, stmt *spqrparser.Show, mngr EntityMgr, ci
return err
}

return cli.BackendConnections(ctx, resp)
var groupBy *spqrparser.Group
if stmt.Group != nil {
groupBy = stmt.Group.(*spqrparser.Group)
}
return cli.BackendConnections(ctx, resp, groupBy)
case spqrparser.ShardsStr:
shards, err := mngr.ListShards(ctx)
if err != nil {
Expand Down
55 changes: 55 additions & 0 deletions test/feature/features/coordinator_show.feature
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,61 @@ Feature: Coordinator show clients, pools and backend_connections
]
"""

Scenario: show backend_connections group by
When I run SQL on host "coordinator"
"""
SHOW backend_connections group by hostname
"""
Then command return code should be "0"
And SQL result should match json
"""
[
{
"hostname":"spqr_shard_1:6432",
"count": "2"
}
]
"""
And SQL result should match json
"""
[
{
"hostname":"spqr_shard_2:6432",
"count": "2"
}
]
"""

When I run SQL on host "coordinator"
"""
SHOW backend_connections group by user
"""
Then command return code should be "0"
And SQL result should match json
"""
[
{
"user":"regress",
"count": "4"
}
]
"""

When I run SQL on host "coordinator"
"""
SHOW backend_connections group by dbname
"""
Then command return code should be "0"
And SQL result should match json
"""
[
{
"dbname":"regress",
"count": "4"
}
]
"""

Scenario: show pools works
When I run SQL on host "coordinator"
"""
Expand Down
8 changes: 8 additions & 0 deletions yacc/console/ast.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ type Order struct {
Col ColumnRef
}

type GroupClause interface{}

type Group struct {
GroupClause
Col ColumnRef
}

type WhereClauseNode interface {
}

Expand Down Expand Up @@ -50,6 +57,7 @@ type Show struct {
Cmd string
Where WhereClauseNode
Order OrderClause
Group GroupClause
}

type Set struct {
Expand Down
Loading
Loading