Speed up pitcher suite live pitch queries

src/matchups.js

@@ -1463,6 +1463,10 @@ function buildSplitSqlFilter(columnExpression, parameterIndex) {
   return `AND ($${parameterIndex}::text IS NULL OR $${parameterIndex}::text = 'overall' OR LOWER(${columnExpression}) = CASE WHEN $${parameterIndex}::text = 'vs_lhb' THEN 'l' WHEN $${parameterIndex}::text = 'vs_rhb' THEN 'r' ELSE LOWER(${columnExpression}) END)`;
 }
 
+function buildPitcherIdentitySql(nameColumn, idColumn, nameParameterIndex, idParameterIndex) {
+  return `(($${idParameterIndex}::text IS NOT NULL AND ${idColumn}::text = $${idParameterIndex}) OR ($${idParameterIndex}::text IS NULL AND LOWER(${nameColumn}) = LOWER($${nameParameterIndex})))`;
+}
+
 function deriveCountBucket(row) {
   const balls = numberOrNull(row.balls) ?? 0;
   const strikes = numberOrNull(row.strikes) ?? 0;
@@ -3043,6 +3047,7 @@ export class MatchupService {
       const window = String(options.window ?? 'last_5');
       const split = String(options.split ?? 'overall');
       const pitchType = options.pitchType ?? options.pitch_type ?? null;
+      const pitcherId = context.pitcherId ?? null;
 
       if (view === 'results') {
         const rows = await this.queryCockroachRows(
@@ -3120,11 +3125,11 @@ export class MatchupService {
               AVG(pfx_x) AS avg_pfx_x,
               AVG(pfx_z) AS avg_pfx_z
             FROM public.live_pitch_mix_2026
-            WHERE LOWER(pitcher_name) = LOWER($1)
-              ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 2)}
-              ${buildSplitSqlFilter('stand', 3)}
+            WHERE ${buildPitcherIdentitySql('pitcher_name', 'pitcher', 1, 2)}
+              ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 3)}
+              ${buildSplitSqlFilter('stand', 4)}
           `,
-          [context.pitcherName, pitchType, split]
+          [context.pitcherName, pitcherId, pitchType, split]
         );
         const baselineRows = await this.queryCockroachRows(
           `
@@ -3135,11 +3140,11 @@ export class MatchupService {
               AVG(pfx_x) AS avg_pfx_x,
               AVG(pfx_z) AS avg_pfx_z
             FROM public.shared_pitcher_baseline_event_rows
-            WHERE LOWER(pitcher_name) = LOWER($1)
-              ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 2)}
-              ${buildSplitSqlFilter('COALESCE(batter_stand, stand)', 3)}
+            WHERE ${buildPitcherIdentitySql('pitcher_name', 'pitcher', 1, 2)}
+              ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 3)}
+              ${buildSplitSqlFilter('COALESCE(batter_stand, stand)', 4)}
           `,
-          [context.pitcherName, pitchType, split]
+          [context.pitcherName, pitcherId, pitchType, split]
         );
         const current = currentRows[0] ?? {};
         const baseline = baselineRows[0] ?? {};
@@ -3204,17 +3209,17 @@ export class MatchupService {
               ${overlayAExpr} AS overlay_a,
               ${overlayBExpr} AS overlay_b
             FROM ${tableName}
-            WHERE LOWER(pitcher_name) = LOWER($1)
-              ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 2)}
-              ${buildSplitSqlFilter(splitExpr, 3)}
+            WHERE ${buildPitcherIdentitySql('pitcher_name', 'pitcher', 1, 2)}
+              ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 3)}
+              ${buildSplitSqlFilter(splitExpr, 4)}
             GROUP BY point_key
           )
           SELECT point_key, primary_value, overlay_a, overlay_b
           FROM grouped
           ORDER BY point_key DESC
-          LIMIT $4
+          LIMIT $5
         `,
