Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Turbopack] use new backend by default #72434

Merged
merged 3 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 16 additions & 10 deletions crates/napi/src/next_api/utils.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::{
collections::HashMap, env, future::Future, ops::Deref, path::PathBuf, sync::Arc, time::Duration,
collections::HashMap, future::Future, ops::Deref, path::PathBuf, sync::Arc, time::Duration,
};

use anyhow::{anyhow, Context, Result};
Expand All @@ -12,7 +12,9 @@ use serde::Serialize;
use turbo_tasks::{
trace::TraceRawVcs, OperationVc, ReadRef, TaskId, TryJoinIterExt, TurboTasks, UpdateInfo, Vc,
};
use turbo_tasks_backend::{default_backing_storage, DefaultBackingStorage};
use turbo_tasks_backend::{
default_backing_storage, noop_backing_storage, DefaultBackingStorage, NoopBackingStorage,
};
use turbo_tasks_fs::FileContent;
use turbopack_core::{
diagnostics::{Diagnostic, DiagnosticContextExt, PlainDiagnostic},
Expand All @@ -25,7 +27,7 @@ use crate::util::log_internal_error_and_inform;

#[derive(Clone)]
pub enum NextTurboTasks {
Memory(Arc<TurboTasks<turbo_tasks_memory::MemoryBackend>>),
Memory(Arc<TurboTasks<turbo_tasks_backend::TurboTasksBackend<NoopBackingStorage>>>),
PersistentCaching(
Arc<TurboTasks<turbo_tasks_backend::TurboTasksBackend<DefaultBackingStorage>>>,
),
Expand Down Expand Up @@ -108,7 +110,7 @@ impl NextTurboTasks {

pub fn memory_backend(&self) -> Option<&turbo_tasks_memory::MemoryBackend> {
match self {
NextTurboTasks::Memory(turbo_tasks) => Some(turbo_tasks.backend()),
NextTurboTasks::Memory(_) => None,
NextTurboTasks::PersistentCaching(_) => None,
}
}
Expand All @@ -124,7 +126,7 @@ impl NextTurboTasks {
pub fn create_turbo_tasks(
output_path: PathBuf,
persistent_caching: bool,
memory_limit: usize,
_memory_limit: usize,
) -> Result<NextTurboTasks> {
Ok(if persistent_caching {
let dirty_suffix = if crate::build::GIT_CLEAN
Expand Down Expand Up @@ -162,11 +164,15 @@ pub fn create_turbo_tasks(
),
))
} else {
let mut backend = turbo_tasks_memory::MemoryBackend::new(memory_limit);
if env::var_os("NEXT_TURBOPACK_PRINT_TASK_INVALIDATION").is_some() {
backend.print_task_invalidation(true);
}
NextTurboTasks::Memory(TurboTasks::new(backend))
NextTurboTasks::Memory(TurboTasks::new(
turbo_tasks_backend::TurboTasksBackend::new(
turbo_tasks_backend::BackendOptions {
storage_mode: None,
..Default::default()
},
noop_backing_storage(),
),
))
})
}

Expand Down
4 changes: 2 additions & 2 deletions turbopack/crates/turbo-tasks-backend/benches/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ pub(crate) mod scope_stress;
pub(crate) mod stress;

criterion_group!(
name = turbo_tasks_memory_stress;
name = turbo_tasks_backend_stress;
config = Criterion::default();
targets = stress::fibonacci, scope_stress::scope_stress
);
criterion_main!(turbo_tasks_memory_stress);
criterion_main!(turbo_tasks_backend_stress);

pub fn register() {
turbo_tasks::register();
Expand Down
2 changes: 1 addition & 1 deletion turbopack/crates/turbopack-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ turbo-tasks = { workspace = true }
turbo-tasks-bytes = { workspace = true }
turbo-tasks-env = { workspace = true }
turbo-tasks-fs = { workspace = true }
turbo-tasks-memory = { workspace = true }
turbo-tasks-backend = { workspace = true }
turbopack-browser = { workspace = true, features = ["test"] }
turbopack-cli-utils = { workspace = true }
turbopack-core = { workspace = true, features = ["issue_path"] }
Expand Down
10 changes: 8 additions & 2 deletions turbopack/crates/turbopack-tests/tests/execution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ use turbo_tasks::{
apply_effects, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, Completion,
NonLocalValue, OperationVc, ResolvedVc, TryJoinIterExt, TurboTasks, Value, Vc,
};
use turbo_tasks_backend::{noop_backing_storage, BackendOptions, TurboTasksBackend};
use turbo_tasks_bytes::stream::SingleValue;
use turbo_tasks_env::CommandLineProcessEnv;
use turbo_tasks_fs::{
json::parse_json_with_source_context, util::sys_to_unix, DiskFileSystem, FileContent,
FileSystem, FileSystemEntryType, FileSystemPath,
};
use turbo_tasks_memory::MemoryBackend;
use turbopack::{
ecmascript::TreeShakingMode,
module_options::{EcmascriptOptionsContext, ModuleOptionsContext, TypescriptTransformOptions},
Expand Down Expand Up @@ -168,7 +168,13 @@ async fn run(resource: PathBuf, snapshot_mode: IssueSnapshotMode) -> Result<JsRe
std::fs::remove_dir_all(&output_path)?;
}

let tt = TurboTasks::new(MemoryBackend::default());
let tt = TurboTasks::new(TurboTasksBackend::new(
BackendOptions {
storage_mode: None,
..Default::default()
},
noop_backing_storage(),
));
tt.run_once(async move {
let emit_op =
run_inner_operation(resource.to_str().unwrap().into(), Value::new(snapshot_mode));
Expand Down
10 changes: 8 additions & 2 deletions turbopack/crates/turbopack-tests/tests/snapshot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ use turbo_tasks::{
apply_effects, ReadConsistency, ReadRef, ResolvedVc, TryJoinIterExt, TurboTasks, Value,
ValueToString, Vc,
};
use turbo_tasks_backend::{noop_backing_storage, BackendOptions, TurboTasksBackend};
use turbo_tasks_env::DotenvProcessEnv;
use turbo_tasks_fs::{
json::parse_json_with_source_context, util::sys_to_unix, DiskFileSystem, FileSystem,
FileSystemPath,
};
use turbo_tasks_memory::MemoryBackend;
use turbopack::{
ecmascript::{EcmascriptInputTransform, TreeShakingMode},
module_options::{
Expand Down Expand Up @@ -156,7 +156,13 @@ fn test(resource: PathBuf) {
async fn run(resource: PathBuf) -> Result<()> {
register();

let tt = TurboTasks::new(MemoryBackend::default());
let tt = TurboTasks::new(TurboTasksBackend::new(
BackendOptions {
storage_mode: None,
..Default::default()
},
noop_backing_storage(),
));
let task = tt.spawn_once_task(async move {
let emit_op = run_inner_operation(resource.to_str().unwrap().into());
emit_op.read_strongly_consistent().await?;
Expand Down
Loading