Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
5 changes: 3 additions & 2 deletions internal/sql-analyzer/collector/sql_audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"github.com/pkg/errors"

oceanbaseconst "github.com/oceanbase/ob-operator/internal/const/oceanbase"
sqlconst "github.com/oceanbase/ob-operator/internal/sql-analyzer/const/sql"
"github.com/oceanbase/ob-operator/internal/sql-analyzer/model"
)
Expand All @@ -34,7 +35,7 @@ func (c *Collector) getMaxRequestIDs() (map[string]uint64, error) {
return nil, errors.Wrap(err, "Failed to get oceanbase connection")
}

if err := cnx.QueryList(c.Ctx, &observers, sqlconst.GetMaxRequestIDByIP, c.TenantID); err != nil {
if err := cnx.QueryList(c.Ctx, &observers, sqlconst.GetMaxRequestIDByIP, c.TenantID, oceanbaseconst.RpcPort); err != nil {
return nil, errors.Wrap(err, "Failed to query max request ids")
}

Expand Down Expand Up @@ -149,7 +150,7 @@ func (c *Collector) collectSqlAuditByOBServer(svrIP string, lastRequestID uint64
return nil, errors.Wrap(err, "Failed to get oceanbase connection")
}

if err := cnx.QueryList(c.Ctx, &results, sqlconst.GetSqlStatistics, c.TenantID, svrIP, lastRequestID); err != nil {
if err := cnx.QueryList(c.Ctx, &results, sqlconst.GetSqlStatistics, c.TenantID, svrIP, oceanbaseconst.RpcPort, lastRequestID); err != nil {
return nil, err
}
return results, nil
Expand Down
4 changes: 2 additions & 2 deletions internal/sql-analyzer/const/sql/sql_audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ See the Mulan PSL v2 for more details.
package sql

const (
GetMaxRequestIDByIP = "SELECT svr_ip, MAX(request_id) as max_request_id FROM gv$ob_sql_audit WHERE tenant_id = ? GROUP BY svr_ip"
GetMaxRequestIDByIP = "SELECT svr_ip, MAX(request_id) as max_request_id FROM gv$ob_sql_audit WHERE tenant_id = ? and svr_port = ? GROUP BY svr_ip"
CreateSqlAuditTempTableTemplate = `CREATE TEMP TABLE ` + "%s" + ` (
svr_ip VARCHAR, svr_port BIGINT, tenant_id BIGINT, tenant_name VARCHAR, user_id BIGINT, user_name VARCHAR,
db_id BIGINT, db_name VARCHAR, sql_id VARCHAR, plan_id BIGINT,
Expand Down Expand Up @@ -124,7 +124,7 @@ const (
SUM(CASE is_hit_plan WHEN 1 THEN 0 ELSE 1 END) as miss_plan_count,
SUM(CASE is_executor_rpc WHEN 1 THEN 1 ELSE 0 END) as executor_rpc_count
FROM gv$ob_sql_audit
WHERE tenant_id = ? AND svr_ip = ? AND request_id > ?
WHERE tenant_id = ? AND svr_ip = ? and svr_port = ? AND request_id > ? and query_sql is not NULL and query_sql <> ''
GROUP BY
svr_ip, svr_port, tenant_id, tenant_name, user_id, user_name, db_id, db_name, sql_id, plan_id
`
Expand Down
Loading