Rename source table uuid field to id

The name of this field doesn't make sense anymore as we changed its
value from UUID to a hash value. This `id` name is more implementation
agnostic, so it's better to rename it now.

Note that this requires an upgrader, similar to the previous patches in
this patch stack. The upgrader will happen in the last commit with all
the relevant changes.

Author: canova

src/components/app/SourceCodeFetcher.tsx

@@ -11,7 +11,7 @@ import {
   getSymbolServerUrl,
   getSourceViewFile,
   getSourceViewSourceIndex,
-  getSourceViewSourceUuid,
+  getSourceViewSourceId,
 } from 'firefox-profiler/selectors';
 import {
   beginLoadingSourceCodeFromUrl,
@@ -36,7 +36,7 @@ import type {
 type StateProps = {
   readonly sourceViewFile: string | null;
   readonly sourceViewSourceIndex: IndexIntoSourceTable | null;
-  readonly sourceViewSourceUuid: string | null;
+  readonly sourceViewSourceId: string | null;
   readonly sourceViewCode: SourceCodeStatus | void;
   readonly symbolServerUrl: string;
   readonly profile: Profile | null;
@@ -68,7 +68,7 @@ class SourceCodeFetcherImpl extends React.PureComponent<Props> {
       sourceViewSourceIndex,
       sourceViewCode,
       sourceViewFile,
-      sourceViewSourceUuid,
+      sourceViewSourceId,
       beginLoadingSourceCodeFromUrl,
       beginLoadingSourceCodeFromBrowserConnection,
       finishLoadingSourceCode,
@@ -105,7 +105,7 @@ class SourceCodeFetcherImpl extends React.PureComponent<Props> {
 
     const fetchSourceResult = await fetchSource(
       sourceViewFile,
-      sourceViewSourceUuid,
+      sourceViewSourceId,
       symbolServerUrl,
       addressProof,
       this._archiveCache,
@@ -137,7 +137,7 @@ export const SourceCodeFetcher = explicitConnect<{}, StateProps, DispatchProps>(
     mapStateToProps: (state) => ({
       sourceViewSourceIndex: getSourceViewSourceIndex(state),
       sourceViewFile: getSourceViewFile(state),
-      sourceViewSourceUuid: getSourceViewSourceUuid(state),
+      sourceViewSourceId: getSourceViewSourceId(state),
       sourceViewCode: getSourceViewCode(state),
       symbolServerUrl: getSymbolServerUrl(state),
       profile: getProfileOrNull(state),

src/profile-logic/data-structures.ts

@@ -348,7 +348,7 @@ export function getEmptySourceTable(): SourceTable {
     // If modifying this structure, please update all callers of this function to ensure
     // that they are pushing on correctly to the data structure. These pushes may not
     // be caught by the type system.
-    uuid: [],
+    id: [],
     filename: [],
     startLine: [],
     startColumn: [],

src/profile-logic/global-data-collector.ts

@@ -61,7 +61,7 @@ export class GlobalDataCollector {
   _libNameToResourceIndex: Map<IndexIntoStringTable, IndexIntoResourceTable> =
     new Map();
   _originToResourceIndex: Map<string, IndexIntoResourceTable> = new Map();
-  _uuidToSourceIndex: Map<string, IndexIntoSourceTable> = new Map();
+  _idToSourceIndex: Map<string, IndexIntoSourceTable> = new Map();
   _filenameToSourceIndex: Map<IndexIntoStringTable, IndexIntoSourceTable> =
     new Map();
 
@@ -116,18 +116,18 @@ export class GlobalDataCollector {
   // Return the global index for this source, adding it to the global list if
   // necessary.
   indexForSource(
-    uuid: string | null,
+    id: string | null,
     filename: string,
     startLine: number = 1,
     startColumn: number = 1,
     sourceMapURL: string | null = null
   ): IndexIntoSourceTable {
     let index: IndexIntoSourceTable | undefined;
 
-    if (uuid !== null) {
-      index = this._uuidToSourceIndex.get(uuid);
+    if (id !== null) {
+      index = this._idToSourceIndex.get(id);
     } else {
-      // For null UUIDs, use filename-based lookup.
+      // For null IDs, use filename-based lookup.
       const filenameIndex = this._stringTable.indexForString(filename);
       index = this._filenameToSourceIndex.get(filenameIndex);
     }
@@ -139,15 +139,15 @@ export class GlobalDataCollector {
         sourceMapURL !== null
           ? this._stringTable.indexForString(sourceMapURL)
           : null;
-      this._sources.uuid[index] = uuid;
+      this._sources.id[index] = id;
       this._sources.filename[index] = filenameIndex;
       this._sources.startLine[index] = startLine;
       this._sources.startColumn[index] = startColumn;
       this._sources.sourceMapURL[index] = sourceMapURLIndex;
       this._sources.length++;
 
-      if (uuid !== null) {
-        this._uuidToSourceIndex.set(uuid, index);
+      if (id !== null) {
+        this._idToSourceIndex.set(id, index);
       } else {
         this._filenameToSourceIndex.set(filenameIndex, index);
       }

src/profile-logic/merge-compare.ts

@@ -556,7 +556,7 @@ function mergeSources(
     const oldStringToNewStringPlusOne = translationMapsForStrings[profileIndex];
 
     for (let i = 0; i < sources.length; i++) {
-      const uuid = sources.uuid[i];
+      const id = sources.id[i];
       const originalUrlIndex = sources.filename[i];
       const newUrlIndex = oldStringToNewStringPlusOne[originalUrlIndex] - 1;
 
@@ -566,12 +566,12 @@ function mergeSources(
           ? oldStringToNewStringPlusOne[originalSourceMapURLIndex] - 1
           : null;
 
-      const sourceKey = uuid ?? `null-uuid-${newUrlIndex}`;
+      const sourceKey = id ?? `null-id-${newUrlIndex}`;
       let insertedSourceIndex = mapOfInsertedSources.get(sourceKey);
       if (insertedSourceIndex === undefined) {
         // Add new source
         insertedSourceIndex = newSources.length;
-        newSources.uuid[insertedSourceIndex] = uuid;
+        newSources.id[insertedSourceIndex] = id;
         newSources.filename[insertedSourceIndex] = newUrlIndex;
         newSources.startLine[insertedSourceIndex] = sources.startLine[i];
         newSources.startColumn[insertedSourceIndex] = sources.startColumn[i];

src/profile-logic/process-profile.ts

@@ -431,22 +431,22 @@ function _extractJsFunction(
   let processedSourceIndex = null;
   if (sourceIndex !== undefined) {
     const geckoSourceIdx = parseInt(sourceIndex, 10);
-    // Look up the UUID for this source index from the process's sources table.
+    // Look up the ID for this source index from the process's sources table.
     if (geckoSourceIdx < geckoSourceTable.data.length) {
-      const uuidIndex = geckoSourceTable.schema.uuid;
+      const idIndex = geckoSourceTable.schema.id;
       const filenameIndex = geckoSourceTable.schema.filename;
       const startLineIndex = geckoSourceTable.schema.startLine;
       const startColumnIndex = geckoSourceTable.schema.startColumn;
       const sourceMapURLIndex = geckoSourceTable.schema.sourceMapURL;
-      const uuid = geckoSourceTable.data[geckoSourceIdx][uuidIndex];
+      const id = geckoSourceTable.data[geckoSourceIdx][idIndex];
       const filename = geckoSourceTable.data[geckoSourceIdx][filenameIndex];
       const startLine = geckoSourceTable.data[geckoSourceIdx][startLineIndex];
       const startColumn =
         geckoSourceTable.data[geckoSourceIdx][startColumnIndex];
       const sourceMapURL =
         geckoSourceTable.data[geckoSourceIdx][sourceMapURLIndex];
       processedSourceIndex = globalDataCollector.indexForSource(
-        uuid,
+        id,
         filename,
         startLine,
         startColumn,

src/profile-logic/processed-profile-versioning.ts

@@ -2663,7 +2663,7 @@ const _upgraders: {
     // Create the sources table
     const sourceTable = {
       length: 0,
-      uuid: [] as Array<string | null>,
+      id: [] as Array<string | null>,
       filename: [] as Array<number>,
     };
 
@@ -2690,7 +2690,7 @@ const _upgraders: {
           if (sourceIndex === undefined) {
             // Add new entry to sources table
             sourceIndex = sourceTable.length;
-            sourceTable.uuid.push(null);
+            sourceTable.id.push(null);
             sourceTable.filename.push(fileNameIndex);
             sourceTable.length++;
             fileNameIndexToSourceIndex.set(fileNameIndex, sourceIndex);

src/profile-logic/profile-compacting.ts

@@ -770,7 +770,7 @@ function _createCompactedSources(
     const newIndex = newSources.length++;
     newSources.filename[newIndex] =
       oldStringToNewStringPlusOne[sources.filename[i]] - 1;
-    newSources.uuid[newIndex] = sources.uuid[i];
+    newSources.id[newIndex] = sources.id[i];
     newSources.startLine[newIndex] = sources.startLine[i];
     newSources.startColumn[newIndex] = sources.startColumn[i];
 

src/profile-logic/symbolication.ts

@@ -806,7 +806,7 @@ function _partiallyApplySymbolicationStep(
           for (let i = 0; i < sources.filename.length; i++) {
             if (
               sources.filename[i] === fileNameStringIndex &&
-              sources.uuid[i] === null
+              sources.id[i] === null
             ) {
               sourceIndex = i;
               break;
@@ -815,7 +815,7 @@ function _partiallyApplySymbolicationStep(
           if (sourceIndex === null) {
             sourceIndex = sources.filename.length;
             sources.filename.push(fileNameStringIndex);
-            sources.uuid.push(null);
+            sources.id.push(null);
             sources.startLine.push(1);
             sources.startColumn.push(1);
             sources.sourceMapURL.push(null);

src/selectors/profile.ts

@@ -963,9 +963,9 @@ export const getSourceViewFile: Selector<string | null> = createSelector(
   }
 );
 
-export const getSourceViewSourceUuid: Selector<string | null> = createSelector(
+export const getSourceViewSourceId: Selector<string | null> = createSelector(
   getSourceTable,
   UrlState.getSourceViewSourceIndex,
   (sources, sourceIndex) =>
-    sourceIndex !== null ? sources.uuid[sourceIndex] : null
+    sourceIndex !== null ? sources.id[sourceIndex] : null
 );

src/test/fixtures/profiles/gecko-profile.ts

@@ -49,7 +49,7 @@ function getEmptyMarkers(): GeckoMarkers {
 export function getEmptySourceTable(): GeckoSourceTable {
   return {
     schema: {
-      uuid: 0 as const,
+      id: 0 as const,
       filename: 1 as const,
       startLine: 2 as const,
       startColumn: 3 as const,