Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent infinite loop when trying to open plots #1727

Merged
merged 2 commits into from
May 17, 2022
Merged

Prevent infinite loop when trying to open plots #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b086ba
do not block data from going to webview after fetching once
mattseddon May 17, 2022
e433bed
Merge branch 'main' into fetch-revs-once
mattseddon May 17, 2022
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
2 changes: 1 addition & 1 deletion extension/src/data/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { definedAndNonEmpty, sameContents, uniqueValues } from '../util/array'
import { DeferredDisposable } from '../class/deferred'

export abstract class BaseData<
T extends PlotsOutput | ExperimentsOutput
T extends { data: PlotsOutput; revs: string[] } | ExperimentsOutput
> extends DeferredDisposable {
public readonly onDidUpdate: Event<T>

Expand Down
14 changes: 7 additions & 7 deletions extension/src/plots/data/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '../../util/array'
import { PlotsModel } from '../model'

export class PlotsData extends BaseData<PlotsOutput> {
export class PlotsData extends BaseData<{ data: PlotsOutput; revs: string[] }> {
private model?: PlotsModel

constructor(
Expand All @@ -26,7 +26,7 @@ export class PlotsData extends BaseData<PlotsOutput> {
}

public async update(): Promise<void> {
const revisions = flattenUnique([
const revs = flattenUnique([
this.model?.getMissingRevisions() || [],
this.model?.getMutableRevisions() || []
])
Expand All @@ -35,31 +35,31 @@ export class PlotsData extends BaseData<PlotsOutput> {
(await this.internalCommands.executeCommand<boolean>(
AvailableCommands.IS_EXPERIMENT_RUNNING
)) &&
!definedAndNonEmpty(revisions)
!definedAndNonEmpty(revs)
) {
return
}

const args = sameContents(revisions, ['workspace']) ? [] : revisions
const args = sameContents(revs, ['workspace']) ? [] : revs

const data = await this.internalCommands.executeCommand<PlotsOutput>(
AvailableCommands.PLOTS_DIFF,
this.dvcRoot,
...args
)

const files = this.collectFiles(data)
const files = this.collectFiles({ data })

this.compareFiles(files)

return this.notifyChanged(data)
return this.notifyChanged({ data, revs })
}

public managedUpdate() {
return this.processManager.run('update')
}

public collectFiles(data: PlotsOutput) {
public collectFiles({ data }: { data: PlotsOutput }) {
return Object.keys(data)
}

Expand Down
6 changes: 3 additions & 3 deletions extension/src/plots/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ export class Plots extends BaseRepository<TPlotsData> {
)

this.dispose.track(
this.data.onDidUpdate(async data => {
this.data.onDidUpdate(async ({ data, revs }) => {
await Promise.all([
this.plots?.transformAndSetPlots(data),
this.plots?.transformAndSetPlots(data, revs),
this.paths?.transformAndSet(data)
])
this.notifyChanged()
Expand Down Expand Up @@ -156,7 +156,7 @@ export class Plots extends BaseRepository<TPlotsData> {

if (
this.paths?.hasPaths() &&
definedAndNonEmpty(this.plots?.getMissingRevisions())
definedAndNonEmpty(this.plots?.getUnfetchedRevisions())
) {
this.sendCheckpointPlotsData()
return this.data.managedUpdate()
Expand Down
13 changes: 12 additions & 1 deletion extension/src/plots/model/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ export class PlotsModel extends ModelWithPersistence {
private branchRevisions: Record<string, string> = {}
private workspaceRunningCheckpoint: string | undefined

private fetchedRevs = new Set<string>()

private comparisonData: ComparisonData = {}
private comparisonOrder: string[]

Expand Down Expand Up @@ -97,7 +99,9 @@ export class PlotsModel extends ModelWithPersistence {
return this.removeStaleData()
}

public async transformAndSetPlots(data: PlotsOutput) {
public async transformAndSetPlots(data: PlotsOutput, revs: string[]) {
this.fetchedRevs = new Set([...this.fetchedRevs, ...revs])

const [{ comparisonData, revisionData }, templates] = await Promise.all([
collectData(data),
collectTemplates(data)
Expand Down Expand Up @@ -153,6 +157,12 @@ export class PlotsModel extends ModelWithPersistence {
}
}

public getUnfetchedRevisions() {
return this.getSelectedRevisions().filter(
revision => !this.fetchedRevs.has(revision)
)
}

public getMissingRevisions() {
const cachedRevisions = new Set([
...Object.keys(this.comparisonData),
Expand Down Expand Up @@ -306,6 +316,7 @@ export class PlotsModel extends ModelWithPersistence {
if (sha && this.branchRevisions[id] !== sha) {
delete this.revisionData[id]
delete this.comparisonData[id]
this.fetchedRevs.delete(id)
this.branchRevisions[id] = sha
}
}
Expand Down