Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
339
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
25
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TransFem.org
Sharkey
Commits
65addc82
Commit
65addc82
authored
3 years ago
by
syuilo
Browse files
Options
Downloads
Patches
Plain Diff
refactoring
parent
28f7e48d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/services/chart/core.ts
+9
-9
9 additions, 9 deletions
src/services/chart/core.ts
with
9 additions
and
9 deletions
src/services/chart/core.ts
+
9
−
9
View file @
65addc82
...
...
@@ -52,7 +52,7 @@ export default abstract class Chart<T extends Record<string, any>> {
private
static
readonly
columnDot
=
'
_
'
;
private
name
:
string
;
private
queue
:
{
private
buffer
:
{
diff
:
DeepPartial
<
T
>
;
group
:
string
|
null
;
}[]
=
[];
...
...
@@ -330,28 +330,28 @@ export default abstract class Chart<T extends Record<string, any>> {
@
autobind
protected
commit
(
diff
:
DeepPartial
<
T
>
,
group
:
string
|
null
=
null
):
void
{
this
.
queue
.
push
({
this
.
buffer
.
push
({
diff
,
group
,
});
}
@
autobind
public
async
save
()
{
if
(
this
.
queue
.
length
===
0
)
{
if
(
this
.
buffer
.
length
===
0
)
{
logger
.
info
(
`
${
this
.
name
}
: Write skipped`
);
return
;
}
// TODO: 前の時間のログが
queue
にあった場合のハンドリング
// TODO: 前の時間のログが
buffer
にあった場合のハンドリング
// 例えば、save が20分ごとに行われるとして、前回行われたのは 01:50 だったとする。
// 次に save が行われるのは 02:10 ということになるが、もし 01:55 に新規ログが
queue
に追加されたとすると、
// 次に save が行われるのは 02:10 ということになるが、もし 01:55 に新規ログが
buffer
に追加されたとすると、
// そのログは本来は 01:00~ のログとしてDBに保存されて欲しいのに、02:00~ のログ扱いになってしまう。
// これを回避するための実装は複雑になりそうなため、一旦保留。
const
update
=
async
(
log
:
Log
)
=>
{
const
finalDiffs
=
{}
as
Record
<
string
,
number
|
unknown
[]
>
;
for
(
const
diff
of
this
.
queue
.
filter
(
q
=>
q
.
group
===
log
.
group
).
map
(
q
=>
q
.
diff
))
{
for
(
const
diff
of
this
.
buffer
.
filter
(
q
=>
q
.
group
===
log
.
group
).
map
(
q
=>
q
.
diff
))
{
const
columns
=
Chart
.
convertObjectToFlattenColumns
(
diff
);
for
(
const
[
k
,
v
]
of
Object
.
entries
(
columns
))
{
...
...
@@ -378,11 +378,11 @@ export default abstract class Chart<T extends Record<string, any>> {
logger
.
info
(
`
${
this
.
name
+
(
log
.
group
?
`:
${
log
.
group
}
`
:
''
)}
: Updated`
);
// TODO: この一連の処理が始まった後に新たに
queue
に入ったものは消さないようにする
this
.
queue
=
this
.
queue
.
filter
(
q
=>
q
.
group
!==
log
.
group
);
// TODO: この一連の処理が始まった後に新たに
buffer
に入ったものは消さないようにする
this
.
buffer
=
this
.
buffer
.
filter
(
q
=>
q
.
group
!==
log
.
group
);
};
const
groups
=
removeDuplicates
(
this
.
queue
.
map
(
log
=>
log
.
group
));
const
groups
=
removeDuplicates
(
this
.
buffer
.
map
(
log
=>
log
.
group
));
await
Promise
.
all
(
groups
.
map
(
group
=>
this
.
getCurrentLog
(
group
).
then
(
log
=>
update
(
log
))));
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment