37151213cd
The existing architecture serializes all cards and revlog entries in the search range into a protobuf message, which the web frontend needs to decode and then process. The thinking at the time was that this would make it easier for add-ons to add extra graphs, but in the ~2.5 years since the new graphs were introduced, no add-ons appear to have taken advantage of it. The cards and revlog entries can grow quite large on large collections - on a collection I tested with approximately 2.5M reviews, the serialized data is about 110MB, which is a lot to have to deserialize in JavaScript. This commit shifts the preliminary processing of the data to the Rust end, which means the data is able to be processed faster, and less needs to be sent to the frontend. On the test collection above, this reduces the serialized data from about 110MB to about 160KB, resulting in a more than 2x performance improvement, and reducing frontend memory usage from about 400MB to about 40MB. This also makes #2043 more feasible - while it is still about 50-100% slower than protobufjs, with the much smaller message size, the difference is only about 10ms.
157 lines
4.4 KiB
TypeScript
157 lines
4.4 KiB
TypeScript
// Copyright: Ankitects Pty Ltd and contributors
|
|
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
/* eslint
|
|
@typescript-eslint/no-explicit-any: "off",
|
|
*/
|
|
|
|
import * as tr from "@tslib/ftl";
|
|
import { localizedNumber } from "@tslib/i18n";
|
|
import type { Stats } from "@tslib/proto";
|
|
import { dayLabel } from "@tslib/time";
|
|
import type { Bin } from "d3";
|
|
import { bin, extent, interpolateGreens, scaleLinear, scaleSequential, sum } from "d3";
|
|
|
|
import type { SearchDispatch, TableDatum } from "./graph-helpers";
|
|
import { getNumericMapBinValue, GraphRange, numericMap } from "./graph-helpers";
|
|
import type { HistogramData } from "./histogram-graph";
|
|
|
|
export interface GraphData {
|
|
dueCounts: Map<number, number>;
|
|
haveBacklog: boolean;
|
|
}
|
|
|
|
export function gatherData(data: Stats.GraphsResponse): GraphData {
|
|
const msg = data.futureDue!;
|
|
return { dueCounts: numericMap(msg.futureDue), haveBacklog: msg.haveBacklog };
|
|
}
|
|
|
|
export interface FutureDueResponse {
|
|
histogramData: HistogramData | null;
|
|
tableData: TableDatum[];
|
|
}
|
|
|
|
function makeQuery(start: number, end: number): string {
|
|
if (start === end) {
|
|
return `"prop:due=${start}"`;
|
|
} else {
|
|
const fromQuery = `"prop:due>=${start}"`;
|
|
const tillQuery = `"prop:due<=${end}"`;
|
|
return `${fromQuery} AND ${tillQuery}`;
|
|
}
|
|
}
|
|
|
|
export function buildHistogram(
|
|
sourceData: GraphData,
|
|
range: GraphRange,
|
|
backlog: boolean,
|
|
dispatch: SearchDispatch,
|
|
browserLinksSupported: boolean,
|
|
): FutureDueResponse {
|
|
const output = { histogramData: null, tableData: [] };
|
|
// get min/max
|
|
const data = sourceData.dueCounts;
|
|
if (!data) {
|
|
return output;
|
|
}
|
|
|
|
const [xMinOrig, origXMax] = extent<number>(data.keys());
|
|
let xMin = xMinOrig;
|
|
if (!backlog) {
|
|
xMin = 0;
|
|
}
|
|
let xMax = origXMax;
|
|
|
|
// cap max to selected range
|
|
switch (range) {
|
|
case GraphRange.Month:
|
|
xMax = 31;
|
|
break;
|
|
case GraphRange.ThreeMonths:
|
|
xMax = 90;
|
|
break;
|
|
case GraphRange.Year:
|
|
xMax = 365;
|
|
break;
|
|
case GraphRange.AllTime:
|
|
break;
|
|
}
|
|
// cap bars to available range
|
|
const desiredBars = Math.min(70, xMax! - xMin!);
|
|
|
|
const x = scaleLinear().domain([xMin!, xMax!]);
|
|
const bins = bin()
|
|
.value((m) => {
|
|
return m[0];
|
|
})
|
|
.domain(x.domain() as any)
|
|
.thresholds(x.ticks(desiredBars))(data.entries() as any);
|
|
|
|
// empty graph?
|
|
if (!sum(bins, (bin) => bin.length)) {
|
|
return output;
|
|
}
|
|
|
|
const xTickFormat = (n: number): string => localizedNumber(n);
|
|
const adjustedRange = scaleLinear().range([0.7, 0.3]);
|
|
const colourScale = scaleSequential((n) => interpolateGreens(adjustedRange(n)!)).domain([xMin!, xMax!]);
|
|
|
|
const total = sum(bins as any, getNumericMapBinValue);
|
|
|
|
function hoverText(
|
|
bin: Bin<number, number>,
|
|
cumulative: number,
|
|
_percent: number,
|
|
): string {
|
|
const days = dayLabel(bin.x0!, bin.x1!);
|
|
const cards = tr.statisticsCardsDue({
|
|
cards: getNumericMapBinValue(bin as any),
|
|
});
|
|
const totalLabel = tr.statisticsRunningTotal();
|
|
|
|
return `${days}:<br>${cards}<br>${totalLabel}: ${localizedNumber(cumulative)}`;
|
|
}
|
|
|
|
function onClick(bin: Bin<number, number>): void {
|
|
const start = bin.x0!;
|
|
const end = bin.x1! - 1;
|
|
const query = makeQuery(start, end);
|
|
dispatch("search", { query });
|
|
}
|
|
|
|
const periodDays = xMax! - xMin!;
|
|
const tableData = [
|
|
{
|
|
label: tr.statisticsTotal(),
|
|
value: tr.statisticsReviews({ reviews: total }),
|
|
},
|
|
{
|
|
label: tr.statisticsAverage(),
|
|
value: tr.statisticsReviewsPerDay({
|
|
count: Math.round(total / periodDays),
|
|
}),
|
|
},
|
|
{
|
|
label: tr.statisticsDueTomorrow(),
|
|
value: tr.statisticsReviews({
|
|
reviews: sourceData.dueCounts.get(1) ?? 0,
|
|
}),
|
|
},
|
|
];
|
|
|
|
return {
|
|
histogramData: {
|
|
scale: x,
|
|
bins,
|
|
total,
|
|
hoverText,
|
|
onClick: browserLinksSupported ? onClick : null,
|
|
showArea: true,
|
|
colourScale,
|
|
binValue: getNumericMapBinValue,
|
|
xTickFormat,
|
|
},
|
|
tableData,
|
|
};
|
|
}
|