Merge "[ui] Introduce sql_utils directory." into main

ui/src/common/empty_state.ts

@@ -20,7 +20,7 @@ import {
   autosaveConfigStore,
   recordTargetStore,
 } from '../frontend/record_config';
-import {SqlTables} from '../frontend/well_known_sql_tables';
+import {SqlTables} from '../frontend/widgets/sql/table/well_known_sql_tables';
 
 import {NonSerializableState, State, STATE_VERSION} from './state';
 

ui/src/controller/flow_events_controller.ts

@@ -17,7 +17,7 @@ import {AreaSelection, getLegacySelection} from '../common/state';
 import {featureFlags} from '../core/feature_flags';
 import {Flow, globals} from '../frontend/globals';
 import {publishConnectedFlows, publishSelectedFlows} from '../frontend/publish';
-import {asSliceSqlId} from '../frontend/sql_types';
+import {asSliceSqlId} from '../trace_processor/sql_utils/core_types';
 import {Engine} from '../trace_processor/engine';
 import {LONG, NUM, STR_NULL} from '../trace_processor/query_result';
 

ui/src/core_plugins/chrome_critical_user_interactions/startup_details_panel.ts

@@ -25,7 +25,7 @@ import {GridLayout, GridLayoutColumn} from '../../widgets/grid_layout';
 import {Section} from '../../widgets/section';
 import {SqlRef} from '../../widgets/sql_ref';
 import {dictToTreeNodes, Tree} from '../../widgets/tree';
