Skip to content

Commit

Permalink
Add max_ldate, median_cdate, median_ldate values to filesummaries API
Browse files Browse the repository at this point in the history
  • Loading branch information
@vkuznet
vkuznet committed Sep 13, 2022
1 parent 7f9ec10 commit cfaca25
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 7 deletions.
9 changes: 2 additions & 7 deletions dbs/filesummaries.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,48 +39,43 @@ func (a *API) FileSummaries() error {
blockName := getValues(a.Params, "block_name")
if len(blockName) == 1 {
_, b := OperatorValue(blockName[0])
args = append(args, b, b, b, b, b) // pass 5 block values
args = append(args, b, b, b, b, b, b, b, b) // pass 8 block values used in sql
if len(runs) > 0 {
s, e := LoadTemplateSQL("filesummaries4block_run", tmpl)
if e != nil {
return Error(e, LoadErrorCode, "", "dbs.filesummaries.FileSummaries")
}
stm += s
// stm += getSQL("filesummaries4block_run")
} else {
s, e := LoadTemplateSQL("filesummaries4block_norun", tmpl)
if e != nil {
return Error(e, LoadErrorCode, "", "dbs.filesummaries.FileSummaries")
}
stm += s
// stm += getSQL("filesummaries4block_norun")
}
}

dataset := getValues(a.Params, "dataset")
if len(dataset) == 1 {
_, d := OperatorValue(dataset[0])
args = append(args, d, d, d, d, d) // pass 5 dataset values
args = append(args, d, d, d, d, d, d, d, d) // pass 8 dataset values used in sql
if len(runs) > 0 {
s, e := LoadTemplateSQL("filesummaries4dataset_run", tmpl)
if e != nil {
return Error(e, LoadErrorCode, "", "dbs.filesummaries.FileSummaries")
}
stm += s
// stm += getSQL("filesummaries4dataset_run")
} else {
s, e := LoadTemplateSQL("filesummaries4dataset_norun", tmpl)
if e != nil {
return Error(e, LoadErrorCode, "", "dbs.filesummaries.FileSummaries")
}
stm += s
// stm += getSQL("filesummaries4dataset_norun")
}
}
// replace whererun in stm
stm = strings.Replace(stm, "whererun", whererun, -1)
stm = strings.Replace(stm, "wheresql_isFileValid", wheresqlIsFileValid, -1)
// stm = WhereClause(stm, conds)

// use generic query API to fetch the results from DB
err = executeAll(a.Writer, a.Separator, stm, args...)
Expand Down
24 changes: 24 additions & 0 deletions static/sql/filesummaries4block_norun.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,30 @@ select
where b.BLOCK_NAME=:block_name wheresql_isFileValid
) as num_file,

(select max(f.last_modification_date) from {{.Owner}}.files f
join {{.Owner}}.blocks b on b.BLOCK_ID = f.block_id
{{if .Valid}}
JOIN {{.Owner}}.DATASETS D ON D.DATASET_ID = F.DATASET_ID JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where b.BLOCK_NAME=:block_name wheresql_isFileValid
) as max_ldate,

(select median(f.creation_date) from {{.Owner}}.files f
join {{.Owner}}.blocks b on b.BLOCK_ID = f.block_id
{{if .Valid}}
JOIN {{.Owner}}.DATASETS D ON D.DATASET_ID = F.DATASET_ID JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where b.BLOCK_NAME=:block_name wheresql_isFileValid
) as median_cdate,

(select median(f.last_modification_date) from {{.Owner}}.files f
join {{.Owner}}.blocks b on b.BLOCK_ID = f.block_id
{{if .Valid}}
JOIN {{.Owner}}.DATASETS D ON D.DATASET_ID = F.DATASET_ID JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where b.BLOCK_NAME=:block_name wheresql_isFileValid
) as median_ldate,

