tp: simplify StaticTableFunction API significantly
This CL removes the ValidateConstraints API method and significantly
simplifies the ComputeTable method on StaticTableFunction.
Back when StaticTableFunctions were actually DynamicTables, this more
complex API made more sense as we wanted to expose the full power of
SQLite's virtual table API. However, in practice, with one exception,
we never actually used this power. Most of the changes, with the
exception, are fully mechanical and should have no impact on anything.
The one exception is the flamegraph function: in this case, we were
actually making use of some of the weirder features (partial constraint
setting, non-equality constraints) which require changing the API of
flamegraph to deal with this.
As flamegraph is an experimental API, we can make this change without
any sort of deprecation happening.
Change-Id: I553b10191f4e6b99707f482f125374d3c91aaa22
diff --git a/ui/src/controller/flamegraph_controller.ts b/ui/src/controller/flamegraph_controller.ts
index cff3593..62648df 100644
--- a/ui/src/controller/flamegraph_controller.ts
+++ b/ui/src/controller/flamegraph_controller.ts
@@ -421,41 +421,42 @@
private async prepareViewsAndTables(
start: time, end: time, upids: number[], type: ProfileType,
focusRegex: string): Promise<string> {
- // Creating unique names for views so we can reuse and not delete them
- // for each marker.
- let focusRegexConditional = '';
- if (focusRegex !== '') {
- focusRegexConditional = `and focus_str = '${focusRegex}'`;
- }
const flamegraphType = getFlamegraphType(type);
-
- /*
- * TODO(octaviant) this branching should be eliminated for simplicity.
- */
if (type === ProfileType.PERF_SAMPLE) {
- let upidConditional = `upid = ${upids[0]}`;
+ let upid: string;
+ let upidGroup: string;
if (upids.length > 1) {
- upidConditional =
- `upid_group = '${FlamegraphController.serializeUpidGroup(upids)}'`;
+ upid = `NULL`;
+ upidGroup = `'${FlamegraphController.serializeUpidGroup(upids)}'`;
+ } else {
+ upid = `${upids[0]}`;
+ upidGroup = `NULL`;
}
return this.cache.getTableName(
`select id, name, map_name, parent_id, depth, cumulative_size,
cumulative_alloc_size, cumulative_count, cumulative_alloc_count,
size, alloc_size, count, alloc_count, source_file, line_number
- from experimental_flamegraph
- where profile_type = '${flamegraphType}' and ${start} <= ts and
- ts <= ${end} and ${upidConditional}
- ${focusRegexConditional}`);
+ from experimental_flamegraph(
+ '${flamegraphType}',
+ NULL,
+ '>=${start},<=${end}',
+ ${upid},
+ ${upidGroup},
+ '${focusRegex}'
+ )`);
}
return this.cache.getTableName(
`select id, name, map_name, parent_id, depth, cumulative_size,
cumulative_alloc_size, cumulative_count, cumulative_alloc_count,
size, alloc_size, count, alloc_count, source_file, line_number
- from experimental_flamegraph
- where profile_type = '${flamegraphType}'
- and ts = ${end}
- and upid = ${upids[0]}
- ${focusRegexConditional}`);
+ from experimental_flamegraph(
+ '${flamegraphType}',
+ ${end},
+ NULL,
+ ${upids[0]},
+ NULL,
+ '${focusRegex}'
+ )`);
}
getMinSizeDisplayed(flamegraphData: CallsiteInfo[], rootSize?: number):
