[Don't merge] Add empty flex transfer

.github/workflows/close_stale_pr_and_issues.yml

@@ -13,7 +13,7 @@ jobs:
     if: github.repository_owner == 'opentripplanner'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v10.3.0
+      - uses: actions/stale@v10
         id: stale
         with:
           stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 30 days'

application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java

@@ -88,7 +88,6 @@ static void setup() {
       transferRepository,
       model.fareServiceFactory().makeFareService(),
       null,
-      null,
       FLEX_PARAMETERS
     ).routingService();
   }

application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java

@@ -22,7 +22,6 @@ public class SiriAzureETUpdater implements SiriAzureMessageHandler {
 
   private final SiriRealTimeTripUpdateAdapter adapter;
   private final Consumer<UpdateResult> recordMetrics;
-  private final boolean fuzzyTripMatching;
   private final String feedId;
 
   private WriteToGraphCallback writeToGraphCallback;
@@ -33,7 +32,6 @@ public SiriAzureETUpdater(
   ) {
     this.adapter = adapter;
     this.recordMetrics = TripUpdateMetrics.streaming(config);
-    this.fuzzyTripMatching = config.isFuzzyTripMatching();
     this.feedId = Objects.requireNonNull(config.feedId(), "feedId must not be null");
   }
 
@@ -56,13 +54,14 @@ public Future<?> handleMessage(ServiceDelivery serviceDelivery, String messageId
 
   private Future<?> processMessage(List<EstimatedTimetableDeliveryStructure> updates) {
     return writeToGraphCallback.execute(context -> {
-      var result = adapter.applyEstimatedTimetable(
-        fuzzyTripMatching ? context.siriFuzzyTripMatcher() : null,
-        context.entityResolver(feedId),
-        feedId,
-        UpdateIncrementality.DIFFERENTIAL,
-        updates
-      );
+      var result = adapter
+        .forUpdate(context.mutableSnapshot())
+        .applyEstimatedTimetable(
+          context.entityResolver(feedId),
+          feedId,
+          UpdateIncrementality.DIFFERENTIAL,
+          updates
+        );
       ResultLogger.logUpdateResultErrors(feedId, "siri-et", result);
       recordMetrics.accept(result);
     });

application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java

@@ -8,6 +8,7 @@
 import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.updater.alert.siri.SiriAlertsUpdateHandler;
 import org.opentripplanner.updater.spi.WriteToGraphCallback;
+import org.opentripplanner.updater.trip.siri.SiriFuzzyTripMatcherCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import uk.org.siri.siri21.ServiceDelivery;
@@ -22,13 +23,15 @@ public class SiriAzureSXUpdater implements SiriAzureMessageHandler {
 
   public SiriAzureSXUpdater(
     SiriAzureSXUpdaterParameters config,
-    TimetableRepository timetableRepository
+    TimetableRepository timetableRepository,
+    @Nullable SiriFuzzyTripMatcherCache siriFuzzyTripMatcherCache
   ) {
     this.transitAlertService = new TransitAlertServiceImpl(timetableRepository);
     this.updateHandler = new SiriAlertsUpdateHandler(
       config.feedId(),
       transitAlertService,
-      Duration.ZERO
+      Duration.ZERO,
+      siriFuzzyTripMatcherCache
     );
   }
 

application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdater.java

@@ -38,6 +38,7 @@
 import org.opentripplanner.updater.alert.TransitAlertProvider;
 import org.opentripplanner.updater.spi.GraphUpdater;
 import org.opentripplanner.updater.spi.WriteToGraphCallback;
+import org.opentripplanner.updater.trip.siri.SiriFuzzyTripMatcherCache;
 import org.opentripplanner.updater.trip.siri.SiriRealTimeTripUpdateAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -133,9 +134,14 @@ public static SiriAzureUpdater createETUpdater(
 
   public static SiriAzureUpdater createSXUpdater(
     SiriAzureSXUpdaterParameters config,
-    TimetableRepository timetableRepository
+    TimetableRepository timetableRepository,
+    @Nullable SiriFuzzyTripMatcherCache siriFuzzyTripMatcherCache
   ) {
-    var messageHandler = new SiriAzureSXUpdater(config, timetableRepository);
+    var messageHandler = new SiriAzureSXUpdater(
+      config,
+      timetableRepository,
+      siriFuzzyTripMatcherCache
+    );
     return new SxWrapper(config, messageHandler);
   }
 

application/src/ext/java/org/opentripplanner/ext/siri/updater/mqtt/SiriETMqttUpdater.java

@@ -26,11 +26,7 @@ public SiriETMqttUpdater(
   ) {
     configRef = parameters.configRef();
     asyncEstimatedTimetableSource = new MqttEstimatedTimetableSource(parameters);
-    estimatedTimetableHandler = new EstimatedTimetableHandler(
-      updateAdapter,
-      parameters.fuzzyTripMatching(),
-      parameters.feedId()
-    );
+    estimatedTimetableHandler = new EstimatedTimetableHandler(updateAdapter, parameters.feedId());
     updateResultConsumer = TripUpdateMetrics.streaming(parameters);
   }
 

application/src/main/java/org/opentripplanner/framework/transaction/internal/PeriodicCommitScheduler.java

@@ -19,7 +19,8 @@ class PeriodicCommitScheduler {
   private final String name;
   private final ScheduledExecutorService scheduler;
   private final Supplier<Future<Void>> performCommit;
-  private long warningLimitMillis;
+  private final long interval_ms;
+  private long warningLimit_ms;
 
   PeriodicCommitScheduler(
     String name,
@@ -30,9 +31,9 @@ class PeriodicCommitScheduler {
     this.name = name;
     this.scheduler = Executors.newSingleThreadScheduledExecutor(threadFactory);
     this.performCommit = performCommit;
-    var intervalMillis = commitInterval.toMillis();
-    this.warningLimitMillis = intervalMillis;
-    scheduler.scheduleAtFixedRate(this::runCommit, intervalMillis, intervalMillis, MILLISECONDS);
+    this.interval_ms = commitInterval.toMillis();
+    this.warningLimit_ms = interval_ms;
+    this.scheduler.scheduleAtFixedRate(this::runCommit, interval_ms, interval_ms, MILLISECONDS);
   }
 
   void shutdown() {
@@ -50,13 +51,31 @@ private void runCommit() {
       LOG.error("Error during periodic commit", e);
     }
     long elapsedTime = System.currentTimeMillis() - startTime;
-    if (elapsedTime > warningLimitMillis) {
-      warningLimitMillis *= 2;
-      LOG.warn(
-        "Commit is taking a long time to complete (including queued wait), {} ms for {}.",
-        elapsedTime,
-        name
-      );
+    if (elapsedTime > warningLimit_ms) {
+      if (warningLimit_ms == interval_ms) {
+        // We increase the limit after the first log event to:
+        // - avoid spamming the logs if the update is exceeding the limit by a small amount.
+        // - distinguish between the first (initialization) and the followups.
+        warningLimit_ms *= 2;
+        LOG.warn(
+          "Commit is taking a long time to complete (including queued wait), {} ms for {}. " +
+            "The update interval is {} ms. This is the first warning, increasing the warning limit " +
+            "to {} ms.",
+          elapsedTime,
+          name,
+          interval_ms,
+          warningLimit_ms
+        );
+      } else {
+        LOG.warn(
+          "Commit is taking a long time to complete (including queued wait), {} ms for {}. " +
+            "The warning limit is {} ms. If this continues to happen, consider investigating why or " +
+            "increasing the update interval.",
+          elapsedTime,
+          name,
+          warningLimit_ms
+        );
+      }
     }
   }
 }

application/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java

@@ -152,6 +152,12 @@ else if (pathLeg.isTransferLeg()) {
 
     // Map egress leg
     EgressPathLeg<T> egressPathLeg = pathLeg.asEgressLeg();
+    if (
+      OTPFeature.ExtraTransferLegOnSameStop.isOn() &&
+      isPathTransferAtSameStop(previousLeg, egressPathLeg)
+    ) {
+      legs.add(createTransferLegAtSameStop(previousLeg, pathLeg));
+    }
     var egressLegs = mapEgressLeg(egressPathLeg);
     legs.addAll(egressLegs);
 
@@ -199,6 +205,19 @@ private static <T extends TripSchedule> boolean isPathTransferAtSameStop(
     );
   }
 
+  private static <T extends TripSchedule> boolean isPathTransferAtSameStop(
+    PathLeg<T> previousLeg,
+    EgressPathLeg<T> egressPathLeg
+  ) {
+    return (
+      previousLeg != null &&
+      previousLeg.isTransitLeg() &&
+      egressPathLeg.egress().hasRides() &&
+      !previousLeg.asTransitLeg().isStaySeatedOntoNextLeg() &&
+      (previousLeg.asTransitLeg().toStop() == egressPathLeg.fromStop())
+    );
+  }
+
   private List<Leg> mapAccessLeg(AccessPathLeg<T> accessPathLeg) {
     if (accessPathLeg.access().isFree()) {
       return List.of();

application/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java

@@ -11,8 +11,8 @@
 import org.opentripplanner.routing.alertpatch.TransitAlert;
 import org.opentripplanner.routing.services.TransitAlertService;
 import org.opentripplanner.transit.model.timetable.Direction;
-import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.updater.alert.TransitAlertProvider;
+import org.opentripplanner.updater.spi.GraphUpdater;
 
 /**
  * This class is used to combine alerts from multiple {@link TransitAlertService}s. Each
@@ -35,16 +35,11 @@ public class DelegatingTransitAlertServiceImpl implements TransitAlertService {
    * This implies that these instances are expected to remain in use indefinitely (not be replaced
    * with new instances or taken out of service over time).
    */
-  public DelegatingTransitAlertServiceImpl(TimetableRepository timetableRepository) {
-    if (timetableRepository.getUpdaterManager() != null) {
-      timetableRepository
-        .getUpdaterManager()
-        .getUpdaterList()
-        .stream()
-        .filter(TransitAlertProvider.class::isInstance)
-        .map(TransitAlertProvider.class::cast)
-        .map(TransitAlertProvider::getTransitAlertService)
-        .forEach(transitAlertServices::add);
+  public DelegatingTransitAlertServiceImpl(Iterable<GraphUpdater> updaters) {
+    for (GraphUpdater updater : updaters) {
+      if (updater instanceof TransitAlertProvider alertProvider) {
+        transitAlertServices.add(alertProvider.getTransitAlertService());
+      }
     }
   }
 

application/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java

@@ -19,6 +19,7 @@
 import org.opentripplanner.ext.sorlandsbanen.SorlandsbanenNorwayService;
 import org.opentripplanner.ext.stopconsolidation.StopConsolidationService;
 import org.opentripplanner.framework.application.OTPFeature;
+import org.opentripplanner.framework.transaction.api.TransactionScope;
 import org.opentripplanner.place.NearbyPlaceFinder;
 import org.opentripplanner.place.NearbyStopFinder;
 import org.opentripplanner.place.nearbystopfinder.StraightLineNearbyStopFinder;
@@ -79,6 +80,14 @@
 public interface OtpServerRequestContext {
   DebugUiConfig debugUiConfig();
 
+  /**
+   * The transaction scope that was captured at the start of this HTTP request. It holds a strong
+   * reference to the current {@link org.opentripplanner.framework.transaction.internal.Transaction},
+   * preventing the {@link org.opentripplanner.framework.transaction.internal.RepositorySnapshotCache}
+   * from GC-ing any snapshot used during this request.
+   */
+  TransactionScope transactionScope();
+
   /**
    * A RouteRequest containing default parameters that will be cloned when handling each request.
    */

application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java

@@ -42,7 +42,6 @@
 import org.opentripplanner.transfer.regular.TransferRepository;
 import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.updater.configure.UpdaterConfigurator;
-import org.opentripplanner.updater.trip.TimetableSnapshotManager;
 import org.opentripplanner.utils.logging.ProgressTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -216,7 +215,8 @@ private void setupTransitRoutingServer() {
       vehicleParkingRepository(),
       timetableRepository(),
       carpoolingRepository(),
-      snapshotManager(),
+      factory.updateManager(),
+      factory.timetableRepositoryHandle(),
       routerConfig().updaterConfig()
     );
 
@@ -305,10 +305,6 @@ public VehicleRentalRepository vehicleRentalRepository() {
     return factory.vehicleRentalRepository();
   }
 
-  private TimetableSnapshotManager snapshotManager() {
-    return factory.timetableSnapshotManager();
-  }
-
   public VehicleParkingService vehicleParkingService() {
     return factory.vehicleParkingService();
   }

application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java

@@ -26,6 +26,9 @@
 import org.opentripplanner.ext.sorlandsbanen.configure.SorlandsbanenNorwayModule;
 import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository;
 import org.opentripplanner.ext.stopconsolidation.configure.StopConsolidationServiceModule;
+import org.opentripplanner.framework.transaction.UpdateManager;
+import org.opentripplanner.framework.transaction.api.RepositoryHandle;
+import org.opentripplanner.framework.transaction.configure.TransactionModule;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueSummary;
 import org.opentripplanner.raptor.configure.RaptorConfig;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.RaptorTransitData;
@@ -65,9 +68,10 @@
 import org.opentripplanner.transfer.regular.configure.TransferServiceModule;
 import org.opentripplanner.transit.configure.TransitModule;
 import org.opentripplanner.transit.model.calendar.DefaultTripCalendars;
+import org.opentripplanner.transit.repository.MutableTimetableSnapshot;
+import org.opentripplanner.transit.repository.ReadOnlyTimetableSnapshot;
 import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.transit.service.TransitService;
-import org.opentripplanner.updater.trip.TimetableSnapshotManager;
 import org.opentripplanner.warmup.WarmupLauncher;
 import org.opentripplanner.warmup.configure.WarmupModule;
 
@@ -105,6 +109,7 @@
     ViaModule.class,
     WarmupModule.class,
     WorldEnvelopeServiceModule.class,
+    TransactionModule.class,
   }
 )
 public interface ConstructApplicationFactory {
@@ -123,7 +128,8 @@ public interface ConstructApplicationFactory {
   VehicleRentalService vehicleRentalService();
   VehicleParkingRepository vehicleParkingRepository();
   VehicleParkingService vehicleParkingService();
-  TimetableSnapshotManager timetableSnapshotManager();
+  UpdateManager updateManager();
+  RepositoryHandle<ReadOnlyTimetableSnapshot, MutableTimetableSnapshot> timetableRepositoryHandle();
   DataImportIssueSummary dataImportIssueSummary();
 
   @Nullable

application/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java

@@ -17,6 +17,8 @@
 import org.opentripplanner.ext.ridehailing.RideHailingService;
 import org.opentripplanner.ext.sorlandsbanen.SorlandsbanenNorwayService;
 import org.opentripplanner.ext.stopconsolidation.StopConsolidationService;
+import org.opentripplanner.framework.transaction.RepositoryRegistry;
+import org.opentripplanner.framework.transaction.api.RepositoryHandle;
 import org.opentripplanner.raptor.configure.RaptorConfig;
 import org.opentripplanner.routing.algorithm.filterchain.ext.EmissionDecorator;
 import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator;
@@ -38,7 +40,10 @@
 import org.opentripplanner.street.linking.VertexLinker;
 import org.opentripplanner.street.service.StreetLimitationParametersService;
 import org.opentripplanner.transfer.regular.RegularTransferService;
-import org.opentripplanner.transit.service.TransitService;
+import org.opentripplanner.transit.repository.MutableTimetableSnapshot;
+import org.opentripplanner.transit.repository.ReadOnlyTimetableSnapshot;
+import org.opentripplanner.transit.service.DefaultTransitService;
+import org.opentripplanner.transit.service.TimetableRepository;
 
 @Module
 public class ConstructApplicationModule {
@@ -51,7 +56,9 @@ OtpServerRequestContext providesServerContext(
     Graph graph,
     LinkingContextFactory linkingContextFactory,
     VertexLinker vertexLinker,
-    TransitService transitService,
+    TimetableRepository timetableRepository,
+    RepositoryRegistry repositoryRegistry,
+    RepositoryHandle<ReadOnlyTimetableSnapshot, MutableTimetableSnapshot> timetableRepositoryHandle,
     RegularTransferService transferService,
     WorldEnvelopeService worldEnvelopeService,
     RealtimeVehicleService realtimeVehicleService,
@@ -83,6 +90,13 @@ OtpServerRequestContext providesServerContext(
     var flexParameters = routerConfig.flexParameters();
     var transmodelAPIParameters = routerConfig.transmodelApi();
 
+    // Create exactly one TransactionScope per request. The scope holds a strong reference to the
+    // current Transaction, preventing the RepositorySnapshotCache from GC-ing the snapshot while
+    // this request is in flight. The scope is stored on DefaultServerRequestContext for this reason.
+    var transactionScope = repositoryRegistry.scope();
+    var timetableSnapshot = timetableRepositoryHandle.repositorySnapshot(transactionScope);
+    var transitService = new DefaultTransitService(timetableRepository, timetableSnapshot);
+
     return new DefaultServerRequestContext(
       debugUiConfig,
       fareService,
@@ -97,6 +111,7 @@ OtpServerRequestContext providesServerContext(
       defaultRequest,
       streetLimitationParametersService,
       transferService,
+      transactionScope,
       transitRoutingConfig,
       transitService,
       triasApiParameters,