fix(oracle): 增加收集间隔时间参数

Author: littleniannian

sqle/pkg/oracle/db.go

@@ -53,7 +53,7 @@ func (o *DB) Close() error {
 	return o.db.Close()
 }
 
-func (o *DB) QueryTopSQLs(ctx context.Context, topN int, notInUsers []string, orderBy string) ([]*DynPerformanceSQLArea, error) {
+func (o *DB) QueryTopSQLs(ctx context.Context, collectIntervalMinute string, topN int, notInUsers []string, orderBy string) ([]*DynPerformanceSQLArea, error) {
 	// if notInUsers is empty, notInUsersStr will be empty
 	// if notInUsers is not empty, notInUsersStr will be formatted as "AND u.username NOT IN ('user1', 'user2')"
 	var notInUsersStr string
@@ -75,7 +75,7 @@ func (o *DB) QueryTopSQLs(ctx context.Context, topN int, notInUsers []string, or
 	}
 	var ret []*DynPerformanceSQLArea
 	for _, metric := range metrics {
-		query := fmt.Sprintf(DynPerformanceViewSQLAreaTpl, notInUsersStr, metric, topN)
+		query := fmt.Sprintf(DynPerformanceViewSQLAreaTpl, collectIntervalMinute, notInUsersStr, metric, topN)
 		rows, err := o.db.QueryContext(ctx, query)
 		if err != nil {
 			rows.Close()

sqle/pkg/oracle/perf.go

@@ -33,6 +33,7 @@ SELECT * FROM (
     JOIN
         DBA_USERS u ON s.parsing_user_id = u.user_id
     WHERE
+        last_active_time >= SYSDATE - INTERVAL '%v' MINUTE AND
         s.EXECUTIONS > 0
         %v
     ORDER BY %v DESC

sqle/server/auditplan/task_type_oracle_topsql.go

@@ -125,7 +125,7 @@ func (at *OracleTopSQLTaskV2) ExtractSQL(logger *logrus.Entry, ap *AuditPlan, pe
 		notInUser = append(notInUser, blacklist.FilterContent)
 	}
 	// filter db user by
-	sqls, err := db.QueryTopSQLs(ctx, ap.Params.GetParam("top_n").Int(), notInUser, ap.Params.GetParam("order_by_column").String())
+	sqls, err := db.QueryTopSQLs(ctx, ap.Params.GetParam("collect_interval_minute").String(), ap.Params.GetParam("top_n").Int(), notInUser, ap.Params.GetParam("order_by_column").String())
 	if err != nil {
 		return nil, fmt.Errorf("query top sql fail, error: %v", err)
 	}