nvl((select sum(f.event_count) event_count from {{.Owner}}.files f
join {{.Owner}}.blocks b on b.BLOCK_ID = f.block_id
{{if .Valid}}
Expand Down
31 changes: 31 additions & 0 deletions static/sql/filesummaries4block_run.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,37 @@
where b.BLOCK_NAME=:block_name wheresql_isFileValid
and f.FILE_ID in (select fl.file_id from {{.Owner}}.file_lumis fl where whererun )
) as num_file,

(select max(f.last_modification_date) from {{.Owner}}.files f
join {{.Owner}}.blocks b on b.BLOCK_ID = f.block_id
{{if .Valid}}
JOIN {{.Owner}}.DATASETS D ON D.DATASET_ID = F.DATASET_ID JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where b.BLOCK_NAME=:block_name wheresql_isFileValid
and f.FILE_ID in (select fl.file_id from {{.Owner}}.file_lumis fl where whererun )
) as max_ldate,

(select median(f.creation_date) from {{.Owner}}.files f
join {{.Owner}}.blocks b on b.BLOCK_ID = f.block_id
{{if .Valid}}
JOIN {{.Owner}}.DATASETS D ON D.DATASET_ID = F.DATASET_ID JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where b.BLOCK_NAME=:block_name wheresql_isFileValid
and f.FILE_ID in (select fl.file_id from {{.Owner}}.file_lumis fl where whererun )
) as median_cdate,

(select median(f.last_modification_date) from {{.Owner}}.files f
join {{.Owner}}.blocks b on b.BLOCK_ID = f.block_id
{{if .Valid}}
JOIN {{.Owner}}.DATASETS D ON D.DATASET_ID = F.DATASET_ID JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where b.BLOCK_NAME=:block_name wheresql_isFileValid
and f.FILE_ID in (select fl.file_id from {{.Owner}}.file_lumis fl where whererun )
) as median_ldate,

nvl((select sum(f.event_count) event_count from {{.Owner}}.files f
join {{.Owner}}.blocks b on b.BLOCK_ID = f.block_id
{{if .Valid}}
Expand Down
24 changes: 24 additions & 0 deletions static/sql/filesummaries4dataset_norun.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,30 @@ select
where d.dataset=:dataset wheresql_isFileValid
) as num_file,

(select max(f.last_modification_date) from {{.Owner}}.files f
join {{.Owner}}.datasets d on d.DATASET_ID = f.dataset_id
{{if .Valid}}
JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where d.dataset=:dataset wheresql_isFileValid
) as max_ldate,

(select median(f.creation_date) from {{.Owner}}.files f
join {{.Owner}}.datasets d on d.DATASET_ID = f.dataset_id
{{if .Valid}}
JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where d.dataset=:dataset wheresql_isFileValid
) as median_cdate,

(select median(f.last_modification_date) from {{.Owner}}.files f
join {{.Owner}}.datasets d on d.DATASET_ID = f.dataset_id
{{if .Valid}}
JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where d.dataset=:dataset wheresql_isFileValid
) as median_ldate,

nvl((select sum(f.event_count) event_count from {{.Owner}}.files f
join {{.Owner}}.datasets d on d.DATASET_ID = f.dataset_id
{{if .Valid}}
Expand Down
27 changes: 27 additions & 0 deletions static/sql/filesummaries4dataset_run.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,33 @@ select
f.FILE_ID in (select fl.file_id from {{.Owner}}.file_lumis fl where whererun)
) as num_file,

(select max(f.last_modification_date) from {{.Owner}}.files f
join {{.Owner}}.datasets d on d.DATASET_ID = f.dataset_id
{{if .Valid}}
JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where d.dataset=:dataset wheresql_isFileValid and
f.FILE_ID in (select fl.file_id from {{.Owner}}.file_lumis fl where whererun)
) as max_ldate,

(select median(f.creation_date) from {{.Owner}}.files f
join {{.Owner}}.datasets d on d.DATASET_ID = f.dataset_id
{{if .Valid}}
JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where d.dataset=:dataset wheresql_isFileValid and
f.FILE_ID in (select fl.file_id from {{.Owner}}.file_lumis fl where whererun)
) as median_cdate,

(select median(f.last_modification_date) from {{.Owner}}.files f
join {{.Owner}}.datasets d on d.DATASET_ID = f.dataset_id
{{if .Valid}}
JOIN {{.Owner}}.DATASET_ACCESS_TYPES DT ON DT.DATASET_ACCESS_TYPE_ID = D.DATASET_ACCESS_TYPE_ID
{{end}}
where d.dataset=:dataset wheresql_isFileValid and
f.FILE_ID in (select fl.file_id from {{.Owner}}.file_lumis fl where whererun)
) as median_ldate,

nvl((select sum(f.event_count) event_count from {{.Owner}}.files f
join {{.Owner}}.datasets d on d.DATASET_ID = f.dataset_id
{{if .Valid}}
Expand Down

0 comments on commit cfaca25

Please sign in to comment.