remove session id concept

Author: sokra

turbopack/crates/turbo-tasks-backend/src/backend/mod.rs

@@ -27,8 +27,8 @@ use tokio::time::{Duration, Instant};
 use tracing::{Span, field::Empty, info_span, trace_span};
 use turbo_tasks::{
     CellId, FxDashMap, FxIndexMap, KeyValuePair, RawVc, ReadCellOptions, ReadConsistency,
-    ReadOutputOptions, ReadTracking, SessionId, TRANSIENT_TASK_BIT, TaskExecutionReason, TaskId,
-    TraitTypeId, TurboTasksBackendApi, ValueTypeId,
+    ReadOutputOptions, ReadTracking, TRANSIENT_TASK_BIT, TaskExecutionReason, TaskId, TraitTypeId,
+    TurboTasksBackendApi, ValueTypeId,
     backend::{
         Backend, CachedTaskType, CellContent, TaskExecutionSpec, TransientTaskRoot,
         TransientTaskType, TurboTasksExecutionError, TypedCellContent, VerificationMode,
@@ -170,7 +170,6 @@ struct TurboTasksBackendInner<B: BackingStorage> {
     options: BackendOptions,
 
     start_time: Instant,
-    session_id: SessionId,
 
     persisted_task_id_factory: IdFactoryWithReuse<TaskId>,
     transient_task_id_factory: IdFactoryWithReuse<TaskId>,
@@ -244,9 +243,6 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
         Self {
             options,
             start_time: Instant::now(),
-            session_id: backing_storage
-                .next_session_id()
-                .expect("Failed get session id"),
             persisted_task_id_factory: IdFactoryWithReuse::new(
                 next_task_id,
                 TaskId::try_from(TRANSIENT_TASK_BIT - 1).unwrap(),
@@ -285,10 +281,6 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
         ExecuteContextImpl::new(self, turbo_tasks)
     }
 
-    fn session_id(&self) -> SessionId {
-        self.session_id
-    }
-
     /// # Safety
     ///
     /// `tx` must be a transaction from this TurboTasksBackendInner instance.
@@ -1164,7 +1156,6 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
         if !persisted_task_cache_log.is_empty() || !task_snapshots.is_empty() {
             new_items = true;
             if let Err(err) = self.backing_storage.save_snapshot(
-                self.session_id,
                 suspended_operations,
                 persisted_task_cache_log,
                 task_snapshots,

turbopack/crates/turbo-tasks-backend/src/backend/operation/mod.rs

@@ -14,7 +14,7 @@ use std::{
 };
 
 use serde::{Deserialize, Serialize};
-use turbo_tasks::{FxIndexMap, KeyValuePair, SessionId, TaskId, TurboTasksBackendApi};
+use turbo_tasks::{FxIndexMap, KeyValuePair, TaskId, TurboTasksBackendApi};
 
 use crate::{
     backend::{
@@ -51,7 +51,6 @@ pub trait ExecuteContext<'e>: Sized {
     fn child_context<'l, 'r>(&'r self) -> impl ChildExecuteContext<'l> + use<'e, 'l, Self>
     where
         'e: 'l;
-    fn session_id(&self) -> SessionId;
     fn task(&mut self, task_id: TaskId, category: TaskDataCategory) -> Self::TaskGuardImpl;
     fn is_once_task(&self, task_id: TaskId) -> bool;
     fn task_pair(
@@ -181,10 +180,6 @@ where
         }
     }
 
-    fn session_id(&self) -> SessionId {
-        self.backend.session_id()
-    }
-
     fn task(&mut self, task_id: TaskId, category: TaskDataCategory) -> Self::TaskGuardImpl {
         #[cfg(debug_assertions)]
         if self.active_task_locks.fetch_add(1, Ordering::AcqRel) != 0 {

turbopack/crates/turbo-tasks-backend/src/backing_storage.rs

@@ -3,7 +3,7 @@ use std::{any::type_name, sync::Arc};
 use anyhow::Result;
 use either::Either;
 use smallvec::SmallVec;
-use turbo_tasks::{SessionId, TaskId, backend::CachedTaskType};
+use turbo_tasks::{TaskId, backend::CachedTaskType};
 
 use crate::{
     backend::{AnyOperation, TaskDataCategory},
@@ -43,13 +43,11 @@ pub trait BackingStorage: BackingStorageSealed {
 pub trait BackingStorageSealed: 'static + Send + Sync {
     type ReadTransaction<'l>;
     fn next_free_task_id(&self) -> Result<TaskId>;
-    fn next_session_id(&self) -> Result<SessionId>;
     fn uncompleted_operations(&self) -> Result<Vec<AnyOperation>>;
     #[allow(clippy::ptr_arg)]
     fn serialize(&self, task: TaskId, data: &Vec<CachedDataItem>) -> Result<SmallVec<[u8; 16]>>;
     fn save_snapshot<I>(
         &self,
-        session_id: SessionId,
         operations: Vec<Arc<AnyOperation>>,
         task_cache_updates: Vec<ChunkedVec<(Arc<CachedTaskType>, TaskId)>>,
         snapshots: Vec<I>,
@@ -116,10 +114,6 @@ where
         either::for_both!(self, this => this.next_free_task_id())
     }
 
-    fn next_session_id(&self) -> Result<SessionId> {
-        either::for_both!(self, this => this.next_session_id())
-    }
-
     fn uncompleted_operations(&self) -> Result<Vec<AnyOperation>> {
         either::for_both!(self, this => this.uncompleted_operations())
     }
@@ -130,7 +124,6 @@ where
 
     fn save_snapshot<I>(
         &self,
-        session_id: SessionId,
         operations: Vec<Arc<AnyOperation>>,
         task_cache_updates: Vec<ChunkedVec<(Arc<CachedTaskType>, TaskId)>>,
         snapshots: Vec<I>,
@@ -146,7 +139,6 @@ where
             + Sync,
     {
         either::for_both!(self, this => this.save_snapshot(
-            session_id,
             operations,
             task_cache_updates,
             snapshots,

turbopack/crates/turbo-tasks-backend/src/kv_backing_storage.rs

@@ -9,7 +9,7 @@ use anyhow::{Context, Result, anyhow};
 use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
 use turbo_tasks::{
-    SessionId, TaskId,
+    TaskId,
     backend::CachedTaskType,
     panic_hooks::{PanicHookGuard, register_panic_hook},
     parallel,
@@ -71,7 +71,6 @@ fn pot_de_symbol_list<'l>() -> pot::de::SymbolList<'l> {
 
 const META_KEY_OPERATIONS: u32 = 0;
 const META_KEY_NEXT_FREE_TASK_ID: u32 = 1;
-const META_KEY_SESSION_ID: u32 = 2;
 
 struct IntKey([u8; 4]);
 
@@ -238,7 +237,7 @@ impl<T: KeyValueDatabase> KeyValueDatabaseBackingStorageInner<T> {
         Ok(())
     }
 
-    /// Used to read the previous session id and the next free task ID from the database.
+    /// Used to read the next free task ID from the database.
     fn get_infra_u32(&self, key: u32) -> Result<Option<u32>> {
         let tx = self.database.begin_read_transaction()?;
         self.database
@@ -269,16 +268,6 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
             .map_or(Ok(TaskId::MIN), TaskId::try_from)?)
     }
 
-    fn next_session_id(&self) -> Result<SessionId> {
-        Ok(SessionId::try_from(
-            self.inner
-                .get_infra_u32(META_KEY_SESSION_ID)
-                .context("Unable to read session id from database")?
-                .unwrap_or(0)
-                + 1,
-        )?)
-    }
-
     fn uncompleted_operations(&self) -> Result<Vec<AnyOperation>> {
         fn get(database: &impl KeyValueDatabase) -> Result<Vec<AnyOperation>> {
             let tx = database.begin_read_transaction()?;
@@ -302,7 +291,6 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
 
     fn save_snapshot<I>(
         &self,
-        session_id: SessionId,
         operations: Vec<Arc<AnyOperation>>,
         task_cache_updates: Vec<ChunkedVec<(Arc<CachedTaskType>, TaskId)>>,
         snapshots: Vec<I>,
@@ -317,7 +305,7 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
             > + Send
             + Sync,
     {
-        let _span = tracing::trace_span!("save snapshot", session_id = ?session_id, operations = operations.len());
+        let _span = tracing::trace_span!("save snapshot", operations = operations.len());
         let mut batch = self.inner.database.write_batch()?;
 
         // Start organizing the updates in parallel
@@ -401,7 +389,6 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
                 save_infra::<T::SerialWriteBatch<'_>, T::ConcurrentWriteBatch<'_>>(
                     &mut WriteBatchRef::concurrent(batch),
                     next_task_id,
-                    session_id,
                     operations,
                 )?;
             }
@@ -473,7 +460,6 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
                 save_infra::<T::SerialWriteBatch<'_>, T::ConcurrentWriteBatch<'_>>(
                     &mut WriteBatchRef::serial(batch),
                     next_task_id,
-                    session_id,
                     operations,
                 )?;
             }
@@ -608,7 +594,6 @@ where
 fn save_infra<'a, S, C>(
     batch: &mut WriteBatchRef<'_, 'a, S, C>,
     next_task_id: u32,
-    session_id: SessionId,
     operations: Vec<Arc<AnyOperation>>,
 ) -> Result<(), anyhow::Error>
 where
@@ -624,16 +609,6 @@ where
             )
             .with_context(|| anyhow!("Unable to write next free task id"))?;
     }
-    {
-        let _span = tracing::trace_span!("update session id", session_id = ?session_id).entered();
-        batch
-            .put(
-                KeySpace::Infra,
-                WriteBuffer::Borrowed(IntKey::new(META_KEY_SESSION_ID).as_ref()),
-                WriteBuffer::Borrowed(&session_id.to_le_bytes()),
-            )
-            .with_context(|| anyhow!("Unable to write next session id"))?;
-    }
     {
         let _span =
             tracing::trace_span!("update operations", operations = operations.len()).entered();

turbopack/crates/turbo-tasks/src/id.rs

@@ -122,7 +122,6 @@ define_id!(TaskId: u32, derive(Serialize, Deserialize), serde(transparent));
 define_id!(FunctionId: u16);
 define_id!(ValueTypeId: u16);
 define_id!(TraitTypeId: u16);
-define_id!(SessionId: u32, derive(Debug, Serialize, Deserialize), serde(transparent));
 define_id!(
     LocalTaskId: u32,
     derive(Debug, Serialize, Deserialize),

turbopack/crates/turbo-tasks/src/lib.rs

@@ -97,9 +97,7 @@ pub use collectibles::CollectiblesSource;
 pub use completion::{Completion, Completions};
 pub use display::ValueToString;
 pub use effect::{ApplyEffectsContext, Effects, apply_effects, effect, get_effects};
-pub use id::{
-    ExecutionId, LocalTaskId, SessionId, TRANSIENT_TASK_BIT, TaskId, TraitTypeId, ValueTypeId,
-};
+pub use id::{ExecutionId, LocalTaskId, TRANSIENT_TASK_BIT, TaskId, TraitTypeId, ValueTypeId};
 pub use invalidation::{
     InvalidationReason, InvalidationReasonKind, InvalidationReasonSet, Invalidator, get_invalidator,
 };