You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2024/03/07 04:04:24 UTC
(incubator-devlake) branch main updated: fix: revert dora empty (#7128)
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 01bbe407e fix: revert dora empty (#7128)
01bbe407e is described below
commit 01bbe407eec003827ae1e3057e7a7e9eb29b6e49
Author: abeizn <zi...@merico.dev>
AuthorDate: Thu Mar 7 12:04:17 2024 +0800
fix: revert dora empty (#7128)
---
.../dora/tasks/change_lead_time_calculator.go | 10 ++---
.../dora/tasks/deployment_commits_generator.go | 42 ++++++++++----------
backend/plugins/dora/tasks/deployment_generator.go | 45 +++++++++++-----------
.../dora/tasks/incident_deploy_connector.go | 10 ++---
4 files changed, 54 insertions(+), 53 deletions(-)
diff --git a/backend/plugins/dora/tasks/change_lead_time_calculator.go b/backend/plugins/dora/tasks/change_lead_time_calculator.go
index 8e29f1678..c76b3d54b 100644
--- a/backend/plugins/dora/tasks/change_lead_time_calculator.go
+++ b/backend/plugins/dora/tasks/change_lead_time_calculator.go
@@ -46,11 +46,11 @@ func CalculateChangeLeadTime(taskCtx plugin.SubTaskContext) errors.Error {
db := taskCtx.GetDal()
logger := taskCtx.GetLogger()
data := taskCtx.GetData().(*DoraTaskData)
- // Clear previous results from the project
- err := db.Exec("DELETE FROM project_pr_metrics WHERE project_name = ? ", data.Options.ProjectName)
- if err != nil {
- return errors.Default.Wrap(err, "error deleting previous project_pr_metrics")
- }
+ // // Clear previous results from the project
+ // err := db.Exec("DELETE FROM project_pr_metrics WHERE project_name = ? ", data.Options.ProjectName)
+ // if err != nil {
+ // return errors.Default.Wrap(err, "error deleting previous project_pr_metrics")
+ // }
// Get pull requests by repo project_name
var clauses = []dal.Clause{
diff --git a/backend/plugins/dora/tasks/deployment_commits_generator.go b/backend/plugins/dora/tasks/deployment_commits_generator.go
index 64133ce06..cc72128c9 100644
--- a/backend/plugins/dora/tasks/deployment_commits_generator.go
+++ b/backend/plugins/dora/tasks/deployment_commits_generator.go
@@ -101,32 +101,32 @@ func GenerateDeploymentCommits(taskCtx plugin.SubTaskContext) errors.Error {
}
if data.Options.ScopeId != nil {
clauses = append(clauses, dal.Where(`p.cicd_scope_id = ?`, data.Options.ScopeId))
- // Clear previous results from the project
- deleteSql := `DELETE FROM cicd_deployment_commits WHERE cicd_scope_id = ? ;`
- err := db.Exec(deleteSql, data.Options.ScopeId)
- if err != nil {
- return errors.Default.Wrap(err, "error deleting previous cicd_deployment_commits")
- }
+ // // Clear previous results from the project
+ // deleteSql := `DELETE FROM cicd_deployment_commits WHERE cicd_scope_id = ? ;`
+ // err := db.Exec(deleteSql, data.Options.ScopeId)
+ // if err != nil {
+ // return errors.Default.Wrap(err, "error deleting previous cicd_deployment_commits")
+ // }
} else {
clauses = append(clauses,
dal.Join("LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = p.cicd_scope_id)"),
dal.Where(`pm.project_name = ?`, data.Options.ProjectName),
)
- // Clear previous results from the project
- deleteSql := `DELETE FROM cicd_deployment_commits
- WHERE cicd_scope_id IN (
- SELECT cicd_scope_id
- FROM (
- SELECT cdc.cicd_scope_id
- FROM cicd_deployment_commits cdc
- LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cdc.cicd_scope_id)
- WHERE pm.project_name = ?
- ) AS subquery
- );`
- err := db.Exec(deleteSql, data.Options.ProjectName)
- if err != nil {
- return errors.Default.Wrap(err, "error deleting previous cicd_deployment_commits")
- }
+ // // Clear previous results from the project
+ // deleteSql := `DELETE FROM cicd_deployment_commits
+ // WHERE cicd_scope_id IN (
+ // SELECT cicd_scope_id
+ // FROM (
+ // SELECT cdc.cicd_scope_id
+ // FROM cicd_deployment_commits cdc
+ // LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cdc.cicd_scope_id)
+ // WHERE pm.project_name = ?
+ // ) AS subquery
+ // );`
+ // err := db.Exec(deleteSql, data.Options.ProjectName)
+ // if err != nil {
+ // return errors.Default.Wrap(err, "error deleting previous cicd_deployment_commits")
+ // }
}
cursor, err := db.Cursor(clauses...)
if err != nil {
diff --git a/backend/plugins/dora/tasks/deployment_generator.go b/backend/plugins/dora/tasks/deployment_generator.go
index 54b39b2e2..cca452d6b 100644
--- a/backend/plugins/dora/tasks/deployment_generator.go
+++ b/backend/plugins/dora/tasks/deployment_generator.go
@@ -18,13 +18,14 @@ limitations under the License.
package tasks
import (
+ "reflect"
+
"github.com/apache/incubator-devlake/core/dal"
"github.com/apache/incubator-devlake/core/errors"
"github.com/apache/incubator-devlake/core/models/domainlayer"
"github.com/apache/incubator-devlake/core/models/domainlayer/devops"
"github.com/apache/incubator-devlake/core/plugin"
"github.com/apache/incubator-devlake/helpers/pluginhelper/api"
- "reflect"
)
var DeploymentGeneratorMeta = plugin.SubTaskMeta{
@@ -77,32 +78,32 @@ func GenerateDeployment(taskCtx plugin.SubTaskContext) errors.Error {
clauses = append(clauses,
dal.Where("p.cicd_scope_id = ?", data.Options.ScopeId),
)
- // Clear previous results from the cicd_scope_id
- deleteSql := `DELETE FROM cicd_deployments WHERE cicd_scope_id = ?;`
- err := db.Exec(deleteSql, data.Options.ScopeId)
- if err != nil {
- return errors.Default.Wrap(err, "error deleting previous deployments")
- }
+ // // Clear previous results from the cicd_scope_id
+ // deleteSql := `DELETE FROM cicd_deployments WHERE cicd_scope_id = ?;`
+ // err := db.Exec(deleteSql, data.Options.ScopeId)
+ // if err != nil {
+ // return errors.Default.Wrap(err, "error deleting previous deployments")
+ // }
} else {
clauses = append(clauses,
dal.Join("LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = p.cicd_scope_id)"),
dal.Where("pm.project_name = ?", data.Options.ProjectName),
)
- // Clear previous results from the project
- deleteSql := `DELETE FROM cicd_deployments
- WHERE cicd_scope_id IN (
- SELECT cicd_scope_id
- FROM (
- SELECT cd.cicd_scope_id
- FROM cicd_deployments cd
- LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cd.cicd_scope_id)
- WHERE pm.project_name = ?
- ) AS subquery
- );`
- err := db.Exec(deleteSql, data.Options.ProjectName)
- if err != nil {
- return errors.Default.Wrap(err, "error deleting previous deployments")
- }
+ // // Clear previous results from the project
+ // deleteSql := `DELETE FROM cicd_deployments
+ // WHERE cicd_scope_id IN (
+ // SELECT cicd_scope_id
+ // FROM (
+ // SELECT cd.cicd_scope_id
+ // FROM cicd_deployments cd
+ // LEFT JOIN project_mapping pm ON (pm.table = 'cicd_scopes' AND pm.row_id = cd.cicd_scope_id)
+ // WHERE pm.project_name = ?
+ // ) AS subquery
+ // );`
+ // err := db.Exec(deleteSql, data.Options.ProjectName)
+ // if err != nil {
+ // return errors.Default.Wrap(err, "error deleting previous deployments")
+ // }
}
cursor, err := db.Cursor(clauses...)
diff --git a/backend/plugins/dora/tasks/incident_deploy_connector.go b/backend/plugins/dora/tasks/incident_deploy_connector.go
index 6d9a1365d..2ec9f04cb 100644
--- a/backend/plugins/dora/tasks/incident_deploy_connector.go
+++ b/backend/plugins/dora/tasks/incident_deploy_connector.go
@@ -47,11 +47,11 @@ type simpleCicdDeploymentCommit struct {
func ConnectIncidentToDeployment(taskCtx plugin.SubTaskContext) errors.Error {
db := taskCtx.GetDal()
data := taskCtx.GetData().(*DoraTaskData)
- // Clear previous results from the project
- err := db.Exec("DELETE FROM project_issue_metrics WHERE project_name = ?", data.Options.ProjectName)
- if err != nil {
- return errors.Default.Wrap(err, "error deleting previous project_issue_metrics")
- }
+ // // Clear previous results from the project
+ // err := db.Exec("DELETE FROM project_issue_metrics WHERE project_name = ?", data.Options.ProjectName)
+ // if err != nil {
+ // return errors.Default.Wrap(err, "error deleting previous project_issue_metrics")
+ // }
// select all issues belongs to the board
clauses := []dal.Clause{
dal.From(`issues i`),