-        [context.pitcherName, pitchType, split, getPitcherWindowPointLimit(window)]
+        [context.pitcherName, pitcherId, pitchType, split, getPitcherWindowPointLimit(window)]
       );
       if (!rows.length) {
         throw new Error(`No ${view} trend points were available for ${context.pitcherName}.`);
@@ -3418,17 +3423,18 @@ export class MatchupService {
       const split = String(options.split ?? 'overall');
       const pitchType = options.pitchType ?? options.pitch_type ?? null;
       const countBucket = String(options.countBucket ?? options.count_bucket ?? 'all');
+      const pitcherId = context.pitcherId ?? null;
       const rows = await this.queryCockroachRows(
         `
           SELECT plate_x, plate_z, zone, pitch_type, pitch_name, stand, balls, strikes, description, events, estimated_woba_using_speedangle
           FROM public.live_pitch_mix_2026
-          WHERE LOWER(pitcher_name) = LOWER($1)
-            ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 2)}
-            ${buildSplitSqlFilter('stand', 3)}
+          WHERE ${buildPitcherIdentitySql('pitcher_name', 'pitcher', 1, 2)}
+            ${buildPitchTypeSqlFilter('pitch_type', 'pitch_name', 3)}
+            ${buildSplitSqlFilter('stand', 4)}
           ORDER BY game_date::date DESC, pitch_number DESC
           LIMIT 4000
         `,
-        [context.pitcherName, pitchType, split]
+        [context.pitcherName, pitcherId, pitchType, split]
       );
       if (!rows.length) {
         throw new Error(`No location rows were available for ${context.pitcherName}.`);
@@ -3461,17 +3467,18 @@ export class MatchupService {
       const view = String(options.view ?? 'count_usage');
       const split = String(options.split ?? 'overall');
       const pitchType = options.pitchType ?? options.pitch_type ?? null;
+      const pitcherId = context.pitcherId ?? null;
       const rows = await this.queryCockroachRows(
         `
           SELECT pitch_name, balls, strikes, description, stand
           FROM public.live_pitch_mix_2026
-          WHERE LOWER(pitcher_name) = LOWER($1)
-            ${buildPitchTypeSqlFilter('NULL', 'pitch_name', 2)}
-            ${buildSplitSqlFilter('stand', 3)}
+          WHERE ${buildPitcherIdentitySql('pitcher_name', 'pitcher', 1, 2)}
+            ${buildPitchTypeSqlFilter('NULL', 'pitch_name', 3)}
+            ${buildSplitSqlFilter('stand', 4)}
           ORDER BY game_date::date DESC, pitch_number DESC
           LIMIT 4000
         `,
-        [context.pitcherName, pitchType, split]
+        [context.pitcherName, pitcherId, pitchType, split]
       );
       if (!rows.length) {
         throw new Error(`No approach rows were available for ${context.pitcherName}.`);
@@ -3500,6 +3507,7 @@ export class MatchupService {
       const context = await this.resolvePitcherSuiteContext(options.pitcher, options);
       const view = String(options.view ?? 'current_vs_career');
       const window = String(options.window ?? 'last_5');
+      const pitcherId = context.pitcherId ?? null;
 
       if (view === 'risk_reward') {
         const rows = await this.queryCockroachRows(
@@ -3536,17 +3544,17 @@ export class MatchupService {
         `
           SELECT AVG(release_speed) AS avg_release_speed, AVG(release_spin_rate) AS avg_release_spin_rate, AVG(release_extension) AS avg_release_extension, AVG(pfx_x) AS avg_pfx_x, AVG(pfx_z) AS avg_pfx_z
           FROM public.live_pitch_mix_2026
-          WHERE LOWER(pitcher_name) = LOWER($1)
+          WHERE ${buildPitcherIdentitySql('pitcher_name', 'pitcher', 1, 2)}
         `,
-        [context.pitcherName]
+        [context.pitcherName, pitcherId]
       );
       const baselineRows = await this.queryCockroachRows(
         `
           SELECT AVG(release_speed) AS avg_release_speed, AVG(release_spin_rate) AS avg_release_spin_rate, AVG(release_extension) AS avg_release_extension, AVG(pfx_x) AS avg_pfx_x, AVG(pfx_z) AS avg_pfx_z
           FROM public.shared_pitcher_baseline_event_rows
-          WHERE LOWER(pitcher_name) = LOWER($1)
+          WHERE ${buildPitcherIdentitySql('pitcher_name', 'pitcher', 1, 2)}
         `,
-        [context.pitcherName]
+        [context.pitcherName, pitcherId]
       );
       const current = currentRows[0] ?? {};
       const baseline = baselineRows[0] ?? {};
@@ -3556,12 +3564,12 @@ export class MatchupService {
           `
             SELECT source_season::text AS season_label, AVG(release_speed) AS avg_release_speed, AVG(release_spin_rate) AS avg_release_spin_rate, AVG(release_extension) AS avg_release_extension
             FROM public.shared_pitcher_baseline_event_rows
-            WHERE LOWER(pitcher_name) = LOWER($1)
+            WHERE ${buildPitcherIdentitySql('pitcher_name', 'pitcher', 1, 2)}
             GROUP BY source_season
             ORDER BY source_season DESC
             LIMIT 6
           `,
-          [context.pitcherName]
+          [context.pitcherName, pitcherId]
         );
         return {
           ...context,