Scope file count aggregation to candidates (#1827)

Author: Widthdom

src/CodeIndex/Database/DbReader.FilesStatus.cs

@@ -407,20 +407,28 @@ FROM chunks c
     {
         using var cmd = _conn.CreateCommand();
         cmd.CommandText = $@"
+            WITH file_match AS (
+                SELECT f.id, f.path, f.lang, f.size, f.lines,
+                       {GetFileColumnSql("checksum")} AS checksum,
+                       {GetFileColumnSql("modified")} AS modified,
+                       {GetFileColumnSql("indexed_at")} AS indexed_at
+                FROM files f
+                WHERE f.path = @path
+            )
             SELECT f.path, f.lang, f.size, f.lines,
                    COALESCE(symbol_counts.symbol_count, 0) AS symbol_count,
                    {FileReferenceCountSql} AS reference_count,
-                   {GetFileColumnSql("checksum")} AS checksum,
-                   {GetFileColumnSql("modified")} AS modified,
-                   {GetFileColumnSql("indexed_at")} AS indexed_at
-            FROM files f
+                   f.checksum,
+                   f.modified,
+                   f.indexed_at
+            FROM file_match f
             LEFT JOIN (
-                SELECT file_id, COUNT(*) AS symbol_count
-                FROM symbols
-                GROUP BY file_id
+                SELECT s.file_id, COUNT(*) AS symbol_count
+                FROM symbols s
+                JOIN file_match file_set ON file_set.id = s.file_id
+                GROUP BY s.file_id
             ) AS symbol_counts ON symbol_counts.file_id = f.id
-            {FileReferenceCountJoinSql}
-            WHERE f.path = @path";
+            {BuildFileReferenceCountJoinSql("file_match")}";
         cmd.Parameters.AddWithValue("@path", path);
 
         using var reader = cmd.ExecuteTrackedReader();

src/CodeIndex/Database/DbReader.cs

@@ -878,13 +878,14 @@ private HashSet<string> LoadHotspotFamilyReadyLanguages(SqliteConnection conn)
         }
     }
 
-    private string FileReferenceCountJoinSql =>
+    private string BuildFileReferenceCountJoinSql(string fileSetCteName) =>
         _hasReferencesTable
-            ? @"
+            ? $@"
             LEFT JOIN (
-                SELECT file_id, COUNT(*) AS reference_count
-                FROM symbol_references
-                GROUP BY file_id
+                SELECT r.file_id, COUNT(*) AS reference_count
+                FROM symbol_references r
+                JOIN {fileSetCteName} file_set ON file_set.id = r.file_id
+                GROUP BY r.file_id
             ) AS reference_counts ON reference_counts.file_id = f.id"
             : string.Empty;
 
@@ -1417,20 +1418,13 @@ public List<FileResult> ListFiles(string? query = null, int limit = 20, string?
         using var cmd = _conn.CreateCommand();
 
         var sql = $@"
-            SELECT f.path, f.lang, f.size, f.lines,
-                   COALESCE(symbol_counts.symbol_count, 0) AS symbol_count,
-                   {FileReferenceCountSql} AS reference_count,
-                   {GetFileColumnSql("checksum")} AS checksum,
-                   {GetFileColumnSql("modified")} AS modified,
-                   {GetFileColumnSql("indexed_at")} AS indexed_at
-            FROM files f
-            LEFT JOIN (
-                SELECT file_id, COUNT(*) AS symbol_count
-                FROM symbols
-                GROUP BY file_id
-            ) AS symbol_counts ON symbol_counts.file_id = f.id
-            {FileReferenceCountJoinSql}
-            WHERE 1=1";
+            WITH file_page AS (
+                SELECT f.id, f.path, f.lang, f.size, f.lines,
+                       {GetFileColumnSql("checksum")} AS checksum,
+                       {GetFileColumnSql("modified")} AS modified,
+                       {GetFileColumnSql("indexed_at")} AS indexed_at
+                FROM files f
+                WHERE 1=1";
 
         if (query != null)
             sql += " AND f.path LIKE @query ESCAPE '\\'";
@@ -1441,6 +1435,24 @@ GROUP BY file_id
         AppendPathFilters(ref sql, pathPatterns, excludePathPatterns, excludeTests);
         sql += $" ORDER BY {PathBucketOrder}, f.path LIMIT @limit";
 
+        sql += $@"
+            )
+            SELECT f.path, f.lang, f.size, f.lines,
+                   COALESCE(symbol_counts.symbol_count, 0) AS symbol_count,
+                   {FileReferenceCountSql} AS reference_count,
+                   f.checksum,
+                   f.modified,
+                   f.indexed_at
+            FROM file_page f
+            LEFT JOIN (
+                SELECT s.file_id, COUNT(*) AS symbol_count
+                FROM symbols s
+                JOIN file_page file_set ON file_set.id = s.file_id
+                GROUP BY s.file_id
+            ) AS symbol_counts ON symbol_counts.file_id = f.id
+            {BuildFileReferenceCountJoinSql("file_page")}
+            ORDER BY {PathBucketOrder}, f.path";
+
         cmd.CommandText = sql;
         if (query != null)
             cmd.Parameters.AddWithValue("@query", $"%{EscapeLikeQuery(query)}%");

tests/CodeIndex.Tests/DbReaderTests.cs

@@ -253,10 +253,11 @@ GROUP BY r.symbol_name
     [Fact]
     public void FileCountHelpers_UseGroupedReferenceCounts()
     {
-        var joinSql = GetPrivateStringProperty(_reader, "FileReferenceCountJoinSql");
+        var joinSql = InvokePrivateStringMethod(_reader, "BuildFileReferenceCountJoinSql", "file_page");
         var countSql = GetPrivateStringProperty(_reader, "FileReferenceCountSql");
 
-        Assert.Contains("GROUP BY file_id", joinSql, StringComparison.Ordinal);
+        Assert.Contains("GROUP BY r.file_id", joinSql, StringComparison.Ordinal);
+        Assert.Contains("JOIN file_page file_set ON file_set.id = r.file_id", joinSql, StringComparison.Ordinal);
         Assert.DoesNotContain("WHERE file_id = f.id", joinSql, StringComparison.OrdinalIgnoreCase);
         Assert.Equal("COALESCE(reference_counts.reference_count, 0)", countSql);
     }
@@ -451,6 +452,13 @@ private static string GetPrivateStringProperty(DbReader reader, string name)
         return Assert.IsType<string>(property!.GetValue(reader));
     }
 
+    private static string InvokePrivateStringMethod(DbReader reader, string name, params object[] args)
+    {
+        var method = typeof(DbReader).GetMethod(name, BindingFlags.Instance | BindingFlags.NonPublic);
+        Assert.NotNull(method);
+        return Assert.IsType<string>(method!.Invoke(reader, args));
+    }
+
     private SqliteCommand CreateSearchReferencesCommandForSql(string query)
     {
         var method = typeof(DbReader).GetMethod(