-import {asUpid, Upid} from '../../frontend/sql_types';
+import {asUpid, Upid} from '../../trace_processor/sql_utils/core_types';
 
 interface Data {
   startupId: number;

ui/src/core_plugins/chrome_critical_user_interactions/web_content_interaction_details_panel.ts

@@ -31,7 +31,7 @@ import m from 'mithril';
 import {duration, Time, time} from '../../base/time';
 import {BottomTab, NewBottomTabArgs} from '../../frontend/bottom_tab';
 import {GenericSliceDetailsTabConfig} from '../../frontend/generic_slice_details_tab';
-import {asUpid, Upid} from '../../frontend/sql_types';
+import {asUpid, Upid} from '../../trace_processor/sql_utils/core_types';
 import {DurationWidget} from '../../frontend/widgets/duration';
 import {Timestamp} from '../../frontend/widgets/timestamp';
 import {LONG, NUM, STR} from '../../trace_processor/query_result';

ui/src/core_plugins/chrome_scroll_jank/event_latency_details_panel.ts

@@ -25,10 +25,12 @@ import {
   getSlice,
   getSliceFromConstraints,
   SliceDetails,
-  sliceRef,
   SliceTreeNode,
-} from '../../frontend/sql/slice';
-import {asSliceSqlId, SliceSqlId} from '../../frontend/sql_types';
+} from '../../trace_processor/sql_utils/slice';
+import {
+  asSliceSqlId,
+  SliceSqlId,
+} from '../../trace_processor/sql_utils/core_types';
 import {
   ColumnDescriptor,
   Table,
@@ -57,6 +59,7 @@ import {
   ScrollJankSlice,
 } from './scroll_jank_slice';
 import {ScrollJankV3TrackKind} from './common';
+import {sliceRef} from '../../frontend/widgets/slice';
 
 // Given a node in the slice tree, return a path from root to it.
 function getPath(slice: SliceTreeNode): string[] {

ui/src/core_plugins/chrome_scroll_jank/scroll_jank_cause_link_utils.ts

@@ -23,7 +23,7 @@ import {
   focusHorizontalRange,
   verticalScrollToTrack,
 } from '../../frontend/scroll_helper';
-import {SliceSqlId} from '../../frontend/sql_types';
+import {SliceSqlId} from '../../trace_processor/sql_utils/core_types';
 import {Engine} from '../../trace_processor/engine';
 import {LONG, NUM, STR} from '../../trace_processor/query_result';
 import {Anchor} from '../../widgets/anchor';

ui/src/core_plugins/chrome_scroll_jank/scroll_jank_slice.ts

@@ -19,7 +19,7 @@ import {duration, time, Time} from '../../base/time';
 import {Actions} from '../../common/actions';
 import {globals} from '../../frontend/globals';
 import {scrollToTrackAndTs} from '../../frontend/scroll_helper';
-import {SliceSqlId} from '../../frontend/sql_types';
+import {SliceSqlId} from '../../trace_processor/sql_utils/core_types';
 import {Engine} from '../../trace_processor/engine';
 import {LONG, NUM} from '../../trace_processor/query_result';
 import {

ui/src/core_plugins/chrome_scroll_jank/scroll_jank_v3_details_panel.ts

@@ -19,8 +19,8 @@ import {exists} from '../../base/utils';
 import {raf} from '../../core/raf_scheduler';
 import {BottomTab, NewBottomTabArgs} from '../../frontend/bottom_tab';
 import {GenericSliceDetailsTabConfig} from '../../frontend/generic_slice_details_tab';
-import {getSlice, SliceDetails} from '../../frontend/sql/slice';
-import {asSliceSqlId} from '../../frontend/sql_types';
+import {getSlice, SliceDetails} from '../../trace_processor/sql_utils/slice';
+import {asSliceSqlId} from '../../trace_processor/sql_utils/core_types';
 import {DurationWidget} from '../../frontend/widgets/duration';
 import {Timestamp} from '../../frontend/widgets/timestamp';
 import {Engine} from '../../trace_processor/engine';

ui/src/core_plugins/chrome_tasks/index.ts

@@ -15,7 +15,7 @@
 import {uuidv4} from '../../base/uuid';
 import {GenericSliceDetailsTabConfig} from '../../frontend/generic_slice_details_tab';
 import {addSqlTableTab} from '../../frontend/sql_table_tab';
-import {asUtid} from '../../frontend/sql_types';
+import {asUtid} from '../../trace_processor/sql_utils/core_types';
 import {
   BottomTabToSCSAdapter,
   NUM,

ui/src/core_plugins/chrome_tasks/track.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import {Utid} from '../../frontend/sql_types';
+import {Utid} from '../../trace_processor/sql_utils/core_types';
 import {
   CustomSqlDetailsPanelConfig,
   CustomSqlTableDefConfig,

ui/src/core_plugins/screenshots/screenshot_panel.ts

@@ -18,8 +18,8 @@ import {assertTrue} from '../../base/logging';
 import {exists} from '../../base/utils';
 import {BottomTab, NewBottomTabArgs} from '../../frontend/bottom_tab';
 import {GenericSliceDetailsTabConfig} from '../../frontend/generic_slice_details_tab';
-import {getSlice, SliceDetails} from '../../frontend/sql/slice';
-import {asSliceSqlId} from '../../frontend/sql_types';
+import {getSlice, SliceDetails} from '../../trace_processor/sql_utils/slice';
+import {asSliceSqlId} from '../../trace_processor/sql_utils/core_types';
 import {Engine} from '../../trace_processor/engine';
 
 async function getSliceDetails(

ui/src/core_plugins/thread_state/index.ts

@@ -14,7 +14,7 @@
 
 import {uuidv4} from '../../base/uuid';
 import {THREAD_STATE_TRACK_KIND} from '../../public';
-import {asThreadStateSqlId} from '../../frontend/sql_types';
+import {asThreadStateSqlId} from '../../trace_processor/sql_utils/core_types';
 import {ThreadStateTab} from '../../frontend/thread_state_tab';
 import {
   BottomTabToSCSAdapter,

ui/src/frontend/app.ts

@@ -52,12 +52,12 @@ import {
 } from './keyboard_event_handler';
 import {publishPermalinkHash} from './publish';
 import {OmniboxMode, PromptOption} from './omnibox_manager';
-import {Utid} from './sql_types';
-import {getThreadInfo} from './thread_and_process_info';
+import {Utid} from '../trace_processor/sql_utils/core_types';
 import {THREAD_STATE_TRACK_KIND} from '../core/track_kinds';
 import {DisposableStack} from '../base/disposable_stack';
 import {addSqlTableTab} from './sql_table_tab';
-import {SqlTables} from './well_known_sql_tables';
+import {SqlTables} from './widgets/sql/table/well_known_sql_tables';
+import {getThreadInfo} from '../trace_processor/sql_utils/thread';
 
 function renderPermalink(): m.Children {
   const hash = globals.permalinkHash;

ui/src/frontend/debug_tracks/details_tab.ts

@@ -19,10 +19,12 @@ import {raf} from '../../core/raf_scheduler';
 import {BottomTab, NewBottomTabArgs} from '../bottom_tab';
 import {GenericSliceDetailsTabConfig} from '../generic_slice_details_tab';
 import {hasArgs, renderArguments} from '../slice_args';
-import {getSlice, SliceDetails, sliceRef} from '../sql/slice';
-import {asSliceSqlId, Utid} from '../sql_types';
-import {getProcessName, getThreadName} from '../thread_and_process_info';
-import {getThreadState, ThreadState, threadStateRef} from '../thread_state';
+import {getSlice, SliceDetails} from '../../trace_processor/sql_utils/slice';
+import {asSliceSqlId, Utid} from '../../trace_processor/sql_utils/core_types';
+import {
+  getThreadState,
+  ThreadState,
+} from '../../trace_processor/sql_utils/thread_state';
 import {DurationWidget} from '../widgets/duration';
 import {Timestamp} from '../widgets/timestamp';
 import {
@@ -37,6 +39,10 @@ import {DetailsShell} from '../../widgets/details_shell';
 import {GridLayout} from '../../widgets/grid_layout';
 import {Section} from '../../widgets/section';
 import {dictToTree, dictToTreeNodes, Tree, TreeNode} from '../../widgets/tree';
+import {threadStateRef} from '../widgets/thread_state';
+import {getThreadName} from '../../trace_processor/sql_utils/thread';
+import {getProcessName} from '../../trace_processor/sql_utils/process';
+import {sliceRef} from '../widgets/slice';
 
 export const ARG_PREFIX = 'arg_';
 

ui/src/frontend/globals.ts

@@ -37,7 +37,7 @@ import {Engine, EngineBase} from '../trace_processor/engine';
 import {HttpRpcState} from '../trace_processor/http_rpc_engine';
 import {Analytics, initAnalytics} from './analytics';
 import {Timeline} from './timeline';
-import {SliceSqlId} from './sql_types';
+import {SliceSqlId} from '../trace_processor/sql_utils/core_types';
 import {SelectionManager, LegacySelection} from '../core/selection_manager';
 import {Optional, exists} from '../base/utils';
 import {OmniboxManager} from './omnibox_manager';

ui/src/frontend/pivot_table.ts

@@ -44,8 +44,8 @@ import {PopupMenuButton, popupMenuIcon, PopupMenuItem} from './popup_menu';
 import {ReorderableCell, ReorderableCellGroup} from './reorderable_cells';
 import {AttributeModalHolder} from './tables/attribute_modal_holder';
 import {DurationWidget} from './widgets/duration';
-import {SqlTables} from './well_known_sql_tables';
 import {addSqlTableTab} from './sql_table_tab';
+import {SqlTables} from './widgets/sql/table/well_known_sql_tables';
 
 interface PathItem {
   tree: PivotTree;

ui/src/frontend/pivot_table_query_generator.ts

@@ -19,7 +19,7 @@ import {Area, PivotTableQuery, PivotTableState} from '../common/state';
 import {getSelectedTrackKeys} from '../controller/aggregation/slice_aggregation_controller';
 
 import {Aggregation, TableColumn} from './pivot_table_types';
-import {SqlTables} from './well_known_sql_tables';
+import {SqlTables} from './widgets/sql/table/well_known_sql_tables';
 
 export interface Table {
   name: string;

ui/src/frontend/slice_args.ts

@@ -25,10 +25,10 @@ import {Anchor} from '../widgets/anchor';
 import {MenuItem, PopupMenu2} from '../widgets/menu';
 import {TreeNode} from '../widgets/tree';
 
-import {Arg} from './sql/args';
+import {Arg} from '../trace_processor/sql_utils/args';
 import {globals} from './globals';
 import {addSqlTableTab} from './sql_table_tab';
-import {SqlTables} from './well_known_sql_tables';
+import {SqlTables} from './widgets/sql/table/well_known_sql_tables';
 
 // Renders slice arguments (key/value pairs) as a subtree.
 export function renderArguments(engine: Engine, args: Arg[]): m.Children {

ui/src/frontend/slice_details.ts

@@ -23,16 +23,17 @@ import {Section} from '../widgets/section';
 import {SqlRef} from '../widgets/sql_ref';
 import {Tree, TreeNode} from '../widgets/tree';
 
-import {SliceDetails} from './sql/slice';
+import {SliceDetails} from '../trace_processor/sql_utils/slice';
 import {
   BreakdownByThreadState,
   BreakdownByThreadStateTreeNode,
 } from './sql/thread_state';
-import {getProcessName, getThreadName} from './thread_and_process_info';
 import {DurationWidget} from './widgets/duration';
 import {Timestamp} from './widgets/timestamp';
 import {addSqlTableTab} from './sql_table_tab';
-import {SqlTables} from './well_known_sql_tables';
+import {SqlTables} from './widgets/sql/table/well_known_sql_tables';
+import {getThreadName} from '../trace_processor/sql_utils/thread';
+import {getProcessName} from '../trace_processor/sql_utils/process';
 
 // Renders a widget storing all of the generic details for a slice from the
 // slice table.

ui/src/frontend/sql/thread_state.ts

@@ -23,7 +23,7 @@ import {
   STR_NULL,
 } from '../../trace_processor/query_result';
 import {TreeNode} from '../../widgets/tree';
-import {Utid} from '../sql_types';
+import {Utid} from '../../trace_processor/sql_utils/core_types';
 import {DurationWidget} from '../widgets/duration';
 
 // An individual node of the thread state breakdown tree.